Skip to content

P
PERFORMA_REPLICA
Commit 092c61c1 by Harsh Shah
Options

Finish Hotfix-20190124

parents 91ca052c 78929fa4
Showing with 231 additions and 104 deletions
cmsWebApp/src/performa/form/SelectHiringTeamFP.java
......@@ -17,11 +17,12 @@ public class SelectHiringTeamFP extends ORMProcessFormProcessor
{
HttpServletRequest request = submission.getRequest();
CompanyUser companyUser = (CompanyUser) request.getAttribute("CompanyUser");
String nextPage = (String) request.getAttribute("nextPage");
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SelectHiringTeamFP for ", companyUser, " selected hiring team : ", companyUser.getSelectedTeam());
request.getSession().setAttribute("SelectedHiringTeam", companyUser.getSelectedTeam());
return RedisplayResult.getInstance();
return new ProcessRedirectResult (nextPage, new String[]{});
}
}
\ No newline at end of file
cmsWebApp/webroot/css/common.css
......@@ -1356,10 +1356,11 @@ input.btn.btn-primary.top-margin-25{
.work-rating,.work-l-rating,.friend-rating {
background: #eff0f2;
padding: 15px 20px;
display: inline-block;
display: block;
font-size: 13px;
position: relative;
margin: 10px -25px;
/*width: 100%;*/
}
.rate-toggle {
float: right;
......@@ -1732,7 +1733,8 @@ p.job-txt , p.job-txt span{
text-align: right;
}
.apply-job-logo-header .logo-img img {
height: 100%;
height: 100%;
width: auto;
}
.apply-job-logo-header .header-title {
......@@ -1905,11 +1907,11 @@ table.pos-table{
border-radius: 3px;
display: inline-block;
margin: 0 auto;
width: 84.617%;
width: 56%;
}
.social-login li {
display: inline-block;
padding: 7.1% 7.8%;
padding: 10.1% 10.8%;
border-left: 2px solid #d3d3d3;
}
.social-login li a{
......
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
......@@ -22,140 +22,236 @@
<div style="padding-left: 15px; padding-right: 15px;">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
</div>
<div class="form-page-area">
<div class="form-page-area nopadding">
<div class="create-job">
<div class="assessment-criteria">
<div class="form-page-section">
<div class="form-group">
<label class="label-16">Details</label>
</div>
<div class="form-group">
<label><oneit:label GUIName="Job Title" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="JobTitle" cssClass="form-control" />
</div>
<div class="form-group">
<label><oneit:label GUIName="Job Description" /></label>
<oneit:ormtextarea obj="<%= job %>" attributeName="JobDescription" cssClass="form-control textarea-box"/>
<label class="label-16 blue-label">Job Details</label>
</div>
<div class="form-group row">
<div class="col-md-8">
<label><oneit:label GUIName="Job Title" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="JobTitle" cssClass="form-control" />
</div>
<div class="col-md-4">
<label><oneit:label GUIName="Reference Number" /><a href="#" title="Uniquely identify jobs that have identical titles. Examlple:<br>&#8226; New Home Sales Consutant (ABC123)<br>&#8226; New Home Sales Consutant (ABC456)" class="info-icon"><img src="images/info-icon.png" /></a></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="ReferenceNumber" cssClass="form-control" />
</div>
</div>
<div class="form-group">
<label><oneit:label GUIName="Job Type" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="JobType" cssClass="form-control"/>
<div class="form-group row">
<div class="col-md-12">
<label><oneit:label GUIName="About the Job" /></label>
<oneit:ormtextarea obj="<%= job %>" attributeName="JobDescription" cssClass="form-control textarea-box"/>
</div>
</div>
<!--<div class="optional-title">OPTIONAL</div>-->
<div class="row">
<div class="form-group row">
<div class="col-md-6">
<label><oneit:label GUIName="Job Owner"/></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="JobOwner" options="<%= job.getHiringTeam().getActiveTeammates().toArray(new CompanyUser[0]) %>"/>
</div>
</div>
<%
if(job.getHiringTeam().showHasClientSupport())
{
%>
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label>
<div class="col-sm-6 col-xs-12">
<label><oneit:label GUIName="Client "/><span>(Optional)</span></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
</div>
</div>
</div>
<%
}
%>
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="ReferenceNumber" cssClass="form-control" />
</div>
</div>
<div class="text-center form-group">
<oneit:button value="Cancel and go to your jobs" name="gotoPage" cssClass="btn btn-primary largeBtn grey"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE).toMap() %>'/>
<oneit:button value="Save changes to this job" name="save" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" />
</div>
</div>
<div class="form-page-section darkbg">
<div class="form-group row">
<div class="col-md-12">
<label class="label-16">Job Location</label>
</div>
</div>
<div class="form-group row">
<div class="col-md-8">
<label><oneit:label GUIName="Google Location"/></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="GoogleAddressText" class="autoAddress" id="<%= "gAddress_"+job.getObjectID() %>" placeholder="Enter your address" cssClass="form-control" />
</div>
<div class="col-md-4">
<label><oneit:label GUIName="Expected Candidate Radius"/></label>
<oneit:ormEnum obj="<%= job %>" attributeName="ExpectedCandidateRadius" cssClass="form-control"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-6">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="is-remote" attributeName="Remote" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.getRemote() != null && job.getRemote() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="is-remote">
<oneit:label GUIName="Working remotely is an option" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
</div>
</div>
<div class="form-page-section">
<div class="form-group row">
<div class="col-md-12">
<label><oneit:label GUIName="Job Type" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="JobType" cssClass="form-control"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:label GUIName="Industry Classification" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="Industry" cssClass="form-control" displayType="autocomplete"/>
</div>
<div class="col-md-6">
<label><oneit:label GUIName="Job Occupation Classification" /></label>
<input type="text" class="form-control select-occupation search-input " placeholder="Select the occupation classification"
value="<%= job.getOccupation() != null ? job.getOccupation() : "Select the occupation classification"%>"></input>
<oneit:ormInput obj="<%= job %>" id="select-occupation-id" attributeName="OccupationId" type="hidden"/>
</div>
</div>
</div>
<div class="text-center form-group">
<oneit:button value="Cancel and go to your jobs" name="gotoPage" cssClass="btn btn-primary largeBtn grey"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE).toMap() %>'/>
<oneit:button value="Save changes to this job" name="save" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" />
</div>
<div class="opacity-5">
<div class="opacity-5">
<div class="form-page-section">
<div class="form-brack-line-sub"></div>
<div class="form-group">
<label class="label-16">Role</label>
<div class="form-group row">
<div class="col-md-4">
<label><oneit:label GUIName="Require CV & Cover Letter" /></label>
</div>
<div class="col-md-8">
<oneit:toString value="<%= job.getRequireCV() ? "Yes" : "No" %>" mode="EscapeHTML"/>
</div>
</div>
<div class="form-group">
<div class="beloning job-match-ass">
<div class="form-brack-line-sub"></div>
<div class="form-group row">
<div class="col-md-4">
<label><oneit:label GUIName="Role" /></label>
</div>
<div class="col-md-8">
<oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/>
</div>
</div>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<label class="label-16">Culture</label>
<div class="form-group row">
<div class="row">
<div class="col-md-4 review-medium-title">
<oneit:label GUIName="Appllicant Workflow / Tabs" />
</div>
<div class="col-md-8 workflow-tabs">
<%
for (WorkFlow workflow : job.getSortedWorkFlows())
{
%>
<span class="skill-label">
<strong><%= workflow.getSortOrder()%> .</strong>&nbsp;&nbsp; <%= workflow.getName()%>
</span>
<%
}
%>
</div>
</div>
</div>
</div>
<div class="form-page-section darkbg">
<div class="form-group">
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">
<label><oneit:label GUIName="Location" /></label>
<label class="label-16 blue-label">Requirements</label>
</div>
<%
for(CriteriaType criteria : CriteriaType.getCriteriaTypeArray())
{
Collection<AssessmentCriteria> assessmentCriterias = job.getAssessmentCriteraByType(criteria);
if(assessmentCriterias.size() == 0)
{
continue;
}
%>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<div class="beloning">
<oneit:toString value="<%= criteria.getDescription() %>" mode="EscapeHTML"/>
</div>
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getGoogleAddressText() %>" mode="EscapeHTML"/>
<%
for (AssessmentCriteria assessmentCriteria : assessmentCriterias)
{
%>
<div class="form-group row <%= assessmentCriteria.getImportance() == Importance.ESSENTIAL ? "essential" : "" %>">
<div class="col-md-5 review-medium-title">
<oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/>
</div>
<div class="col-md-2 assescriteria_importace" >
<oneit:toString value="<%= assessmentCriteria.getImportance() %>" mode="EscapeHTML"/>
</div>
<div class="col-md-5 essential_note" >
<oneit:toString value="<%= assessmentCriteria.getImportance() == Importance.ESSENTIAL ? "This field will be mandatory for applicants" : "" %>" mode="EscapeHTML" />
</div>
</div>
<% }
}
%>
</div>
<div class="form-page-section">
<div class="form-group">
<label class="label-16 blue-label">Culture</label>
</div>
<div class="form-brack-line-sub"></div>
<div class="row">
<div class="col-md-12 review-medium-title">
<oneit:label GUIName="Organisation Culture Statement" />
<span class="skill-label">
<oneit:toString value="<%= job.getCultureStatement() %>" mode="ParagraphHTML" />
</span>
</div>
</div>
<%
for(CultureClass cultureClass : CultureClass.getCultureClassArray())
{
%>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<div class="beloning">
<oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/>
</div>
</div>
<div class="form-group">
<%
for (CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass))
{
if(criteria.getIsApplicable())
{
%>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label culture-element">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= criteria.getCultureElementRating()!= null ? criteria.getCultureElementRating().getDescription() : ""%>" mode="EscapeHTML"/>
(<oneit:toString value="<%= criteria.getImportance() %>" mode="EscapeHTML"/>)
<div class="row main-review-label">
<div class="col-sm-4 col-xs-12 review-label culture-element">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div>
<div class="col-sm-8 col-xs-12 review-data">
<oneit:toString value="<%= criteria.getCultureElementRating()!= null ? criteria.getCultureElementRating().getDescription() : ""%>" mode="EscapeHTML"/>
(<oneit:toString value="<%= criteria.getImportance() %>" mode="EscapeHTML"/>)
</div>
</div>
</div>
<% } %>
</div>
<% } %>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<label class="label-16">Requirements</label>
</div>
<%
for(CriteriaType criteria : CriteriaType.getCriteriaTypeArray())
{
Collection<AssessmentCriteria> assessmentCriterias = job.getAssessmentCriteraByType(criteria);
if(assessmentCriterias.size() == 0)
{
continue;
}
%>
<div class="form-group">
<div class="beloning">
<oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/>
</div>
</div>
<div class="form-group">
<%
for (AssessmentCriteria assessmentCriteria : assessmentCriterias)
{
<%
}
}
%>
<span class="skill-label">
<oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/> -
<oneit:toString value="<%= assessmentCriteria.getImportance() %>" mode="EscapeHTML"/>
</span>
<% } %>
</div>
<% } %>
<%
}
%>
</div>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/inc/culture_details.jsp
......@@ -6,6 +6,9 @@
<oneit:dynIncluded>
<div class="form-page-section">
<style>
.rate-background{overflow: hidden;}
</style>
<script type="text/javascript">
function moveImportanceSection(elementRating){
......
cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp
......@@ -168,7 +168,7 @@
<oneit:button name="selectHiringTeam" value="Save" cssClass="change-hiring-team hidden"
requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
// .mapEntry("nextPage", currentPage)
.mapEntry("nextPage", homeUrl)
.toMap() %>" />
<%--
<div class="inset-shadow"></div>
......
cmsWebApp/webroot/extensions/adminportal/inc/view_application_tab_applicant.jsp
......@@ -310,6 +310,11 @@
for(FactorClass factorClass : factorClassDtls.keySet())
{
if(roleScoreMap.get(factorClass) == null)
{
continue;
}
Map<FactorLevelLink, Map> factorDetails = factorClassDtls.get(factorClass);
Double rating = roleScoreMap.get(factorClass).get2();
ColorCode colorCode = roleScoreMap.get(factorClass).get1();
......@@ -350,7 +355,7 @@
<div class="tab-view-label">
<oneit:toString value="<%= factorLevelLink.getFactor() %>" mode="EscapeHTML"/>
<%
if(job.isExpressJob())
if(false)//if(job.isExpressJob())
{
%>
<div class="ja-exp-fact-score">
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
......@@ -256,7 +256,7 @@
<div class="form-brack-line-sub"></div>
<div class="form-group">
<div class="beloning">
<oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/>
<oneit:toString value="<%= criteria.getDescription() %>" mode="EscapeHTML"/>
</div>
</div>
<%
......@@ -297,7 +297,7 @@
</span>
</div>
</div>
<div class=" job-detail-subsection">
<div class=" job-detail-subsection">
<%
for(CultureClass cultureClass : CultureClass.getCultureClassArray())
{
......
cmsWebApp/webroot/extensions/adminportal/view_applicants.jsp
......@@ -19,6 +19,15 @@
Debug.assertion(job != null, "Job is null in admin portal view applicants");
SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = companyUser.getSelectedTeam();
if(hiringTeam != job.getHiringTeam())
{
response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
}
String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
AppSortOption appSortOpt = null;
......
cmsWebApp/webroot/extensions/adminportal/view_application.jsp
......@@ -20,14 +20,21 @@
Debug.assertion(jobApplication != null, "JobApplication is null in admin portal view applicants");
Job job = jobApplication.getJob();
String samePage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
Job job = jobApplication.getJob();
String samePage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = companyUser.getSelectedTeam();
if(hiringTeam != job.getHiringTeam())
{
response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
}
//to navigation between applications
if(applications==null)
if(applications == null)
{
// applications = Utils.getApplicationsSorted(job.getJobApplicationsSet(), AppSortOption.RANK);
applications = new ArrayList(job.getJobApplicationsSet());
process.setAttribute("Applications", applications);
}
......
cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp
......@@ -140,6 +140,7 @@
<img src="<%= request.getContextPath() %>/images/login-facebok-icon.svg" />
</oneit:button>
</li>
<%--
<li>
<oneit:button value=" " name="googleOAuthLogin" skin="link" cssClass="social_login_btn"
disabled="<%= Utils.googleAvailable() ? "false" : "true" %>"
......@@ -147,6 +148,7 @@
<img src="<%= request.getContextPath() %>/images/login-google.png" />
</oneit:button>
</li>
--%>
</ul>
</oneit:form>
......
cmsWebApp/webroot/extensions/performa/upgrades/20190205_Alter_FactorScoreResult.sql 0 → 100644
update tl_level_factor set to_score= 13 where level_number = 1002 and factor_number = 13 and from_score = 9;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment