Updated pplication for submit if requirement not included to job.

cmsWebApp/src/performa/orm/JobApplication.java

@@ -190,8 +190,13 @@ public class JobApplication extends BaseJobApplication
     }
 
     
-    public boolean selectionCompleted()
+    public boolean selectionCompleted() //req   
     {
+        if(getJob()!=null && getJob().getIncludeAssessmentCriteria()!=Boolean.TRUE)
+        {
+            return Boolean.TRUE;
+        }
+        
         int allAnswersCount =   getAssessmentCriteriaAnswersCount();
         
         if(allAnswersCount == getJob().getAssessmentCriteriasCount())
@@ -222,7 +227,7 @@ public class JobApplication extends BaseJobApplication
     }
     
     
-    public boolean assessmentCompleted()
+    public boolean assessmentCompleted() //role
     {
         int allAnswersCount = getJob().getAllLeftQuestions(Arrays.asList(Question.searchAll(getTransaction()))).size();
         

cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp

@@ -135,10 +135,29 @@
                             }
                         %>
                     </span>
-                    <oneit:button   value="<%= btnText %>"  name="gotoPage" skin="link" cssClass="box-btn"
-                                    requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
-                                                                    .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
-                                                                    .toMap() %>"/>
+                    <%
+                        if(isSelectionComplete && isCultureComplete && isAssesmentComplete)
+                        {
+                            nextPage    =   WebUtils.getSamePageInRenderMode(request, "SubmitApplication");
+                    %>
+                            <oneit:button   value="Submit your application"    name="completeApplication"  id="nextButton"  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() %>"/>
+                    <%
+                        }
+                        else
+                        {
+                    %>
+                            <oneit:button   value="<%= btnText %>"  name="gotoPage" skin="link" cssClass="box-btn"
+                                            requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
+                                                                            .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
+                                                                            .toMap() %>"/>
+                    <%
+                        }
+                    %>
                 </div>
             </oneit:form>
     <%