S12522073 # Client - Incoming Issues (raised by Client) #Cannot change to Incomplete

cmsWebApp/src/performa/orm/Job.java

@@ -637,4 +637,16 @@ public class Job extends BaseJob
         return pipelineJob().toWorkFlows(filter).val();
     } 
     
+    public Set<WorkFlow> getIncompleteApplicantWFs()
+    {
+        Filter<WorkFlow>    filter  =   WorkFlow.SearchByAll().andApplicationStatus(new InFilter<>(ApplicationStatus.DRAFT, ApplicationStatus.UNSUITABLE));
+        return pipelineJob().toWorkFlows(filter).uniqueVals();
+    }
+    
+    public Set<WorkFlow> getApplicantWFs()
+    {
+        Filter<WorkFlow>    filter  =   WorkFlow.SearchByAll().andApplicationStatus(new NotEqualsFilter<>(ApplicationStatus.DRAFT));
+        return pipelineJob().toWorkFlows(filter).uniqueVals();
+    }
+    
 }
\ No newline at end of file

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

@@ -11,6 +11,9 @@
     String                  currentPage     =   (String) getData(request, "currentPage");
     ApplicationStatus       appStatus       =   (ApplicationStatus)  getData(request, "WorkFlowStatus");
     String                  applicationPage =   WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
+    List<WorkFlow>          sortedWorkFlows =   ObjstoreUtils.sort(job.getIncompleteApplicantWFs(), 
+                                                        new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()}, 
+                                                        new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
 %>
 
 <oneit:dynIncluded>
@@ -125,7 +128,7 @@
                 <div class="appli-status appli-l eq-second-height">
                     <div class="appli-list-drop">
                         <tagfile:ormsingleasso_select obj="<%= jobApplication %>"   assocName="WorkFlow"    cssClass="form-control app-process"    
-                                                      options="<%= job.getWorkFlowsSet().toArray(new WorkFlow[0]) %>"/>
+                                                      options="<%= sortedWorkFlows.toArray(new WorkFlow[0]) %>"/>
                     </div>
                 </div> 
                 <oneit:button   name="changeApplicationStatus"  value=" "   cssClass="<%= "save-application" +  jobApplication.getID().toString() + " hidden"%>"

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

@@ -11,7 +11,7 @@
     String                  currentPage     =   (String) getData(request, "currentPage");
     ApplicationStatus       appStatus       =   (ApplicationStatus)  getData(request, "WorkFlowStatus");
     String                  applicationPage =   WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
-    List<WorkFlow>          sortedWorkFlows =   ObjstoreUtils.sort(job.getWorkFlowsSet(), 
+    List<WorkFlow>          sortedWorkFlows =   ObjstoreUtils.sort(job.getApplicantWFs(), 
                                                         new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()}, 
                                                         new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
 %>