Updated culture score calculation.

cmsWebApp/src/performa/orm/JobApplication.java

@@ -41,19 +41,19 @@ public class JobApplication extends BaseJobApplication
     }
     
     
-    private void initACAnswers()
-    {
-        if(isIncludeAssessmentCriteria())
-        {
-            for(AssessmentCriteria assessmentCriteria : getJob().getAssessmentCriteriasSet())
-            {
-                AssessmentCriteriaAnswer    answer  =   AssessmentCriteriaAnswer.createAssessmentCriteriaAnswer(getTransaction());
-
-                addToAssessmentCriteriaAnswers(answer);
-                assessmentCriteria.addToAnswers(answer);
-            }
-        }
-    }
+//    private void initACAnswers()
+//    {
+//        if(isIncludeAssessmentCriteria())
+//        {
+//            for(AssessmentCriteria assessmentCriteria : getJob().getAssessmentCriteriasSet())
+//            {
+//                AssessmentCriteriaAnswer    answer  =   AssessmentCriteriaAnswer.createAssessmentCriteriaAnswer(getTransaction());
+//
+//                addToAssessmentCriteriaAnswers(answer);
+//                assessmentCriteria.addToAnswers(answer);
+//            }
+//        }
+//    }
     
     
     public boolean createAssessmentCriteriaObjects() throws FieldException
@@ -94,6 +94,12 @@ public class JobApplication extends BaseJobApplication
     {
         boolean safeRedirect = false;
         
+        //to skip culture test
+        if(getAlreadyCompletedApplicationForCulture()!=null)
+        {
+            return safeRedirect;
+        }
+        
         for(CultureCriteria cultureCriteria : getJob().getCultureCriteriasSet())
         {
             boolean available   = false;
@@ -251,7 +257,7 @@ public class JobApplication extends BaseJobApplication
     }
     
     
-    public int getJobMatchPercentage()
+    public int getJobMatchPercentage() //ROLE
     {
         return 85;
     }
@@ -259,7 +265,7 @@ public class JobApplication extends BaseJobApplication
     
     public int getCulturePercentage()
     {
-        return AnalysisEngine.getCultureFit(getCultureCriteriaAnswersSet()).get(null).intValue();
+        return AnalysisEngine.getCultureFit(getAlreadyCompletedApplicationForCulture()!=null ? getAlreadyCompletedApplicationForCulture().getCultureCriteriaAnswersSet() : getCultureCriteriaAnswersSet()).get(null).intValue();
     }
     
     

cmsWebApp/webroot/extensions/adminportal/inc/view_application_tab_applicant.jsp

@@ -308,7 +308,8 @@
                     </div>
                     <div class="tab-pane" id="2a">
                         <%
-                            Map<CultureClass, Long> cultureFitData  =   AnalysisEngine.getCultureFit(jobApplication.getCultureCriteriaAnswersSet());
+                            JobApplication          completeaApp    =   jobApplication.getAlreadyCompletedApplicationForCulture();
+                            Map<CultureClass, Long> cultureFitData  =   AnalysisEngine.getCultureFit(completeaApp!=null ? completeaApp.getCultureCriteriaAnswersSet() : jobApplication.getCultureCriteriaAnswersSet());
                             
                             for(CultureClass cClass: cultureFitData.keySet())
                             {

cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp

@@ -265,8 +265,9 @@
                                         </div>
                                         <div class="detail-box">
                                             <%
-                                                Map<CultureClass, Long> cultureFitData  =   AnalysisEngine.getCultureFit(jobApplication.getCultureCriteriaAnswersSet());
-                            
+                                                JobApplication          completeaApp    =   jobApplication.getAlreadyCompletedApplicationForCulture();
+                                                Map<CultureClass, Long> cultureFitData  =   AnalysisEngine.getCultureFit(completeaApp!=null ? completeaApp.getCultureCriteriaAnswersSet() : jobApplication.getCultureCriteriaAnswersSet());
+                                                
                                                 for(CultureClass cClass: cultureFitData.keySet())
                                                 {
                                                     if(cClass==null)
@@ -296,7 +297,7 @@
                                         <div class="detail-box">
                                             <%
                                                 Map<Importance, Long>   requirementFitData  =   AnalysisEngine.getRequirementFit(jobApplication.getAssessmentCriteriaAnswersSet());
-                            
+                                                
                                                 for(Importance importance: requirementFitData.keySet())
                                                 {
                                                     if(importance==null)