Commit a85473f2 by Harsh Shah

Finish Release-20171123

parents b9ef3d23 6d501280
...@@ -93,9 +93,9 @@ ...@@ -93,9 +93,9 @@
<div class="appli-aust-title"> <div class="appli-aust-title">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/>
</div> </div>
<p class="appli-content"> <div class="appli-content">
<oneit:toString value="<%= job.getJobDescription() %>" mode="ParagraphHTML" nullValue="-"/> <oneit:toString value="<%= job.getJobDescription() %>" mode="ParagraphHTML" nullValue="-"/>
</p> </div>
<div class="three-block"> <div class="three-block">
<% <%
if(job.getIncludeAssessmentCriteria()) if(job.getIncludeAssessmentCriteria())
......
...@@ -135,8 +135,8 @@ ...@@ -135,8 +135,8 @@
<p>Using the scale given, indicate how important to you are the following aspects in your work life. Use the following system:</p> <p>Using the scale given, indicate how important to you are the following aspects in your work life. Use the following system:</p>
<ul class="security-level"> <ul class="security-level">
<li><span>1</span> means of very little importance to you</li> <li><span>1</span> means of very little importance to you</li>
<li><span><oneit:toString value="<%= midRating %>" mode="EscapeHTML"/></span> means about average in importance to you</li> <li><oneit:toString value="<%= midRating %>" mode="EscapeHTML"/> means about average in importance to you</li>
<li><span><oneit:toString value="<%= maxRating %>" mode="EscapeHTML"/></span> means of high importance to you</li> <li><oneit:toString value="<%= maxRating %>" mode="EscapeHTML"/> means of high importance to you</li>
</ul> </ul>
<p>Use the other numbers (<oneit:toString value="<%= otherRating %>" mode="EscapeHTML"/>) to indicate in-between levels of importance to you.</p> <p>Use the other numbers (<oneit:toString value="<%= otherRating %>" mode="EscapeHTML"/>) to indicate in-between levels of importance to you.</p>
</div> </div>
...@@ -210,10 +210,10 @@ ...@@ -210,10 +210,10 @@
<% <%
for(int index=1; index <= (questionType == QuestionType.SCALAR ? 7 : 5); index++) for(int index=1; index <= (questionType == QuestionType.SCALAR ? 7 : 5); index++)
{ {
String activeStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "active" : ""); String activeStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "active " : "");
String selectedStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "checked" : ""); String selectedStr = (CollectionUtils.equals(String.valueOf(index), formValue) ? "checked" : "");
%> %>
<li class="<%= activeStr %>"> <li class="<%= activeStr + ((questionType == QuestionType.SCALAR) ? "scaler" : "ipsative")%>">
<a href="javascript:void(0);"> <a href="javascript:void(0);">
<input type="radio" name="<%= optionKey %>" id="<%= index %>" onchange="gotoNextQuestion();" class="answer_radio" value="<%= answer.getFinalAnswerValue(index) %>" <%= selectedStr %>> <input type="radio" name="<%= optionKey %>" id="<%= index %>" onchange="gotoNextQuestion();" class="answer_radio" value="<%= answer.getFinalAnswerValue(index) %>" <%= selectedStr %>>
<label for="<%= index %>"><%= index %></label> <label for="<%= index %>"><%= index %></label>
...@@ -238,7 +238,12 @@ ...@@ -238,7 +238,12 @@
} }
%> %>
</div> </div>
<div> <div class="section-btn text-center">
<oneit:button value="Save and exit" name="saveAndExitWorkStyle" cssClass="box-btn-gray"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/>
<% <%
if(questionNumber + 1 < allQuestions.size()) if(questionNumber + 1 < allQuestions.size())
{ {
...@@ -267,13 +272,6 @@ ...@@ -267,13 +272,6 @@
} }
%> %>
<div class="auto-save"> <div class="auto-save">
<span style="float: left">
<oneit:button value="Save and exit" name="saveAndExitWorkStyle" cssClass="box-btn-gray"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/>
</span>
<%-- <div>Autosaved 1 min ago.</div> --%> <%-- <div>Autosaved 1 min ago.</div> --%>
</div> </div>
</div> </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%> %>
<style> <style>
.row { .row {
padding-bottom: 120px; padding-bottom: 30px;
} }
.power-footer { .power-footer {
background-color:#fff; background-color:#fff;
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$('.first-element-focus').focus();
}); });
$(document.body).addClass('bg-color'); $(document.body).addClass('bg-color');
...@@ -86,7 +88,8 @@ ...@@ -86,7 +88,8 @@
<% <%
FormTag applicationForm = FormTag.getActiveFormTag(request); FormTag applicationForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = applicationForm.getFormBuilder(); FormBuilder formBuilder = applicationForm.getFormBuilder();
boolean first = true;
for(CriteriaType ct: CriteriaType.getCriteriaTypeArray()) for(CriteriaType ct: CriteriaType.getCriteriaTypeArray())
{ {
Collection<AssessmentCriteriaAnswer> answerList = jobApplication.getACAnswersByType(ct); Collection<AssessmentCriteriaAnswer> answerList = jobApplication.getACAnswersByType(ct);
...@@ -115,7 +118,7 @@ ...@@ -115,7 +118,7 @@
<oneit:toString value="<%= answer.getAssessmentCriteria() %>" mode="EscapeHTML"/> <oneit:toString value="<%= answer.getAssessmentCriteria() %>" mode="EscapeHTML"/>
</label> </label>
<div class="radio radio-primary second-radio-primary"> <div class="radio radio-primary second-radio-primary">
<input type="radio" name="<%= optionKey %>" value="true" id="<%= trueID%>" <%= trueSelected %>/> <input type="radio" name="<%= optionKey %>" value="true" id="<%= trueID%>" <%= trueSelected %> class="<%= first ? "first-element-focus" : ""%>"/>
<label for="<%= trueID%>"> <label for="<%= trueID%>">
Yes Yes
</label> </label>
...@@ -135,6 +138,8 @@ ...@@ -135,6 +138,8 @@
</div> </div>
</oneit:recalcClass> </oneit:recalcClass>
<% <%
first = false;
if(answerNo++<total) if(answerNo++<total)
{ {
%> %>
...@@ -153,7 +158,7 @@ ...@@ -153,7 +158,7 @@
<div class="selection-br-line"></div> <div class="selection-br-line"></div>
<div class="main-sc-section-bottom btn-remove-padd"> <div class="main-sc-section-bottom btn-remove-padd">
<div class="section-btn text-center"> <div class="section-btn text-center">
<oneit:button value="Save and exit" name="saveAndExitExperienece" cssClass="box-btn-gray" <oneit:button value="Save and exit" name="saveAndExitExperienece" cssClass="box-btn-gray half-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication) .mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
...@@ -173,7 +178,12 @@ ...@@ -173,7 +178,12 @@
else else
{ {
%> %>
<oneit:button value="Proceed to next step" name="gotoPage" cssClass="box-btn"
<oneit:button value="Proceed to next step" name="gotoPage" cssClass="box-btn m-hide"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/>
<oneit:button value="Proceed" name="gotoPage" cssClass="box-btn show-mobile"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/> .toMap() %>"/>
......
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
$('input[type="text"]').keyup(function() { $('input[type="text"]').keyup(function() {
$(this).change(); $(this).change();
}); });
$('input[name$=Email]').focus();
}); });
function validate() { function validate() {
...@@ -166,7 +168,7 @@ ...@@ -166,7 +168,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", WebUtils.getSamePageInRenderMode(request, "ForgotPassword")) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", WebUtils.getSamePageInRenderMode(request, "ForgotPassword"))
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/> .toMap() %>"/>
<oneit:button value="Sign In" name="signIn" cssClass="box-btn sign-in-btn" <oneit:button value="Sign in" name="signIn" cssClass="box-btn sign-in-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Job",job) .mapEntry("Job",job)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
......
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@ page extends="oneit.servlets.jsp.JSPInclude" %> <%@ page extends="oneit.servlets.jsp.JSPInclude" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%> <%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%> <%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
...@@ -31,19 +32,19 @@ ...@@ -31,19 +32,19 @@
<span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span>
<div class="clearfix no-height"></div> <div class="clearfix no-height"></div>
</div> </div>
<div class="mobile-successfull-show display-none">Thank you <span><img class="mob-smile-face" src="images/smile-face.png" /></span></div> <div class="mobile-successfull-show display-none">Thank you 😀</div>
<div class="section-page-area complete-back"> <div class="section-page-area complete-back">
<div class="job-post-complete"> <div class="job-post-complete">
<div class="big-right-sy"><span><img src="images/big-right-symbol.svg" /></span></div> <div class="big-right-sy"><span><img src="images/big-right-symbol.svg" /></span></div>
<div class="app-complete-title m-hide">Thank you <span><img class="smile-face"src="images/smile-face.png" /></span></div> <div class="app-complete-title m-hide">Thank you 😀</div>
<div class="app-complete-text"> <div class="app-complete-text">
Your application for Your application for
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/>
has been submitted for review. has been submitted for review.
</div> </div>
<oneit:form name="applyJob" method="post" enctype="multipart/form-data"> <oneit:form name="applyJob" method="post" enctype="multipart/form-data">
<div class="section-btn text-center"> <div class="text-center">
<oneit:button value="Return to Job Details" name="gotoPage" cssClass="btn btn-primary box-btn btn-gotojob" <oneit:button value="Return to Job Details" name="gotoPage" cssClass="box-btn btn-gotojob"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/> .toMap() %>"/>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
} }
int total = candidate.getCultureCriteriaAnswersCount(); int total = candidate.getCultureCriteriaAnswersCount();
boolean isLast = total == cultureQuestionNo; boolean isLast = total == cultureQuestionNo + 1;
if(isLast) if(isLast)
{ {
...@@ -62,7 +62,11 @@ ...@@ -62,7 +62,11 @@
function gotoNextQuestion() function gotoNextQuestion()
{ {
$("#nextButton").click(); setTimeout(
function() {
$("#nextButton").click();
},
1000); // delay in order to visually reinforce selection before advancing
} }
</script> </script>
...@@ -103,17 +107,23 @@ ...@@ -103,17 +107,23 @@
<oneit:dynInclude page="/extensions/applicantportal/inc/application_main_tabs.jsp" PageNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/> <oneit:dynInclude page="/extensions/applicantportal/inc/application_main_tabs.jsp" PageNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="section-page-area"> <div class="section-page-area">
<div class="main-sc-section"> <%
<p> if(cultureQuestionNo == 0)
A job isn't just about what one does, but the environment where one does it. {
This questionnaire will help us both learn what's most important to you in a workplace environment. %>
There are no right or wrong answers, so please choose what best fits you (not what you think might be right for a particular job). <div class="main-sc-section">
</p> <p>
</div> A job isn't just about what one does, but the environment where one does it.
<div class="selection-br-line"></div> This questionnaire will help us both learn what's most important to you in a workplace environment.
There are no right or wrong answers, so please choose what best fits you (not what you think might be right for a particular job).
</p>
</div>
<div class="selection-br-line"></div>
<%
}
%>
<div class="main-sc-section main-wc-section"> <div class="main-sc-section main-wc-section">
<div class="rateing-title"> <div class="rateing-title">
Rate the importance of each item below
<span><oneit:toString value="<%= numberText %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= numberText %>" mode="EscapeHTML"/></span>
</div> </div>
<% <%
...@@ -157,7 +167,7 @@ ...@@ -157,7 +167,7 @@
<% <%
} }
%> %>
<oneit:button value="Save and exit" name="saveAndExitCulture" cssClass="box-btn-gray" <oneit:button value="Save and exit" name="saveAndExitCulture" cssClass="<%= (!isLast) ? "box-btn-gray" : "box-btn-gray half-btn" %>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", exitPage)
.mapEntry ("JobApplication", jobApplication) .mapEntry ("JobApplication", jobApplication)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
...@@ -177,7 +187,12 @@ ...@@ -177,7 +187,12 @@
else if(isLast) else if(isLast)
{ {
%> %>
<oneit:button value="Proceed to next step" name="gotoPage" cssClass="box-btn"
<oneit:button value="Proceed to next step" name="gotoPage" cssClass="box-btn m-hide"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/>
<oneit:button value="Proceed" name="gotoPage" cssClass="box-btn show-mobile"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/> .toMap() %>"/>
......
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<g fill="none" fill-rule="evenodd" stroke="#4E5258" stroke-linejoin="round" stroke-width=".8"> <g fill="none" fill-rule="evenodd" stroke="#d3d3d3" stroke-linejoin="round" stroke-width="1">
<path d="M12.377 5.504c0-3.294-3.084-5.176-5.884-5.176C3.013.328.324 3.08.324 6.588c0 1.994.65 3.863 2.598 5.027v3.771h6.493V13.11c1.298.007 1.96-.088 2.415-.547.583-.588.527-3.07.527-3.07s.553.022.972.004a.488.488 0 0 0 .374-.2c.084-.12.057-.266.068-.412.075-1.052-1.394-2.857-1.394-3.381z"/> <path d="M12.377 5.504c0-3.294-3.084-5.176-5.884-5.176C3.013.328.324 3.08.324 6.588c0 1.994.65 3.863 2.598 5.027v3.771h6.493V13.11c1.298.007 1.96-.088 2.415-.547.583-.588.527-3.07.527-3.07s.553.022.972.004a.488.488 0 0 0 .374-.2c.084-.12.057-.266.068-.412.075-1.052-1.394-2.857-1.394-3.381z"/>
<path stroke-linecap="round" d="M8.73 4.948L6.07 7.801 4.172 5.94"/> <path stroke-linecap="round" d="M8.73 4.948L6.07 7.801 4.172 5.94"/>
<path d="M10.202 6.22c0 2.17-1.743 3.928-3.895 3.928-2.15 0-3.896-1.758-3.896-3.928s1.745-3.929 3.896-3.929c2.152 0 3.895 1.76 3.895 3.929z"/> <path d="M10.202 6.22c0 2.17-1.743 3.928-3.895 3.928-2.15 0-3.896-1.758-3.896-3.928s1.745-3.929 3.896-3.929c2.152 0 3.895 1.76 3.895 3.929z"/>
......
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<g fill="none" fill-rule="evenodd" stroke="#4E5258" stroke-linecap="round" stroke-linejoin="round" stroke-width=".8"> <g fill="none" fill-rule="evenodd" stroke="#d3d3d3" stroke-linecap="round" stroke-linejoin="round" stroke-width="1">
<path d="M.348 15.348h15v-15h-15z"/> <path d="M.348 15.348h15v-15h-15z"/>
<path d="M2.305 4.913l1.304 1.304 3.26-3.26M2.305 10.783l1.304 1.305 3.26-3.261M8.174 5h5.218M8.174 11h5.218"/> <path d="M2.305 4.913l1.304 1.304 3.26-3.26M2.305 10.783l1.304 1.305 3.26-3.261M8.174 5h5.218M8.174 11h5.218"/>
</g> </g>
......
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