fix re-open issue : S30102928 # Client - Incoming Issues (raised by Client)…

fix re-open issue : S30102928 # Client - Incoming Issues (raised by Client) #Values are erased when Proceed clicked

cmsWebApp/src/performa/form/CompleteApplicationFP.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import oneit.logging.*;
 import oneit.objstore.*;
 import oneit.objstore.parser.BusinessObjectParser;
+import oneit.objstore.rdbms.filters.EqualsFilter;
 import oneit.servlets.forms.*;
 import oneit.servlets.process.*;
 import oneit.utils.*;
@@ -52,19 +53,19 @@ public class CompleteApplicationFP extends SaveFP
     {
         HttpServletRequest  request         =   submission.getRequest();
         ObjectTransaction   objTran         =   ObjectTransaction.getTransaction();
-        JobApplication      jobApplication  =   process.getAttribute("JobApplication") != null ? (JobApplication) process.getAttribute("JobApplication") : (JobApplication)request.getAttribute("JobApplication");
-        jobApplication                      =   jobApplication.getInTransaction(objTran);
+        JobApplication      application     =   process.getAttribute("JobApplication") != null ? (JobApplication) process.getAttribute("JobApplication") : (JobApplication)request.getAttribute("JobApplication");
+        JobApplication      jobApplication  =   application.getInTransaction(objTran);
         
         if(!jobApplication.cultureCompleted())
         {
-            BusinessObjectParser.assertFieldCondition(jobApplication.getCandidate().getCultureCriteriaAnswersCount()>0, jobApplication, JobApplication.FIELD_ObjectID, "completeCulture", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(jobApplication.getCandidate().getCultureCriteriaAnswersCount()>0, application, JobApplication.FIELD_ObjectID, "completeCulture", exceptions, true, request);
         }
         
         if(jobApplication.isIncludeAssessmentCriteria())
         {
-            JobApplication  application =   jobApplication.getInTransaction(objTran);
-            
-            BusinessObjectParser.assertFieldCondition(jobApplication.getJob().getAssessmentCriteriasCount() == application.getAssessmentCriteriaAnswersCount(), jobApplication, JobApplication.FIELD_ObjectID, "completeAssessment", exceptions, true, request);
+            AssessmentCriteriaAnswer[]  criteria =   AssessmentCriteriaAnswer.SearchByAll().andJobApplication(new EqualsFilter<>(jobApplication)).search(objTran);
+
+            BusinessObjectParser.assertFieldCondition(jobApplication.getJob().getAssessmentCriteriasCount() == criteria.length, application, JobApplication.FIELD_ObjectID, "completeAssessment", exceptions, true, request);
         }
         
         super.validate(process, submission, exceptions, params);

cmsWebApp/src/performa/form/ValidateApplicationFP.java

@@ -35,19 +35,17 @@ public class ValidateApplicationFP extends SaveFP
         
         HttpServletRequest  request             =   submission.getRequest();
         ObjectTransaction   objTran             =   process.getTransaction();
-        JobApplication      jobApplication      =   process.getAttribute("JobApplication") != null ? (JobApplication) process.getAttribute("JobApplication") : (JobApplication)request.getAttribute("JobApplication");
+        JobApplication      application         =   process.getAttribute("JobApplication") != null ? (JobApplication) process.getAttribute("JobApplication") : (JobApplication)request.getAttribute("JobApplication");
+        JobApplication      jobApplication      =   application.getInTransaction(objTran);
         boolean             fromRequirements    =   request.getAttribute("fromRequirements") != null ? (boolean) request.getAttribute("fromRequirements"): false;
         
         Debug.assertion(jobApplication != null, "No jobApplication found . Call from " + getClass().getName());
-        jobApplication  =   jobApplication.getInTransaction(objTran);
+
         if(jobApplication.isIncludeAssessmentCriteria() && fromRequirements)
         {
-//            JobApplication  application =   jobApplication.getInTransaction(objTran);
-            
-            AssessmentCriteriaAnswer[]  application =   AssessmentCriteriaAnswer.SearchByAll().andJobApplication(new EqualsFilter<>(jobApplication)).search(objTran);
+            AssessmentCriteriaAnswer[]  criteria =   AssessmentCriteriaAnswer.SearchByAll().andJobApplication(new EqualsFilter<>(jobApplication)).search(objTran);
 
-            BusinessObjectParser.assertFieldCondition(jobApplication.getJob().getAssessmentCriteriasCount() == application.length, jobApplication, JobApplication.FIELD_ObjectID, "completeAssessment", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(jobApplication.getJob().getAssessmentCriteriasCount() == criteria.length, application, JobApplication.FIELD_ObjectID, "completeAssessment", exceptions, true, request);
         }
-        
     }
 }
\ No newline at end of file