Show only essential factors for areas of concern - improvements to previous commit

cmsWebApp/src/performa/orm/JobApplication.java

@@ -262,7 +262,7 @@ public class JobApplication extends BaseJobApplication
         {
             try
             {
-                setCultureFit(AnalysisEngine.getCultureFit(getCandidate().getCultureCriteriaAnswersSet(), getJob(), false));
+                setCultureFit(AnalysisEngine.getCultureFit(getCandidate().getCultureCriteriaAnswersSet(), getJob()));
             }
             catch (FieldException ex)
             {
@@ -553,7 +553,7 @@ public class JobApplication extends BaseJobApplication
     
     public List<Tuple.T2> getCultureAreaOfConcerns()
     {
-        Map<CultureClass, Tuple.T2<Long, Set<Tuple.T3>>>    cultureFitData  =   AnalysisEngine.getCultureFit(getCandidate().getCultureCriteriaAnswersSet(), getJob(), true);
+        Map<CultureClass, Tuple.T2<Long, Set<Tuple.T3>>>    cultureFitData  =   (Map<CultureClass, Tuple.T2<Long, Set<Tuple.T3>>>) getCultureFit();
         List<Tuple.T2>                                      result          =   new ArrayList();
                             
         for(CultureClass cClass : cultureFitData.keySet())
@@ -566,8 +566,9 @@ public class JobApplication extends BaseJobApplication
             for(Tuple.T3 tuple : cultureFitData.get(cClass).get1())
             {
                 CultureNarrative    cultureNarrative    =   (CultureNarrative) tuple.get2();
+                Integer             weightingScore      =   (Integer) tuple.get0();
                 
-                if(cultureNarrative != null && cultureNarrative.getColorCode() != null && cultureNarrative.getColorCode() != ColorCode.GREEN)
+                if(cultureNarrative != null && cultureNarrative.getColorCode() != null && cultureNarrative.getColorCode() != ColorCode.GREEN && weightingScore == 10)   //i.e. Importance = ESSENTIAL
                 {
                     result.add(new Tuple.T2(tuple.get1(), cultureNarrative.getColorCode()));
                 }

cmsWebApp/src/performa/utils/AnalysisEngine.java

@@ -231,7 +231,7 @@ public class AnalysisEngine
     }
     
     //Tuple.T2<Long, Set<Tuple.T3>> ---> T2<Score, List<T3 <WeightingScore, CultureElement, Narrative>>
-    public static Map<CultureClass, Tuple.T2<Long, Set<Tuple.T3>>> getCultureFit(Set<CultureCriteriaAnswer> cultureCriteriaAnswers, Job job, boolean areaOfConcern)
+    public static Map<CultureClass, Tuple.T2<Long, Set<Tuple.T3>>> getCultureFit(Set<CultureCriteriaAnswer> cultureCriteriaAnswers, Job job)
     {
         LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1, "AnalysisEngine --> getCultureFit called");
         
@@ -256,11 +256,6 @@ public class AnalysisEngine
             
             if(criteria != null && criteria.getImportance() != null && criteria.getImportance() != Importance.NOT_APPLICABLE)
             {
-                if(areaOfConcern && (criteria.getImportance() == Importance.DESIRABLE || criteria.getImportance() == Importance.HIGHLY_DESIRABLE))
-                {
-                    continue;
-                }
-                
                 CultureElementRating    rating  =   criteria.getCultureElementRating();
                 
                 if(rating != null && rating.getCultureElement() != null && rating.getCultureElement().getCultureClass() != null)