S12519048 # Client - Incoming Issues (raised by Client) #Close Job - not available to Standard User

cmsWebApp/src/performa/orm/Job.java

@@ -530,18 +530,26 @@ public class Job extends BaseJob
     }
     
     
-    public List<JobStatus> getAvailableStatus()
+    public List<JobStatus> getAvailableStatus(RoleType roleType)
     {
-        if(getJobStatus() == JobStatus.OPEN)
+        List<JobStatus> statusList  =   new ArrayList<>();
+        
+        statusList.add(JobStatus.FILLED);
+        
+        if(getJobStatus() == JobStatus.OPEN || getJobStatus() == JobStatus.DRAFT)
         {
-            return Arrays.asList(new JobStatus[]{JobStatus.COMPLETE, JobStatus.FILLED});
+            if(roleType != RoleType.STANDARD)
+            {
+                statusList.add(JobStatus.COMPLETE);
+            }
         }
-        else if(getJobStatus() == JobStatus.COMPLETE)
+
+        if(getJobStatus() == JobStatus.DRAFT )
         {
-            return Arrays.asList(new JobStatus[]{JobStatus.FILLED});
+            statusList.add(JobStatus.OPEN);
         }
-
-        return Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE, JobStatus.FILLED});
+        
+        return statusList;
     }
     
     private String getURL()

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

@@ -39,6 +39,10 @@
     
     <div class="main-job-list">
     <%
+        ObjectTransaction   objTran     =   process.getTransaction ();
+        CompanyUser         companyUser =   SecUser.getTXUser(objTran).getExtension(CompanyUser.REFERENCE_CompanyUser);
+        RoleType            roleType    =   companyUser.pipelineCompanyUser().toHiringTeams(CompanyUserHiringTeamLink.SearchByAll().andHiringTeam(new EqualsFilter<>(companyUser.getSelectedTeam()))).toRole().val();
+        
         for(Job job: jobs)
         {
             int     shortlisted     =   job.getNoOfCandidatesFor(ApplicationStatus.SHORTLISTED);
@@ -169,8 +173,23 @@
                     </div>
                 </div>
                 <div class="job-states jl-c wider-select">
+<%--                    <select class="form-control"    onChange="$('<%= ".save-job" +  job.getID().toString() %>').click()">
+                        <option selected value=" ">
+                            <oneit:toString value="<%= job.getJobStatus() %>"   mode="EscapeHTML"/>
+                        </option>
+                    <%
+                        for (JobStatus jStatus : job.getAvailableStatus(roleType))
+                        {
+                    %>
+                            <option>
+                                <oneit:toString value="<%= jStatus.getDescription() %>"   mode="EscapeHTML"/>
+                            </option>
+                    <%
+                        }
+                    %>
+                    </select>--%>
                     <oneit:ormEnum  obj="<%= job %>" attributeName="JobStatus" cssClass="form-control status-img job-status"   
-                                    enums="<%= job.getAvailableStatus() %>"/>
+                                    enums="<%= job.getAvailableStatus(roleType) %>"/>
                 </div>
                 <oneit:button   name="saveJob"  value="Save"    cssClass="<%= "save-job" +  job.getID().toString() + " hidden"%>"
                                 requestAttribs="<%= CollectionUtils.mapEntry("Job", job).mapEntry("nextPage", homePage + "&JobStatus=" + jobStatus + "&JobSortOption=" + jobSortOption).toMap() %>" />