Navigation update.

cmsWebApp/src/performa/orm/JobApplication.java

@@ -24,6 +24,7 @@ public class JobApplication extends BaseJobApplication
         // Do not add any code to this, always put it in initialiseNewObject
     }
 
+    
     public static JobApplication createNewApplication(Candidate candidate, Job job) throws StorageException, FieldException
     {
         JobApplication  jobApplication  =   createJobApplication(job.getTransaction());
@@ -32,11 +33,12 @@ public class JobApplication extends BaseJobApplication
         jobApplication.setJob(job);
         
         jobApplication.initACAnswers();
-//        jobApplication.initCCAnswers();
+        jobApplication.initCCAnswers();
         
         return jobApplication;
     }
     
+    
     private void initACAnswers()
     {
         for(AssessmentCriteria assessmentCriteria : getJob().getAssessmentCriteriasSet())
@@ -48,9 +50,8 @@ public class JobApplication extends BaseJobApplication
         }
     }
     
-    public void initCCAnswers()
-    {
-        if(this.getCultureCriteriaAnswersCount()==0)
+    
+    private void initCCAnswers()
     {
         for(CultureCriteria cultureCriteria : getJob().getCultureCriteriasSet())
         {
@@ -60,7 +61,6 @@ public class JobApplication extends BaseJobApplication
             cultureCriteria.addToAnswers(answer);
         }
     }
-    }
     
     
     public Answer getPAAnswerOrCreate(Question question, int index) throws FieldException
@@ -87,6 +87,7 @@ public class JobApplication extends BaseJobApplication
         return answer;
     }
     
+    
     public Collection<AssessmentCriteriaAnswer> getACAnswersByType(CriteriaType criteriaType)
     {
         Filter  filter  =   AssessmentCriteriaAnswer.SearchByCriteriaType().byCriteriaType(criteriaType);

cmsWebApp/webroot/extensions/applicantportal/selection_criteria.jsp

@@ -101,7 +101,7 @@
                         <div class="section-btn text-center">
                             <oneit:button   value="Save and exit"   name="save" cssClass="box-btn-gray"
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
-                                                                            .mapEntry ("procParams", Collections.singletonMap("id", "XXXXXXXXXXX"))
+                                                                            .mapEntry ("procParams", Collections.singletonMap("JobApplication", jobApplication))
                                                                             .toMap() %>"/>
                             <oneit:button   value="Proceed to step 2"   name="gotoPage" cssClass="box-btn"
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)

cmsWebApp/webroot/extensions/applicantportal/workplace_culture.jsp

@@ -11,8 +11,6 @@
     Job                 job             =   jobApplication.getJob();
     String              exitPage        =   WebUtils.getArticleLink(request, objTran, WebUtils.APPLY_JOB, "Page");
     exitPage                            =   exitPage + "&id=" + job.getID() + "&key=" + job.getRandomKey();
-    
-    jobApplication.initCCAnswers();
 %>
     <script>
         $(document.body).addClass('bg-color');
@@ -99,7 +97,7 @@
                         <div class="section-btn text-center">
                             <oneit:button   value="Save and exit"   name="save" cssClass="box-btn-gray"
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
-                                                                            .mapEntry ("procParams", Collections.singletonMap("id", "XXXXXXXXXXX"))
+                                                                            .mapEntry ("procParams", Collections.singletonMap("JobApplication", jobApplication))
                                                                             .toMap() %>"/>
                             <oneit:button   value="Proceed to step 3"   name="gotoPage" cssClass="box-btn"
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)