Skip to content

P
PERFORMA_REPLICA
Commit f3119510 by nilu
Options

S34574763 # Client - Incoming Issues (raised by Client) #Add Disable of Culture at top

parent 92718785
Showing with 220 additions and 37 deletions
cmsWebApp/sql/Job.xml
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<column name="open_date" type="Date" nullable="true"/> <column name="open_date" type="Date" nullable="true"/>
<column name="apply_by" type="Date" nullable="true"/> <column name="apply_by" type="Date" nullable="true"/>
<column name="include_assessment_criteria" type="Boolean" nullable="false"/> <column name="include_assessment_criteria" type="Boolean" nullable="false"/>
<column name="include_culture" type="Boolean" nullable="false"/>
<column name="assessment_type" type="String" nullable="false" length="200"/> <column name="assessment_type" type="String" nullable="false" length="200"/>
<column name="random_key" type="String" nullable="true" length="10"/> <column name="random_key" type="String" nullable="true" length="10"/>
<column name="job_type" type="String" nullable="false" length="200"/> <column name="job_type" type="String" nullable="false" length="200"/>
......
cmsWebApp/sql/ms/Job.sql
...@@ -14,6 +14,7 @@ CREATE TABLE tl_job ( ...@@ -14,6 +14,7 @@ CREATE TABLE tl_job (
open_date datetime NULL, open_date datetime NULL,
apply_by datetime NULL, apply_by datetime NULL,
include_assessment_criteria char(1) NOT NULL, include_assessment_criteria char(1) NOT NULL,
include_culture char(1) NOT NULL,
assessment_type varchar(200) NOT NULL, assessment_type varchar(200) NOT NULL,
random_key varchar(10) NULL, random_key varchar(10) NULL,
job_type varchar(200) NOT NULL, job_type varchar(200) NOT NULL,
......
cmsWebApp/sql/oracle/Job.sql
...@@ -15,6 +15,7 @@ CREATE TABLE tl_job ( ...@@ -15,6 +15,7 @@ CREATE TABLE tl_job (
open_date date NULL, open_date date NULL,
apply_by date NULL, apply_by date NULL,
include_assessment_criteria char(1) NOT NULL, include_assessment_criteria char(1) NOT NULL,
include_culture char(1) NOT NULL,
assessment_type varchar2(200) NOT NULL, assessment_type varchar2(200) NOT NULL,
random_key varchar2(10) NULL, random_key varchar2(10) NULL,
job_type varchar2(200) NOT NULL, job_type varchar2(200) NOT NULL,
......
cmsWebApp/sql/postgres/Job.sql
...@@ -15,6 +15,7 @@ CREATE TABLE tl_job ( ...@@ -15,6 +15,7 @@ CREATE TABLE tl_job (
open_date timestamp NULL, open_date timestamp NULL,
apply_by timestamp NULL, apply_by timestamp NULL,
include_assessment_criteria char(1) NOT NULL, include_assessment_criteria char(1) NOT NULL,
include_culture char(1) NOT NULL,
assessment_type varchar(200) NOT NULL, assessment_type varchar(200) NOT NULL,
random_key varchar(10) NULL, random_key varchar(10) NULL,
job_type varchar(200) NOT NULL, job_type varchar(200) NOT NULL,
......
cmsWebApp/src/performa/form/ChangeCultureCriteriaFP.java 0 → 100644
package performa.form;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import oneit.logging.*;
import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException;
import oneit.servlets.forms.*;
import oneit.servlets.process.*;
import oneit.utils.BusinessException;
import performa.orm.*;
public class ChangeCultureCriteriaFP extends ORMProcessFormProcessor
{
@Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction();
Job job = (Job) request.getAttribute("Job");
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside ChangeCultureCriteriaFP for ", job , " Include Culture:", job.getIncludeCulture());
if(!job.isTrue(job.getIncludeCulture()))
{
for(CultureCriteria cultureCriteria : job.getCultureCriteriasSet())
{
cultureCriteria.delete();
}
job.setSaveCultureTemplate(false);
job.setCultureTemplate(null);
}
else
{
for(CultureElement cultureElement : CultureElement.searchAll(objTran))
{
CultureCriteria cultureCriteria = CultureCriteria.createCultureCriteria(objTran);
cultureCriteria.setCultureElement(cultureElement);
job.addToCultureCriterias(cultureCriteria);
}
}
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "ChangeCultureCriteriaFP completed for ", job);
return RedisplayResult.getInstance();
}
}
cmsWebApp/src/performa/orm/Candidate.java
...@@ -114,7 +114,7 @@ public class Candidate extends BaseCandidate ...@@ -114,7 +114,7 @@ public class Candidate extends BaseCandidate
{ {
int allAnswersCount = getCultureCriteriaAnswersCount(); int allAnswersCount = getCultureCriteriaAnswersCount();
if(allAnswersCount == job.getCultureCriteriasCount()) if(job.showCultureCriteriaSection() && allAnswersCount == job.getCultureCriteriasCount())
{ {
Filter filter = CultureCriteriaAnswer.SearchByAll().andSelectedQuestion(new IsNotNullFilter<>()); Filter filter = CultureCriteriaAnswer.SearchByAll().andSelectedQuestion(new IsNotNullFilter<>());
Collection selectedAnswers = pipelineCandidate().toCultureCriteriaAnswers(filter).vals(); Collection selectedAnswers = pipelineCandidate().toCultureCriteriaAnswers(filter).vals();
...@@ -127,7 +127,7 @@ public class Candidate extends BaseCandidate ...@@ -127,7 +127,7 @@ public class Candidate extends BaseCandidate
public double cultureCompletedPercentage(Job job) public double cultureCompletedPercentage(Job job)
{ {
return (getCultureCriteriaAnswersCount() * 100) / job.getCultureCriteriasCount() ; return job.showCultureCriteriaSection() ? (getCultureCriteriaAnswersCount() * 100) / job.getCultureCriteriasCount() : 0d;
} }
public double roleFitCompletedPercentage(Job job) public double roleFitCompletedPercentage(Job job)
......
cmsWebApp/src/performa/orm/Job.java
...@@ -415,6 +415,16 @@ public class Job extends BaseJob ...@@ -415,6 +415,16 @@ public class Job extends BaseJob
return isTrue(getIncludeAssessmentCriteria()); return isTrue(getIncludeAssessmentCriteria());
} }
public boolean showCultureCriteriaSection()
{
return isTrue(getIncludeCulture());
}
public int getNumberOfSections()
{
return (showCultureCriteriaSection() && showAssessmentCriteriaSection() ? 3 : (showCultureCriteriaSection() || showAssessmentCriteriaSection()) ? 2 : 1);
}
public int getMaxShortlistApplicants() public int getMaxShortlistApplicants()
{ {
return 25; return 25;
......
cmsWebApp/src/performa/orm/Job.xml
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<ATTRIB name="OpenDate" type="Date" dbcol="open_date"/> <ATTRIB name="OpenDate" type="Date" dbcol="open_date"/>
<ATTRIB name="ApplyBy" type="Date" dbcol="apply_by"/> <ATTRIB name="ApplyBy" type="Date" dbcol="apply_by"/>
<ATTRIB name="IncludeAssessmentCriteria" type="Boolean" dbcol="include_assessment_criteria" mandatory="true" defaultValue="Boolean.TRUE"/> <ATTRIB name="IncludeAssessmentCriteria" type="Boolean" dbcol="include_assessment_criteria" mandatory="true" defaultValue="Boolean.TRUE"/>
<ATTRIB name="IncludeCulture" type="Boolean" dbcol="include_culture" mandatory="true" defaultValue="Boolean.TRUE"/>
<ATTRIB name="AssessmentType" type="AssessmentType" dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="AssessmentType.COMPREHENSIVE"/> <ATTRIB name="AssessmentType" type="AssessmentType" dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="AssessmentType.COMPREHENSIVE"/>
<ATTRIB name="RandomKey" type="String" dbcol="random_key" length="10"/> <ATTRIB name="RandomKey" type="String" dbcol="random_key" length="10"/>
<ATTRIB name="JobType" type="JobType" dbcol="job_type" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="JobType.FULL_TIME"/> <ATTRIB name="JobType" type="JobType" dbcol="job_type" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="JobType.FULL_TIME"/>
......
cmsWebApp/src/performa/orm/JobApplication.java
...@@ -165,7 +165,7 @@ public class JobApplication extends BaseJobApplication ...@@ -165,7 +165,7 @@ public class JobApplication extends BaseJobApplication
Candidate candidate = getCandidate(); Candidate candidate = getCandidate();
//to skip culture test //to skip culture test
if(cultureCompleted()) if(!isIncludeCultureCriteria() || cultureCompleted())
{ {
return safeRedirect; return safeRedirect;
} }
...@@ -249,7 +249,7 @@ public class JobApplication extends BaseJobApplication ...@@ -249,7 +249,7 @@ public class JobApplication extends BaseJobApplication
public boolean cultureCompleted() public boolean cultureCompleted()
{ {
return getCandidate().cultureCompleted(getJob()); return isIncludeCultureCriteria() ? getCandidate().cultureCompleted(getJob()) : true;
} }
...@@ -281,6 +281,11 @@ public class JobApplication extends BaseJobApplication ...@@ -281,6 +281,11 @@ public class JobApplication extends BaseJobApplication
return getJob() != null && isTrue(getJob().getIncludeAssessmentCriteria()); return getJob() != null && isTrue(getJob().getIncludeAssessmentCriteria());
} }
public boolean isIncludeCultureCriteria()
{
return getJob() != null && isTrue(getJob().getIncludeCulture());
}
@Override @Override
public Map getRoleFit() public Map getRoleFit()
{ {
......
cmsWebApp/webroot/css/common.css
...@@ -4447,6 +4447,14 @@ no-applicant.inactive a:hover,no-applicant.inactive a:hover span{ ...@@ -4447,6 +4447,14 @@ no-applicant.inactive a:hover,no-applicant.inactive a:hover span{
text-transform: uppercase; text-transform: uppercase;
width: 20%; width: 20%;
} }
.appli-jcs3 {
color: #4a4a4a;
font-size: 11px;
letter-spacing: 1px;
padding: 26px 18px 5px;
text-transform: uppercase;
width: 40%;
}
.appli-overall{ .appli-overall{
color: #4a4a4a; color: #4a4a4a;
font-size: 11px; font-size: 11px;
......
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<NODE name="dynamic_content_form::ADMIN_PORTAL" factory="Participant"> <NODE name="dynamic_content_form::ADMIN_PORTAL" factory="Participant">
<FORM name="*.changeAssessmentCriteria" factory="Participant" class="performa.form.ChangeAssessmentCriteriaFP"/> <FORM name="*.changeAssessmentCriteria" factory="Participant" class="performa.form.ChangeAssessmentCriteriaFP"/>
<FORM name="*.changeCultureCriteria" factory="Participant" class="performa.form.ChangeCultureCriteriaFP"/>
<FORM name="*.saveJob" factory="Participant" class="performa.form.SaveJobFP"/> <FORM name="*.saveJob" factory="Participant" class="performa.form.SaveJobFP"/>
<FORM name="*.saveRequirementTemplate" factory="Participant" class="performa.form.SaveRequirementsTemplateFP"/> <FORM name="*.saveRequirementTemplate" factory="Participant" class="performa.form.SaveRequirementsTemplateFP"/>
<FORM name="*.saveCultureTemplate" factory="Participant" class="performa.form.SaveCultureTemplateFP"/> <FORM name="*.saveCultureTemplate" factory="Participant" class="performa.form.SaveCultureTemplateFP"/>
......
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
...@@ -242,6 +242,10 @@ ...@@ -242,6 +242,10 @@
<label class="label-16 blue-label">Culture</label> <label class="label-16 blue-label">Culture</label>
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<%
if(job.showCultureCriteriaSection())
{
%>
<div class="row"> <div class="row">
<div class="col-md-12 review-medium-title"> <div class="col-md-12 review-medium-title">
<oneit:label GUIName="Organisation Culture Statement" /> <oneit:label GUIName="Organisation Culture Statement" />
...@@ -279,6 +283,7 @@ ...@@ -279,6 +283,7 @@
<% <%
} }
} }
}
%> %>
</div> </div>
<% <%
......
cmsWebApp/webroot/extensions/adminportal/inc/applicant_report.jsp
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<div class="view-appli-list"> <div class="view-appli-list">
<!--Requirements--> <!--Requirements-->
<% <%
if(job.getIncludeAssessmentCriteria() == Boolean.TRUE) if(job.showAssessmentCriteriaSection())
{ {
%> %>
<table width="100%" cellspacing="0" cellpadding="0" class="charts-table"> <table width="100%" cellspacing="0" cellpadding="0" class="charts-table">
...@@ -443,6 +443,10 @@ ...@@ -443,6 +443,10 @@
%> %>
<!--Culture Fit Data--> <!--Culture Fit Data-->
<%
if(job.showCultureCriteriaSection())
{
%>
<table width="100%" cellspacing="0" cellpadding="0" class="charts-table culture"> <table width="100%" cellspacing="0" cellpadding="0" class="charts-table culture">
<tr> <tr>
<td class="chart-cell"> <td class="chart-cell">
...@@ -544,6 +548,9 @@ ...@@ -544,6 +548,9 @@
</td> </td>
</tr> </tr>
</table> </table>
<%
}
%>
</div> </div>
</div> </div>
</oneit:dynIncluded> </oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/inc/applicants_grid_report.jsp
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
%> %>
</span> by <oneit:toString value="<%= job.getCreatedBy() %>" mode="EscapeHTML" nullValue=""/> </span> by <oneit:toString value="<%= job.getCreatedBy() %>" mode="EscapeHTML" nullValue=""/>
&nbsp;&nbsp;.&nbsp;&nbsp; &nbsp;&nbsp;.&nbsp;&nbsp;
<oneit:toString value="<%= job.getOccupation() %>" mode="EscapeHTML" /> <oneit:toString value="<%= job.getLevel() %>" mode="EscapeHTML" />
</div> </div>
</div> </div>
<div class="white-header"> <div class="white-header">
...@@ -112,6 +112,10 @@ ...@@ -112,6 +112,10 @@
<oneit:toString value="<%= jobApplication.getRoleFitPercentage() %>" mode="PercentageWholeNumber" /> <oneit:toString value="<%= jobApplication.getRoleFitPercentage() %>" mode="PercentageWholeNumber" />
</div> </div>
</div> </div>
<%
if(job.showCultureCriteriaSection())
{
%>
<div class="culture jcc"> <div class="culture jcc">
<div class="jcc-title"> <div class="jcc-title">
<img src="file:///<%= PDFUtils.FILE_BASE_PATH %>/images/culture-icon.png" /> culture fit <img src="file:///<%= PDFUtils.FILE_BASE_PATH %>/images/culture-icon.png" /> culture fit
...@@ -120,9 +124,10 @@ ...@@ -120,9 +124,10 @@
<oneit:toString value="<%= jobApplication.getCultureFitScore() %>" mode="PercentageWholeNumber" /> <oneit:toString value="<%= jobApplication.getCultureFitScore() %>" mode="PercentageWholeNumber" />
</div> </div>
</div> </div>
<% <%
if(job.getIncludeAssessmentCriteria()==Boolean.TRUE) }
if(job.showAssessmentCriteriaSection())
{ {
%> %>
<div class="criteria jcc <%=(missingReq ? "red-bg" : "green-bg")%> "> <div class="criteria jcc <%=(missingReq ? "red-bg" : "green-bg")%> ">
......
cmsWebApp/webroot/extensions/adminportal/inc/applicants_list_report.jsp
...@@ -114,7 +114,10 @@ ...@@ -114,7 +114,10 @@
</span> </span>
role fit role fit
</div> </div>
<%
if(job.showCultureCriteriaSection())
{
%>
<div class="appli-jcs appli-l eq-second-height"> <div class="appli-jcs appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
<div class="progress"> <div class="progress">
...@@ -127,7 +130,9 @@ ...@@ -127,7 +130,9 @@
culture fit culture fit
</div> </div>
<% <%
if(job.getIncludeAssessmentCriteria() == Boolean.TRUE) }
if(job.showAssessmentCriteriaSection())
{ {
long criteriaVal = jobApplication.getRequirementFitScore(); long criteriaVal = jobApplication.getRequirementFitScore();
String criteria = FormatUtils.stringify(criteriaVal, "PercentageWholeNumber", "0"); String criteria = FormatUtils.stringify(criteriaVal, "PercentageWholeNumber", "0");
......
cmsWebApp/webroot/extensions/adminportal/inc/incomplete_applicants_list.jsp
...@@ -141,14 +141,10 @@ ...@@ -141,14 +141,10 @@
</div> </div>
</div> </div>
<% <%
String widthClass = "appli-jcs2"; String widthClass = (job.showAssessmentCriteriaSection() && job.showCultureCriteriaSection()) ? "appli-jcs" :
(job.showAssessmentCriteriaSection() || job.showCultureCriteriaSection()) ? "appli-jcs2" : "appli-jcs3";
if(job.getIncludeAssessmentCriteria() == Boolean.TRUE) if(job.showAssessmentCriteriaSection())
{
widthClass = "appli-jcs";
}
if(job.getIncludeAssessmentCriteria() == Boolean.TRUE)
{ {
%> %>
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
...@@ -168,6 +164,9 @@ ...@@ -168,6 +164,9 @@
</div> </div>
<% <%
} }
if(job.showCultureCriteriaSection())
{
%> %>
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
...@@ -181,6 +180,9 @@ ...@@ -181,6 +180,9 @@
</span> </span>
culture fit culture fit
</div> </div>
<%
}
%>
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
<div class="progress"> <div class="progress">
......
cmsWebApp/webroot/extensions/adminportal/inc/view_applicants_grid.jsp
...@@ -104,6 +104,10 @@ ...@@ -104,6 +104,10 @@
</oneit:button> </oneit:button>
</span> </span>
</div> </div>
<%
if(job.showCultureCriteriaSection())
{
%>
<div class="culture jcc"> <div class="culture jcc">
<img src="images/culture-icon.svg"> culture fit <img src="images/culture-icon.svg"> culture fit
<span> <span>
...@@ -116,7 +120,9 @@ ...@@ -116,7 +120,9 @@
</span> </span>
</div> </div>
<% <%
if(job.getIncludeAssessmentCriteria()==Boolean.TRUE) }
if(job.showAssessmentCriteriaSection())
{ {
%> %>
<div class="criteria jcc <%=(missingReq ? "red-bg" : "green-bg")%> "> <div class="criteria jcc <%=(missingReq ? "red-bg" : "green-bg")%> ">
......
cmsWebApp/webroot/extensions/adminportal/inc/view_applicants_list.jsp
...@@ -75,12 +75,8 @@ ...@@ -75,12 +75,8 @@
</div> </div>
</div> </div>
<% <%
String widthClass = "appli-jcs2"; String widthClass = (job.showAssessmentCriteriaSection() && job.showCultureCriteriaSection()) ? "appli-jcs" :
(job.showAssessmentCriteriaSection() || job.showCultureCriteriaSection()) ? "appli-jcs2" : "appli-jcs3";
if(job.getIncludeAssessmentCriteria() == Boolean.TRUE)
{
widthClass = "appli-jcs";
}
%> %>
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
...@@ -94,6 +90,10 @@ ...@@ -94,6 +90,10 @@
</span> </span>
role fit role fit
</div> </div>
<%
if(job.showCultureCriteriaSection())
{
%>
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
<div class="progress"> <div class="progress">
...@@ -107,7 +107,9 @@ ...@@ -107,7 +107,9 @@
culture fit culture fit
</div> </div>
<% <%
if(job.getIncludeAssessmentCriteria() == Boolean.TRUE) }
if(job.showAssessmentCriteriaSection())
{ {
%> %>
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
......
cmsWebApp/webroot/extensions/adminportal/inc/view_applicants_shortlist_grid.jsp
...@@ -180,6 +180,9 @@ ...@@ -180,6 +180,9 @@
</div> </div>
<% <%
} }
if(job.showCultureCriteriaSection())
{
%> %>
<div class="culture jcc"> <div class="culture jcc">
<img src="images/culture-icon.svg"> culture fit <img src="images/culture-icon.svg"> culture fit
...@@ -212,7 +215,9 @@ ...@@ -212,7 +215,9 @@
%> %>
</div> </div>
<% <%
if(job.getIncludeAssessmentCriteria()==Boolean.TRUE) }
if(job.showAssessmentCriteriaSection())
{ {
%> %>
<div class="jcc"> <div class="jcc">
......
cmsWebApp/webroot/extensions/adminportal/inc/view_application_tab_applicant.jsp
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
List<Tuple.T2> cultureConcerns = jobApplication.getCultureAreaOfConcerns(); List<Tuple.T2> cultureConcerns = jobApplication.getCultureAreaOfConcerns();
%> %>
<div class="applicant-progress"> <div class="applicant-progress">
<div class="<%= job.getIncludeAssessmentCriteria()==Boolean.TRUE ? "col-sm-4" : "col-sm-6" %> col-xs-12 text-center thr-block role-fit" href="#1a" data-toggle="tab" id="progress1" onClick="tabToggle('#tab1', '.role-fit')"> <div class="<%= job.getNumberOfSections() == 3 ? "col-sm-4" : job.getNumberOfSections() == 2 ? "col-sm-6" : "col-sm-12" %> col-xs-12 text-center thr-block role-fit" href="#1a" data-toggle="tab" id="progress1" onClick="tabToggle('#tab1', '.role-fit')">
<label class="progress-label">role fit</label> <label class="progress-label">role fit</label>
<div class="<%= colorClass %> fixed-width"> <div class="<%= colorClass %> fixed-width">
<p style="display:none;"><oneit:toString value="<%= roleFitData!=null ? roleFitData.get2() > 0 ? roleFitData.get2() : 0d : 0d %>" mode="TwoDPDouble" nullValue="0"/></p> <p style="display:none;"><oneit:toString value="<%= roleFitData!=null ? roleFitData.get2() > 0 ? roleFitData.get2() : 0d : 0d %>" mode="TwoDPDouble" nullValue="0"/></p>
...@@ -202,7 +202,11 @@ ...@@ -202,7 +202,11 @@
%> %>
</div> </div>
</div> </div>
<div class="<%= job.getIncludeAssessmentCriteria()==Boolean.TRUE ? "col-sm-4" : "col-sm-6" %> col-xs-12 text-center thr-block culture-fit" href="#2a" data-toggle="tab" id="progress2" onClick="tabToggle('#tab2', '.culture-fit')"> <%
if(job.showCultureCriteriaSection())
{
%>
<div class="<%= job.getNumberOfSections() == 3 ? "col-sm-4" : job.getNumberOfSections() == 2 ? "col-sm-6" : "col-sm-12" %> col-xs-12 text-center thr-block culture-fit" href="#2a" data-toggle="tab" id="progress2" onClick="tabToggle('#tab2', '.culture-fit')">
<label class="progress-label">culture fit</label> <label class="progress-label">culture fit</label>
<div class="<%= "percent-" + jobApplication.getCultureFitColor() + " fixed-width" %>"> <div class="<%= "percent-" + jobApplication.getCultureFitColor() + " fixed-width" %>">
<p style="display:none;"><oneit:toString value="<%= jobApplication.getCultureFitScore() %>" mode="TwoDPDouble" /></p> <p style="display:none;"><oneit:toString value="<%= jobApplication.getCultureFitScore() %>" mode="TwoDPDouble" /></p>
...@@ -253,10 +257,12 @@ ...@@ -253,10 +257,12 @@
</div> </div>
</div> </div>
<% <%
if(job.getIncludeAssessmentCriteria()==Boolean.TRUE) }
if(job.showAssessmentCriteriaSection())
{ {
%> %>
<div class="col-sm-4 col-xs-12 text-center thr-block requirement-fit" href="#3a" data-toggle="tab" id="progress3" onClick="tabToggle('#tab3','.requirement-fit')"> <div class="<%= job.getNumberOfSections() == 3 ? "col-sm-4" : job.getNumberOfSections() == 2 ? "col-sm-6" : "col-sm-12" %> col-xs-12 text-center thr-block requirement-fit" href="#3a" data-toggle="tab" id="progress3" onClick="tabToggle('#tab3','.requirement-fit')">
<label class="progress-label">requirements</label> <label class="progress-label">requirements</label>
<div class="<%= "percent-" + jobApplication.getRequirementFitColor() + " fixed-width progress-circle" %>"> <div class="<%= "percent-" + jobApplication.getRequirementFitColor() + " fixed-width progress-circle" %>">
<% if (missingReq) { %> <% if (missingReq) { %>
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
...@@ -298,7 +298,10 @@ ...@@ -298,7 +298,10 @@
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<%
if(job.showCultureCriteriaSection())
{
%>
<div class="row"> <div class="row">
<div class="col-md-12 review-medium-title"> <div class="col-md-12 review-medium-title">
<oneit:label GUIName="Organisation Culture Statement" /> <oneit:label GUIName="Organisation Culture Statement" />
...@@ -349,6 +352,9 @@ ...@@ -349,6 +352,9 @@
} }
%> %>
</div> </div>
<%
}
%>
<div class="text-center"> <div class="text-center">
<oneit:button value="Save as Draft and go to your jobs" name="saveJob" cssClass="btn btn-primary btn-gray largeBtn" <oneit:button value="Save as Draft and go to your jobs" name="saveJob" cssClass="btn btn-primary btn-gray largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190509_Alter_Job.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_job</tableName>
<column name="include_culture" type="Boolean" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
$(document).ready(function(){ $(document).ready(function(){
recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true});
$(".switch input[type='checkbox']").change(function() {
$("button[name$='changeCultureCriteria']").click();
});
}); });
</script> </script>
...@@ -44,11 +48,29 @@ ...@@ -44,11 +48,29 @@
.toMap() %>" /> .toMap() %>" />
<div class="form-page-area nopadding"> <div class="form-page-area nopadding">
<div class="create-job"> <div class="create-job">
<div class="form-page-section" style="padding-bottom: 0px">
<div class="form-group">
<label>Include Culture for this Job?</label>
<span class="pull-right">
<label class="switch">
<oneit:recalcClass htmlTag="span" classScript="job.showCultureCriteriaSection() ? 'checkbox checked': 'checkbox unchecked'" job="<%= job %>">
<oneit:ormInput obj="<%= job %>" attributeName="IncludeCulture" type="checkbox"/>
</oneit:recalcClass>
<div class="slider round"></div>
</label>
<oneit:button value=" " name="changeCultureCriteria" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
</span>
</div>
</div>
<oneit:recalcClass htmlTag="div" classScript="job.showCultureCriteriaSection() ? 'show': 'hide'" job="<%= job %>">
<% <%
if(templates.length > 0) if(templates.length > 0)
{ {
%> %>
<div class="form-page-section" style="padding-bottom: 0px"> <div class="form-page-section" style="padding-bottom: 0px; padding-top: 0px;">
<div class="form-group"> <div class="form-group">
<label class="label-16 work-title">Culture</label> <label class="label-16 work-title">Culture</label>
</div> </div>
...@@ -71,7 +93,10 @@ ...@@ -71,7 +93,10 @@
</div> </div>
<oneit:dynInclude page="/extensions/adminportal/inc/culture_details.jsp" Job="<%= job %>" data="<%= CollectionUtils.EMPTY_MAP%>"/> <oneit:dynInclude page="/extensions/adminportal/inc/culture_details.jsp" Job="<%= job %>" data="<%= CollectionUtils.EMPTY_MAP%>"/>
</oneit:recalcClass>
<div class="form-page-section"> <div class="form-page-section">
<oneit:recalcClass htmlTag="div" classScript="job.showCultureCriteriaSection() ? 'show': 'hide'" job="<%= job %>">
<div class="form-group"> <div class="form-group">
<div class="styled_checkboxes"> <div class="styled_checkboxes">
<div class="checkbox checkbox-primary"> <div class="checkbox checkbox-primary">
...@@ -97,6 +122,7 @@ ...@@ -97,6 +122,7 @@
</span> </span>
</div> </div>
</oneit:recalcClass> </oneit:recalcClass>
</oneit:recalcClass>
<div class="text-center"> <div class="text-center">
<oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn" <oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
......
cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
if(job.getIncludeAssessmentCriteria()) if(job.getIncludeAssessmentCriteria())
{ {
%> %>
<div class="col-sm-4 col-xs-12 app-block eq-height"> <div class="<%= (job.getNumberOfSections() == 3 ? "col-sm-4" : (job.getNumberOfSections() == 2 ? "col-sm-6" : "col-sm-12" )) + " col-xs-12 app-block eq-height"%>">
<div class="block-icon <%= isSelectionComplete ? "app-outline-complete" : "" %>"> <div class="block-icon <%= isSelectionComplete ? "app-outline-complete" : "" %>">
<div class="<%= isSelectionComplete ? "app-outline-complete-icon" : "app-outline-selection-icon" %>"></div> <div class="<%= isSelectionComplete ? "app-outline-complete-icon" : "app-outline-selection-icon" %>"></div>
</div> </div>
...@@ -105,8 +105,11 @@ ...@@ -105,8 +105,11 @@
</div> </div>
<% <%
} }
if(job.showCultureCriteriaSection())
{
%> %>
<div class="<%= (job.getIncludeAssessmentCriteria() ? "col-sm-4 app-second-block " : " col-sm-6 app-block " ) + " col-xs-12 app-block eq-height "%> "> <div class="<%= (job.getNumberOfSections() == 3 ? "col-sm-4 app-second-block " : (job.getNumberOfSections() == 2 ? " col-sm-6 app-block " : " col-sm-12 app-block " )) + " col-xs-12 app-block eq-height "%> ">
<div class="block-icon <%= isCultureComplete ? "app-outline-complete" : "" %>"> <div class="block-icon <%= isCultureComplete ? "app-outline-complete" : "" %>">
<div class="<%= isCultureComplete ? "app-outline-complete-icon" : "app-outline-culture-icon" %>"></div> <div class="<%= isCultureComplete ? "app-outline-complete-icon" : "app-outline-culture-icon" %>"></div>
</div> </div>
...@@ -133,7 +136,10 @@ ...@@ -133,7 +136,10 @@
There are no right or wrong answers, so please choose what best fits you (not what you think might be right for a particular job). There are no right or wrong answers, so please choose what best fits you (not what you think might be right for a particular job).
</p> </p>
</div> </div>
<div class="<%= (job.getIncludeAssessmentCriteria() ? "col-sm-4 " : "col-sm-6 app-thired-block " ) + "col-xs-12 app-block eq-height last-border"%>"> <%
}
%>
<div class="<%= (job.getNumberOfSections() == 3 ? "col-sm-4 " : (job.getNumberOfSections() == 2 ? " col-sm-6 app-thired-block " :"col-sm-12 " )) + "col-xs-12 app-block eq-height last-border"%>">
<div class="block-icon <%= isAssesmentComplete ? "app-outline-complete" : "" %>"> <div class="block-icon <%= isAssesmentComplete ? "app-outline-complete" : "" %>">
<div class="<%= isAssesmentComplete ? "app-outline-complete-icon" : "app-outline-assesmet-icon" %>"></div> <div class="<%= isAssesmentComplete ? "app-outline-complete-icon" : "app-outline-assesmet-icon" %>"></div>
</div> </div>
......
cmsWebApp/webroot/extensions/applicantportal/inc/application_main_tabs.jsp
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
String secondPage = WebUtils.getSamePageInRenderMode(request, "WorkplaceCulture"); String secondPage = WebUtils.getSamePageInRenderMode(request, "WorkplaceCulture");
String thirdPage = WebUtils.getSamePageInRenderMode(request, "JobMatchAssessment"); String thirdPage = WebUtils.getSamePageInRenderMode(request, "JobMatchAssessment");
boolean includeAssessment = jobApplication.isIncludeAssessmentCriteria(); boolean includeAssessment = jobApplication.isIncludeAssessmentCriteria();
boolean includeCulture = jobApplication.isIncludeCultureCriteria();
// Boolean alreadyCompletedCulture = (Boolean) process.getAttribute("AlreadyCompletedCulture"); // Boolean alreadyCompletedCulture = (Boolean) process.getAttribute("AlreadyCompletedCulture");
// Boolean alreadyCompletedRole = (Boolean) process.getAttribute("AlreadyCompletedRole"); // Boolean alreadyCompletedRole = (Boolean) process.getAttribute("AlreadyCompletedRole");
...@@ -41,6 +42,9 @@ ...@@ -41,6 +42,9 @@
</li> </li>
<% <%
} }
if(includeCulture)
{
%> %>
<li class="<%= pageNumber == "2" ? "active" : isCultureComplete ? "complate" : ""%>"> <li class="<%= pageNumber == "2" ? "active" : isCultureComplete ? "complate" : ""%>">
<oneit:button value=" " name="validateApplication" skin="link" disabled="<%= isCultureComplete ? "true" : "false"%>" <oneit:button value=" " name="validateApplication" skin="link" disabled="<%= isCultureComplete ? "true" : "false"%>"
...@@ -53,6 +57,9 @@ ...@@ -53,6 +57,9 @@
<div class="mobile-hide">Workplace Preferences</div> <div class="mobile-hide">Workplace Preferences</div>
</oneit:button> </oneit:button>
</li> </li>
<%
}
%>
<li class="<%= pageNumber == "3" ? "active" : isAssesmentComplete ? "complate" : ""%>"> <li class="<%= pageNumber == "3" ? "active" : isAssesmentComplete ? "complate" : ""%>">
<oneit:button value=" " name="validateApplication" skin="link" disabled="<%= isAssesmentComplete ? "true" : "false"%>" <oneit:button value=" " name="validateApplication" skin="link" disabled="<%= isAssesmentComplete ? "true" : "false"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
...@@ -60,11 +67,11 @@ ...@@ -60,11 +67,11 @@
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.mapEntry("fromRequirements", fromRequirements) .mapEntry("fromRequirements", fromRequirements)
.toMap() %>"> .toMap() %>">
<span><%= isAssesmentComplete ? "<img src=\"images/right-mark.png\" />" : (includeAssessment ? "3" : "2")%></span> <span><%= isAssesmentComplete ? "<img src=\"images/right-mark.png\" />" : (includeAssessment && includeCulture ? "3" : ( (includeAssessment || includeCulture) ? "2" : "1"))%></span>
<div class="mobile-hide">Your Work Style</div> <div class="mobile-hide">Your Work Style</div>
</oneit:button> </oneit:button>
</li> </li>
<li><a href="#"><span><%= includeAssessment ? "4" : "3" %></span><div class="mobile-hide">Submit Application</div></a></li> <li><a href="#"><span><%= (includeAssessment && includeCulture ? "4" : ( (includeAssessment || includeCulture) ? "3" : "2")) %></span><div class="mobile-hide">Submit Application</div></a></li>
</ul> </ul>
</div> </div>
</oneit:dynIncluded> </oneit:dynIncluded>
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