Skip to content

P
PERFORMA_REPLICA
Commit 156e825c by Nilu Committed by Harsh Shah
Options

Clicking (actual) number **> 0** of Filled Jobs goes to HT002 to list any filled… 

Clicking (actual) number **> 0** of Filled Jobs goes to HT002 to list any filled jobs {_yes, I know, we don't have a filter nor sort for this yet_}

Row - Job - When moving from Draft to Open, the **clock begins at the time the Job is set to Open** (_not_ the Job's creation date)

fix issue with clonning
parent 3448b7f9
Showing with 54 additions and 88 deletions
cmsWebApp/src/performa/form/LoadJobFromTemplateFP.java
...@@ -12,6 +12,7 @@ import oneit.servlets.process.ORMProcessFormProcessor; ...@@ -12,6 +12,7 @@ import oneit.servlets.process.ORMProcessFormProcessor;
import oneit.servlets.process.ORMProcessState; import oneit.servlets.process.ORMProcessState;
import oneit.utils.BusinessException; import oneit.utils.BusinessException;
import performa.orm.*; import performa.orm.*;
import performa.orm.types.JobStatus;
/** /**
* *
...@@ -41,6 +42,9 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor ...@@ -41,6 +42,9 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor
jobTemplate.cloneJob(job); jobTemplate.cloneJob(job);
job.initAttribs(); job.initAttribs();
job.setJobStatus(JobStatus.DRAFT);
job.setApplyBy(null);
job.setOpenDate(null);
job.setCompletedDetails(Boolean.TRUE); job.setCompletedDetails(Boolean.TRUE);
job.setCompletedAssessmentType(Boolean.TRUE); job.setCompletedAssessmentType(Boolean.TRUE);
job.setCompletedRequirements(Boolean.TRUE); job.setCompletedRequirements(Boolean.TRUE);
......
cmsWebApp/src/performa/form/SaveJobFP.java
...@@ -25,10 +25,14 @@ public class SaveJobFP extends SaveFP ...@@ -25,10 +25,14 @@ public class SaveJobFP extends SaveFP
LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job ); LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
job.setJobStatus(JobStatus.OPEN); Job oldJob = (Job) job.getEarliestBackup();
job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
job.setOpenDate(new Date()); if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT)
{
job.setJobStatus(JobStatus.OPEN);
job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
job.setOpenDate(new Date());
}
return super.processForm(process, submission, params); return super.processForm(process, submission, params);
} }
} }
\ No newline at end of file
cmsWebApp/src/performa/utils/Utils.java
...@@ -2,6 +2,7 @@ package performa.utils; ...@@ -2,6 +2,7 @@ package performa.utils;
import java.util.*; import java.util.*;
import oneit.objstore.ObjectTransaction; import oneit.objstore.ObjectTransaction;
import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.objstore.rdbms.filters.GreaterThanEqualFilter; import oneit.objstore.rdbms.filters.GreaterThanEqualFilter;
import oneit.objstore.rdbms.filters.LessThanFilter; import oneit.objstore.rdbms.filters.LessThanFilter;
import oneit.security.*; import oneit.security.*;
...@@ -14,6 +15,7 @@ import oneit.utils.*; ...@@ -14,6 +15,7 @@ import oneit.utils.*;
import oneit.utils.filter.CollectionFilter; import oneit.utils.filter.CollectionFilter;
import oneit.utils.filter.Filter; import oneit.utils.filter.Filter;
import performa.orm.types.AppSortOption; import performa.orm.types.AppSortOption;
import performa.orm.types.JobStatus;
/** /**
* *
......
cmsWebApp/webroot/css/common.css
...@@ -2600,6 +2600,14 @@ span.ex-management { ...@@ -2600,6 +2600,14 @@ span.ex-management {
border-radius: 100px; border-radius: 100px;
margin: -5px 11px; margin: -5px 11px;
} }
.filled-status-icon{
width: 20px;
height: 20px;
border: solid 4px #f56440;
display: inline-block;
border-radius: 100px;
margin: -5px 11px;
}
.draft-status-icon{ .draft-status-icon{
width: 20px; width: 20px;
height: 20px; height: 20px;
......
cmsWebApp/webroot/extensions/adminportal/inc/applicant_view_tabs.jsp
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
String firstTab = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS); String firstTab = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
String secondTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_SHORTLIST); String secondTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_SHORTLIST);
String thirdTab = WebUtils.getSamePageInRenderMode(request, WebUtils.UNSUITABLE_APPS); String thirdTab = WebUtils.getSamePageInRenderMode(request, WebUtils.UNSUITABLE_APPS);
int closingInDays = DateDiff.getDateDiff(Calendar.DATE, DateDiff.getToday(), job.getApplyBy());
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
......
cmsWebApp/webroot/extensions/adminportal/inc/application_list_data.jsp
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</div> </div>
</div> </div>
</span> </span>
Job Match role fit
</div> </div>
<div class="appli-jcs appli-l eq-second-height"> <div class="appli-jcs appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</div> </div>
</div> </div>
</span> </span>
culture culture fit
</div> </div>
<div class="appli-jcs appli-l eq-second-height"> <div class="appli-jcs appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</div> </div>
</div> </div>
</span> </span>
selection criteria requirements
</div> </div>
<div class="appli-status appli-l eq-second-height"> <div class="appli-status appli-l eq-second-height">
<!--TODO: logic needed to be worked out. Added to note that there are three colors--> <!--TODO: logic needed to be worked out. Added to note that there are three colors-->
......
cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp
...@@ -26,13 +26,7 @@ ...@@ -26,13 +26,7 @@
textColor: '#03a0e7', textColor: '#03a0e7',
fontSize: '0px', fontSize: '0px',
fontWeight: 'normal' fontWeight: 'normal'
}); });
// $(".job-row").click(function()
// {
// var id = $(this).closest('.job-list').attr('id');
// $('.' + id).click();
// });
$(".job-status").change(function() $(".job-status").change(function()
{ {
...@@ -48,6 +42,8 @@ ...@@ -48,6 +42,8 @@
{ {
int shortlisted = job.getNoOfCandidatesShortlisted(); int shortlisted = job.getNoOfCandidatesShortlisted();
int maxShortlist = job.getMaxShortlistApplicants(); int maxShortlist = job.getMaxShortlistApplicants();
nextPage = shortlisted > 0 ? shortlistPage : nextPage;
%> %>
<div class="job-list" id="<%= job.getID() %>"> <div class="job-list" id="<%= job.getID() %>">
<div class="job-row" > <div class="job-row" >
...@@ -116,9 +112,9 @@ ...@@ -116,9 +112,9 @@
</div> </div>
<div class="job-states jl-c wider-select"> <div class="job-states jl-c wider-select">
<oneit:ormEnum obj="<%= job %>" attributeName="JobStatus" cssClass="form-control status-img job-status" <oneit:ormEnum obj="<%= job %>" attributeName="JobStatus" cssClass="form-control status-img job-status"
enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE}) %>"/> enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE, JobStatus.FILLED}) %>"/>
</div> </div>
<oneit:button name="save" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>" <oneit:button name="saveJob" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", homePage+ (jobStatus != null ? "&JobStatus=" + jobStatus : "")).toMap() %>" /> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", homePage+ (jobStatus != null ? "&JobStatus=" + jobStatus : "")).toMap() %>" />
</div> </div>
<% <%
......
cmsWebApp/webroot/extensions/adminportal/inc/shortlist_tabs.jsp
<%@ page extends="oneit.servlets.jsp.JSPInclude" %> <!-- DELETED -->
\ No newline at end of file
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<%
Job job = (Job) process.getAttribute("Job");
String tabNumber = (String) getData(request, "TabNumber");
String firstTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_SHORTLIST);
String secondTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_GRID);
%>
<oneit:dynIncluded>
<script language="Javascript">
function updateOrder(s) {
alert(s.value);
// $('#changeJobStatu
//
// sBtn').click();
}
</script>
<div class="main-applicants-filter main-shortlist-filter">
<div class="appli-list-shorting main-shortlist">
<div class="appli-shorting-dropdown appli-left">
<span class="appli-order-label">Bulk Update</span>
<select class="form-control">
<option>Interview</option>
</select>
</div>
<div class="appli-filter">
<ul class="">
<li class="lable-appli-shorting">View</li>
<li class="<%= (tabNumber == "1" ? "active" : "" ) + " short-list"%>">
<oneit:button value="List" name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstTab)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</li>
<li class="<%= (tabNumber == "2" ? "active" : "" ) + " grid-list"%>">
<oneit:button value="Grid" name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondTab)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</li>
</ul>
</div>
<div class="appli-shorting-dropdown">
<span class="appli-order-label">Export</span>
<select class="form-control">
<option>PDF</option>
<option>CSV</option>
<option>XML</option>
</select>
</div>
<div class="appli-shorting-dropdown">
<span class="appli-order-label">order by</span>
<select onChange="updateOrder(this)" class="form-control" id="sortOrder">
<option>Suitability</option>
<option>Newest</option>
<option>Oldest</option>
</select>
</div>
</div>
</div>
</oneit:dynIncluded>
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
...@@ -58,7 +58,27 @@ ...@@ -58,7 +58,27 @@
</div> </div>
<div class="col-sm-3 col-xs-12 d-three-box gray-light"> <div class="col-sm-3 col-xs-12 d-three-box gray-light">
<div class="d-fl-left eq-height"> <div class="d-fl-left eq-height">
<div class="dash-count c-gray">2</div> <div class="dash-count c-gray">
<%
Job[] filledJobs = Job.SearchByAll().andJobStatus(new EqualsFilter<>(JobStatus.FILLED))
.andSecUser(new EqualsFilter(SecUser.getTXUser(transaction)))
.search(transaction);
int filledCount = filledJobs != null ? filledJobs.length : 0;
if(filledCount > 0)
{
%>
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobStatus", JobStatus.FILLED).toMap())
.toMap() %>">
<oneit:toString value="<%= filledCount %>" mode="Integer" nullValue="0"/>
</oneit:button>
<%
}
%>
<%= filledCount == 0 ? "0" : "" %>
</div>
<div class="d-box-title">Jobs filled</div> <div class="d-box-title">Jobs filled</div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants.jsp
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS); String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION); String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
int closingInDays = DateDiff.getDateDiff(Calendar.DATE, DateDiff.getToday(), job.getApplyBy());
AppSortOption appSortOpt = (AppSortOption) process.getAttribute("AppSortOption"); AppSortOption appSortOpt = (AppSortOption) process.getAttribute("AppSortOption");
if(request.getParameter("AppSortOption") != null) if(request.getParameter("AppSortOption") != null)
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_unsuitable.jsp
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.UNSUITABLE_APPS); String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.UNSUITABLE_APPS);
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION); String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
int closingInDays = DateDiff.getDateDiff(Calendar.DATE, DateDiff.getToday(), job.getApplyBy());
AppSortOption appSortOpt = (AppSortOption) process.getAttribute("AppSortOption"); AppSortOption appSortOpt = (AppSortOption) process.getAttribute("AppSortOption");
if(request.getParameter("AppSortOption") != null) if(request.getParameter("AppSortOption") != null)
......
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