Skip to content

P
PERFORMA_REPLICA
Commit c0cb44b9 by chenith Committed by Harsh Shah
Options

Update aplicant portal if not have assessment criteria.

parent dace822b
Showing with 121 additions and 45 deletions
cmsWebApp/src/performa/orm/JobApplication.java
...@@ -2,7 +2,6 @@ package performa.orm; ...@@ -2,7 +2,6 @@ package performa.orm;
import java.util.Collection; import java.util.Collection;
import oneit.logging.LoggingArea; import oneit.logging.LoggingArea;
import oneit.objstore.ObjectStatus;
import oneit.objstore.StorageException; import oneit.objstore.StorageException;
import oneit.objstore.rdbms.filters.EqualsFilter; import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.objstore.rdbms.filters.IsNotNullFilter; import oneit.objstore.rdbms.filters.IsNotNullFilter;
...@@ -41,24 +40,30 @@ public class JobApplication extends BaseJobApplication ...@@ -41,24 +40,30 @@ public class JobApplication extends BaseJobApplication
private void initACAnswers() private void initACAnswers()
{ {
for(AssessmentCriteria assessmentCriteria : getJob().getAssessmentCriteriasSet()) if(isIncludeAssessmentCriteria())
{ {
AssessmentCriteriaAnswer answer = AssessmentCriteriaAnswer.createAssessmentCriteriaAnswer(getTransaction()); for(AssessmentCriteria assessmentCriteria : getJob().getAssessmentCriteriasSet())
{
AssessmentCriteriaAnswer answer = AssessmentCriteriaAnswer.createAssessmentCriteriaAnswer(getTransaction());
addToAssessmentCriteriaAnswers(answer); addToAssessmentCriteriaAnswers(answer);
assessmentCriteria.addToAnswers(answer); assessmentCriteria.addToAnswers(answer);
}
} }
} }
private void initCCAnswers() public void initCCAnswers()
{ {
for(CultureCriteria cultureCriteria : getJob().getCultureCriteriasSet()) if(this.getCultureCriteriaAnswersCount()==0)
{ {
CultureCriteriaAnswer answer = CultureCriteriaAnswer.createCultureCriteriaAnswer(getTransaction()); for(CultureCriteria cultureCriteria : getJob().getCultureCriteriasSet())
{
CultureCriteriaAnswer answer = CultureCriteriaAnswer.createCultureCriteriaAnswer(getTransaction());
addToCultureCriteriaAnswers(answer); addToCultureCriteriaAnswers(answer);
cultureCriteria.addToAnswers(answer); cultureCriteria.addToAnswers(answer);
}
} }
} }
...@@ -132,4 +137,29 @@ public class JobApplication extends BaseJobApplication ...@@ -132,4 +137,29 @@ public class JobApplication extends BaseJobApplication
return Boolean.FALSE; return Boolean.FALSE;
} }
public Boolean assessmentCompleted()
{
int all = this.getJob().getAllProfileAssessmentQuestions().size();
if(all>0)
{
Filter filter = Answer.SearchByAll().andAnswerNo(new IsNotNullFilter<>());
Collection selected = this.pipelineJobApplication().toProfileAssessmentAnswers(filter).toAnswerNo().vals();
if(selected!=null && CollectionUtils.equals(selected.size(),all))
{
return Boolean.TRUE;
}
}
return Boolean.FALSE;
}
public Boolean isIncludeAssessmentCriteria()
{
return this.getJob().getIncludeAssessmentCriteria();
}
} }
\ No newline at end of file
cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp
...@@ -17,6 +17,14 @@ ...@@ -17,6 +17,14 @@
jobApplication = JobApplication.createNewApplication(candidate, job); jobApplication = JobApplication.createNewApplication(candidate, job);
} }
//to fix mandatory issue in save and continue
jobApplication.initCCAnswers();
if(!jobApplication.isIncludeAssessmentCriteria())
{
nextPage = WebUtils.getSamePageInRenderMode(request, "WorkplaceCulture");
}
process.setAttribute("JobApplication", jobApplication); process.setAttribute("JobApplication", jobApplication);
if(jobApplication.getApplicationStatus()==ApplicationStatus.SUBMITTED) if(jobApplication.getApplicationStatus()==ApplicationStatus.SUBMITTED)
......
cmsWebApp/webroot/extensions/applicantportal/inc/application_main_tabs.jsp
...@@ -16,34 +16,65 @@ ...@@ -16,34 +16,65 @@
<div class="main-tab-form"> <div class="main-tab-form">
<ul class="nav nav-pills nav-justified"> <ul class="nav nav-pills nav-justified">
<li class="<%= pageNumber == "1" ? "active" : jobApplication.selectionCompleted() ? "complate" : ""%>"> <%
<oneit:button value=" " name="gotoPage" skin="link" if(jobApplication.isIncludeAssessmentCriteria())
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage) {
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) %>
.toMap() %>"> <li class="<%= pageNumber == "1" ? "active" : jobApplication.selectionCompleted() ? "complate" : ""%>">
<span><%= jobApplication.selectionCompleted() ? "<img src=\"images/right-mark.png\" />" : "1"%></span> <oneit:button value=" " name="gotoPage" skin="link"
<div class="mobile-hide">Selection Criteria</div> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage)
</oneit:button> .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
</li> .toMap() %>">
<li class="<%= pageNumber == "2" ? "active" : jobApplication.cultureCompleted() ? "complate" : ""%>"> <span><%= jobApplication.selectionCompleted() ? "<img src=\"images/right-mark.png\" />" : "1"%></span>
<oneit:button value=" " name="gotoPage" skin="link" <div class="mobile-hide">Selection Criteria</div>
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage) </oneit:button>
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) </li>
.toMap() %>"> <li class="<%= pageNumber == "2" ? "active" : jobApplication.cultureCompleted() ? "complate" : ""%>">
<span><%= jobApplication.cultureCompleted() ? "<img src=\"images/right-mark.png\" />" : "2"%></span> <oneit:button value=" " name="gotoPage" skin="link"
<div class="mobile-hide">Workplace Culture</div> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
</oneit:button> .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
</li> .toMap() %>">
<li class="<%= pageNumber == "3" ? "active" : ""%>"> <span><%= jobApplication.cultureCompleted() ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
<oneit:button value=" " name="gotoPage" skin="link" <div class="mobile-hide">Workplace Culture</div>
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage) </oneit:button>
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) </li>
.toMap() %>"> <li class="<%= pageNumber == "3" ? "active" : jobApplication.assessmentCompleted() ? "complate" : ""%>">
<span><%= "3" %></span> <oneit:button value=" " name="gotoPage" skin="link"
<div class="mobile-hide">Job Match Assessment</div> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
</oneit:button> .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
</li> .toMap() %>">
<li><a href="#"><span>4</span><div class="mobile-hide">Submit Application</div></a></li> <span><%= jobApplication.assessmentCompleted() ? "<img src=\"images/right-mark.png\" />" : "3"%></span>
<div class="mobile-hide">Job Match Assessment</div>
</oneit:button>
</li>
<li><a href="#"><span>4</span><div class="mobile-hide">Submit Application</div></a></li>
<%
}
else
{
%>
<li class="<%= pageNumber == "2" ? "active" : jobApplication.cultureCompleted() ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>">
<span><%= jobApplication.cultureCompleted() ? "<img src=\"images/right-mark.png\" />" : "1"%></span>
<div class="mobile-hide">Workplace Culture</div>
</oneit:button>
</li>
<li class="<%= pageNumber == "3" ? "active" : jobApplication.assessmentCompleted() ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>">
<span><%= jobApplication.assessmentCompleted() ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
<div class="mobile-hide">Job Match Assessment</div>
</oneit:button>
</li>
<li><a href="#"><span>3</span><div class="mobile-hide">Submit Application</div></a></li>
<%
}
%>
</ul> </ul>
</div> </div>
</oneit:dynIncluded> </oneit:dynIncluded>
cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
JobApplication jobApplication = (JobApplication) process.getAttribute("JobApplication"); JobApplication jobApplication = (JobApplication) process.getAttribute("JobApplication");
Job job = jobApplication.getJob(); Job job = jobApplication.getJob();
int questionNumber = process.getAttribute("QuestionNumber")!= null ? (int) process.getAttribute("QuestionNumber") : 0; int questionNumber = process.getAttribute("QuestionNumber")!= null ? (int) process.getAttribute("QuestionNumber") : 0;
String sectionNo = jobApplication.isIncludeAssessmentCriteria() ? "3" : "2";
List<Question> allQuestions = (List<Question>) process.getAttribute("AllQuestions"); List<Question> allQuestions = (List<Question>) process.getAttribute("AllQuestions");
if(allQuestions==null) if(allQuestions==null)
...@@ -31,10 +32,10 @@ ...@@ -31,10 +32,10 @@
<span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span>
</div> </div>
<div class="show-mobile-title"> <div class="show-mobile-title">
<div class="mobile-title-page">Section 3 - Job Match Assessment</div> <div class="mobile-title-page">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/> - Job Match Assessment</div>
<div class="mobile-estimated">Estimated time to complete: <b>20 mins</b></div> <div class="mobile-estimated">Estimated time to complete: <b>20 mins</b></div>
</div> </div>
<div class="section-title m-hide">Section 3</div> <div class="section-title m-hide">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/></div>
<div class="section-c-title m-hide"> <div class="section-c-title m-hide">
Job Match Assessment Job Match Assessment
<span>Estimated time to complete: <b>20 mins</b></span> <span>Estimated time to complete: <b>20 mins</b></span>
......
cmsWebApp/webroot/extensions/applicantportal/messages/messagesOverride.txt
#completeCulture = Please complete the section 2. #completeCulture = Please complete the culture assessment.
\ No newline at end of file
cmsWebApp/webroot/extensions/applicantportal/workplace_culture.jsp
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
Job job = jobApplication.getJob(); Job job = jobApplication.getJob();
String exitPage = WebUtils.getArticleLink(request, objTran, WebUtils.APPLY_JOB, "Page"); String exitPage = WebUtils.getArticleLink(request, objTran, WebUtils.APPLY_JOB, "Page");
exitPage = exitPage + "&id=" + job.getID() + "&key=" + job.getRandomKey(); exitPage = exitPage + "&id=" + job.getID() + "&key=" + job.getRandomKey();
String sectionNo = jobApplication.isIncludeAssessmentCriteria() ? "2" : "1";
String nextBtnText = jobApplication.isIncludeAssessmentCriteria() ? "Proceed to step 3" : "Proceed to step 2";
process.setAttribute("JobApplication", jobApplication);
%> %>
<script> <script>
$(document.body).addClass('bg-color'); $(document.body).addClass('bg-color');
...@@ -22,10 +26,10 @@ ...@@ -22,10 +26,10 @@
<span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span>
</div> </div>
<div class="show-mobile-title"> <div class="show-mobile-title">
<div class="mobile-title-page">Section 2 - Workplace Culture</div> <div class="mobile-title-page">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/> - Workplace Culture</div>
<div class="mobile-estimated">Estimated time to complete: <b>5 mins</b></div> <div class="mobile-estimated">Estimated time to complete: <b>5 mins</b></div>
</div> </div>
<div class="section-title m-hide">Section 2</div> <div class="section-title m-hide">Section <oneit:toString value="<%= sectionNo %>" mode="EscapeHTML"/></div>
<div class="section-c-title m-hide"> <div class="section-c-title m-hide">
Workplace Culture Workplace Culture
<span>Estimated time to complete: <b>5 mins</b></span> <span>Estimated time to complete: <b>5 mins</b></span>
...@@ -95,11 +99,11 @@ ...@@ -95,11 +99,11 @@
<div class="selection-br-line"></div> <div class="selection-br-line"></div>
<div class="main-sc-section btn-remove-padd"> <div class="main-sc-section btn-remove-padd">
<div class="section-btn text-center"> <div class="section-btn text-center">
<oneit:button value="Save and exit" name="save" cssClass="box-btn-gray" <oneit:button value="Save and exit" name="save" cssClass="box-btn-gray"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("procParams", Collections.singletonMap("JobApplication", jobApplication)) .mapEntry ("procParams", Collections.singletonMap("JobApplication", jobApplication))
.toMap() %>"/> .toMap() %>"/>
<oneit:button value="Proceed to step 3" name="gotoPage" cssClass="box-btn" <oneit:button value="<%= nextBtnText %>" name="gotoPage" cssClass="box-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/> .toMap() %>"/>
......
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