Bugfix: Assessment Completed logic considering only left questions

cmsWebApp/src/performa/orm/Candidate.java

@@ -112,7 +112,7 @@ public class Candidate extends BaseCandidate
     
     public boolean assessmentCompleted(Job job) //role
     {
-        int allAnswersCount = job.getAllLeftQuestions(Arrays.asList(Question.searchAll(getTransaction()))).size();
+        int allAnswersCount =   job.getAllQuestions().size();
         
         if(allAnswersCount > 0)
         {

cmsWebApp/src/performa/orm/Job.java

@@ -130,6 +130,15 @@ public class Job extends BaseJob
         return getAssessmentCriteraByType(criteria).size();
     }
     
+    public List<Question> getAllQuestions()
+    {
+        return Arrays.asList(Question.searchAll(getTransaction()));
+    }
+    
+    public List<Question> getAllLeftQuestions()
+    {
+        return getAllLeftQuestions(getAllQuestions());
+    }
     
     //to get only left Questions
     public List<Question> getAllLeftQuestions(List<Question> totalQuestions)

cmsWebApp/src/performa/orm/JobApplication.java

@@ -323,7 +323,7 @@ public class JobApplication extends BaseJobApplication
         int remainingTime   =   0;
         
         //REQ
-        if(getJob()!=null && getJob().getIncludeAssessmentCriteria()==Boolean.TRUE)
+        if(getJob()!=null && isTrue(getJob().getIncludeAssessmentCriteria()))
         {
             if(!selectionCompleted())
             {
@@ -359,7 +359,7 @@ public class JobApplication extends BaseJobApplication
         }
         else //partially completed test for role
         {
-            int allAnswersCount =   getJob().getAllLeftQuestions(Arrays.asList(Question.searchAll(getTransaction()))).size(); 
+            int allAnswersCount =   getJob().getAllQuestions().size(); 
 
             if(allAnswersCount > 0)
             {
@@ -374,7 +374,6 @@ public class JobApplication extends BaseJobApplication
                 }
             }
         }
-        
         return remainingTime;
     }
 }
\ No newline at end of file

cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp

@@ -20,7 +20,7 @@
 
     if(totalQuestions == null)
     {
-        totalQuestions  =   Arrays.asList(Question.searchAll(transaction));
+        totalQuestions  =   job.getAllQuestions();
         
         process.setAttribute("TotalQuestions", totalQuestions);
     }