Commit 189d8aa8 by Nilu

Only (but both) of Highly Desirable and Desirable Requirements are …

Only  (but  both)  of  Highly  Desirable  and  Desirable  Requirements  are  used  to  calculate  the  percentage.  Essential  Requirements  do  not  contribute  to  the  Requirements  score.  - related styling changes
parent 2e8441b7
...@@ -6492,4 +6492,5 @@ input{ ...@@ -6492,4 +6492,5 @@ input{
.job-edit-pop .jBox-container{border-radius: 2px !important; width: 240px;box-shadow: 0 3px 9px 0 rgba(0,0,0,0.35);background-color: #FFFFFF;} .job-edit-pop .jBox-container{border-radius: 2px !important; width: 240px;box-shadow: 0 3px 9px 0 rgba(0,0,0,0.35);background-color: #FFFFFF;}
.job-edit-menu .job-edit-menu-item {display: block; font-weight: 500; height:45px; padding: 24px;border-bottom: 1px solid #DBDBDF;font-size:11px;line-height:1px;letter-spacing: 1px; color: #03A0E7;} .job-edit-menu .job-edit-menu-item {display: block; font-weight: 500; height:45px; padding: 24px;border-bottom: 1px solid #DBDBDF;font-size:11px;line-height:1px;letter-spacing: 1px; color: #03A0E7;}
.red-requirements {color: #F9623D;} .red-requirements {color: #F9623D;}
\ No newline at end of file .green-requirements {color: #67B413;}
\ No newline at end of file
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<div class="first-part"> <div class="first-part">
<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 %>"/>
<div class="int-timeline"> <div class="int-timeline">
<ul> <ul>
<li class="<%= "incomplete " + (noOfIncomplete > 0 ? "has-applicant" : "no-applicant") %> <%= appStatus == ApplicationStatus.DRAFT ? "active" : "inactive" %>"> <li class="<%= "incomplete " + (noOfIncomplete > 0 ? "has-applicant" : "no-applicant") %> <%= appStatus == ApplicationStatus.DRAFT ? "active" : "inactive" %>">
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<%@ 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");
int shortlisted = job.getNoOfCandidatesFor(ApplicationStatus.SHORTLISTED); boolean applicantPage = (boolean) getData(request, "applicantPage");
String editJobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB); String editJobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB);
String sharePage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB); String sharePage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB);
String jobPage = WebUtils.getSamePageInRenderMode(request, (shortlisted > 0 ? WebUtils.APPLICANTS_SHORTLIST : WebUtils.VIEW_APPLICANTS)); String jobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
if(job.getJobStatus() == JobStatus.DRAFT) if(job.getJobStatus() == JobStatus.DRAFT)
{ {
...@@ -37,21 +37,27 @@ ...@@ -37,21 +37,27 @@
<div class="officer-box"> <div class="officer-box">
<div class="officer-name"> <div class="officer-name">
<div class="chief-officer"> <div class="chief-officer">
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link" <%
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage).toMap() %>" > if(applicantPage)
<img src="images/arrow-left-prev_blue.svg" /> {
</oneit:button> %>
<% <oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
BinaryContent logo = job.getLogo(); requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage).toMap() %>" >
<img src="images/arrow-left-prev_blue.svg" />
</oneit:button>
<%
}
BinaryContent logo = job.getLogo();
if(logo != null) if(logo != null)
{ {
int logoHeight = 26; int logoHeight = 26;
%>
<tagfile:img cssClass="officer-logo" src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(logo), "KEEP", new ScaleWithin (0, logoHeight)) %>" />
<%
}
%> %>
<tagfile:img cssClass="officer-logo" src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(logo), "KEEP", new ScaleWithin (0, logoHeight)) %>" />
<%
}
%>
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
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 missingReq = jobApplication.hasFailedEssentialRequirements();
%> %>
<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-->
...@@ -119,6 +120,7 @@ ...@@ -119,6 +120,7 @@
{ {
%> %>
<div class="criteria jcc"> <div class="criteria jcc">
<!--TODO: Use missingReq attribute, if true make background red and add image. If 100% make background green-->
<img src="images/criteria-icon.svg"> requirements <img src="images/criteria-icon.svg"> requirements
<span> <span>
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
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);
boolean missingReq = jobApplication.hasFailedEssentialRequirements();
Map<FactorClass, Tuple.T3<Double, ColorCode, Double>> roleScoreMap = (Map<FactorClass, Tuple.T3<Double, ColorCode, Double>>)jobApplication.getRoleFit(); Map<FactorClass, Tuple.T3<Double, ColorCode, Double>> roleScoreMap = (Map<FactorClass, Tuple.T3<Double, ColorCode, Double>>)jobApplication.getRoleFit();
%> %>
<script> <script>
...@@ -265,6 +266,9 @@ ...@@ -265,6 +266,9 @@
} }
%> %>
</div> </div>
<div class="<%= missingReq ? "red-requirements" : "green-requirements" %>">
<span><%= missingReq ? "Does not meet essential requirements" : "Does meet essential requirements" %></span>
</div>
</div> </div>
<% <%
...@@ -428,14 +432,28 @@ ...@@ -428,14 +432,28 @@
%> %>
<div class="main-score-bar main-pro-bar <%= importance %>"> <div class="main-score-bar main-pro-bar <%= importance %>">
<div class="score-bar pro-bar"> <div class="score-bar pro-bar">
<span class="appli-label"><oneit:toString value="<%= importance %>" mode="EscapeHTML"/></span> <span class="appli-label"><oneit:toString value="<%= importance %>" mode="EscapeHTML"/></span>
<span class="appli-percen gray"><oneit:toString value="<%= rating %>" mode="PercentageWholeNumber" /></span> <%
<span class="appli-progress-bar"> if(importance == Importance.ESSENTIAL)
<div class="progress"> {
<div class="progress-bar" role="progressbar" aria-valuenow="<%= rating %>" aria-valuemin="0" aria-valuemax="100" style="width:<%= rating %>%"></div> %>
</div> <span class="<%= missingReq ? "red-requirements" : "green-requirements" %>">
</span> <%= missingReq ? "Candidate does not meet essential requirements" : "Candidate does meet essential requirements" %>
</span>
<% <%
}
else
{
%>
<span class="appli-percen gray"><oneit:toString value="<%= rating %>" mode="PercentageWholeNumber" /></span>
<span class="appli-progress-bar">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="<%= rating %>" aria-valuemin="0" aria-valuemax="100" style="width:<%= rating %>%"></div>
</div>
</span>
<%
}
if(reqAnswersByImportance.getValuesForKey(importance)!=null) if(reqAnswersByImportance.getValuesForKey(importance)!=null)
{ {
%> %>
...@@ -457,7 +475,7 @@ ...@@ -457,7 +475,7 @@
String dotClass = answer.getAnswer() ? "" : (importance == Importance.ESSENTIAL ? "red-dot" : (importance == Importance.HIGHLY_DESIRABLE ? "yellow-dot" : "")); String dotClass = answer.getAnswer() ? "" : (importance == Importance.ESSENTIAL ? "red-dot" : (importance == Importance.HIGHLY_DESIRABLE ? "yellow-dot" : ""));
%> %>
<div class="tab-row"> <div class="tab-row">
<div class="detail-tab-row-title col-md-4 col-sm-4 col-xs-4" style="width: 30%"> <div class="detail-tab-row-title col-md-4 col-sm-4 col-xs-4 <%= (importance == Importance.ESSENTIAL ? (missingReq ? "red-requirements" : "green-requirements") : "") %>" style="width: 30%">
<span class="common-dot <%= dotClass %>"></span> &nbsp; <span class="common-dot <%= dotClass %>"></span> &nbsp;
<oneit:toString value="<%= answer.getAssessmentCriteria().getCriteriaType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= answer.getAssessmentCriteria().getCriteriaType() %>" mode="EscapeHTML"/>
</div> </div>
......
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
<div class="dashboard-content-area"> <div class="dashboard-content-area">
<div class="first-part"> <div class="first-part">
<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="<%= true %>"/>
</div> </div>
<div class="second-part v-applicant-area"> <div class="second-part v-applicant-area">
<oneit:dynInclude page="/extensions/adminportal/inc/view_application_tab_applicant.jsp" <oneit:dynInclude page="/extensions/adminportal/inc/view_application_tab_applicant.jsp"
......
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