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
......@@ -6493,3 +6493,4 @@ input{
.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;}
.green-requirements {color: #67B413;}
\ No newline at end of file
......@@ -19,7 +19,8 @@
<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">
<ul>
<li class="<%= "incomplete " + (noOfIncomplete > 0 ? "has-applicant" : "no-applicant") %> <%= appStatus == ApplicationStatus.DRAFT ? "active" : "inactive" %>">
......
......@@ -6,10 +6,10 @@
<%
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 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)
{
......@@ -37,11 +37,17 @@
<div class="officer-box">
<div class="officer-name">
<div class="chief-officer">
<%
if(applicantPage)
{
%>
<oneit:button cssClass="arrow-btn-blue" name="gotoPage" value=" " skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage).toMap() %>" >
<img src="images/arrow-left-prev_blue.svg" />
</oneit:button>
<%
}
BinaryContent logo = job.getLogo();
if(logo != null)
......
......@@ -68,6 +68,7 @@
String appID = "app-id-" + jobApplication.getID().toString();
Integer overallRank = jobApplication.getOverallRank();
Boolean isTopRank = CollectionUtils.equals(overallRank, 1);
boolean missingReq = jobApplication.hasFailedEssentialRequirements();
%>
<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-->
......@@ -119,6 +120,7 @@
{
%>
<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
<span>
<oneit:button value=" " name="gotoPage" skin="link"
......
......@@ -14,6 +14,7 @@
Candidate candidate = jobApplication.getCandidate();
String tabText = candidate.getToString();
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();
%>
......@@ -265,6 +266,9 @@
}
%>
</div>
<div class="<%= missingReq ? "red-requirements" : "green-requirements" %>">
<span><%= missingReq ? "Does not meet essential requirements" : "Does meet essential requirements" %></span>
</div>
</div>
<%
......@@ -429,6 +433,18 @@
<div class="main-score-bar main-pro-bar <%= importance %>">
<div class="score-bar pro-bar">
<span class="appli-label"><oneit:toString value="<%= importance %>" mode="EscapeHTML"/></span>
<%
if(importance == Importance.ESSENTIAL)
{
%>
<span class="<%= missingReq ? "red-requirements" : "green-requirements" %>">
<%= 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">
......@@ -436,6 +452,8 @@
</div>
</span>
<%
}
if(reqAnswersByImportance.getValuesForKey(importance)!=null)
{
%>
......@@ -457,7 +475,7 @@
String dotClass = answer.getAnswer() ? "" : (importance == Importance.ESSENTIAL ? "red-dot" : (importance == Importance.HIGHLY_DESIRABLE ? "yellow-dot" : ""));
%>
<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;
<oneit:toString value="<%= answer.getAssessmentCriteria().getCriteriaType() %>" mode="EscapeHTML"/>
</div>
......
......@@ -105,7 +105,8 @@
<div class="dashboard-content-area">
<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 class="second-part v-applicant-area">
<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