Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
a00dd374
Commit
a00dd374
authored
Oct 05, 2018
by
Nilu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update content of team members based on hiring team.
Adding common hiring team select to header
parent
2c852b9a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
176 additions
and
50 deletions
+176
-50
SaveCompanyUserFP.java
cmsWebApp/src/performa/form/SaveCompanyUserFP.java
+30
-2
SelectHiringTeamFP.java
cmsWebApp/src/performa/form/SelectHiringTeamFP.java
+28
-0
SendUserInvitationFP.java
cmsWebApp/src/performa/form/SendUserInvitationFP.java
+23
-12
BaseCompanyUser.java
cmsWebApp/src/performa/orm/BaseCompanyUser.java
+0
-0
CompanyUser.java
cmsWebApp/src/performa/orm/CompanyUser.java
+14
-0
CompanyUser.xml
cmsWebApp/src/performa/orm/CompanyUser.xml
+2
-0
common.css
cmsWebApp/webroot/css/common.css
+2
-0
CustomServlets_adminPortal.xml
...oot/extensions/adminportal/CustomServlets_adminPortal.xml
+1
-0
assessment_criteria.jsp
...pp/webroot/extensions/adminportal/assessment_criteria.jsp
+1
-1
edit_client.jsp
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
+1
-1
forgot_password.jsp
cmsWebApp/webroot/extensions/adminportal/forgot_password.jsp
+1
-1
hiring_teams.jsp
cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp
+1
-1
htmlheader.jsp
cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp
+38
-1
job_match_assessment.jsp
...p/webroot/extensions/adminportal/job_match_assessment.jsp
+1
-1
job_payment.jsp
cmsWebApp/webroot/extensions/adminportal/job_payment.jsp
+1
-1
manage_plan.jsp
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
+1
-1
manage_users.jsp
cmsWebApp/webroot/extensions/adminportal/manage_users.jsp
+23
-22
my_company.jsp
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
+1
-1
my_details.jsp
cmsWebApp/webroot/extensions/adminportal/my_details.jsp
+2
-0
view_applicants_shortlist.jsp
...root/extensions/adminportal/view_applicants_shortlist.jsp
+1
-1
view_applicants_shortlist_grid.jsp
...extensions/adminportal/view_applicants_shortlist_grid.jsp
+1
-1
view_applicants_unsuitable.jsp
...oot/extensions/adminportal/view_applicants_unsuitable.jsp
+1
-1
view_applicantss_grid.jsp
.../webroot/extensions/adminportal/view_applicantss_grid.jsp
+1
-1
workplace_culture.jsp
...bApp/webroot/extensions/adminportal/workplace_culture.jsp
+1
-1
No files found.
cmsWebApp/src/performa/form/SaveCompanyUserFP.java
View file @
a00dd374
...
@@ -12,6 +12,11 @@ import oneit.utils.BusinessException;
...
@@ -12,6 +12,11 @@ import oneit.utils.BusinessException;
import
performa.orm.Company
;
import
performa.orm.Company
;
import
performa.orm.CompanyUser
;
import
performa.orm.CompanyUser
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
oneit.objstore.ObjectTransaction
;
import
oneit.objstore.rdbms.filters.EqualsFilter
;
import
oneit.utils.CollectionUtils
;
import
performa.orm.CompanyUserHiringTeamLink
;
import
performa.orm.HiringTeam
;
public
class
SaveCompanyUserFP
extends
SaveFP
public
class
SaveCompanyUserFP
extends
SaveFP
...
@@ -20,15 +25,37 @@ public class SaveCompanyUserFP extends SaveFP
...
@@ -20,15 +25,37 @@ public class SaveCompanyUserFP extends SaveFP
public
SuccessfulResult
processForm
(
ORMProcessState
process
,
SubmissionDetails
submission
,
Map
params
)
throws
BusinessException
,
StorageException
public
SuccessfulResult
processForm
(
ORMProcessState
process
,
SubmissionDetails
submission
,
Map
params
)
throws
BusinessException
,
StorageException
{
{
HttpServletRequest
request
=
submission
.
getRequest
();
HttpServletRequest
request
=
submission
.
getRequest
();
ObjectTransaction
objTran
=
process
.
getTransaction
();
HiringTeam
hiringTeam
=
(
HiringTeam
)
request
.
getAttribute
(
"HiringTeam"
);
CompanyUser
companyUser
=
(
CompanyUser
)
request
.
getAttribute
(
"CompanyUser"
);
CompanyUser
companyUser
=
(
CompanyUser
)
request
.
getAttribute
(
"CompanyUser"
);
Boolean
disabled
=
(
Boolean
)
request
.
getAttribute
(
"disabled"
);
Boolean
disabled
=
(
Boolean
)
request
.
getAttribute
(
"disabled"
);
Boolean
remove
=
(
Boolean
)
request
.
getAttribute
(
"remove"
);
LogMgr
.
log
(
Company
.
LOG
,
LogLevel
.
PROCESSING1
,
"In SaveCompanyUserFP saving company user : "
,
companyUser
);
LogMgr
.
log
(
Company
.
LOG
,
LogLevel
.
PROCESSING1
,
"In SaveCompanyUserFP saving company user : "
,
companyUser
);
companyUser
.
setIsDisabled
(
disabled
);
if
(
disabled
!=
null
)
{
companyUser
.
setIsDisabled
(
disabled
);
LogMgr
.
log
(
Company
.
LOG
,
LogLevel
.
PROCESSING1
,
"In SaveCompanyUserFP setting is disabled : "
,
disabled
,
" for company user : "
,
companyUser
);
LogMgr
.
log
(
Company
.
LOG
,
LogLevel
.
PROCESSING1
,
"In SaveCompanyUserFP setting is disabled : "
,
disabled
,
" for company user : "
,
companyUser
);
}
if
(
CollectionUtils
.
equals
(
remove
,
Boolean
.
TRUE
))
{
CompanyUserHiringTeamLink
[]
links
=
CompanyUserHiringTeamLink
.
SearchByAll
()
.
andHiringTeam
(
new
EqualsFilter
<>(
hiringTeam
))
.
andCompanyUser
(
new
EqualsFilter
<>(
companyUser
))
.
search
(
objTran
);
for
(
CompanyUserHiringTeamLink
link:
links
)
{
link
.
delete
();
LogMgr
.
log
(
Company
.
LOG
,
LogLevel
.
PROCESSING1
,
"In SaveCompanyUserFP removing link of company user : "
,
companyUser
,
" for hiring team : "
,
hiringTeam
);
}
}
return
super
.
processForm
(
process
,
submission
,
params
);
return
super
.
processForm
(
process
,
submission
,
params
);
}
}
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/SelectHiringTeamFP.java
0 → 100644
View file @
a00dd374
package
performa
.
form
;
import
java.util.Map
;
import
javax.servlet.http.HttpServletRequest
;
import
oneit.logging.*
;
import
oneit.objstore.StorageException
;
import
oneit.servlets.forms.*
;
import
oneit.servlets.process.*
;
import
oneit.utils.BusinessException
;
import
performa.orm.*
;
public
class
SelectHiringTeamFP
extends
ORMProcessFormProcessor
{
@Override
public
SuccessfulResult
processForm
(
ORMProcessState
process
,
SubmissionDetails
submission
,
Map
params
)
throws
BusinessException
,
StorageException
{
HttpServletRequest
request
=
submission
.
getRequest
();
CompanyUser
companyUser
=
(
CompanyUser
)
request
.
getAttribute
(
"CompanyUser"
);
LogMgr
.
log
(
Job
.
LOG
,
LogLevel
.
PROCESSING1
,
"Inside SelectHiringTeamFP for "
,
companyUser
,
" selected hiring team : "
,
companyUser
.
getSelectedTeam
());
request
.
getSession
().
setAttribute
(
"SelectedHiringTeam"
,
companyUser
.
getSelectedTeam
());
return
RedisplayResult
.
getInstance
();
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/SendUserInvitationFP.java
View file @
a00dd374
...
@@ -41,7 +41,6 @@ public class SendUserInvitationFP extends SaveFP
...
@@ -41,7 +41,6 @@ public class SendUserInvitationFP extends SaveFP
{
{
BusinessObjectParser
.
assertFieldCondition
(
company
.
getUserEmail
()!=
null
,
company
,
Company
.
FIELD_UserEmail
,
"mandatory"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(
company
.
getUserEmail
()!=
null
,
company
,
Company
.
FIELD_UserEmail
,
"mandatory"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(
StringUtils
.
isEmailAddress
(
company
.
getUserEmail
()),
company
,
Company
.
FIELD_UserEmail
,
"invalidEmail"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(
StringUtils
.
isEmailAddress
(
company
.
getUserEmail
()),
company
,
Company
.
FIELD_UserEmail
,
"invalidEmail"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(!
Utils
.
isCompanyUserEmailFound
(
process
.
getTransaction
(),
company
.
getUserEmail
()),
company
,
Company
.
FIELD_UserEmail
,
"emailExists"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(
company
.
getRoleType
()!=
null
,
company
,
Company
.
FIELD_RoleType
,
"mandatory"
,
exceptions
,
true
,
request
);
BusinessObjectParser
.
assertFieldCondition
(
company
.
getRoleType
()!=
null
,
company
,
Company
.
FIELD_RoleType
,
"mandatory"
,
exceptions
,
true
,
request
);
}
}
...
@@ -56,6 +55,7 @@ public class SendUserInvitationFP extends SaveFP
...
@@ -56,6 +55,7 @@ public class SendUserInvitationFP extends SaveFP
ObjectTransaction
objTran
=
process
.
getTransaction
();
ObjectTransaction
objTran
=
process
.
getTransaction
();
Company
company
=
(
Company
)
process
.
getAttribute
(
"Company"
);
Company
company
=
(
Company
)
process
.
getAttribute
(
"Company"
);
CompanyUser
resendUser
=
(
CompanyUser
)
request
.
getAttribute
(
"ResendUser"
);
CompanyUser
resendUser
=
(
CompanyUser
)
request
.
getAttribute
(
"ResendUser"
);
HiringTeam
hiringTeam
=
(
HiringTeam
)
request
.
getAttribute
(
"HiringTeam"
);
if
(
resendUser
!=
null
)
if
(
resendUser
!=
null
)
{
{
...
@@ -78,20 +78,31 @@ public class SendUserInvitationFP extends SaveFP
...
@@ -78,20 +78,31 @@ public class SendUserInvitationFP extends SaveFP
secUser
.
setUserName
(
company
.
getUserEmail
().
toLowerCase
());
secUser
.
setUserName
(
company
.
getUserEmail
().
toLowerCase
());
}
}
CompanyUser
newComUser
=
secUser
.
getExtensionOrCreate
(
CompanyUser
.
REFERENCE_CompanyUser
);
CompanyUser
comUser
=
secUser
.
getExtension
(
CompanyUser
.
REFERENCE_CompanyUser
);
secUser
.
setEmail
(
secUser
.
getUserName
());
if
(
comUser
==
null
)
secUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
CompanyUser
.
DEFAULT_PASSWORD
);
{
secUser
.
addRole
(
Utils
.
getRole
(
Utils
.
ROLE_CLIENT
,
objTran
));
comUser
=
secUser
.
getExtensionOrCreate
(
CompanyUser
.
REFERENCE_CompanyUser
);
secUser
.
setFirstName
(
company
.
getFirstName
());
secUser
.
setLastName
(
company
.
getLastName
());
secUser
.
setEmail
(
secUser
.
getUserName
());
secUser
.
setAttribute
(
"md5:"
+
SecUser
.
FIELD_Password
,
CompanyUser
.
DEFAULT_PASSWORD
);
newComUser
.
setCompany
(
company
);
secUser
.
addRole
(
Utils
.
getRole
(
Utils
.
ROLE_CLIENT
,
objTran
));
newComUser
.
setRole
(
company
.
getRoleType
());
secUser
.
setFirstName
(
company
.
getFirstName
());
secUser
.
setLastName
(
company
.
getLastName
());
comUser
.
setDefaultHiringTeam
(
hiringTeam
);
comUser
.
setCompany
(
company
);
}
CompanyUserHiringTeamLink
link
=
CompanyUserHiringTeamLink
.
createCompanyUserHiringTeamLink
(
objTran
);
link
.
setCompanyUser
(
comUser
);
link
.
setHiringTeam
(
hiringTeam
);
comUser
.
setRole
(
company
.
getRoleType
());
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"New user created :: "
,
secUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"New user created :: "
,
secUser
);
sendInvitationMail
(
newC
omUser
,
request
,
objTran
);
sendInvitationMail
(
c
omUser
,
request
,
objTran
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"End of sending invitation email."
,
secUser
);
LogMgr
.
log
(
LOG
,
LogLevel
.
PROCESSING1
,
"End of sending invitation email."
,
secUser
);
}
}
...
...
cmsWebApp/src/performa/orm/BaseCompanyUser.java
View file @
a00dd374
This diff is collapsed.
Click to expand it.
cmsWebApp/src/performa/orm/CompanyUser.java
View file @
a00dd374
...
@@ -185,4 +185,17 @@ public class CompanyUser extends BaseCompanyUser
...
@@ -185,4 +185,17 @@ public class CompanyUser extends BaseCompanyUser
{
{
return
CollectionUtils
.
equals
(
getCompany
().
getAddedByUser
(),
this
);
return
CollectionUtils
.
equals
(
getCompany
().
getAddedByUser
(),
this
);
}
}
public
HiringTeam
getActiveHiringTeam
()
{
return
getSelectedTeam
()
!=
null
?
getSelectedTeam
()
:
getDefaultHiringTeam
();
}
@Override
public
HiringTeam
getSelectedTeam
()
throws
StorageException
{
return
super
.
getSelectedTeam
()
==
null
?
getDefaultHiringTeam
()
:
super
.
getSelectedTeam
();
}
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/CompanyUser.xml
View file @
a00dd374
...
@@ -13,6 +13,8 @@
...
@@ -13,6 +13,8 @@
<TRANSIENT
name=
"Password"
type=
"String"
/>
<TRANSIENT
name=
"Password"
type=
"String"
/>
<TRANSIENT
name=
"ConfirmPassword"
type=
"String"
/>
<TRANSIENT
name=
"ConfirmPassword"
type=
"String"
/>
<TRANSIENTSINGLE
name=
"SelectedTeam"
type=
"HiringTeam"
/>
<TABLE
name=
"oneit_sec_user_extension"
tablePrefix=
"object"
polymorphic=
"TRUE"
>
<TABLE
name=
"oneit_sec_user_extension"
tablePrefix=
"object"
polymorphic=
"TRUE"
>
<ATTRIB
name=
"ForgotPasswordMailSendDate"
type=
"Date"
dbcol=
"forgot_password_mail_send_date"
/>
<ATTRIB
name=
"ForgotPasswordMailSendDate"
type=
"Date"
dbcol=
"forgot_password_mail_send_date"
/>
...
...
cmsWebApp/webroot/css/common.css
View file @
a00dd374
...
@@ -620,6 +620,8 @@ span.select2-selection.select2-selection--single:focus{
...
@@ -620,6 +620,8 @@ span.select2-selection.select2-selection--single:focus{
}
}
.wider-select
.select2-container
{
width
:
100%
!important
;}
.wider-select
.select2-container
{
width
:
100%
!important
;}
.header-select
{
margin
:
10px
20px
;}
.header-select
.select2-container
{
width
:
40%
!important
;}
.select2-container
option
{
.select2-container
option
{
margin
:
12px
15px
;
margin
:
12px
15px
;
...
...
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
View file @
a00dd374
...
@@ -59,6 +59,7 @@
...
@@ -59,6 +59,7 @@
<FORM
name=
"*.replaceCard"
factory=
"Participant"
class=
"performa.form.ReplaceCardFP"
/>
<FORM
name=
"*.replaceCard"
factory=
"Participant"
class=
"performa.form.ReplaceCardFP"
/>
<FORM
name=
"*.addHiringTeam"
factory=
"Participant"
class=
"performa.form.AddHiringTeamFP"
/>
<FORM
name=
"*.addHiringTeam"
factory=
"Participant"
class=
"performa.form.AddHiringTeamFP"
/>
<FORM
name=
"*.saveCompanyUser"
factory=
"Participant"
class=
"performa.form.SaveCompanyUserFP"
/>
<FORM
name=
"*.saveCompanyUser"
factory=
"Participant"
class=
"performa.form.SaveCompanyUserFP"
/>
<FORM
name=
"*.selectHiringTeam"
factory=
"Participant"
class=
"performa.form.SelectHiringTeamFP"
/>
</NODE>
</NODE>
<NODE
name=
"job_assessment_criteria_add_jsp"
factory=
"Participant"
>
<NODE
name=
"job_assessment_criteria_add_jsp"
factory=
"Participant"
>
...
...
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
View file @
a00dd374
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
editJob
"), {'recalcOnError':true});
$(".switch input[type='checkbox']").change(function() {
$(".switch input[type='checkbox']").change(function() {
$("button[name$='changeAssessmentCriteria']").click();
$("button[name$='changeAssessmentCriteria']").click();
...
...
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
View file @
a00dd374
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<script>
<script>
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
editClient
"), {'recalcOnError':true});
$("#upload").change(function(){
$("#upload").change(function(){
readURL(this);
readURL(this);
...
...
cmsWebApp/webroot/extensions/adminportal/forgot_password.jsp
View file @
a00dd374
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function() {
$(document).ready(function() {
recalcFunction = setupRecalc ($("for
m
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("for
gotPassword
"), {'recalcOnError':true});
$('input[type="text"]').keyup(function() {
$('input[type="text"]').keyup(function() {
$(this).change();
$(this).change();
...
...
cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp
View file @
a00dd374
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
listHiringTeams
"), {'recalcOnError':true});
});
});
</script>
</script>
...
...
cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp
View file @
a00dd374
...
@@ -7,7 +7,14 @@
...
@@ -7,7 +7,14 @@
<
%
<
%
Company
company =
clientUser
!=
null
&&
clientUser
.
getExtension
(
CompanyUser
.
REFERENCE_CompanyUser
)
!=
null
Company
company =
clientUser
!=
null
&&
clientUser
.
getExtension
(
CompanyUser
.
REFERENCE_CompanyUser
)
!=
null
?
clientUser
.
getExtension
(
CompanyUser
.
REFERENCE_CompanyUser
).
getCompany
()
:
null
;
?
clientUser
.
getExtension
(
CompanyUser
.
REFERENCE_CompanyUser
).
getCompany
()
:
null
;
CompanyUser
companyUser =
clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
User
intercomUser =
(User)session.getAttribute("IntercomUser");
User
intercomUser =
(User)session.getAttribute("IntercomUser");
HiringTeam
selectedTeam =
(HiringTeam)
session
.
getAttribute
("
SelectedHiringTeam
");
if
(
selectedTeam
!=
null
&&
companyUser
!=
null
)
{
companyUser
.
setSelectedTeam
(
selectedTeam
.
getInTransaction
(
objTran
));
}
if
(
intercomUser =
=
null
)
if
(
intercomUser =
=
null
)
{
{
...
@@ -70,15 +77,44 @@
...
@@ -70,15 +77,44 @@
}
}
%>
%>
<header>
<header>
<oneit:form
name=
"headerForm"
method=
"post"
enctype=
"multipart/form-data"
>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
()
{
$
(
'select[name$=SelectedTeam]'
).
change
(
function
()
{
$
(
'.change-hiring-team'
).
click
();
});
});
</script>
<div
class=
"container-fluid"
>
<div
class=
"container-fluid"
>
<div
class=
"row"
style=
"background-color: #ffffff;"
>
<div
class=
"row"
style=
"background-color: #ffffff;"
>
<div
class=
"site-logo"
>
<div
class=
"site-logo"
>
<a
href=
"<%= homeUrl %>"
><img
src=
"images/logo.svg"
></a>
<a
href=
"<%= homeUrl %>"
><img
src=
"images/logo.svg"
></a>
</div>
</div>
<div
class=
"search-bar"
style=
"display: none;"
>
<div
class=
"search-bar"
>
<
%
if
(
companyUser
!=
null
)
{
%
>
<div
class=
"header-select"
>
<tagfile:ormsingleasso
_select
obj=
"<%= companyUser %>"
assocName=
"SelectedTeam"
options=
"<%= company.getHiringTeamsSet().toArray(new HiringTeam[0]) %>"
cssClass=
"selected-team"
/>
</div>
<
%
}
%
>
<oneit:button
name=
"selectHiringTeam"
value=
"Save"
cssClass=
"change-hiring-team hidden"
requestAttribs=
"<%= CollectionUtils.mapEntry("
CompanyUser
",
companyUser
)
//
.
mapEntry
("
nextPage
",
currentPage
)
.
toMap
()
%
>
" />
<
%
--
<
div
class=
"inset-shadow"
></div>
<
div
class=
"inset-shadow"
></div>
<img
src=
"images/search-icon.svg"
/>
<img
src=
"images/search-icon.svg"
/>
<input
type=
"text"
class=
"form-control"
placeholder=
"<%= company.showHasClientSupport() ? "
Search
for
job
,
candidate
or
client
"
:
"
Search
for
a
job
or
candidate
"%
>
"/>
<input
type=
"text"
class=
"form-control"
placeholder=
"<%= company.showHasClientSupport() ? "
Search
for
job
,
candidate
or
client
"
:
"
Search
for
a
job
or
candidate
"%
>
"/>
--%>
</div>
</div>
<div
class=
"fl-right"
>
<div
class=
"fl-right"
>
<div
class=
"notification-bar"
>
<div
class=
"notification-bar"
>
...
@@ -117,6 +153,7 @@
...
@@ -117,6 +153,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
</oneit:form>
</header>
</header>
<script
type=
"text/javascript"
>
<script
type=
"text/javascript"
>
...
...
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
View file @
a00dd374
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%>
%>
<script>
<script>
$(document).ready(function(){
$(document).ready(function(){
setupRecalc ($("
form
"), {'recalcOnError':true});
setupRecalc ($("
editJob
"), {'recalcOnError':true});
});
});
</script>
</script>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
...
...
cmsWebApp/webroot/extensions/adminportal/job_payment.jsp
View file @
a00dd374
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
editJob
"), {'recalcOnError':true});
addPostRecalcHandler(function ($fieldThatChanged) {
addPostRecalcHandler(function ($fieldThatChanged) {
if (! $fieldThatChanged) {
if (! $fieldThatChanged) {
...
...
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
View file @
a00dd374
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
editCompany
"), {'recalcOnError':true});
$("#upload").change(function(){
$("#upload").change(function(){
readURL(this);
readURL(this);
...
...
cmsWebApp/webroot/extensions/adminportal/manage_users.jsp
View file @
a00dd374
...
@@ -14,27 +14,20 @@
...
@@ -14,27 +14,20 @@
SecUser secUser = SecUser.getTXUser(objTran);
SecUser secUser = SecUser.getTXUser(objTran);
Company company = (Company) process.getAttribute("Company");
Company company = (Company) process.getAttribute("Company");
CompanyUser comUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
CompanyUser comUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = comUser.getActiveHiringTeam();
UserSortOption userSortOpt = (UserSortOption) process.getAttribute("UserSortOption");
UserSortOption userSortOpt = (UserSortOption) process.getAttribute("UserSortOption");
Collection companyUsers = (Collection<CompanyUser>) process.getAttribute("CompanyUsers");
Set<CompanyUser> allUsers = CompanyUserHiringTeamLink.pipesCompanyUserHiringTeamLink(hiringTeam.getUsersSet()).toCompanyUser().uniqueVals();
Collection pendingUsers = (Collection<CompanyUser>) process.getAttribute("PendingUsers");
Collection companyUsers = CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.FALSE)));
Collection disabledUsers = (Collection<CompanyUser>) process.getAttribute("DisabledUsers");
Collection pendingUsers = CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new NotEqualsFilter<>(Boolean.TRUE)));
Collection disabledUsers = CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.TRUE)));
Debug.assertion(hiringTeam != null, "Hiring Team is null in admin portal Manage Teammates");
if(company == null)
if(company == null)
{
{
company = comUser.getCompany();
company = comUser.getCompany();
process.setAttribute("Company", company);
process.setAttribute("Company", company);
}
}
if(companyUsers == null || pendingUsers == null || disabledUsers == null)
{
companyUsers = CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.FALSE)));
pendingUsers = CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new NotEqualsFilter<>(Boolean.TRUE)));
disabledUsers = CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.TRUE)));
process.setAttribute("CompanyUsers", companyUsers);
process.setAttribute("PendingUsers", pendingUsers);
process.setAttribute("DisabledUsers", disabledUsers);
}
if( request.getParameter("UserSortOption") != null)
if( request.getParameter("UserSortOption") != null)
{
{
...
@@ -58,7 +51,7 @@
...
@@ -58,7 +51,7 @@
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
listUsers
"), {'recalcOnError':true});
$(".user-role").change(function()
$(".user-role").change(function()
{
{
...
@@ -133,6 +126,8 @@
...
@@ -133,6 +126,8 @@
</div>
</div>
</div>
</div>
<div class="main-manage-userlist">
<div class="main-manage-userlist">
<%
<%
for(CompanyUser companyUser : sortedCompanyUsers)
for(CompanyUser companyUser : sortedCompanyUsers)
{
{
...
@@ -140,7 +135,16 @@
...
@@ -140,7 +135,16 @@
%>
%>
<div class="user-list-row" id="<%= companyUser.getID() %>">
<div class="user-list-row" id="<%= companyUser.getID() %>">
<div class="m-user-left">
<div class="m-user-left">
<div class="remove-icon">_</div>
<oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner() ? 'hide': 'show'" companyUser="<%= companyUser %>">
<oneit:button value=" " name="saveCompanyUser" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry("remove", Boolean.TRUE)
.mapEntry("CompanyUser", companyUser)
.mapEntry("HiringTeam", hiringTeam)
.toMap() %>">
<div class="remove-icon">_</div>
</oneit:button>
</oneit:recalcClass>
<div class="m-user-icon"><img src="images/user-list-icon.png"></div>
<div class="m-user-icon"><img src="images/user-list-icon.png"></div>
<div class="m-user-info">
<div class="m-user-info">
<div class="m-user-name">
<div class="m-user-name">
...
@@ -169,7 +173,6 @@
...
@@ -169,7 +173,6 @@
<div class="m-user-right">
<div class="m-user-right">
<oneit:ormEnum obj="<%= companyUser %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.ADMIN, RoleType.STANDARD}) %>"/>
<oneit:ormEnum obj="<%= companyUser %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.ADMIN, RoleType.STANDARD}) %>"/>
</div>
</div>
<oneit:button name="save" value="Save" cssClass="<%= "save-user" + companyUser.getID().toString() + " hidden"%>"
<oneit:button name="save" value="Save" cssClass="<%= "save-user" + companyUser.getID().toString() + " hidden"%>"
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser).mapEntry("nextPage", usersPage + "&UserSortOption=" + userSortOpt).toMap() %>" />
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser).mapEntry("nextPage", usersPage + "&UserSortOption=" + userSortOpt).toMap() %>" />
...
@@ -223,6 +226,7 @@
...
@@ -223,6 +226,7 @@
<oneit:button value="<%= resendTxt %>" name="sendUserInvites" skin="link"
<oneit:button value="<%= resendTxt %>" name="sendUserInvites" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry ("ResendUser", pendingUser)
.mapEntry ("ResendUser", pendingUser)
.mapEntry ("HiringTeam", hiringTeam)
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.toMap() %>" />
.toMap() %>" />
</div>
</div>
...
@@ -290,10 +294,6 @@
...
@@ -290,10 +294,6 @@
<label><oneit:label GUIName="Role" /></label>
<label><oneit:label GUIName="Role" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="RoleType" cssClass="form-control"/>
<oneit:ormEnum obj="<%= company %>" attributeName="RoleType" cssClass="form-control"/>
</div>
</div>
<div class="form-group">
<label><oneit:label GUIName="Add to multiple hiring teams" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="RoleType" cssClass="form-control"/>
</div>
<div class="correctEmail" >
<div class="correctEmail" >
<oneit:recalc mode="Boolean" script="company.isEmailCorrect()" company="<%= company %>" />
<oneit:recalc mode="Boolean" script="company.isEmailCorrect()" company="<%= company %>" />
</div>
</div>
...
@@ -301,6 +301,7 @@
...
@@ -301,6 +301,7 @@
<oneit:button value="Invite" name="sendUserInvites" cssClass="btn btn-invite"
<oneit:button value="Invite" name="sendUserInvites" cssClass="btn btn-invite"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("HiringTeam", hiringTeam)
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.toMap() %>" />
.toMap() %>" />
</oneit:recalcClass>
</oneit:recalcClass>
...
...
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
View file @
a00dd374
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
editCompany
"), {'recalcOnError':true});
$("#upload").change(function(){
$("#upload").change(function(){
readURL(this);
readURL(this);
...
...
cmsWebApp/webroot/extensions/adminportal/my_details.jsp
View file @
a00dd374
...
@@ -104,6 +104,8 @@
...
@@ -104,6 +104,8 @@
<div class="wider-select">
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= companyUser %>" assocName="DefaultHiringTeam" options="<%= Utils.getHiringTeamsByUser(companyUser) %>"/>
<tagfile:ormsingleasso_select obj="<%= companyUser %>" assocName="DefaultHiringTeam" options="<%= Utils.getHiringTeamsByUser(companyUser) %>"/>
</div>
</div>
<tagfile:ormsingleasso_select obj="<%= companyUser %>" assocName="DefaultHiringTeam" options="<%= companyUser.getCompany().getHiringTeamsSet().toArray(new HiringTeam[0]) %>"/>
</div>
</div>
<div class="text-center form-group">
<div class="text-center form-group">
<oneit:button value="Save Updates" name="saveUserDetails" cssClass="btn btn-primary largeBtn"
<oneit:button value="Save Updates" name="saveUserDetails" cssClass="btn btn-primary largeBtn"
...
...
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist.jsp
View file @
a00dd374
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
viewApplicants
"), {'recalcOnError':true});
});
});
</script>
</script>
...
...
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
View file @
a00dd374
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
]
]
});
});
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
viewApplicants
"), {'recalcOnError':true});
});
});
</script>
</script>
...
...
cmsWebApp/webroot/extensions/adminportal/view_applicants_unsuitable.jsp
View file @
a00dd374
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function()
$(document).ready(function()
{
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
viewApplicants
"), {'recalcOnError':true});
});
});
</script>
</script>
...
...
cmsWebApp/webroot/extensions/adminportal/view_applicantss_grid.jsp
View file @
a00dd374
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
]
]
});
});
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
viewApplicants
"), {'recalcOnError':true});
});
});
</script>
</script>
...
...
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
View file @
a00dd374
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
$(document).ready(function(){
$(document).ready(function(){
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
editJob
"), {'recalcOnError':true});
$(".importance_radio").change(function(){
$(".importance_radio").change(function(){
enableElementRating(this);
enableElementRating(this);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment