Commit dd83ab5b by chenith Committed by Harsh Shah

Update Save and continue and Job match assesment functions in applicant portal.

parent 51db7a5c
package performa.orm; package performa.orm;
import oneit.objstore.rdbms.filters.EqualsFilter; import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.utils.MultiException;
import oneit.utils.filter.CollectionFilter; import oneit.utils.filter.CollectionFilter;
import oneit.utils.filter.Filter; import oneit.utils.filter.Filter;
import oneit.utils.parsers.FieldException; import oneit.utils.parsers.FieldException;
...@@ -19,14 +20,14 @@ public class Answer extends BaseAnswer ...@@ -19,14 +20,14 @@ public class Answer extends BaseAnswer
@Override @Override
public void preCommit(boolean willBeStored) throws Exception public void validate(MultiException e)
{ {
super.preCommit(willBeStored);
if(this.getAnswerNo()==null) if(this.getAnswerNo()==null)
{ {
this.delete(); this.delete();
} }
super.validate(e);
} }
......
...@@ -87,7 +87,7 @@ public class Job extends BaseJob ...@@ -87,7 +87,7 @@ public class Job extends BaseJob
//to get All Profile Assessment Questions //to get All Profile Assessment Questions
public Collection<Question> getAllProfileAssessmentQuestions() public Collection<Question> getAllProfileAssessmentQuestions()
{ {
return pipelineJob().toLevel().toFactors().toFactor().toQuestions().toQuestion().vals(); return pipelineJob().toLevel().toFactors().toFactor().toQuestions().toQuestion().uniqueVals();
} }
......
...@@ -32,7 +32,7 @@ public class JobApplication extends BaseJobApplication ...@@ -32,7 +32,7 @@ public class JobApplication extends BaseJobApplication
jobApplication.setJob(job); jobApplication.setJob(job);
jobApplication.initACAnswers(); jobApplication.initACAnswers();
jobApplication.initCCAnswers(); // jobApplication.initCCAnswers();
return jobApplication; return jobApplication;
} }
......
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
jobApplication = JobApplication.createNewApplication(candidate, job); jobApplication = JobApplication.createNewApplication(candidate, job);
} }
//to fix mandatory issue in save and continue
jobApplication.initCCAnswers();
if(!jobApplication.isIncludeAssessmentCriteria()) if(!jobApplication.isIncludeAssessmentCriteria())
{ {
nextPage = WebUtils.getSamePageInRenderMode(request, "WorkplaceCulture"); nextPage = WebUtils.getSamePageInRenderMode(request, "WorkplaceCulture");
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
JobApplication jobApplication = (JobApplication) process.getAttribute("JobApplication"); JobApplication jobApplication = (JobApplication) process.getAttribute("JobApplication");
Job job = jobApplication.getJob(); Job job = jobApplication.getJob();
int questionNumber = process.getAttribute("QuestionNumber")!= null ? (int) process.getAttribute("QuestionNumber") : 0; int questionNumber = process.getAttribute("QuestionNumber")!= null ? (int) process.getAttribute("QuestionNumber") : 0;
String sectionNo = jobApplication.isIncludeAssessmentCriteria() ? "3" : "2"; String sectionNo = jobApplication.isIncludeAssessmentCriteria() ? "3" : "2";
List<Question> allQuestions = (List<Question>) process.getAttribute("AllQuestions"); List<Question> allQuestions = (List<Question>) process.getAttribute("AllQuestions");
if(allQuestions==null) if(allQuestions==null)
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
exitPage = exitPage + "&id=" + job.getID() + "&key=" + job.getRandomKey(); exitPage = exitPage + "&id=" + job.getID() + "&key=" + job.getRandomKey();
String sectionNo = jobApplication.isIncludeAssessmentCriteria() ? "2" : "1"; String sectionNo = jobApplication.isIncludeAssessmentCriteria() ? "2" : "1";
String nextBtnText = jobApplication.isIncludeAssessmentCriteria() ? "Proceed to step 3" : "Proceed to step 2"; String nextBtnText = jobApplication.isIncludeAssessmentCriteria() ? "Proceed to step 3" : "Proceed to step 2";
//to fix mandatory issue in save and continue
jobApplication.initCCAnswers();
process.setAttribute("JobApplication", jobApplication); process.setAttribute("JobApplication", jobApplication);
%> %>
......
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