J004 - Include option to select Express and remove lating text from express description

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", true);
+    public static final AssessmentType EXPRESS = new AssessmentType ("EXPRESS", "EXPRESS", "Talentology Express", false);
 
     private static final AssessmentType[] allAssessmentTypes =
         new AssessmentType[] { COMPREHENSIVE,EXPRESS};
@@ -138,7 +138,7 @@ public class AssessmentType extends AbstractEnumerated
         COMPREHENSIVE.QuestionDetails = " (250 Questions - 20 Minutes)";
         COMPREHENSIVE.TestDescr = "Comprehensive Assessment";
         EXPRESS.HeaderDesc = "";
-        EXPRESS.AdditionalDesc = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut.";
+        EXPRESS.AdditionalDesc = "";
         EXPRESS.QuestionDetails = " (30 Questions - 5 Minutes)";
         EXPRESS.TestDescr = "Express Assessment";
         

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

@@ -13,8 +13,8 @@
                 QuestionDetails='" (250 Questions - 20 Minutes)"'
                 TestDescr='"Comprehensive Assessment"'/>
         <VALUE  name="EXPRESS"          description="Talentology Express"       HeaderDesc='""'
-                AdditionalDesc='"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut."'
-                QuestionDetails='" (30 Questions - 5 Minutes)"' disabled="true"
+                AdditionalDesc='""'
+                QuestionDetails='" (30 Questions - 5 Minutes)"'
                 TestDescr='"Express Assessment"'/>
     </CONSTANT>
 </ROOT>
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp

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