Commit 1257861a by chenith Committed by Harsh Shah

Hide Requirements and expand Role and Culture fit if requirement test not applicable.

Removed percentage mark from HT003 grid view for role, culture and requirements.
parent 062e43f0
...@@ -3548,6 +3548,14 @@ input.add-note-btn:hover{ ...@@ -3548,6 +3548,14 @@ input.add-note-btn:hover{
text-transform: uppercase; text-transform: uppercase;
width: 15%; width: 15%;
} }
.appli-jcs2 {
color: #4a4a4a;
font-size: 11px;
letter-spacing: 1px;
padding: 26px 18px 5px;
text-transform: uppercase;
width: 20%;
}
.appli-overall{ .appli-overall{
color: #4a4a4a; color: #4a4a4a;
font-size: 11px; font-size: 11px;
...@@ -3914,9 +3922,10 @@ img.alert-icon {float: left;} ...@@ -3914,9 +3922,10 @@ img.alert-icon {float: left;}
.expand-box{margin-left: 15px;} .expand-box{margin-left: 15px;}
.big-percentage{font-size: 58px;} .big-percentage{font-size: 58px;}
.appli-percent-no{padding-right: 25px;} .appli-percent-no{padding-right: 25px;}
.appli-jcs{font-size: 10px;padding: 26px 15px 5px;} .appli-jcs{font-size: 10px;padding: 26px 15px 5px; width: 13%;}
.appli-jcs2{font-size: 10px;padding: 26px 15px 5px;}
.appli-list-name{font-size: 18px;} .appli-list-name{font-size: 18px;}
.appli-status{padding: 15px 0 0 12px;width: 28.8%;} .appli-status{width: 13%; padding: 15px 0 0 12px; }
} }
@media screen and (max-width: 1480px){ @media screen and (max-width: 1480px){
...@@ -3982,7 +3991,8 @@ img.alert-icon {float: left;} ...@@ -3982,7 +3991,8 @@ img.alert-icon {float: left;}
.work-rating {font-size: 12px;} .work-rating {font-size: 12px;}
.make-payment-tab li a{width: 300px;} .make-payment-tab li a{width: 300px;}
.appli-percent-no {padding-right: 18px;font-size: 28px;} .appli-percent-no {padding-right: 18px;font-size: 28px;}
.appli-jcs {font-size: 9px;padding: 26px 10px 0;} .appli-jcs {font-size: 9px;padding: 26px 10px 0; width: 12%;}
.appli-jcs2 {font-size: 9px;padding: 26px 10px 0; width: 18%;}
.jcc{padding: 0 8px;} .jcc{padding: 0 8px;}
.jcc span{font-size: 18px;} .jcc span{font-size: 18px;}
.jcc img {margin-right: 5px;} .jcc img {margin-right: 5px;}
...@@ -4087,6 +4097,7 @@ img.alert-icon {float: left;} ...@@ -4087,6 +4097,7 @@ img.alert-icon {float: left;}
.appli-list-name{width: 18.5%;} .appli-list-name{width: 18.5%;}
.appli-list-drop {width: 130px;} .appli-list-drop {width: 130px;}
.appli-jcs {font-size: 8px;} .appli-jcs {font-size: 8px;}
.appli-jcs2 {font-size: 8px;}
.appli-list-name {padding: 26px 0 0 8px;} .appli-list-name {padding: 26px 0 0 8px;}
.jcc{font-size: 8px;line-height: 34px;} .jcc{font-size: 8px;line-height: 34px;}
.jcc span {font-size: 16px;} .jcc span {font-size: 16px;}
...@@ -4177,6 +4188,7 @@ img.alert-icon {float: left;} ...@@ -4177,6 +4188,7 @@ img.alert-icon {float: left;}
.cb-title {font-size: 16px;padding: 12.5px 10px;} .cb-title {font-size: 16px;padding: 12.5px 10px;}
.appli-list-name {border-right: medium none;width: 93%;border-bottom: 1px solid rgba(229, 232, 235, 0.5); padding: 15px 0 0 8px;} .appli-list-name {border-right: medium none;width: 93%;border-bottom: 1px solid rgba(229, 232, 235, 0.5); padding: 15px 0 0 8px;}
.appli-jcs{width: 20.33%;padding: 26px 10px 15px;} .appli-jcs{width: 20.33%;padding: 26px 10px 15px;}
.appli-jcs2{width: 30.33%;padding: 26px 10px 15px;}
.appli-status{width: 36%;} .appli-status{width: 36%;}
.appli-checkbox{border-bottom: 1px solid rgba(229, 232, 235, 0.5);padding: 15px 0 0;width: 7%;} .appli-checkbox{border-bottom: 1px solid rgba(229, 232, 235, 0.5);padding: 15px 0 0;width: 7%;}
.appli-filter > ul {padding-right: 0;} .appli-filter > ul {padding-right: 0;}
......
...@@ -57,8 +57,16 @@ ...@@ -57,8 +57,16 @@
<div class="<%= "appli-percent-no " + (j == 0 ? "first green" : (j < 3 ? "blue" : "grey" ))%>"> <div class="<%= "appli-percent-no " + (j == 0 ? "first green" : (j < 3 ? "blue" : "grey" ))%>">
<oneit:toString value="<%= jobApplication.getOverallSuitability() %>" mode="Integer" /> <oneit:toString value="<%= jobApplication.getOverallSuitability() %>" mode="Integer" />
</div> </div>
</div> </div>
<div class="appli-jcs appli-l eq-second-height"> <%
String widthClass = "appli-jcs2";
if(job.getIncludeAssessmentCriteria()==Boolean.TRUE)
{
widthClass = "appli-jcs";
}
%>
<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="<%= jobMatch %>" aria-valuemin="0" aria-valuemax="100" <div class="progress-bar" role="progressbar" aria-valuenow="<%= jobMatch %>" aria-valuemin="0" aria-valuemax="100"
...@@ -68,7 +76,7 @@ ...@@ -68,7 +76,7 @@
</span> </span>
role fit role fit
</div> </div>
<div class="appli-jcs 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="progress-bar" role="progressbar" aria-valuenow="<%= culture %>" aria-valuemin="0" aria-valuemax="100"
...@@ -78,16 +86,23 @@ ...@@ -78,16 +86,23 @@
</span> </span>
culture fit culture fit
</div> </div>
<div class="appli-jcs appli-l eq-second-height"> <%
<span class="appli-view-bar"> if(job.getIncludeAssessmentCriteria()==Boolean.TRUE)
<div class="progress"> {
<div class="progress-bar" role="progressbar" aria-valuenow="<%= criteria %>" aria-valuemin="0" aria-valuemax="100" %>
style="<%= "width: " + criteria %>"> <div class="<%= widthClass %> appli-l eq-second-height">
</div> <span class="appli-view-bar">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="<%= criteria %>" aria-valuemin="0" aria-valuemax="100"
style="<%= "width: " + criteria %>">
</div>
</div>
</span>
requirements
</div> </div>
</span> <%
requirements }
</div> %>
<div class="appli-status appli-l eq-second-height"> <div class="appli-status appli-l eq-second-height">
<div class="appli-list-drop"> <div class="appli-list-drop">
<oneit:ormEnum obj="<%= jobApplication %>" attributeName="AppProcessOption" cssClass="form-control app-process" <oneit:ormEnum obj="<%= jobApplication %>" attributeName="AppProcessOption" cssClass="form-control app-process"
......
...@@ -71,30 +71,44 @@ ...@@ -71,30 +71,44 @@
<div class="applicant-sub-part"> <div class="applicant-sub-part">
<div class="applicant-left"> <div class="applicant-left">
<div class="applicant-progress"> <div class="applicant-progress">
<div class="col-sm-4 col-xs-12 text-center" href="#1a" data-toggle="tab" id="progress1" onClick="tabToggle('#tab1')"> <div class="<%= job.getIncludeAssessmentCriteria()==Boolean.TRUE ? "col-sm-4" : "col-sm-6" %> col-xs-12 text-center" href="#1a" data-toggle="tab" id="progress1" onClick="tabToggle('#tab1')">
<label class="progress-label">role fit</label> <label class="progress-label">role fit</label>
<div class="percent-green fixed-width"> <div class="percent-green fixed-width">
<p style="display:none;"><oneit:toString value="<%= roleScoreMap.get(null) %>" mode="TwoDPDouble" nullValue="0"/></p> <p style="display:none;"><oneit:toString value="<%= roleScoreMap.get(null) %>" mode="TwoDPDouble" nullValue="0"/></p>
</div> </div>
</div> </div>
<div class="col-sm-4 col-xs-12 text-center" href="#2a" data-toggle="tab" id="progress2" onClick="tabToggle('#tab2')"> <div class="<%= job.getIncludeAssessmentCriteria()==Boolean.TRUE ? "col-sm-4" : "col-sm-4" %> col-xs-12 text-center" href="#2a" data-toggle="tab" id="progress2" onClick="tabToggle('#tab2')">
<label class="progress-label">culture fit</label> <label class="progress-label">culture fit</label>
<div class="percent-green fixed-width"> <div class="percent-green fixed-width">
<p style="display:none;"><oneit:toString value="<%= jobApplication.getCulturePercentage() %>" mode="PercentageWholeNumber" /></p> <p style="display:none;"><oneit:toString value="<%= jobApplication.getCulturePercentage() %>" mode="PercentageWholeNumber" /></p>
</div> </div>
</div> </div>
<div class="col-sm-4 col-xs-12 text-center" href="#3a" data-toggle="tab" id="progress3" onClick="tabToggle('#tab3')"> <%
<label class="progress-label">requirements</label> if(job.getIncludeAssessmentCriteria()==Boolean.TRUE)
<div class="percent-blue fixed-width"> {
<p style="display:none;"><oneit:toString value="<%= jobApplication.getCriteriaPercentage() %>" mode="PercentageWholeNumber" /></p> %>
</div> <div class="col-sm-4 col-xs-12 text-center" href="#3a" data-toggle="tab" id="progress3" onClick="tabToggle('#tab3')">
</div> <label class="progress-label">requirements</label>
<div class="percent-blue fixed-width">
<p style="display:none;"><oneit:toString value="<%= jobApplication.getCriteriaPercentage() %>" mode="PercentageWholeNumber" /></p>
</div>
</div>
<%
}
%>
</div> </div>
<div class="applicant-tab"> <div class="applicant-tab">
<ul class="nav nav-pills nav-justified test-tabs"> <ul class="nav nav-pills nav-justified test-tabs">
<li id="tab1" class="active"><a href="#1a" data-toggle="tab">role fit</a></li> <li id="tab1" class="active"><a href="#1a" data-toggle="tab">role fit</a></li>
<li id="tab2"><a href="#2a" data-toggle="tab">culture fit</a></li> <li id="tab2"><a href="#2a" data-toggle="tab">culture fit</a></li>
<li id="tab3"><a href="#3a" data-toggle="tab">requirements</a></li> <%
if(job.getIncludeAssessmentCriteria()==Boolean.TRUE)
{
%>
<li id="tab3"><a href="#3a" data-toggle="tab">requirements</a></li>
<%
}
%>
<li id="tab4"><a href="#4a" data-toggle="tab">areas of concern</a></li> <li id="tab4"><a href="#4a" data-toggle="tab">areas of concern</a></li>
</ul> </ul>
<div class="tab-content clearfix"> <div class="tab-content clearfix">
...@@ -234,79 +248,86 @@ ...@@ -234,79 +248,86 @@
} }
%> %>
</div> </div>
<div class="tab-pane" id="3a"> <%
<% if(job.getIncludeAssessmentCriteria()==Boolean.TRUE)
Map<Importance, Long> requirementFitData = AnalysisEngine.getRequirementFit(jobApplication.getAssessmentCriteriaAnswersSet()); {
%>
for(Importance importance: requirementFitData.keySet()) <div class="tab-pane" id="3a">
{ <%
if(importance==null) Map<Importance, Long> requirementFitData = AnalysisEngine.getRequirementFit(jobApplication.getAssessmentCriteriaAnswersSet());
{
continue; for(Importance importance: requirementFitData.keySet())
} {
if(importance==null)
Long rating = requirementFitData.get(importance); {
%> continue;
<div class="main-pro-bar"> }
<div class="pro-bar">
<span class="appli-label"><oneit:toString value="<%= importance %>" mode="EscapeHTML"/></span> Long rating = requirementFitData.get(importance);
<span class="appli-percen"><oneit:toString value="<%= rating %>" mode="PercentageWholeNumber" /></span> %>
<span class="appli-progress-bar"> <div class="main-pro-bar">
<div class="progress"> <div class="pro-bar">
<div class="progress-bar" role="progressbar" aria-valuenow="<%= rating %>" aria-valuemin="0" aria-valuemax="100" style="width:<%= rating %>%"></div> <span class="appli-label"><oneit:toString value="<%= importance %>" mode="EscapeHTML"/></span>
</div> <span class="appli-percen"><oneit:toString value="<%= rating %>" mode="PercentageWholeNumber" /></span>
</span> <span class="appli-progress-bar">
<span class="expand-box"> <div class="progress">
<span class="hasarrow"><img src="images/select-down-arrow.svg" /></span> <div class="progress-bar" role="progressbar" aria-valuenow="<%= rating %>" aria-valuemin="0" aria-valuemax="100" style="width:<%= rating %>%"></div>
</span> </div>
</div> </span>
<div class="expand-hide-tag"> <span class="expand-box">
<div class="tab-row"> <span class="hasarrow"><img src="images/select-down-arrow.svg" /></span>
<div class="tab-view-label"> </span>
Achievement
</div>
<div class="tab-view-side">
<div class="result-want">
<div class="result">Not results focused</div>
<div class="wants">Wants results</div>
</div>
<div class="result-bar">
<ul>
<li class="red-b" style="width: 26.5%;"></li>
<li class="yellow-b" style="width: 26.5%;"></li>
<li class="green-b" style="width: 47%;"></li>
</ul>
<span class="triangle-arrow" style="left: 48%;"></span>
</div>
<div class="like-strive">Likely to strive to achive results</div>
</div>
</div>
<div class="tab-row">
<div class="tab-view-label">
Remuneration
</div> </div>
<div class="tab-view-side"> <div class="expand-hide-tag">
<div class="result-want"> <div class="tab-row">
<div class="result">Low concern</div> <div class="tab-view-label">
<div class="wants">High concern</div> Achievement
</div>
<div class="tab-view-side">
<div class="result-want">
<div class="result">Not results focused</div>
<div class="wants">Wants results</div>
</div>
<div class="result-bar">
<ul>
<li class="red-b" style="width: 26.5%;"></li>
<li class="yellow-b" style="width: 26.5%;"></li>
<li class="green-b" style="width: 47%;"></li>
</ul>
<span class="triangle-arrow" style="left: 48%;"></span>
</div>
<div class="like-strive">Likely to strive to achive results</div>
</div>
</div> </div>
<div class="result-bar"> <div class="tab-row">
<ul> <div class="tab-view-label">
<li class="red-b" style="width: 23.2%;"></li> Remuneration
<li class="yellow-b" style="width: 57.6%;"></li> </div>
<li class="green-b" style="width: 19%;"></li> <div class="tab-view-side">
</ul> <div class="result-want">
<span class="triangle-arrow" style="left: 72%;"></span> <div class="result">Low concern</div>
<div class="wants">High concern</div>
</div>
<div class="result-bar">
<ul>
<li class="red-b" style="width: 23.2%;"></li>
<li class="yellow-b" style="width: 57.6%;"></li>
<li class="green-b" style="width: 19%;"></li>
</ul>
<span class="triangle-arrow" style="left: 72%;"></span>
</div>
<div class="like-strive">Financial reward is less of a motivation than many other factors</div>
</div>
</div> </div>
<div class="like-strive">Financial reward is less of a motivation than many other factors</div>
</div> </div>
</div> </div>
</div> <%
</div> }
<% %>
} </div>
%> <%
</div> }
%>
<div class="tab-pane" id="4a"> <div class="tab-pane" id="4a">
</div> </div>
</div> </div>
......
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"> .toMap() %>">
<oneit:toString value="<%= jobApplication.getCulturePercentage() %>" mode="PercentageWholeNumber" /> <oneit:toString value="<%= jobApplication.getCulturePercentage() %>" mode="WholeNumber" />
</oneit:button> </oneit:button>
</span> </span>
</div> </div>
...@@ -185,42 +185,49 @@ ...@@ -185,42 +185,49 @@
%> %>
<div class="detail-row"> <div class="detail-row">
<div class="detail-label"><oneit:toString value="<%= cClass %>" mode="EscapeHTML"/></div> <div class="detail-label"><oneit:toString value="<%= cClass %>" mode="EscapeHTML"/></div>
<div class="detail-no green"><oneit:toString value="<%= cultureFitData.get(cClass) %>" mode="PercentageWholeNumber" /></div> <div class="detail-no green"><oneit:toString value="<%= cultureFitData.get(cClass) %>" mode="WholeNumber" /></div>
</div> </div>
<% <%
} }
%> %>
</div> </div>
<div class="jcc"> <%
<img src="images/criteria-icon.svg"> Requirements if(job.getIncludeAssessmentCriteria()==Boolean.TRUE)
<span> {
<oneit:button value=" " name="gotoPage" skin="link" %>
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage) <div class="jcc">
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) <img src="images/criteria-icon.svg"> Requirements
.toMap() %>"> <span>
<oneit:toString value="<%= jobApplication.getCriteriaPercentage() %>" mode="PercentageWholeNumber" /> <oneit:button value=" " name="gotoPage" skin="link"
</oneit:button> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
</span> .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
</div> .toMap() %>">
<div class="detail-box"> <oneit:toString value="<%= jobApplication.getCriteriaPercentage() %>" mode="WholeNumber" />
<% </oneit:button>
Map<Importance, Long> requirementFitData = AnalysisEngine.getRequirementFit(jobApplication.getAssessmentCriteriaAnswersSet()); </span>
</div>
<div class="detail-box">
<%
Map<Importance, Long> requirementFitData = AnalysisEngine.getRequirementFit(jobApplication.getAssessmentCriteriaAnswersSet());
for(Importance importance: requirementFitData.keySet()) for(Importance importance: requirementFitData.keySet())
{ {
if(importance==null) if(importance==null)
{ {
continue; continue;
} }
%> %>
<div class="detail-row"> <div class="detail-row">
<div class="detail-label"><oneit:toString value="<%= importance %>" mode="EscapeHTML"/></div> <div class="detail-label"><oneit:toString value="<%= importance %>" mode="EscapeHTML"/></div>
<div class="detail-no green"><oneit:toString value="<%= requirementFitData.get(importance) %>" mode="PercentageWholeNumber" /></div> <div class="detail-no green"><oneit:toString value="<%= requirementFitData.get(importance) %>" mode="WholeNumber" /></div>
</div> </div>
<% <%
} }
%> %>
</div> </div>
<%
}
%>
</div> </div>
</oneit:button> </oneit:button>
</div> </div>
......
...@@ -156,21 +156,28 @@ ...@@ -156,21 +156,28 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"> .toMap() %>">
<oneit:toString value="<%= jobApplication.getCulturePercentage() %>" mode="PercentageWholeNumber" /> <oneit:toString value="<%= jobApplication.getCulturePercentage() %>" mode="WholeNumber" />
</oneit:button>
</span>
</div>
<div class="criteria jcc">
<img src="images/criteria-icon.svg"> requirements
<span>
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>">
<oneit:toString value="<%= jobApplication.getCriteriaPercentage() %>" mode="PercentageWholeNumber" />
</oneit:button> </oneit:button>
</span> </span>
</div> </div>
<%
if(job.getIncludeAssessmentCriteria()==Boolean.TRUE)
{
%>
<div class="criteria jcc">
<img src="images/criteria-icon.svg"> requirements
<span>
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>">
<oneit:toString value="<%= jobApplication.getCriteriaPercentage() %>" mode="WholeNumber" />
</oneit:button>
</span>
</div>
<%
}
%>
</div> </div>
</oneit:button> </oneit:button>
</div> </div>
......
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