Section completed mark addeed.

cmsWebApp/src/performa/form/CompleteApplicationFP.java

 package performa.form;
 
 import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
 import oneit.logging.*;
 import oneit.objstore.StorageException;
+import oneit.objstore.parser.BusinessObjectParser;
 import oneit.servlets.forms.*;
 import oneit.servlets.process.*;
 import oneit.utils.*;
@@ -23,4 +25,16 @@ public class CompleteApplicationFP extends SaveFP
         
         return super.processForm(process, submission, params);
     }
+
+    
+    @Override
+    public void validate(ORMProcessState process, SubmissionDetails submission, MultiException exceptions, Map params) throws StorageException 
+    {
+        HttpServletRequest  request     =   submission.getRequest();
+        JobApplication  jobApplication  =   (JobApplication) process.getAttribute("JobApplication");
+        
+        BusinessObjectParser.assertFieldCondition(jobApplication.getCultureCriteriaAnswersCount()>0, jobApplication, jobApplication.FIELD_ObjectID, "completeCulture", exceptions, true, request);
+    
+        super.validate(process, submission, exceptions, params);
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Answer.java

@@ -17,6 +17,19 @@ public class Answer extends BaseAnswer
         // Do not add any code to this, always put it in initialiseNewObject
     }
 
+    
+    @Override
+    public void preCommit(boolean willBeStored) throws Exception 
+    {
+        super.preCommit(willBeStored);
+        
+        if(this.getAnswerNo()==null)
+        {
+            this.delete();
+        }
+    }
+    
+    
     @Override
     protected void postAnswerNoChange() throws FieldException 
     {

cmsWebApp/src/performa/orm/JobApplication.java

@@ -2,8 +2,11 @@ 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;
+import oneit.utils.CollectionUtils;
 import oneit.utils.filter.CollectionFilter;
 import oneit.utils.filter.Filter;
 import oneit.utils.parsers.FieldException;
@@ -94,18 +97,38 @@ public class JobApplication extends BaseJobApplication
     
     public Boolean selectionCompleted()
     {
+        int all =   this.getAssessmentCriteriaAnswersCount();
+        
+        if(all>0)
+        {
+            Filter      filter      =   AssessmentCriteriaAnswer.SearchByAll().andAnswer(new IsNotNullFilter<>());
+            Collection  selected    =   this.pipelineJobApplication().toAssessmentCriteriaAnswers(filter).toAnswer().vals();
+
+            if(selected!=null && CollectionUtils.equals(selected.size(),all))
+            {
+                return Boolean.TRUE;
+            }
+        }
+        
         return Boolean.FALSE;
     }
        
     
     public Boolean cultureCompleted()
     {
-        return Boolean.FALSE;
-    }
+        int all =   this.getCultureCriteriaAnswersCount();
         
+        if(all>0)
+        {
+            Filter      filter      =   CultureCriteriaAnswer.SearchByAll().andSelectedQuestion(new IsNotNullFilter<>());
+            Collection  selected    =   this.pipelineJobApplication().toCultureCriteriaAnswers(filter).toSelectedQuestion().vals();
 
-    public Boolean assessmentCompleted()
+            if(selected!=null && CollectionUtils.equals(selected.size(),all))
             {
+                return Boolean.TRUE;
+            }
+        }
+        
         return Boolean.FALSE;
     }
 }
\ No newline at end of file

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

@@ -10,7 +10,6 @@
     String          firstPage       = WebUtils.getSamePageInRenderMode(request, "SelectionCriteria");
     String          secondPage      = WebUtils.getSamePageInRenderMode(request, "WorkplaceCulture");
     String          thirdPage       = WebUtils.getSamePageInRenderMode(request, "JobMatchAssessment");
-//    String          fourthPage      = WebUtils.getSamePageInRenderMode(request, "SubmitApplication");
 %>
 
 <oneit:dynIncluded>
@@ -35,12 +34,12 @@
                     <div class="mobile-hide">Workplace Culture</div>
                 </oneit:button>
             </li>
-            <li class="<%= pageNumber == "3" ? "active" :  jobApplication.assessmentCompleted() ? "complate" : ""%>">
+            <li class="<%= pageNumber == "3" ? "active" : ""%>">
                 <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\" />" : "3"%></span>
+                    <span><%= "3" %></span>
                     <div class="mobile-hide">Job Match Assessment</div>
                 </oneit:button>
             </li>

cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp

@@ -130,21 +130,16 @@
                                                                                         .toMap() %>"/>
                                 <%
                                     }
-                                    else
-                                    {
                                 %>
+                            </span>
+                        </div>
+                        <div class="auto-save">
                             <oneit:button   value="Complete"    name="completeApplication"  cssClass="box-btn"
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
                                                                             .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
                                                                             .mapEntry("attribNamesToRestore", Collections.singleton("JobApplication"))
                                                                             .mapEntry("restartProcess", Boolean.TRUE)
                                                                             .toMap() %>"/>
-                                <%
-                                    }
-                                %>
-                            </span>
-                        </div>
-                        <div class="auto-save">
                             <%-- <div>Autosaved 1 min ago.</div> --%>
                         </div>
                     </div>                      

cmsWebApp/webroot/extensions/applicantportal/messages/messagesOverride.txt

+
+#completeCulture    =   Please complete the section 2.
+ 
\ No newline at end of file