job creation flow - issue fixes of assessment criteria having ticked values and…

job creation flow - issue fixes of assessment criteria having ticked values and culture tab being ticked

not letting user save as draft on job details screen when no requirements added

cmsWebApp/src/performa/form/ProcessCultureFP.java

@@ -40,6 +40,7 @@ public class ProcessCultureFP extends SaveFP
         Job                 job             =   (Job) process.getAttribute("Job");
         boolean             fromJobMatch    =   request.getAttribute("fromJobMatch") != null ? (boolean) request.getAttribute("fromJobMatch"): false;
         boolean             fromCulture     =   request.getAttribute("fromCulture") != null ? (boolean) request.getAttribute("fromCulture"): false;
+        boolean             fromAssessment  =   request.getAttribute("fromAssessment") != null ? (boolean) request.getAttribute("fromAssessment"): false;
         
         Debug.assertion(job != null, "No job found . Call from " + getClass().getName());
         
@@ -71,5 +72,13 @@ public class ProcessCultureFP extends SaveFP
                 }
             }
         }
+        
+        if(fromAssessment)
+        {
+            if (job.getIncludeAssessmentCriteria())
+            {
+                BusinessObjectParser.assertFieldCondition(job.getAssessmentCriteriasCount() > 0, job , Job.FIELD_IncludeAssessmentCriteria, "atleastOneRequirement", exceptions, true, request);
+            }
+        }
     }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Job.java

@@ -83,11 +83,6 @@ public class Job extends BaseJob
     {
         super.validate(context);
 
-        if (getIncludeAssessmentCriteria())
-        {
-           context.check(getAssessmentCriteriasCount() > 0 ,  this, FIELD_IncludeAssessmentCriteria, "atleastOneRequirement");
-        }
-        
         context.check(getSaveAssessmentTemplate() == null || !getSaveAssessmentTemplate() ,  this, FIELD_AssessmentTemplateName, "saveTemplateFirst"); 
         
         context.check(getSaveCultureTemplate() == null || !getSaveCultureTemplate() ,  this, FIELD_CultureTemplateName, "saveTemplateFirst"); 
@@ -171,7 +166,7 @@ public class Job extends BaseJob
     
     public Boolean cultureCriteriaCompleted()
     {
-        Filter<CultureCriteria> filter  =   CultureCriteria.SearchByAll().andIsApplicable(new EqualsFilter<>(Boolean.TRUE));
+        Filter<CultureCriteria> filter  =   CultureCriteria.SearchByAll().andIsApplicable(new EqualsFilter<>(Boolean.TRUE)).andCultureElementRating(new IsNotNullFilter<>());
         
         return pipelineJob().toCultureCriterias(filter).uniqueVals().size() > 0;
     }

cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp

@@ -214,6 +214,7 @@
                         <oneit:button   value="Proceed to Culture"  name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
                                                                         .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
+                                                                        .mapEntry("fromAssessment", true)
                                                                         .toMap() %>" />
                     </div>
                        </div>

cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp

@@ -13,6 +13,8 @@
 //    String  fifthPage       =   WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
     boolean savedJob        =   job.getStatus() != ObjectStatus.NEW;
     boolean fromJobMatch    =   pageNumber == "1";
+    boolean fromAssessment  =   pageNumber == "2";
+    boolean fromCulture     =   pageNumber == "3";
 %>
 
 
@@ -25,6 +27,8 @@
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage)
                                                                 .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
                                                                 .mapEntry("fromJobMatch", fromJobMatch)
+                                                                .mapEntry("fromAssessment", fromAssessment)
+                                                                .mapEntry("fromCulture", fromCulture)
                                                                 .toMap() %>">
                     <span><%=  job.jobDetailsCompleted() ? "<img src=\"images/right-mark.png\" />" : "1"%></span>
                     Job Detail
@@ -35,6 +39,8 @@
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
                                                                 .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
                                                                 .mapEntry("fromJobMatch", fromJobMatch)
+                                                                .mapEntry("fromAssessment", fromAssessment)
+                                                                .mapEntry("fromCulture", fromCulture)
                                                                 .toMap() %>">
                     <span><%= job.jobAssessmentCompleted() ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
                     Requirements
@@ -45,6 +51,8 @@
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
                                                                 .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
                                                                 .mapEntry("fromJobMatch", fromJobMatch)
+                                                                .mapEntry("fromAssessment", fromAssessment)
+                                                                .mapEntry("fromCulture", fromCulture)
                                                                 .toMap() %>">
                     <span><%= job.cultureCriteriaCompleted() ? "<img src=\"images/right-mark.png\" />" : "3"%></span>
                     Culture