Commit 9276a42b by Jay

S21280521 # Client - Incoming Issues (raised by Client) #Add percentages to bar chart.

parent 6d24cf59
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
for(JobApplication jobApplication : applications) for(JobApplication jobApplication : applications)
{ {
double roleFitVal = jobApplication.getRoleFitPercentage();
double cultureVal = jobApplication.getCultureFitScore();
long criteriaVal = jobApplication.getRequirementFitScore(); long criteriaVal = jobApplication.getRequirementFitScore();
String roleFit = FormatUtils.stringify(jobApplication.getRoleFitPercentage(), "PercentageTwoDP", "0"); String roleFit = FormatUtils.stringify(jobApplication.getRoleFitPercentage(), "PercentageTwoDP", "0");
String culture = FormatUtils.stringify(jobApplication.getCultureFitScore(), "PercentageWholeNumber", "0"); String culture = FormatUtils.stringify(jobApplication.getCultureFitScore(), "PercentageWholeNumber", "0");
...@@ -83,9 +85,11 @@ ...@@ -83,9 +85,11 @@
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
<div class="progress"> <div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="<%= roleFit %>" aria-valuemin="0" aria-valuemax="100" <div class="completion-progress-bar <%= roleFitVal == 100 ? "green-bar": (roleFitVal >= 50 && roleFitVal < 100 ? "orange-bar" : "red-bar") %>" role="progressbar" aria-valuenow="<%= roleFit %>" aria-valuemin="0" aria-valuemax="100"
style="<%= "width: " + roleFit %>"> style="<%= "width: " + roleFit %>">
<span class="show-precentage"><%= roleFit %></span>
</div> </div>
</div> </div>
</span> </span>
role fit role fit
...@@ -93,9 +97,11 @@ ...@@ -93,9 +97,11 @@
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
<div class="progress"> <div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="<%= culture %>" aria-valuemin="0" aria-valuemax="100" <div class="completion-progress-bar <%= cultureVal == 100 ? "green-bar": (cultureVal >= 50 && cultureVal < 100 ? "orange-bar" : "red-bar") %>" role="progressbar" aria-valuenow="<%= culture %>" aria-valuemin="0" aria-valuemax="100"
style="<%= "width: " + culture %>"> style="<%= "width: " + culture %>">
</div> <span class="show-precentage"><%= culture %></span>
</div>
</div> </div>
</span> </span>
culture fit culture fit
...@@ -107,11 +113,13 @@ ...@@ -107,11 +113,13 @@
<div class="<%= widthClass %> appli-l eq-second-height"> <div class="<%= widthClass %> appli-l eq-second-height">
<span class="appli-view-bar"> <span class="appli-view-bar">
<div class="progress"> <div class="progress">
<div class="progress-bar <%= (criteriaVal == 100 && !missingReq ? " green" : "")%>" role="progressbar" aria-valuenow="<%= criteria %>" aria-valuemin="0" aria-valuemax="100" <div class="completion-progress-bar <%= criteriaVal == 100 ? "green-bar": (criteriaVal >= 50 && criteriaVal < 100 ? "orange-bar" : "red-bar") %>" role="progressbar" aria-valuenow="<%= criteria %>" aria-valuemin="0" aria-valuemax="100"
style="<%= "width: " + criteria %>"> style="<%= "width: " + criteria %>">
<span class="show-precentage"><%= criteria %></span>
</div> </div>
</div> </div>
<span class="<%= missingReq ? "missing-requirements-icon" : "requirements-correct-icon" %>"></span> <span class="<%= missingReq ? "missing-requirements-icon" : "requirements-correct-icon" %>"></span>
</span> </span>
<span class="<%= missingReq ? "red-requirements" : "" %>"> <span class="<%= missingReq ? "red-requirements" : "" %>">
requirements requirements
......
...@@ -34,18 +34,6 @@ ...@@ -34,18 +34,6 @@
ApplicationFilter appFilter = null; ApplicationFilter appFilter = null;
ApplicationStatus workflowStatus = null; ApplicationStatus workflowStatus = null;
if(process.getAttribute("ShowList") != null && process.getAttribute("ShowList") == Boolean.TRUE)
{
session.setAttribute("ShowList",true);
}
else if(process.getAttribute("ShowList") != null && process.getAttribute("ShowList") == Boolean.FALSE)
{
session.setAttribute("ShowList",false);
}
boolean showList = session.getAttribute("ShowList") != null ? (boolean) session.getAttribute("ShowList") : true;
SearchApplicant searchApplicant = (SearchApplicant) RunSearchExecutorFP.setupExecutor(request, SearchApplicant.REFERENCE_SearchApplicant, true); SearchApplicant searchApplicant = (SearchApplicant) RunSearchExecutorFP.setupExecutor(request, SearchApplicant.REFERENCE_SearchApplicant, true);
JobApplication[] applications = null; JobApplication[] applications = null;
Map<String, String[]> parameterMap = request.getParameterMap(); Map<String, String[]> parameterMap = request.getParameterMap();
...@@ -123,6 +111,17 @@ ...@@ -123,6 +111,17 @@
applicantList = job.filterEssentialRequirements(appFilter == ApplicationFilter.HAS_REQ , applicantList); applicantList = job.filterEssentialRequirements(appFilter == ApplicationFilter.HAS_REQ , applicantList);
} }
if((process.getAttribute("ShowList") != null && process.getAttribute("ShowList") == Boolean.TRUE) || CollectionUtils.equals(workflowStatus,ApplicationStatus.DRAFT))
{
session.setAttribute("ShowList",true);
}
else if(process.getAttribute("ShowList") != null && process.getAttribute("ShowList") == Boolean.FALSE)
{
session.setAttribute("ShowList",false);
}
boolean showList = session.getAttribute("ShowList") != null ? (boolean) session.getAttribute("ShowList") : true;
List<JobApplication> sortedApplications = Utils.getApplicationsSorted(applicantList, appSortOpt); List<JobApplication> sortedApplications = Utils.getApplicationsSorted(applicantList, appSortOpt);
process.setAttribute("AppSortOption", appSortOpt); process.setAttribute("AppSortOption", appSortOpt);
......
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