Commit 53546bc0 by Nilu Committed by Harsh Shah

job match minor changes

parent 604a19b0
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
<oneit:toString value="<%= question.getDescription() %>" mode="EscapeHTML"/> <oneit:toString value="<%= question.getDescription() %>" mode="EscapeHTML"/>
</div> </div>
<% <%
actualNumber++;
} }
else else
{ {
...@@ -130,7 +129,6 @@ ...@@ -130,7 +129,6 @@
<span><oneit:toString value="<%= numberText %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= numberText %>" mode="EscapeHTML"/></span>
</div> </div>
<% <%
actualNumber +=2;
} }
%> %>
<div class="ratting-box"> <div class="ratting-box">
...@@ -180,17 +178,14 @@ ...@@ -180,17 +178,14 @@
} }
%> %>
</div> </div>
<%
}
%>
<div> <div>
<% <%
if(actualNumber < totNoOfQuestions) if(questionNumber + 1 < allQuestions.size())
{ {
%> %>
<oneit:button value=" " name="gotoPage" id="nextButton" skin="link" <oneit:button value=" " name="gotoPage" id="nextButton" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry("procParams", CollectionUtils.mapEntry("QuestionNumber", (questionNumber + 1)).mapEntry("ActualNumber", actualNumber).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("QuestionNumber", (questionNumber + 1)).mapEntry("ActualNumber", questionType == QuestionType.SCALAR ? actualNumber + 1 : actualNumber + 2).toMap())
.toMap() %>"/> .toMap() %>"/>
<% <%
} }
...@@ -198,7 +193,7 @@ ...@@ -198,7 +193,7 @@
{ {
%> %>
<oneit:button value="Complete" name="completeApplication" id="nextButton" skin="link" <oneit:button value=" " name="completeApplication" id="nextButton" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.mapEntry("attribNamesToRestore", Collections.singleton("JobApplication")) .mapEntry("attribNamesToRestore", Collections.singleton("JobApplication"))
...@@ -208,6 +203,9 @@ ...@@ -208,6 +203,9 @@
} }
%> %>
</div> </div>
<%
}
%>
<div class="auto-save"> <div class="auto-save">
<span style="float: left"> <span style="float: left">
<oneit:button value="Save and exit" name="saveAndExitWorkStyle" cssClass="box-btn-gray" <oneit:button value="Save and exit" name="saveAndExitWorkStyle" cssClass="box-btn-gray"
......
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