S12521519 # Client - Incoming Issues (raised by Client) #Editing Draft Job sets filter to Draft

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -40,12 +40,12 @@ public class SaveJobFP extends SaveFP
         
         LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
 
-        if(status != null)
-        {
-            LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP setting job status to session : ", status );
-
-            request.getSession().setAttribute("JobStatus", status);
-        }
+//        if(status != null)
+//        {
+//            LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP setting job status to session : ", status );
+//
+//            request.getSession().setAttribute("JobStatus", status);
+//        }
         
         Job oldJob  = (Job) job.getEarliestBackup();
         

cmsWebApp/src/performa/orm/types/DraftLocation.java

@@ -25,9 +25,11 @@ public class DraftLocation extends AbstractEnumerated
     public static final DraftLocation ASSESSMENT = new DraftLocation ("ASSESSMENT", "ASSESSMENT", "Assessment", false);
     
     public static final DraftLocation CULTURE = new DraftLocation ("CULTURE", "CULTURE", "Culture", false);
+    
+    public static final DraftLocation REVIEW = new DraftLocation ("REVIEW", "REVIEW", "Review", false);
 
     private static final DraftLocation[] allDraftLocations =
-        new DraftLocation[] { DETAILS,ASSESSMENT,CULTURE};
+        new DraftLocation[] { DETAILS,ASSESSMENT,CULTURE,REVIEW};
 
 
     private static DraftLocation[] getAllDraftLocations ()

cmsWebApp/src/performa/orm/types/DraftLocation.xml

@@ -6,6 +6,7 @@
         <VALUE name="DETAILS"       description="Details"       />
         <VALUE name="ASSESSMENT"    description="Assessment"    />
         <VALUE name="CULTURE"       description="Culture"       />
+        <VALUE name="REVIEW"        description="Review"        />
         
     </CONSTANT>
 </ROOT>
\ No newline at end of file

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

@@ -122,7 +122,7 @@
                         String  optionLink  =   applicantsPage + "&ApplicationFilter=" + applicationFilter.getName();
                 %>
                         <option <%= (appFilter != null && appFilter == applicationFilter ? "selected" : "" )%>  value="<%= optionLink %>">
-                            <oneit:toString value="<%= applicationFilter.getName() %>"   mode="EscapeHTML"/>
+                            <oneit:toString value="<%= applicationFilter.getDescription() %>"   mode="EscapeHTML"/>
                         </option>
                 <%
                     }

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

@@ -66,6 +66,10 @@
                 {
                     editJobPage =   jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.WORKPLACE_CULTURE).toMap());
                 }
+                else if(job.getDraftLocation() == DraftLocation.REVIEW)
+                {
+                    editJobPage =   jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.JOB_REVIEW).toMap());
+                }
 
                 editJobPage    =   editJobPage + "&JobID=" + job.getObjectID();  
             }

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

@@ -13,26 +13,6 @@
     String      sharePage       =   WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB);
     String      jobPage         =   WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
 
-    if(job.getJobStatus() == JobStatus.DRAFT)
-    {
-        if(job.getDraftLocation() == null)
-        {
-            editJobPage =   WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
-        }
-        else if(job.getDraftLocation() == DraftLocation.DETAILS)
-        {
-            editJobPage =   WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB); 
-        }
-        else if(job.getDraftLocation() == DraftLocation.ASSESSMENT)
-        {
-            editJobPage =   WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA); 
-        }
-        else if(job.getDraftLocation() == DraftLocation.CULTURE)
-        {
-            editJobPage =   WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE); 
-        }
-    }
-
     List<JobApplication>    applications    =   (List<JobApplication>) getData(request, "applications");
 %>
 

cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp

@@ -342,6 +342,7 @@
                     <div class="text-center">
                         <oneit:button   value="Save as Draft and go to your jobs"   name="saveJob"  cssClass="btn  btn-primary btn-gray largeBtn"   
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
+                                                                        .mapEntry("DraftLocation", DraftLocation.REVIEW)
                                                                         .mapEntry("JobStatus", JobStatus.DRAFT)
                                                                         .mapEntry ("restartProcess", Boolean.TRUE)
                                                                         .mapEntry ("attribNamesToRestore", Collections.singleton("Job"))