Skip to content

P
PERFORMA_REPLICA
Commit 004eec66 by Nilu Committed by Harsh Shah
Options

HT001 next up changes and minor styling changes

parent aaa56a85
Showing with 68 additions and 14 deletions
cmsWebApp/src/performa/orm/types/JobSortOption.java
......@@ -26,9 +26,9 @@ public class JobSortOption extends AbstractEnumerated
public static final JobSortOption OLDEST = new JobSortOption ("OLDEST", "OLDEST", "Oldest", false);
public static final JobSortOption ALPHA_A_Z = new JobSortOption ("ALPHA_A_Z", "ALPHA_A_Z", "Alpha A-Z", false);
public static final JobSortOption ALPHA_A_Z = new JobSortOption ("ALPHA_A_Z", "ALPHA_A_Z", "A-Z", false);
public static final JobSortOption ALPHA_Z_A = new JobSortOption ("ALPHA_Z_A", "ALPHA_Z_A", "Alpha Z-A", false);
public static final JobSortOption ALPHA_Z_A = new JobSortOption ("ALPHA_Z_A", "ALPHA_Z_A", "Z-A", false);
private static final JobSortOption[] allJobSortOptions =
new JobSortOption[] { NEWEST,CLOSING_SOON,OLDEST,ALPHA_A_Z,ALPHA_Z_A};
......
cmsWebApp/src/performa/orm/types/JobSortOption.xml
......@@ -6,8 +6,8 @@
<VALUE name="NEWEST" value="NEWEST" description="Newest"/>
<VALUE name="CLOSING_SOON" value="CLOSING_SOON" description="Closing Soon"/>
<VALUE name="OLDEST" value="OLDEST" description="Oldest"/>
<VALUE name="ALPHA_A_Z" value="ALPHA_A_Z" description="Alpha A-Z"/>
<VALUE name="ALPHA_Z_A" value="ALPHA_Z_A" description="Alpha Z-A"/>
<VALUE name="ALPHA_A_Z" value="ALPHA_A_Z" description="A-Z"/>
<VALUE name="ALPHA_Z_A" value="ALPHA_Z_A" description="Z-A"/>
</CONSTANT>
</ROOT>
\ No newline at end of file
cmsWebApp/src/performa/orm/types/JobStatus.java
......@@ -26,8 +26,10 @@ public class JobStatus extends AbstractEnumerated
public static final JobStatus DRAFT = new JobStatus ("DRAFT", "DRAFT", "Draft", false);
public static final JobStatus FILLED = new JobStatus ("FILLED", "FILLED", "Filled", false);
private static final JobStatus[] allJobStatuss =
new JobStatus[] { OPEN,COMPLETE,DRAFT};
new JobStatus[] { OPEN,COMPLETE,DRAFT,FILLED};
private static JobStatus[] getAllJobStatuss ()
......
cmsWebApp/src/performa/orm/types/JobStatus.xml
......@@ -6,6 +6,7 @@
<VALUE name="OPEN" value="OPEN" description="Open"/>
<VALUE name="COMPLETE" value="COMPLETE" description="Closed"/>
<VALUE name="DRAFT" value="DRAFT" description="Draft"/>
<VALUE name="FILLED" value="FILLED" description="Filled"/>
</CONSTANT>
</ROOT>
\ No newline at end of file
cmsWebApp/src/performa/utils/Utils.java
......@@ -2,6 +2,9 @@ package performa.utils;
import java.util.*;
import oneit.objstore.ObjectTransaction;
import oneit.objstore.rdbms.filters.GreaterThanEqualFilter;
import oneit.objstore.rdbms.filters.LessThanEqualFilter;
import oneit.objstore.rdbms.filters.LessThanFilter;
import oneit.security.*;
import oneit.utils.Tuple;
import performa.orm.*;
......@@ -9,6 +12,8 @@ import performa.orm.types.Importance;
import performa.orm.types.JobSortOption;
import oneit.objstore.utils.*;
import oneit.utils.*;
import oneit.utils.filter.CollectionFilter;
import oneit.utils.filter.Filter;
/**
*
......@@ -114,4 +119,15 @@ public class Utils
new ObjectTransform[]{transform},
new Comparator[]{comparator});
}
public static int getClosingSoonJobCount(Job[] jobs)
{
Filter<Job> filter = Job.SearchByAll()
.andApplyBy(new LessThanFilter<>(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 5)))
.andApplyBy(new GreaterThanEqualFilter<>(DateDiff.getToday()));
Object[] closingSoonJobs = CollectionFilter.filterArray(jobs, filter);
return closingSoonJobs.length;
}
}
cmsWebApp/webroot/css/common.css
......@@ -1879,7 +1879,7 @@ table.pos-table{
padding: 35px 70px;
display: inline-block;
width: 100%;
margin-bottom: 87px;
/*margin-bottom: 87px;*/
}
.selection-br-line{
display: block;
......
cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp
......@@ -27,11 +27,11 @@
fontWeight: 'normal'
});
$(".job-row").click(function()
{
var id = $(this).closest('.job-list').attr('id');
$('.' + id).click();
});
// $(".job-row").click(function()
// {
// var id = $(this).closest('.job-list').attr('id');
// $('.' + id).click();
// });
$(".job-status").change(function()
{
......@@ -73,7 +73,12 @@
<div class="job-application jl-c eq-second-height" style="height: 107px;">
<div class="ja-icon"><img src="images/job-list-user.svg"></div>
<div class="ja-count">
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>">
<oneit:toString value="<%= job.getNoOfCandidatesApplied() %>" mode="EscapeHTML" nullValue="0"/>
</oneit:button>
<span class="grey-span">Applicants</span>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/list_jobs.jsp
......@@ -64,9 +64,13 @@
<%
for (JobStatus status : JobStatus.getJobStatusArray())
{
if(status == JobStatus.FILLED)
{
continue;
}
%>
<li class="<%= (jobStatus != null && jobStatus == status ? "active" : "" )%>">
<oneit:button value="<%= status.getName() %>" name="gotoPage" skin="link"
<oneit:button value="<%= status.getDescription() %>" name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", homePage )
.mapEntry("procParams", CollectionUtils.mapEntry("JobStatus", status).toMap())
.toMap() %>"/>
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
......@@ -14,6 +14,7 @@
Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS);
String nextPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap());
String homePage = WebUtils.getSamePageInRenderMode(request, "Page");
String jobsPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", "Page").toMap());
%>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
......@@ -26,9 +27,32 @@
</div>
<div class="col-sm-3 col-xs-12 d-three-box green-light">
<div class="d-fl-left eq-height">
<div class="dash-count c-green"><oneit:toString value="<%= jobs.length %>" mode="EscapeHTML" nullValue="0"/></div>
<div class="dash-count c-green">
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobStatus", JobStatus.OPEN).toMap())
.toMap() %>">
<oneit:toString value="<%= jobs.length %>" mode="EscapeHTML" nullValue="0"/>
</oneit:button>
</div>
<div class="d-box-title">Open Jobs</div>
<a href="#" class="arrow-btn">2 closing soon </a>
<%
int closingSoonJobs = Utils.getClosingSoonJobCount(jobs);
if(closingSoonJobs > 0)
{
%>
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobStatus", JobStatus.OPEN).mapEntry("JobSortOption", JobSortOption.CLOSING_SOON).toMap())
.toMap() %>">
<div class="arrow-btn">
<oneit:toString value="<%= closingSoonJobs %>" mode="Integer" nullValue="0"/> closing soon
</div>
</oneit:button>
<%
}
%>
</div>
</div>
<div class="col-sm-3 col-xs-12 d-three-box gray-light">
......
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