Commit 949ed158 by nilu

S21294007 # Client - Incoming Issues (raised by Client) #Free Trial

b. For that 1 Job, only the top 2 applicant’s identification details are shown, for all other applicants these fields are hidden:

i. Name

ii. Phone number

iii. CV

iv. Cover Letter
parent befe79dc
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
List<WorkFlow> sortedWorkFlows = ObjstoreUtils.sort(job.getApplicantWFs(), List<WorkFlow> sortedWorkFlows = ObjstoreUtils.sort(job.getApplicantWFs(),
new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()}, new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()},
new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST}); new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
HiringTeam hiringTeam = job.getHiringTeam();
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
...@@ -69,6 +70,10 @@ ...@@ -69,6 +70,10 @@
.mapEntry("Job", job) .mapEntry("Job", job)
.toMap() %>" /> .toMap() %>" />
</div> </div>
<%
if(!(CollectionUtils.equals(workflowStatus,ApplicationStatus.DRAFT) && hiringTeam.isTrue(hiringTeam.getOnTrial())))
{
%>
<div class="appli-filter"> <div class="appli-filter">
<% <%
if(!CollectionUtils.equals(workflowStatus,ApplicationStatus.DRAFT)) if(!CollectionUtils.equals(workflowStatus,ApplicationStatus.DRAFT))
...@@ -142,6 +147,9 @@ ...@@ -142,6 +147,9 @@
%> %>
</select> </select>
</div> </div>
<%
}
%>
</div> </div>
<div class="checkbox-list select-all"> <div class="checkbox-list select-all">
<input type='checkbox' id='select_all' value='select_all' class='norecalc'> <input type='checkbox' id='select_all' value='select_all' class='norecalc'>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
List<WorkFlow> sortedWorkFlows = ObjstoreUtils.sort(job.getIncompleteApplicantWFs(), List<WorkFlow> sortedWorkFlows = ObjstoreUtils.sort(job.getIncompleteApplicantWFs(),
new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()}, new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()},
new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST}); new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
HiringTeam hiringTeam = job.getHiringTeam();
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
...@@ -75,7 +76,11 @@ ...@@ -75,7 +76,11 @@
</div> </div>
</div> </div>
<div class="appli-list-name appli-l eq-second-height wider-box"> <div class="appli-list-name appli-l eq-second-height wider-box">
<oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID() + ""%>" skin="link" <%
if(!hiringTeam.isTrue(hiringTeam.getOnTrial()) || j < 2)
{
%>
<oneit:button value=" " name="<%= hiringTeam.isTrue(hiringTeam.getOnTrial()) ? "" : "gotoPage"%>" cssClass="<%= jobApplication.getID() + ""%>" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap())
.toMap() %>"> .toMap() %>">
...@@ -139,6 +144,9 @@ ...@@ -139,6 +144,9 @@
} }
%> %>
</div> </div>
<%
}
%>
</div> </div>
<% <%
String widthClass = (job.showAssessmentCriteriaSection() && job.showCultureCriteriaSection()) ? "appli-jcs" : String widthClass = (job.showAssessmentCriteriaSection() && job.showCultureCriteriaSection()) ? "appli-jcs" :
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<oneit:dynIncluded> <oneit:dynIncluded>
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
HiringTeam hiringTeam = job.getHiringTeam();
List<JobApplication> applications = (List<JobApplication>) getData(request, "applications"); List<JobApplication> applications = (List<JobApplication>) getData(request, "applications");
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION); String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
...@@ -69,6 +70,8 @@ ...@@ -69,6 +70,8 @@
Integer overallRank = jobApplication.getOverallRank(); Integer overallRank = jobApplication.getOverallRank();
Boolean isTopRank = CollectionUtils.equals(overallRank, 1); Boolean isTopRank = CollectionUtils.equals(overallRank, 1);
boolean missingReq = jobApplication.hasFailedEssentialRequirements(); boolean missingReq = jobApplication.hasFailedEssentialRequirements();
Boolean isVisible = CollectionUtils.equals(overallRank, 2) || isTopRank;
Boolean onTrial = hiringTeam.isTrue(hiringTeam.getOnTrial());
%> %>
<div class="appl-c-box application-row"> <div class="appl-c-box application-row">
<!--TODO: need to work on the logic. just added to demonstrate that there are 3 different colors for this--> <!--TODO: need to work on the logic. just added to demonstrate that there are 3 different colors for this-->
...@@ -77,12 +80,12 @@ ...@@ -77,12 +80,12 @@
<div class="checkbox-list"> <div class="checkbox-list">
<input type="checkbox" name="IsSelected" value="<%= jobApplication.getObjectID().toString() %>" id="<%= appID %>" class="applicant" > <input type="checkbox" name="IsSelected" value="<%= jobApplication.getObjectID().toString() %>" id="<%= appID %>" class="applicant" >
<label for="<%= appID %>"> <label for="<%= appID %>">
<oneit:toString value="<%= jobApplication.getCandidate() %>" mode="EscapeHTML" /> <oneit:toString value="<%= onTrial && !isVisible ? "" : jobApplication.getCandidate() %>" mode="EscapeHTML" />
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID() + ""%>" skin="link" <oneit:button value=" " name="<%= onTrial && !isVisible ? "" : "gotoPage"%>" cssClass="<%= jobApplication.getID() + ""%>" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap())
.toMap() %>"> .toMap() %>">
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
HiringTeam hiringTeam = job.getHiringTeam();
List<JobApplication> applications = (List<JobApplication>) getData(request, "applications"); List<JobApplication> applications = (List<JobApplication>) getData(request, "applications");
String currentPage = (String) getData(request, "currentPage"); String currentPage = (String) getData(request, "currentPage");
ApplicationStatus appStatus = (ApplicationStatus) getData(request, "WorkFlowStatus"); ApplicationStatus appStatus = (ApplicationStatus) getData(request, "WorkFlowStatus");
...@@ -42,6 +43,8 @@ ...@@ -42,6 +43,8 @@
String appID = "app-id-" + jobApplication.getID().toString(); String appID = "app-id-" + jobApplication.getID().toString();
Integer overallRank = jobApplication.getOverallRank(); Integer overallRank = jobApplication.getOverallRank();
Boolean isTopRank = CollectionUtils.equals(overallRank, 1); Boolean isTopRank = CollectionUtils.equals(overallRank, 1);
Boolean isVisible = CollectionUtils.equals(overallRank, 2) || isTopRank;
Boolean onTrial = hiringTeam.isTrue(hiringTeam.getOnTrial());
WorkFlow workflow = job.getWorkFlowByStatus(jobApplication.getApplicationStatus()); WorkFlow workflow = job.getWorkFlowByStatus(jobApplication.getApplicationStatus());
boolean missingReq = jobApplication.hasFailedEssentialRequirements(); boolean missingReq = jobApplication.hasFailedEssentialRequirements();
...@@ -55,6 +58,10 @@ ...@@ -55,6 +58,10 @@
</div> </div>
</div> </div>
<div class="appli-list-name appli-l eq-second-height"> <div class="appli-list-name appli-l eq-second-height">
<%
if(!onTrial || (onTrial && isVisible))
{
%>
<oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID() + ""%>" skin="link" <oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID() + ""%>" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap())
...@@ -64,6 +71,9 @@ ...@@ -64,6 +71,9 @@
<oneit:toString value="<%= jobApplication.getApplicantStatusStr() %>" mode="EscapeHTML" /> <oneit:toString value="<%= jobApplication.getApplicantStatusStr() %>" mode="EscapeHTML" />
</div> </div>
</oneit:button> </oneit:button>
<%
}
%>
</div> </div>
<div class="appli-overall appli-l eq-second-height"> <div class="appli-overall appli-l eq-second-height">
<div class="rank"> <div class="rank">
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<oneit:dynIncluded> <oneit:dynIncluded>
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
HiringTeam hiringTeam = job.getHiringTeam();
List<JobApplication> applications = (List<JobApplication>) getData(request, "applications"); List<JobApplication> applications = (List<JobApplication>) getData(request, "applications");
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION); String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
...@@ -67,6 +68,8 @@ ...@@ -67,6 +68,8 @@
String appID = "app-id-" + jobApplication.getID().toString(); String appID = "app-id-" + jobApplication.getID().toString();
Integer overallRank = jobApplication.getOverallRank(); Integer overallRank = jobApplication.getOverallRank();
Boolean isTopRank = CollectionUtils.equals(overallRank, 1); Boolean isTopRank = CollectionUtils.equals(overallRank, 1);
Boolean isVisible = CollectionUtils.equals(overallRank, 2) || isTopRank;
Boolean onTrial = hiringTeam.isTrue(hiringTeam.getOnTrial());
%> %>
<div class="<%= "appl-c-box " + (i == 0 ? " cb-one" : "")%> "> <div class="<%= "appl-c-box " + (i == 0 ? " cb-one" : "")%> ">
<!--TODO: need to work on the logic. just added to demonstrate that there are 3 different colors for this--> <!--TODO: need to work on the logic. just added to demonstrate that there are 3 different colors for this-->
...@@ -75,12 +78,12 @@ ...@@ -75,12 +78,12 @@
<div class="checkbox-list"> <div class="checkbox-list">
<input type="checkbox" name="IsSelected" value="<%= jobApplication.getObjectID().toString() %>" id="<%= appID %>" class="applicant" > <input type="checkbox" name="IsSelected" value="<%= jobApplication.getObjectID().toString() %>" id="<%= appID %>" class="applicant" >
<label for="<%= appID %>"> <label for="<%= appID %>">
<oneit:toString value="<%= candidate %>" mode="EscapeHTML" /> <oneit:toString value="<%= onTrial && !isVisible ? "" : candidate %>" mode="EscapeHTML" />
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="<%= onTrial && !isVisible ? "" : "gotoPage"%>" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).toMap())
.toMap() %>"> .toMap() %>">
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
JobApplication prevApp = (JobApplication) getData(request, "prevApp"); JobApplication prevApp = (JobApplication) getData(request, "prevApp");
JobApplication nextApp = (JobApplication) getData(request, "nextApp"); JobApplication nextApp = (JobApplication) getData(request, "nextApp");
Job job = jobApplication.getJob(); Job job = jobApplication.getJob();
HiringTeam hiringTeam = job.getHiringTeam();
Candidate candidate = jobApplication.getCandidate(); Candidate candidate = jobApplication.getCandidate();
String tabText = candidate.getToString(); String tabText = candidate.getToString();
String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION); String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
...@@ -20,6 +21,9 @@ ...@@ -20,6 +21,9 @@
List<WorkFlow> sortedWorkFlows = ObjstoreUtils.sort(jobApplication.getApplicationStatus() == ApplicationStatus.DRAFT ? job.getIncompleteApplicantWFs() : job.getApplicantWFs(), List<WorkFlow> sortedWorkFlows = ObjstoreUtils.sort(jobApplication.getApplicationStatus() == ApplicationStatus.DRAFT ? job.getIncompleteApplicantWFs() : job.getApplicantWFs(),
new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()}, new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()},
new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST}); new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
Integer overallRank = jobApplication.getOverallRank();
boolean onTrial = hiringTeam.isTrue(hiringTeam.getOnTrial());
boolean isVisible = CollectionUtils.equals(overallRank, 2) || CollectionUtils.equals(overallRank, 1);
jobApplication.setWorkFlow(workflow); jobApplication.setWorkFlow(workflow);
...@@ -101,13 +105,15 @@ ...@@ -101,13 +105,15 @@
<img src="images/arrow-left-prev.svg" /> <img src="images/arrow-left-prev.svg" />
</oneit:button> </oneit:button>
<div class="main-appli-name"> <div class="main-appli-name">
<div class="appli-name"><oneit:toString value="<%= candidate.getToString() %>" mode="EscapeHTML"/></div> <div class="appli-name"><oneit:toString value="<%= onTrial && !isVisible ? "" : candidate.getToString() %>" mode="EscapeHTML"/></div>
<div class="appli-applied"> <div class="appli-applied">
Applied <oneit:toString value="<%= jobApplication.getSubmittedDate() %>" mode="MidDate"/> Applied <oneit:toString value="<%= jobApplication.getSubmittedDate() %>" mode="MidDate"/>
</div> </div>
</div> </div>
<div class="main-export"> <div class="main-export">
<% <%
if((onTrial && isVisible) || !onTrial)
{
if(jobApplication.getCV() != null && jobApplication.getCoverLetter() != null) if(jobApplication.getCV() != null && jobApplication.getCoverLetter() != null)
{ {
%> %>
...@@ -124,6 +130,9 @@ ...@@ -124,6 +130,9 @@
<option>Excel</option> <option>Excel</option>
</select> </select>
</span> </span>
<%
}
%>
<span class="appli-status-short"> <span class="appli-status-short">
<tagfile:ormsingleasso_select obj="<%= jobApplication %>" assocName="WorkFlow" cssClass="form-control app-process" <tagfile:ormsingleasso_select obj="<%= jobApplication %>" assocName="WorkFlow" cssClass="form-control app-process"
...@@ -585,23 +594,39 @@ ...@@ -585,23 +594,39 @@
<div class="contact-title">Contact</div> <div class="contact-title">Contact</div>
<div class="contact-row"> <div class="contact-row">
<div class="contact-label">E</div> <div class="contact-label">E</div>
<%
if((onTrial && isVisible) || !onTrial)
{
%>
<div class="contact-value"> <div class="contact-value">
<a href="<%= "mailto:" + candidate.getUser().getEmail() %>"> <a href="<%= "mailto:" + candidate.getUser().getEmail() %>">
<oneit:toString value="<%= candidate.getUser().getEmail() %>" mode="EscapeHTML" /> <oneit:toString value="<%= candidate.getUser().getEmail() %>" mode="EscapeHTML" />
</a> </a>
</div> </div>
<%
}
%>
</div> </div>
<div class="contact-row"> <div class="contact-row">
<div class="contact-label">P</div> <div class="contact-label">P</div>
<%
if((onTrial && isVisible) || !onTrial)
{
%>
<div class="contact-value"> <div class="contact-value">
<oneit:toString value="<%= candidate.getPhone() %>" mode="EscapeHTML" /> <oneit:toString value="<%= candidate.getPhone() %>" mode="EscapeHTML" />
</div> </div>
<%
}
%>
</div> </div>
<div class="contact-row" style="display:none;"> <div class="contact-row" style="display:none;">
<div class="contact-label"><img src="images/linkdin-icon.png" /></div> <div class="contact-label"><img src="images/linkdin-icon.png" /></div>
<div class="contact-value"><a href="#">View LinkedIn profile</a></div> <div class="contact-value"><a href="#">View LinkedIn profile</a></div>
</div> </div>
<% <%
if((onTrial && isVisible) || !onTrial)
{
if(jobApplication.getCV() != null) if(jobApplication.getCV() != null)
{ {
%> %>
...@@ -615,8 +640,7 @@ ...@@ -615,8 +640,7 @@
</div> </div>
<% <%
} }
%>
<%
if(jobApplication.getCoverLetter() != null) if(jobApplication.getCoverLetter() != null)
{ {
%> %>
...@@ -630,6 +654,7 @@ ...@@ -630,6 +654,7 @@
</div> </div>
<% <%
} }
}
%> %>
</div> </div>
<div class="applicant-location-info"> <div class="applicant-location-info">
......
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