S12522243 # Client - Incoming Issues (raised by Client) #Change step dropdown…

S12522243 # Client - Incoming Issues (raised by Client) #Change step dropdown does not use full set of steps

cmsWebApp/src/performa/form/ChangeApplicationStatusFP.java

@@ -6,6 +6,7 @@ import oneit.logging.LogLevel;
 import oneit.logging.LogMgr;
 import oneit.objstore.StorageException;
 import oneit.security.SecUser;
+import oneit.servlets.forms.RedisplayResult;
 import oneit.servlets.forms.SubmissionDetails;
 import oneit.servlets.forms.SuccessfulResult;
 import oneit.servlets.process.ORMProcessState;
@@ -25,6 +26,13 @@ public class ChangeApplicationStatusFP extends SaveFP
         
         LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1,"In ChangeApplicationStatusFP changing status of Job Application : ", jobApplication );
 
+        if(jobApplication.getWorkFlow() == null)
+        {
+            LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1,"In ChangeApplicationStatusFP , no workflow set : ", jobApplication.getWorkFlow() );
+            
+            return RedisplayResult.getInstance();
+        }
+        
         jobApplication.setApplicationStatus(jobApplication.getWorkFlow().getApplicationStatus());
         
         LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1,"In ChangeApplicationStatusFP Job Application Status successfully changed : ", jobApplication );

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

@@ -15,6 +15,12 @@
     String                  tabText         =   candidate.getToString();
     String                  currentPage     =   WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
     boolean                 missingReq      =   jobApplication.hasFailedEssentialRequirements();
+    WorkFlow                workflow        =   job.getWorkFlowByStatus(jobApplication.getApplicationStatus());
+    List<WorkFlow>          sortedWorkFlows =   ObjstoreUtils.sort(job.getApplicantWFs(), 
+                                                        new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()}, 
+                                                        new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
+            
+    jobApplication.setWorkFlow(workflow);
 
     Map<FactorClass, Tuple.T3<Double, ColorCode, Double>>   roleScoreMap    =   (Map<FactorClass, Tuple.T3<Double, ColorCode, Double>>)jobApplication.getRoleFit();
 %>
@@ -75,6 +81,11 @@
         });
         
         tabToggle("#tab1", ".role-fit");
+        
+        $("[name$='WorkFlow']").change(function()
+        {
+            $('.save-application').click();
+        });
     });
 </script>
 <div class="main-applicant-content dashboard-content-area v-applicant-area ">
@@ -99,13 +110,15 @@
                 </select>
             </span>
             <span class="appli-status-short">
-                <oneit:ormEnum  obj="<%= jobApplication %>" onChange="$('#saveBtn').click()"  attributeName="ApplicationStatus"   cssClass="form-control status-img"
-                                enums="<%= jobApplication.getAvailableStatuses() %>"/>
-                <oneit:button   name="save" value="Save"    cssClass="hidden"   id="saveBtn"
+                <tagfile:ormsingleasso_select obj="<%= jobApplication %>"   assocName="WorkFlow"    cssClass="form-control app-process"    
+                                                      options="<%= sortedWorkFlows.toArray(new WorkFlow[0]) %>"/>
+                <oneit:button   name="changeApplicationStatus"  value=" "   cssClass="save-application hidden"
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
-                                                                .mapEntry ("attribNamesToRestore", new HashSet<String> (Arrays.asList(new String[] {"Job", "JobApplication"})))
-                                                                .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Job", job).toMap())
-                                                                .mapEntry ("restartProcess", Boolean.TRUE).toMap() %>" />
+                                                                    .mapEntry ("restartProcess", Boolean.TRUE)
+                                                                    .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).mapEntry("Job", job).toMap())
+                                                                    .mapEntry ("attribNamesToRestore", new HashSet<String> (Arrays.asList(new String[] {"Job", "JobApplication", "Applications"})))
+                                                                    .mapEntry("JobApplication", jobApplication)
+                                                                    .toMap() %>" />
             </span>
         </div>
         <oneit:button   name="gotoPage" value=" "   cssClass="next-btn" skin="link" disabled="<%= nextApp == null ? "true" : "false"%>"

cmsWebApp/webroot/extensions/adminportal/view_application.jsp

@@ -107,7 +107,7 @@
     <div class="dashboard-content-area">
         <div class="first-part">
             <oneit:dynInclude   page="/extensions/adminportal/inc/job_title_bar.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"
-                                applicantPage="<%= true %>"/>
+                                applicantPage="<%= true %>" ShowList="<%= false %>"/>
         </div>
         <div class="second-part v-applicant-area">
             <oneit:dynInclude   page="/extensions/adminportal/inc/view_application_tab_applicant.jsp"