Client migration job update issue fixes, AnalysisEngine - color code for Role Fit details

cmsWebApp/src/performa/orm/JobApplication.java

@@ -307,7 +307,7 @@ public class JobApplication extends BaseJobApplication
     
     public Double getRoleFitScore()
     {
-        return getRoleFit() != null ? (Double)getRoleFit().get(null) : 0d;
+        return getRoleFit() != null && getRoleFit().get(null) != null ? ((Tuple.T2<Double, ColorCode>)getRoleFit().get(null)).get0() : 0d;
     }
     
     public Long getCultureFitScore()
@@ -325,7 +325,7 @@ public class JobApplication extends BaseJobApplication
     {
         JobApplication  jobTopper   =   getJob() != null ? getJob().getTopper() : null;
         Double          myScore     =   getRoleFitScore();
-        Double          topScore    =   jobTopper.getRoleFitScore();
+        Double          topScore    =   jobTopper != null ? jobTopper.getRoleFitScore() : null;
         
         return NullArith.round(NullArith.divide(NullArith.multiply(myScore, 100), topScore), 2);
     }

cmsWebApp/src/performa/utils/AnalysisEngine.java

@@ -400,12 +400,12 @@ public class AnalysisEngine
         return roleFitMap;
     }
     
-    public static Map<FactorClass, Double> getRoleFitSuitability(Candidate candidate, Level level)
+    public static Map<FactorClass, Tuple.T2<Double, ColorCode>> getRoleFitSuitability(Candidate candidate, Level level)
     {
         LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1, "AnalysisEngine --> getRoleFitSuitability called for candidate ", candidate, " Level ", level);
         
         TestAnalysis                                    testAnalysis    =   candidate.getTestAnalysisFor(level);
-        Map<FactorClass, Double>    scoreMap            =   new HashMap();
+        Map<FactorClass, Tuple.T2<Double, ColorCode>>   scoreMap        =   new HashMap();
         
         if(testAnalysis != null && testAnalysis.getCandidateClassScoresCount() > 0)
         {
@@ -416,14 +416,16 @@ public class AnalysisEngine
                 CandidateClassScore         candidateClassScore         =   testAnalysis.pipelineTestAnalysis().toCandidateClassScores(candidateClassScoreFilter).val();
                 ClassNormalisation          classNormalisation          =   level.getClassNormalisationFor(factorClass);
                 Double                      score                       =   0d;
+                ColorCode                   colorCode                   =   null;
                 
                 if(candidateClassScore != null && classNormalisation != null && NullArith.greaterThan(classNormalisation.getWghtStddevScore(), 0d))
                 {
                     score       =   NullArith.round(((10 * ((candidateClassScore.getWghtdClassScore() - classNormalisation.getWghtMeanScore()) / classNormalisation.getWghtStddevScore())) + 50), 1);
+                    colorCode   =   candidateClassScore.getColorCode();
                 }
-                scoreMap.put(factorClass, score);
+                scoreMap.put(factorClass, new Tuple.T2(score, colorCode));
             }
-            scoreMap.put(null, getSuitabilityScore(testAnalysis).get0());
+            scoreMap.put(null, getSuitabilityScore(testAnalysis));
         }
         LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1, "AnalysisEngine --> getRoleFitSuitability completed for candidate ", candidate, " Level ", level);
         

cmsWebApp/src/performa/utils/MenuItemDisableTransformFactory.java

@@ -42,8 +42,7 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory,
         public Object transform(Object original)
         {
             if((Boolean)article.getAdditionalAttribute("Allow Disable", Boolean.FALSE) 
-                && this.company !=null 
-                && this.company.getHasClientSupport()!=Boolean.TRUE)
+                && this.company !=null && !this.company.showHasClientSupport())
             {
                 return String.valueOf(original);
             }

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

@@ -57,7 +57,7 @@
                         <div class="search-bar">
                             <div class="inset-shadow"></div>
                             <img src="images/search-icon.svg"/>
-                            <input type="text" class="form-control" placeholder="<%= company.getHasClientSupport() ? "Search for job, candidate or client" : "Search for a job or candidate"%>"/>
+                            <input type="text" class="form-control" placeholder="<%= company.showHasClientSupport() ? "Search for job, candidate or client" : "Search for a job or candidate"%>"/>
                         </div>
                         <div class="fl-right">
                             <div class="notification-bar">

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

@@ -14,7 +14,7 @@
 
 <oneit:dynIncluded>
 <%
-    Map<FactorClass, Double>    roleScoreMap    =   (Map<FactorClass, Double>)jobApplication.getRoleFit();
+    Map<FactorClass, Tuple.T2<Double, ColorCode>>   roleScoreMap    =   (Map<FactorClass, Tuple.T2<Double, ColorCode>>)jobApplication.getRoleFit();
 %>
 <script>
     function tabToggle(tab) {
@@ -116,14 +116,14 @@
                     <%
                         for(FactorClass factorClass : jobApplication.getSortedFactorClasses())
                         {
-                            if(roleScoreMap.get(factorClass) != null && roleScoreMap.get(factorClass) > 0d)
+                            if(roleScoreMap.get(factorClass) != null && roleScoreMap.get(factorClass).get0() > 0d)
                             {
                                 Map<FactorLevelLink, Map>   factorDetails   =   AnalysisEngine.getFactorScoreDetails(candidate, job.getLevel(), factorClass);
                     %>
                                 <div class="main-pro-bar">
                                     <div class="pro-bar">
                                         <span class="appli-label"><oneit:toString   value="<%= factorClass %>"  mode="EscapeHTML"/></span>
-                                        <span class="appli-percen"><oneit:toString  value="<%= roleScoreMap.get(factorClass) %>"    mode="TwoDPDouble"/></span>
+                                        <span class="appli-percen"><oneit:toString  value="<%= roleScoreMap.get(factorClass).get0() %>" mode="TwoDPDouble"/></span>
                                         <span class="expand-box">
                                             <span class="hasarrow"><img src="images/select-down-arrow.svg"></span>
                                         </span>

cmsWebApp/webroot/extensions/adminportal/upgrades/20170901_UpdateUserStructure.xml

@@ -23,6 +23,7 @@
             <value name='object_created_date' class="oneit.sql.transfer.DBTransferer$Timestamp"/>
             <value name='object_type'   factory='String'>CompanyUser</value>
             <value name='role_type'     factory='String'>ADMIN</value>
+            <value name='is_account_verified'   factory='Boolean'>true</value>
             <value name='user_id'       factory='Participant'   class="oneit.sql.transfer.InsertOperation$QueryColumn" column="user_id" />
             <value name='company_id'    factory='Participant'   class="oneit.sql.transfer.DBTransferer$ObjectID" keyName="CompanyID"/>
         </NODE>

cmsWebApp/webroot/extensions/adminportal/upgrades/20170902_UpdateCompanyAddedBy.sql

 -- @AutoRun
 
 update tl_company set added_by_user_id = (select object_id from oneit_sec_user_extension ext where ext.user_id = added_by_user_id);
+
+update tl_job set company_user_id = (select object_id from oneit_sec_user_extension ext where ext.user_id = secuser_id);

cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp

@@ -114,7 +114,7 @@
                             Candidate   candidate   =   jobApplication.getCandidate();
                             String      appID       =   "app-id-" + jobApplication.getID().toString();
 
-                            Map<FactorClass, Double>    roleScoreMap    =   (Map<FactorClass, Double>)jobApplication.getRoleFit();
+                            Map<FactorClass, Tuple.T2<Double, ColorCode>>   roleScoreMap    =   (Map<FactorClass, Tuple.T2<Double, ColorCode>>)jobApplication.getRoleFit();
                     %>
                             <div class="<%= "appl-c-box " + (i == 0 ? " cb-one" : "")%> ">
                                 <!--TODO: need to work on the logic. just added to demonstrate that there are 3 different colors for this-->
@@ -154,7 +154,7 @@
                                                         <oneit:toString   value="<%= factorClass %>"    mode="EscapeHTML"/>
                                                     </div>
                                                     <div class="detail-no green">
-                                                        <oneit:toString  value="<%= roleScoreMap.get(factorClass) %>"   mode="TwoDPDouble"/>
+                                                        <oneit:toString  value="<%= roleScoreMap.get(factorClass).get0() %>"    mode="TwoDPDouble"/>
                                                     </div>
                                                 </div>   
                                         <%