Commit 687a78f4 by chenith Committed by Harsh Shah

Fix browser back issue in culture and role test.

parent 43cc67f9
......@@ -31,6 +31,32 @@
process.setAttribute("AllQuestions", allQuestions);
}
//to store current question number in history
if(process.getAttribute("QuestionNumber")==null || process.getAttribute("ActualNumber")==null)
{
request.getSession().setAttribute ("historyQstNo", null);
request.getSession().setAttribute ("historyActualNo", null);
}
if(request.getSession().getAttribute("historyQstNo")!=null && process.getAttribute("QuestionNumber")!= null)
{
if((int) process.getAttribute("QuestionNumber") <= (int) request.getSession().getAttribute("historyQstNo"))
{
questionNumber = (int) request.getSession().getAttribute("historyQstNo");
}
}
if(request.getSession().getAttribute("historyActualNo")!=null && process.getAttribute("ActualNumber")!= null)
{
if((int) process.getAttribute("ActualNumber") <= (int) request.getSession().getAttribute("historyActualNo"))
{
actualNumber = (int) request.getSession().getAttribute("historyActualNo");
}
}
request.getSession().setAttribute ("historyQstNo", questionNumber);
request.getSession().setAttribute ("historyActualNo", actualNumber);
boolean toRedirect = jobApplication.initAssessmentAnswers(allQuestions);
......
......@@ -14,9 +14,22 @@
int cultureQuestionNo = process.getAttribute("CultureQuestionNo")!= null ? (int) process.getAttribute("CultureQuestionNo") : candidate.getCultureCriteriaAnswersCount();
String exitPage = WebUtils.getArticleLink(request, objTran, WebUtils.APPLY_JOB, "Page") + "&id=" + job.getID() + "&key=" + job.getRandomKey();
boolean toRedirect = jobApplication.createCultureCriteriaObjects();
// Boolean alreadyCompletedRole = (Boolean) process.getAttribute("AlreadyCompletedRole");
Boolean isAssesmentComplete = jobApplication.assessmentCompleted();
//to store current question number in history
if(process.getAttribute("CultureQuestionNo")==null)
{
request.getSession().setAttribute ("historyQuestionNo", null);
}
if(request.getSession().getAttribute("historyQuestionNo")!=null && process.getAttribute("CultureQuestionNo")!= null)
{
if((int) process.getAttribute("CultureQuestionNo")<=(int) request.getSession().getAttribute("historyQuestionNo"))
{
cultureQuestionNo = (int) request.getSession().getAttribute("historyQuestionNo");
}
}
if(isAssesmentComplete)
{
nextPage = WebUtils.getSamePageInRenderMode(request, "SubmitApplication");
......@@ -41,6 +54,8 @@
String numberText = (cultureQuestionNo + 1) + "/" + total;
process.setAttribute("JobApplication", jobApplication);
request.getSession().setAttribute ("historyQuestionNo", cultureQuestionNo);
%>
<script>
$(document.body).addClass('bg-color');
......
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