modifications to HT003

cmsWebApp/src/performa/form/BulkUpdateFP.java

@@ -41,7 +41,7 @@ public class BulkUpdateFP extends SaveFP
         {
             Filter<JobApplication>  filter              =   JobApplication.SearchByAll().andApplicationStatus(new EqualsFilter<>(ApplicationStatus.SHORTLISTED));
             Collection              alreadyShortlisted  =   CollectionFilter.filter(applications, filter);
-            int                     totalShortlisted    =   applications.size() - alreadyShortlisted.size() + job.getNoOfCandidatesShortlisted();
+            int                     totalShortlisted    =   applications.size() - alreadyShortlisted.size() + job.getNoOfCandidatesFor(ApplicationStatus.SHORTLISTED);
           
             BusinessObjectParser.assertFieldCondition(totalShortlisted <= job.getMaxShortlistApplicants() , job , Job.MULTIPLEREFERENCE_JobApplications, "exceedMaxShortlisted");
         }

cmsWebApp/src/performa/orm/Job.java

@@ -230,19 +230,9 @@ public class Job extends BaseJob
     
     public int getNoOfCandidatesApplied()
     {
-        return getNoOfCandidatesFor(ApplicationStatus.SUBMITTED, ApplicationStatus.SHORTLISTED, ApplicationStatus.UNSUITABLE);
-    }
-    
-    
-    public int getNoOfCandidatesShortlisted()
-    {
-        return getNoOfCandidatesFor(ApplicationStatus.SHORTLISTED);
-    }
-    
-    
-    public int getNoOfCandidatesUnsuitable()
-    {
-        return getNoOfCandidatesFor(ApplicationStatus.UNSUITABLE);
+        Filter<JobApplication>  filter =    JobApplication.SearchByAll().andApplicationStatus(new NotInFilter<>(ApplicationStatus.DRAFT));
+        
+        return pipelineJob().toJobApplications(filter).toCandidate().vals().size();
     }
     
     
@@ -256,7 +246,9 @@ public class Job extends BaseJob
 
     public Collection<JobApplication> getSubmittedApplications()
     {
-        return getApplicationsFor(ApplicationStatus.SUBMITTED, ApplicationStatus.SHORTLISTED, ApplicationStatus.UNSUITABLE);
+        Filter<JobApplication>  filter =    JobApplication.SearchByAll().andApplicationStatus(new NotInFilter<>(ApplicationStatus.DRAFT));
+        
+        return CollectionFilter.filter(getJobApplicationsSet(), filter);
     }
     
     

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

@@ -23,7 +23,7 @@
         
         <div class="int-timeline">
             <li class="<%= noOfIncomplete > 0 ? "has-applicant" : "no-applicant" %> <%= tabNumber == 1 ? "active" : "inactive" %>">
-                <oneit:button   id="unsuitableBtn"   value=" "   name="gotoPage" skin="link" disabled="<%= noOfUnsuitable > 0 ? "false" : "false" %>"
+                <oneit:button   id="unsuitableBtn"   value=" "   name="gotoPage" skin="link" disabled="<%= noOfUnsuitable > 0 ? "false" : "true" %>"
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicantsPage)
                                                                 .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).mapEntry("TabNumber", 1).toMap())
                                                                 .toMap() %>">
@@ -37,10 +37,10 @@
                 <%
                     for (WorkFlow workflow : job.getSortedMiddleWorkFlows())
                     {
-                        int noOfCandidates  =   job.getNoOfCandidatesFor(workflow.getApplicationStatus());
+                        int noOfCandidates  =   workflow.getSortOrder() == 2 ? job.getNoOfCandidatesApplied() : job.getNoOfCandidatesFor(workflow.getApplicationStatus());
                 %>
                         <li class="<%= noOfCandidates > 0 ? "has-applicant" : "" %> <%= (tabNumber == workflow.getSortOrder()) ? "active" : "inactive" %>">
-                            <oneit:button   value=" "   name="gotoPage" skin="link"
+                            <oneit:button   value=" "   name="gotoPage" skin="link" disabled="<%= noOfCandidates > 0 ? "false" : "true" %>"
                                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicantsPage)
                                                                             .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).mapEntry("TabNumber", workflow.getSortOrder()).toMap())
                                                                             .toMap() %>">
@@ -56,7 +56,7 @@
             </ul>
         </div>      
         <div class="unsutable <%= noOfUnsuitable > 0 ? "has-applicant" : "no-applicant" %> <%= tabNumber == 9 ? "active" : "inactive" %>">
-            <oneit:button   id="unsuitableBtn"   value=" "   name="gotoPage" skin="link" disabled="<%= noOfUnsuitable > 0 ? "false" : "false" %>"
+            <oneit:button   id="unsuitableBtn"   value=" "   name="gotoPage" skin="link" disabled="<%= noOfUnsuitable > 0 ? "false" : "true" %>"
                             requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicantsPage)
                                                             .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).mapEntry("TabNumber", 9).toMap())
                                                             .toMap() %>">

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

@@ -41,7 +41,7 @@
     <%
         for(Job job: jobs)
         {
-            int     shortlisted     =   job.getNoOfCandidatesShortlisted();
+            int     shortlisted     =   job.getNoOfCandidatesFor(ApplicationStatus.SHORTLISTED);
             int     maxShortlist    =   job.getMaxShortlistApplicants();
             String  goToPage        =   shortlisted > 0 ? shortlistPage : nextPage;
     %>

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

@@ -6,7 +6,7 @@
 
 <%
     Job     job         =   (Job) process.getAttribute("Job"); 
-    int     shortlisted =   job.getNoOfCandidatesShortlisted();
+    int     shortlisted =   job.getNoOfCandidatesFor(ApplicationStatus.SHORTLISTED);
     String  editJobPage =   WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB);
     String  sharePage   =   WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB);
     String  jobPage     =   WebUtils.getSamePageInRenderMode(request, (shortlisted > 0 ? WebUtils.APPLICANTS_SHORTLIST : WebUtils.VIEW_APPLICANTS));