Commit 5b37086b by chenith Committed by Harsh Shah

Set jobs in process based on current status.

Modify sorting option for closing soon.
parent f9979cea
...@@ -97,7 +97,7 @@ public class Utils ...@@ -97,7 +97,7 @@ public class Utils
else if(jobSortOption==JobSortOption.CLOSING_SOON) else if(jobSortOption==JobSortOption.CLOSING_SOON)
{ {
transform = Job.pipesJob().toApplyBy(); transform = Job.pipesJob().toApplyBy();
comparator = CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST); comparator = CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST;
} }
else if(jobSortOption==JobSortOption.ALPHA_A_Z) else if(jobSortOption==JobSortOption.ALPHA_A_Z)
{ {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
String homePage = WebUtils.getSamePageInRenderMode(request, "Page"); String homePage = WebUtils.getSamePageInRenderMode(request, "Page");
JobStatus jobStatus = (JobStatus) process.getAttribute("JobStatus"); JobStatus jobStatus = (JobStatus) process.getAttribute("JobStatus");
JobSortOption jobSortOpt = (JobSortOption) process.getAttribute("JobSortOption"); JobSortOption jobSortOpt = (JobSortOption) process.getAttribute("JobSortOption");
if(jobStatus == null && request.getParameter("JobStatus") != null) if(jobStatus == null && request.getParameter("JobStatus") != null)
{ {
jobStatus = JobStatus.forName((String) request.getParameter("JobStatus")); jobStatus = JobStatus.forName((String) request.getParameter("JobStatus"));
...@@ -26,12 +26,18 @@ ...@@ -26,12 +26,18 @@
{ {
jobSortOpt = JobSortOption.NEWEST; jobSortOpt = JobSortOption.NEWEST;
} }
Job[] jobs = (Job[]) process.getAttribute("Jobs"); String jobListName = "Job" + jobStatus;
jobs = Job.SearchByAll().andJobStatus(new EqualsFilter<>(jobStatus)) Job[] jobs = (Job[]) process.getAttribute(jobListName);
.andSecUser(new EqualsFilter(SecUser.getTXUser(transaction)))
.search(transaction); if(jobs==null)
process.setAttribute("Jobs", jobs); {
jobs = Job.SearchByAll().andJobStatus(new EqualsFilter<>(jobStatus))
.andSecUser(new EqualsFilter(SecUser.getTXUser(transaction)))
.search(transaction);
process.setAttribute(jobListName, jobs);
}
List<Job> sortedJobs = Utils.getJobsSorted(jobs, jobSortOpt); List<Job> sortedJobs = Utils.getJobsSorted(jobs, jobSortOpt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment