J004

'Express' appears and appears selectable, but shouldn't appear, at all, until it's ready

For 'Comprehensive', remove "– Up to 96% accuracy on candidate suitability”

cmsWebApp/src/performa/orm/types/AssessmentType.java

@@ -22,7 +22,7 @@ public class AssessmentType extends AbstractEnumerated
     
     public static final AssessmentType COMPREHENSIVE = new AssessmentType ("COMPREHENSIVE", "COMPREHENSIVE", "Talentology Comprehensive", false);
     
-    public static final AssessmentType EXPRESS = new AssessmentType ("EXPRESS", "EXPRESS", "Talentology Express", false);
+    public static final AssessmentType EXPRESS = new AssessmentType ("EXPRESS", "EXPRESS", "Talentology Express", true);
 
     private static final AssessmentType[] allAssessmentTypes =
         new AssessmentType[] { COMPREHENSIVE,EXPRESS};
@@ -133,7 +133,7 @@ public class AssessmentType extends AbstractEnumerated
 
     public static void defineAdditionalData ()
     {
-        COMPREHENSIVE.HeaderDesc = " – Up to 96% accuracy on candidate suitability ";
+        COMPREHENSIVE.HeaderDesc = "";
         COMPREHENSIVE.AdditionalDesc = "";
         COMPREHENSIVE.QuestionDetails = " (250 Questions - 20 Minutes)";
         COMPREHENSIVE.TestDescr = "Comprehensive Assessment";

cmsWebApp/src/performa/orm/types/AssessmentType.xml

@@ -8,11 +8,11 @@
         <DATA   name="QuestionDetails"  type="String"   />
         <DATA   name="TestDescr"        type="String"   />
                 
-        <VALUE  name="COMPREHENSIVE"    description="Talentology Comprehensive" HeaderDesc='" – Up to 96% accuracy on candidate suitability "'
+        <VALUE  name="COMPREHENSIVE"    description="Talentology Comprehensive" HeaderDesc='""'
                 AdditionalDesc='""'
                 QuestionDetails='" (250 Questions - 20 Minutes)"'
                 TestDescr='"Comprehensive Assessment"'/>
-        <VALUE  name="EXPRESS"          description="Talentology Express"       HeaderDesc='""'
+        <VALUE  name="EXPRESS"          description="Talentology Express"       HeaderDesc='""' disabled="true"
                 AdditionalDesc='""'
                 QuestionDetails='" (30 Questions - 5 Minutes)"'
                 TestDescr='"Express Assessment"'/>

cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp

@@ -54,6 +54,11 @@
 
                     for(AssessmentType assessmentType : AssessmentType.getAssessmentTypeArray())
                     {
+                        if(assessmentType.getDisabled() == Boolean.TRUE)
+                        {
+                            continue;
+                        }
+
                         String  assessmentTypeId    =   assessmentType.getName();
                         String  selectedStr         =   CollectionUtils.equals(assessmentTypeValue, assessmentTypeId) ? "checked" : "";
                 %>