Update aplicant portal if not have assessment criteria.

cmsWebApp/src/performa/orm/JobApplication.java

@@ -2,7 +2,6 @@ package performa.orm;
 
 import java.util.Collection;
 import oneit.logging.LoggingArea;
-import oneit.objstore.ObjectStatus;
 import oneit.objstore.StorageException;
 import oneit.objstore.rdbms.filters.EqualsFilter;
 import oneit.objstore.rdbms.filters.IsNotNullFilter;
@@ -41,6 +40,8 @@ public class JobApplication extends BaseJobApplication
     
     private void initACAnswers()
     {
+        if(isIncludeAssessmentCriteria())
+        {
             for(AssessmentCriteria assessmentCriteria : getJob().getAssessmentCriteriasSet())
             {
                 AssessmentCriteriaAnswer    answer  =   AssessmentCriteriaAnswer.createAssessmentCriteriaAnswer(getTransaction());
@@ -49,9 +50,12 @@ public class JobApplication extends BaseJobApplication
                 assessmentCriteria.addToAnswers(answer);
             }
         }
+    }
     
     
-    private void initCCAnswers()
+    public void initCCAnswers()
+    {
+        if(this.getCultureCriteriaAnswersCount()==0)
         {
             for(CultureCriteria cultureCriteria : getJob().getCultureCriteriasSet())
             {
@@ -61,6 +65,7 @@ public class JobApplication extends BaseJobApplication
                 cultureCriteria.addToAnswers(answer);
             }
         }
+    }
     
     
     public Answer getPAAnswerOrCreate(Question question, int index) throws FieldException
@@ -132,4 +137,29 @@ public class JobApplication extends BaseJobApplication
         
         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 @@
         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);
     
     if(jobApplication.getApplicationStatus()==ApplicationStatus.SUBMITTED)

cmsWebApp/webroot/extensions/applicantportal/inc/application_main_tabs.jsp

@@ -16,6 +16,10 @@
 
     <div class="main-tab-form">
         <ul class="nav nav-pills nav-justified">
+            <%
+                if(jobApplication.isIncludeAssessmentCriteria())
+                {
+            %>
                     <li class="<%= pageNumber == "1" ? "active" : jobApplication.selectionCompleted() ? "complate" : ""%>">
                         <oneit:button   value=" "   name="gotoPage" skin="link"
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage)
@@ -34,16 +38,43 @@
                             <div class="mobile-hide">Workplace Culture</div>
                         </oneit:button>
                     </li>
-            <li class="<%= pageNumber == "3" ? "active" : ""%>">
+                    <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><%= "3" %></span>
+                            <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>
     </div>
 </oneit:dynIncluded>

cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp

@@ -11,6 +11,7 @@
     JobApplication      jobApplication  = (JobApplication) process.getAttribute("JobApplication");
     Job                 job             = jobApplication.getJob();
     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");
     
     if(allQuestions==null)
@@ -31,10 +32,10 @@
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
         </div>
         <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>
-        <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">
             Job Match Assessment
             <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 @@
     Job                 job             =   jobApplication.getJob();
     String              exitPage        =   WebUtils.getArticleLink(request, objTran, WebUtils.APPLY_JOB, "Page");
     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>
         $(document.body).addClass('bg-color');
@@ -22,10 +26,10 @@
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
         </div>
         <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>
-        <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">
             Workplace Culture
             <span>Estimated time to complete: <b>5 mins</b></span>
@@ -99,7 +103,7 @@
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
                                                                             .mapEntry ("procParams", Collections.singletonMap("JobApplication", jobApplication))
                                                                             .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)
                                                                             .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
                                                                             .toMap() %>"/>