zeplin changes to J002

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

@@ -37,10 +37,17 @@ public class CriteriaType extends AbstractEnumerated
         return allCriteriaTypes;
     }
 
+    private transient boolean IsSingular;
+
     private CriteriaType (String name, String value, String description, boolean disabled)
     {
         super (name, value, description, disabled);
     }
+
+    public boolean getIsSingular()
+    {
+    return IsSingular;
+    }
     
     public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allCriteriaTypes);
 
@@ -109,6 +116,10 @@ public class CriteriaType extends AbstractEnumerated
 
     public static void defineAdditionalData ()
     {
+        QUALIFICATION.IsSingular = false;
+        SKILL.IsSingular = false;
+        EXPERIENCE.IsSingular = true;
+        KNOWLEDGE.IsSingular = true;
         
     }
 
@@ -136,6 +147,7 @@ public class CriteriaType extends AbstractEnumerated
     {
         Map attribs = new HashMap ();
 
+        attribs.put ("IsSingular", ArrayFormatter.toObject(getIsSingular()));
         
         return attribs;
     }

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

@@ -3,10 +3,12 @@
 <ROOT>
     <CONSTANT package="performa.orm.types"  name="CriteriaType">
                 
-        <VALUE name="QUALIFICATION" value="QUALIFICATION"   description="Qualifications"/>
-        <VALUE name="SKILL"         value="SKILL"           description="Skills"/>
-        <VALUE name="EXPERIENCE"    value="EXPERIENCE"      description="Experience"/>
-        <VALUE name="KNOWLEDGE"     value="KNOWLEDGE"       description="Knowledge"/>
+        <DATA   name="IsSingular"   type="boolean"/>
+
+        <VALUE name="QUALIFICATION" value="QUALIFICATION"   description="Qualifications"    IsSingular="false"/>
+        <VALUE name="SKILL"         value="SKILL"           description="Skills"            IsSingular="false"/>
+        <VALUE name="EXPERIENCE"    value="EXPERIENCE"      description="Experience"        IsSingular="true"/>
+        <VALUE name="KNOWLEDGE"     value="KNOWLEDGE"       description="Knowledge"         IsSingular="true"/>
         
     </CONSTANT>
 </ROOT>

cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp

@@ -129,7 +129,7 @@
                                                 </oneit:recalcClass>
 
                                                 <oneit:recalcClass htmlTag="span"   class="skill-label" classScript="job.getAssessmentCriteraCountByType(criteria) > 0 ? 'hide': 'show'" job="<%= job %>"    criteria="<%= criteria %>">
-                                                    <span class="skill-label">No <oneit:toString value="<%= criteria %>" mode="EscapeHTML"/> currently added for this role.</span>
+                                                    <span class="skill-label">No required <oneit:toString value="<%= criteria %>" mode="EscapeHTML"/><%= criteria.getIsSingular() ? " has" : " have"%> been added.</span>
                                                 </oneit:recalcClass>
 
                                             </span>