Commit 0829bf77 by Nilu

applicant list pdf title changes

parent 34777d52
...@@ -17,6 +17,7 @@ import oneit.utils.MultiException; ...@@ -17,6 +17,7 @@ import oneit.utils.MultiException;
import performa.orm.Company; import performa.orm.Company;
import performa.orm.CompanyUserHiringTeamLink; import performa.orm.CompanyUserHiringTeamLink;
import performa.orm.HiringTeam; import performa.orm.HiringTeam;
import performa.orm.types.RoleType;
import performa.utils.StripeUtils; import performa.utils.StripeUtils;
...@@ -61,6 +62,7 @@ public class AddHiringTeamFP extends SaveFP ...@@ -61,6 +62,7 @@ public class AddHiringTeamFP extends SaveFP
link.setCompanyUser(company.getOwner()); link.setCompanyUser(company.getOwner());
link.setHiringTeam(hiringTeam); link.setHiringTeam(hiringTeam);
link.setRole(RoleType.OWNER);
if(hiringTeam.getManageOwnBilling()) if(hiringTeam.getManageOwnBilling())
{ {
......
...@@ -14,6 +14,8 @@ import oneit.utils.BusinessException; ...@@ -14,6 +14,8 @@ import oneit.utils.BusinessException;
import oneit.utils.CollectionUtils; import oneit.utils.CollectionUtils;
import oneit.utils.RandomStringGen; import oneit.utils.RandomStringGen;
import performa.orm.JobApplication; import performa.orm.JobApplication;
import performa.orm.WorkFlow;
import performa.orm.types.ApplicationStatus;
import performa.utils.PDFUtils; import performa.utils.PDFUtils;
...@@ -31,6 +33,7 @@ public class ApplicantReportFP extends ORMProcessFormProcessor ...@@ -31,6 +33,7 @@ public class ApplicantReportFP extends ORMProcessFormProcessor
boolean showList = (boolean) request.getAttribute("ShowList"); boolean showList = (boolean) request.getAttribute("ShowList");
boolean detailed = (boolean) request.getAttribute("Detailed"); boolean detailed = (boolean) request.getAttribute("Detailed");
boolean applicantPage = (boolean) request.getAttribute("ApplicantPage"); boolean applicantPage = (boolean) request.getAttribute("ApplicantPage");
WorkFlow workflow = (WorkFlow) request.getAttribute("WorkFlow");
List<JobApplication> applications = (List<JobApplication>) request.getAttribute("Applications"); List<JobApplication> applications = (List<JobApplication>) request.getAttribute("Applications");
final byte[] pdfBytes; final byte[] pdfBytes;
...@@ -42,7 +45,9 @@ public class ApplicantReportFP extends ORMProcessFormProcessor ...@@ -42,7 +45,9 @@ public class ApplicantReportFP extends ORMProcessFormProcessor
} }
else else
{ {
Map data = CollectionUtils.mapEntry("Applications", applications).toMap(); Map data = CollectionUtils.mapEntry("Applications", applications)
.mapEntry("WorkFlow", workflow)
.toMap();
if(CollectionUtils.equals(showList, true)) if(CollectionUtils.equals(showList, true))
{ {
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
ApplicationStatus appStatus = (ApplicationStatus) getData(request, "WorkFlowStatus"); ApplicationStatus appStatus = (ApplicationStatus) getData(request, "WorkFlowStatus");
WorkFlow workFlow = (WorkFlow) getData(request, "WorkFlow");
boolean showList = (boolean) getData(request, "ShowList"); boolean showList = (boolean) getData(request, "ShowList");
String applicantsPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS); String applicantsPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
List<JobApplication> applications = (List<JobApplication>) getData(request, "applications"); List<JobApplication> applications = (List<JobApplication>) getData(request, "applications");
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
<oneit:dynInclude page="/extensions/adminportal/inc/job_title_bar.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" <oneit:dynInclude page="/extensions/adminportal/inc/job_title_bar.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
applicantPage="<%= false %>" applicantPage="<%= false %>"
applications="<%= applications %>" applications="<%= applications %>"
WorkFlow="<%= workFlow %>"
ShowList="<%= showList %>"/> ShowList="<%= showList %>"/>
<div class="int-timeline"> <div class="int-timeline">
<ul> <ul>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
ObjectTransaction objTran = process.getTransaction(); ObjectTransaction objTran = process.getTransaction();
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
List<JobApplication> applications = (List<JobApplication>) getData(request, "Applications"); List<JobApplication> applications = (List<JobApplication>) getData(request, "Applications");
WorkFlow workFlow = (WorkFlow) getData(request, "WorkFlow");
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
<div class="wrap"> <div class="wrap">
...@@ -45,18 +45,14 @@ ...@@ -45,18 +45,14 @@
</div> </div>
<div class="white-header"> <div class="white-header">
<div style="clear:both"></div> <div style="clear:both"></div>
<div class="main-appli-name">
<div class="main-appli-name"> <div class="appli-name"><%= workFlow == null || workFlow.getApplicationStatus() == ApplicationStatus.SUBMITTED ? "All" : workFlow.getName() %> Applicants </div>
<div class="appli-name"> All Applicants </div> </div>
</div> <div class="appli-count">
<div class="appli-count"> <%= applications.size() %> Applicants
<%= applications.size() %> Applicants </div>
</div>
</div> </div>
<div class="view-appli-list"> <div class="view-appli-list">
<% <%
......
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
<%@ include file="/extensions/performa/inc/stdimports.jsp" %> <%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
boolean applicantPage = (boolean) getData(request, "applicantPage"); boolean applicantPage = (boolean) getData(request, "applicantPage");
boolean showList = (boolean) getData(request, "ShowList"); boolean showList = (boolean) getData(request, "ShowList");
String editJobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB); WorkFlow workFlow = (WorkFlow) getData(request, "WorkFlow");
String sharePage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB); String editJobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB);
String jobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS); String sharePage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB);
String jobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
if(job.getJobStatus() == JobStatus.DRAFT) if(job.getJobStatus() == JobStatus.DRAFT)
{ {
...@@ -147,6 +148,7 @@ ...@@ -147,6 +148,7 @@
.mapEntry("ApplicantPage", applicantPage) .mapEntry("ApplicantPage", applicantPage)
.mapEntry("Applications", applications) .mapEntry("Applications", applications)
.mapEntry("Detailed", false) .mapEntry("Detailed", false)
.mapEntry("WorkFlow", workFlow)
.toMap() %>"> .toMap() %>">
EXPORT APPLICANT REPORT EXPORT APPLICANT REPORT
</oneit:button> </oneit:button>
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
} }
List<JobApplication> applicantList = Arrays.asList(applications); List<JobApplication> applicantList = Arrays.asList(applications);
// WorkFlow workflow = job.getWorkFlowByStatus(workflowStatus); WorkFlow workflow = job.getWorkFlowByStatus(workflowStatus);
// filter applicants by status // filter applicants by status
oneit.utils.filter.Filter<JobApplication> filter = JobApplication.SearchByAll().andApplicationStatus(new EqualsFilter<>(isApplicantPage ? appStatus : workflowStatus)); oneit.utils.filter.Filter<JobApplication> filter = JobApplication.SearchByAll().andApplicationStatus(new EqualsFilter<>(isApplicantPage ? appStatus : workflowStatus));
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
ShowList="<%= showList %>" ShowList="<%= showList %>"
applications="<%= sortedApplications %>" applications="<%= sortedApplications %>"
WorkFlowStatus="<%= workflowStatus %>" WorkFlowStatus="<%= workflowStatus %>"
WorkFlow="<%= workflow %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/> data="<%= CollectionUtils.EMPTY_MAP%>"/>
......
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