Add new static enum Criteria type.

cmsWebApp/src/performa/orm/AssessmentCriteria.xml

@@ -9,7 +9,7 @@
             
             <ATTRIB name="Name"             type="String"           dbcol="name"            length="200"/>
             <ATTRIB name="Importance"       type="Importance"       dbcol="importance"      attribHelper="EnumeratedAttributeHelper" />
-            <ATTRIB name="AssessmentType"   type="AssessmentType"   dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" />
+            <ATTRIB name="CriteriaType"     type="CriteriaType"     dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" />
 
             <SINGLEREFERENCE    name="Job"  type="Job"  dbcol="job_id"  backreferenceName="AssessmentCriterias"/>
 

cmsWebApp/src/performa/orm/AssessmentCriteriaPersistenceMgr.java

@@ -29,13 +29,13 @@ public class AssessmentCriteriaPersistenceMgr extends ObjectPersistenceMgr
     // Private attributes corresponding to business object data
     private String dummyName;
     private Importance dummyImportance;
-    private AssessmentType dummyAssessmentType;
+    private CriteriaType dummyCriteriaType;
     
 
     // Static constants corresponding to attribute helpers
     private static final DefaultAttributeHelper HELPER_Name = DefaultAttributeHelper.INSTANCE;
     private static final EnumeratedAttributeHelper HELPER_Importance = new EnumeratedAttributeHelper (Importance.FACTORY_Importance);
-    private static final EnumeratedAttributeHelper HELPER_AssessmentType = new EnumeratedAttributeHelper (AssessmentType.FACTORY_AssessmentType);
+    private static final EnumeratedAttributeHelper HELPER_CriteriaType = new EnumeratedAttributeHelper (CriteriaType.FACTORY_CriteriaType);
     
 
 
@@ -44,7 +44,7 @@ public class AssessmentCriteriaPersistenceMgr extends ObjectPersistenceMgr
     {
         dummyName = (String)(HELPER_Name.initialise (dummyName));
         dummyImportance = (Importance)(HELPER_Importance.initialise (dummyImportance));
-        dummyAssessmentType = (AssessmentType)(HELPER_AssessmentType.initialise (dummyAssessmentType));
+        dummyCriteriaType = (CriteriaType)(HELPER_CriteriaType.initialise (dummyCriteriaType));
         
     }
 
@@ -101,7 +101,7 @@ public class AssessmentCriteriaPersistenceMgr extends ObjectPersistenceMgr
             if (false  || !tl_assessment_criteriaPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
                     !tl_assessment_criteriaPSet.containsAttrib(AssessmentCriteria.FIELD_Name)||
                     !tl_assessment_criteriaPSet.containsAttrib(AssessmentCriteria.FIELD_Importance)||
-                    !tl_assessment_criteriaPSet.containsAttrib(AssessmentCriteria.FIELD_AssessmentType)||
+                    !tl_assessment_criteriaPSet.containsAttrib(AssessmentCriteria.FIELD_CriteriaType)||
                     !tl_assessment_criteriaPSet.containsAttrib(AssessmentCriteria.SINGLEREFERENCE_Job))
             {
                 // We will need to retrieve it
@@ -185,7 +185,7 @@ public class AssessmentCriteriaPersistenceMgr extends ObjectPersistenceMgr
                                                            "SET name = ?, importance = ?, assessment_type = ?, job_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
                                                                 
                                                            "WHERE tl_assessment_criteria.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
-                                                           CollectionUtils.listEntry (HELPER_Name.getForSQL(dummyName, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Name))).listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Importance))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_AssessmentType))).listEntry (SQLManager.CheckNull((Long)(tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.SINGLEREFERENCE_Job)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
+                                                           CollectionUtils.listEntry (HELPER_Name.getForSQL(dummyName, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Name))).listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Importance))).listEntry (HELPER_CriteriaType.getForSQL(dummyCriteriaType, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_CriteriaType))).listEntry (SQLManager.CheckNull((Long)(tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.SINGLEREFERENCE_Job)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
 
                 if (rowsUpdated != 1)
                 {
@@ -443,7 +443,7 @@ public class AssessmentCriteriaPersistenceMgr extends ObjectPersistenceMgr
 
         tl_assessment_criteriaPSet.setAttrib(AssessmentCriteria.FIELD_Name, HELPER_Name.getFromRS(dummyName, r, "name"));
         tl_assessment_criteriaPSet.setAttrib(AssessmentCriteria.FIELD_Importance, HELPER_Importance.getFromRS(dummyImportance, r, "importance"));
-        tl_assessment_criteriaPSet.setAttrib(AssessmentCriteria.FIELD_AssessmentType, HELPER_AssessmentType.getFromRS(dummyAssessmentType, r, "assessment_type"));
+        tl_assessment_criteriaPSet.setAttrib(AssessmentCriteria.FIELD_CriteriaType, HELPER_CriteriaType.getFromRS(dummyCriteriaType, r, "assessment_type"));
         
         tl_assessment_criteriaPSet.setAttrib(AssessmentCriteria.SINGLEREFERENCE_Job, r.getObject ("job_id"));
         
@@ -465,7 +465,7 @@ public class AssessmentCriteriaPersistenceMgr extends ObjectPersistenceMgr
                                      "  (name, importance, assessment_type,  job_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
                                      "VALUES " +
                                      "  (?, ?, ?,  ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
-                                     CollectionUtils.listEntry (HELPER_Name.getForSQL(dummyName, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Name))).listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Importance))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_AssessmentType))) .listEntry (SQLManager.CheckNull((Long)(tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.SINGLEREFERENCE_Job)))) .listEntry (objectID.longID ()).toList().toArray());
+                                     CollectionUtils.listEntry (HELPER_Name.getForSQL(dummyName, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Name))).listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_Importance))).listEntry (HELPER_CriteriaType.getForSQL(dummyCriteriaType, tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.FIELD_CriteriaType))) .listEntry (SQLManager.CheckNull((Long)(tl_assessment_criteriaPSet.getAttrib (AssessmentCriteria.SINGLEREFERENCE_Job)))) .listEntry (objectID.longID ()).toList().toArray());
 
             tl_assessment_criteriaPSet.setStatus (PersistentSetStatus.PROCESSED);
         }

cmsWebApp/src/performa/orm/BaseAssessmentCriteria.java

@@ -42,7 +42,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
     
     public static final String FIELD_Name = "Name";
     public static final String FIELD_Importance = "Importance";
-    public static final String FIELD_AssessmentType = "AssessmentType";
+    public static final String FIELD_CriteriaType = "CriteriaType";
     public static final String SINGLEREFERENCE_Job = "Job";
     public static final String BACKREF_Job = "";
 
@@ -53,13 +53,13 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
     // Static constants corresponding to attribute helpers
     private static final DefaultAttributeHelper<AssessmentCriteria> HELPER_Name = DefaultAttributeHelper.INSTANCE;
     private static final EnumeratedAttributeHelper<AssessmentCriteria, Importance> HELPER_Importance =  new EnumeratedAttributeHelper<AssessmentCriteria, Importance> (Importance.FACTORY_Importance);
-    private static final EnumeratedAttributeHelper<AssessmentCriteria, AssessmentType> HELPER_AssessmentType =  new EnumeratedAttributeHelper<AssessmentCriteria, AssessmentType> (AssessmentType.FACTORY_AssessmentType);
+    private static final EnumeratedAttributeHelper<AssessmentCriteria, CriteriaType> HELPER_CriteriaType =  new EnumeratedAttributeHelper<AssessmentCriteria, CriteriaType> (CriteriaType.FACTORY_CriteriaType);
     
 
     // Private attributes corresponding to business object data
     private String _Name;
     private Importance _Importance;
-    private AssessmentType _AssessmentType;
+    private CriteriaType _CriteriaType;
     
 
     // Private attributes corresponding to single references
@@ -75,7 +75,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
     // Arrays of validators for each attribute
     private static final AttributeValidator[] FIELD_Name_Validators;
     private static final AttributeValidator[] FIELD_Importance_Validators;
-    private static final AttributeValidator[] FIELD_AssessmentType_Validators;
+    private static final AttributeValidator[] FIELD_CriteriaType_Validators;
     
 
     // Arrays of behaviour decorators
@@ -93,7 +93,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
             setupAssocMetaData_Job();
             FIELD_Name_Validators = (AttributeValidator[])setupAttribMetaData_Name(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_Importance_Validators = (AttributeValidator[])setupAttribMetaData_Importance(validatorMapping).toArray (new AttributeValidator[0]);
-            FIELD_AssessmentType_Validators = (AttributeValidator[])setupAttribMetaData_AssessmentType(validatorMapping).toArray (new AttributeValidator[0]);
+            FIELD_CriteriaType_Validators = (AttributeValidator[])setupAttribMetaData_CriteriaType(validatorMapping).toArray (new AttributeValidator[0]);
             
 
             REFERENCE_AssessmentCriteria.initialiseReference ();
@@ -162,20 +162,20 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
     }
     
     // Meta Info setup
-    private static List setupAttribMetaData_AssessmentType(Map validatorMapping)
+    private static List setupAttribMetaData_CriteriaType(Map validatorMapping)
     {
         Map  metaInfo   = new HashMap ();
 
         metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
         metaInfo.put ("dbcol", "assessment_type");
-        metaInfo.put ("name", "AssessmentType");
-        metaInfo.put ("type", "AssessmentType");
+        metaInfo.put ("name", "CriteriaType");
+        metaInfo.put ("type", "CriteriaType");
         
-        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for AssessmentCriteria.AssessmentType:", metaInfo);
-        ATTRIBUTES_METADATA_AssessmentCriteria.put (FIELD_AssessmentType, Collections.unmodifiableMap (metaInfo));
+        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for AssessmentCriteria.CriteriaType:", metaInfo);
+        ATTRIBUTES_METADATA_AssessmentCriteria.put (FIELD_CriteriaType, Collections.unmodifiableMap (metaInfo));
 
-        List validators = BaseBusinessClass.getAttribValidators(AssessmentCriteria.class, "AssessmentType", metaInfo, validatorMapping);
-        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for AssessmentCriteria.AssessmentType:", validators);        
+        List validators = BaseBusinessClass.getAttribValidators(AssessmentCriteria.class, "CriteriaType", metaInfo, validatorMapping);
+        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for AssessmentCriteria.CriteriaType:", validators);        
 
         return validators;
     }
@@ -209,7 +209,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         
         _Name = (String)(HELPER_Name.initialise (_Name));
         _Importance = (Importance)(HELPER_Importance.initialise (_Importance));
-        _AssessmentType = (AssessmentType)(HELPER_AssessmentType.initialise (_AssessmentType));
+        _CriteriaType = (CriteriaType)(HELPER_CriteriaType.initialise (_CriteriaType));
     }
 
 
@@ -433,16 +433,16 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
     }
 
     /**
-     * Get the attribute AssessmentType
+     * Get the attribute CriteriaType
      */
-    public AssessmentType getAssessmentType ()
+    public CriteriaType getCriteriaType ()
     {
         assertValid();
-        AssessmentType valToReturn = _AssessmentType;
+        CriteriaType valToReturn = _CriteriaType;
 
             for (AssessmentCriteriaBehaviourDecorator bhd : AssessmentCriteria_BehaviourDecorators)
             {
-                valToReturn = bhd.getAssessmentType ((AssessmentCriteria)this, valToReturn);
+                valToReturn = bhd.getCriteriaType ((AssessmentCriteria)this, valToReturn);
             }
             
             return valToReturn;
@@ -454,7 +454,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
      * Called prior to the attribute changing.  Subclasses need not call super.  If a field exception
      * is thrown, the attribute change will fail.  The new value is different to the old value.
      */
-    protected void preAssessmentTypeChange (AssessmentType newAssessmentType) throws FieldException
+    protected void preCriteriaTypeChange (CriteriaType newCriteriaType) throws FieldException
     {
     }
 
@@ -464,46 +464,46 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
      * If a field exception is thrown, the value is still changed, however it 
      * may lead to the TX being rolled back
      */
-    protected void postAssessmentTypeChange () throws FieldException
+    protected void postCriteriaTypeChange () throws FieldException
     {
     }
 
     
-    public FieldWriteability getWriteability_AssessmentType ()
+    public FieldWriteability getWriteability_CriteriaType ()
     {
         return getFieldWritabilityUtil (FieldWriteability.TRUE);
     }
 
     /**
-     * Set the attribute AssessmentType.  Checks to ensure a new value
+     * Set the attribute CriteriaType.  Checks to ensure a new value
      * has been supplied.  If so, marks the field as altered and sets the attribute.
      */
-    public void setAssessmentType (AssessmentType newAssessmentType) throws FieldException
+    public void setCriteriaType (CriteriaType newCriteriaType) throws FieldException
     {
-        boolean oldAndNewIdentical = HELPER_AssessmentType.compare (_AssessmentType, newAssessmentType);
+        boolean oldAndNewIdentical = HELPER_CriteriaType.compare (_CriteriaType, newCriteriaType);
         
         try
         {
             for (AssessmentCriteriaBehaviourDecorator bhd : AssessmentCriteria_BehaviourDecorators)
             {
-                newAssessmentType = bhd.setAssessmentType ((AssessmentCriteria)this, newAssessmentType);
-                oldAndNewIdentical = HELPER_AssessmentType.compare (_AssessmentType, newAssessmentType);
+                newCriteriaType = bhd.setCriteriaType ((AssessmentCriteria)this, newCriteriaType);
+                oldAndNewIdentical = HELPER_CriteriaType.compare (_CriteriaType, newCriteriaType);
             }
 
             
 
-            if (FIELD_AssessmentType_Validators.length > 0)
+            if (FIELD_CriteriaType_Validators.length > 0)
             {
-                Object newAssessmentTypeObj = HELPER_AssessmentType.toObject (newAssessmentType);
+                Object newCriteriaTypeObj = HELPER_CriteriaType.toObject (newCriteriaType);
 
-                if (newAssessmentTypeObj != null)
+                if (newCriteriaTypeObj != null)
                 {
-                    int     loopMax = FIELD_AssessmentType_Validators.length;
-                    Map     metadata = (Map)ATTRIBUTES_METADATA_AssessmentCriteria.get (FIELD_AssessmentType);
+                    int     loopMax = FIELD_CriteriaType_Validators.length;
+                    Map     metadata = (Map)ATTRIBUTES_METADATA_AssessmentCriteria.get (FIELD_CriteriaType);
 
                     for (int v = 0 ; v < loopMax ; ++v)
                     {
-                        FIELD_AssessmentType_Validators[v].checkAttribute (this, FIELD_AssessmentType, metadata, newAssessmentTypeObj);
+                        FIELD_CriteriaType_Validators[v].checkAttribute (this, FIELD_CriteriaType, metadata, newCriteriaTypeObj);
                     }
                 }
             }
@@ -521,12 +521,12 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         if (!oldAndNewIdentical)
         {
             assertValid();
-            Debug.assertion (getWriteability_AssessmentType () != FieldWriteability.FALSE, "Field  AssessmentType is not writeable");
-            preAssessmentTypeChange (newAssessmentType);
-            markFieldChange (FIELD_AssessmentType);
-            _AssessmentType = newAssessmentType;            
-            postFieldChange (FIELD_AssessmentType);
-            postAssessmentTypeChange ();
+            Debug.assertion (getWriteability_CriteriaType () != FieldWriteability.FALSE, "Field  CriteriaType is not writeable");
+            preCriteriaTypeChange (newCriteriaType);
+            markFieldChange (FIELD_CriteriaType);
+            _CriteriaType = newCriteriaType;            
+            postFieldChange (FIELD_CriteriaType);
+            postCriteriaTypeChange ();
         }
     }
 
@@ -931,7 +931,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         tl_assessment_criteriaPSet.setAttrib (FIELD_ObjectID, myID);
         tl_assessment_criteriaPSet.setAttrib (FIELD_Name, HELPER_Name.toObject (_Name)); //
         tl_assessment_criteriaPSet.setAttrib (FIELD_Importance, HELPER_Importance.toObject (_Importance)); //
-        tl_assessment_criteriaPSet.setAttrib (FIELD_AssessmentType, HELPER_AssessmentType.toObject (_AssessmentType)); //
+        tl_assessment_criteriaPSet.setAttrib (FIELD_CriteriaType, HELPER_CriteriaType.toObject (_CriteriaType)); //
         _Job.getPersistentSets (allSets);
         
     }
@@ -949,7 +949,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
 
         _Name = (String)(HELPER_Name.fromObject (_Name, tl_assessment_criteriaPSet.getAttrib (FIELD_Name))); //
         _Importance = (Importance)(HELPER_Importance.fromObject (_Importance, tl_assessment_criteriaPSet.getAttrib (FIELD_Importance))); //
-        _AssessmentType = (AssessmentType)(HELPER_AssessmentType.fromObject (_AssessmentType, tl_assessment_criteriaPSet.getAttrib (FIELD_AssessmentType))); //
+        _CriteriaType = (CriteriaType)(HELPER_CriteriaType.fromObject (_CriteriaType, tl_assessment_criteriaPSet.getAttrib (FIELD_CriteriaType))); //
         _Job.setFromPersistentSets (objectID, allSets);
         
     }
@@ -986,7 +986,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
             
             try
             {
-                setAssessmentType (otherAssessmentCriteria.getAssessmentType ());
+                setCriteriaType (otherAssessmentCriteria.getCriteriaType ());
             }
             catch (FieldException ex)
             {
@@ -1010,7 +1010,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
 
             _Name = sourceAssessmentCriteria._Name;
             _Importance = sourceAssessmentCriteria._Importance;
-            _AssessmentType = sourceAssessmentCriteria._AssessmentType;
+            _CriteriaType = sourceAssessmentCriteria._CriteriaType;
             
         }
     }
@@ -1066,7 +1066,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
 
         _Name = (String)(HELPER_Name.readExternal (_Name, vals.get(FIELD_Name))); //
         _Importance = (Importance)(HELPER_Importance.readExternal (_Importance, vals.get(FIELD_Importance))); //
-        _AssessmentType = (AssessmentType)(HELPER_AssessmentType.readExternal (_AssessmentType, vals.get(FIELD_AssessmentType))); //
+        _CriteriaType = (CriteriaType)(HELPER_CriteriaType.readExternal (_CriteriaType, vals.get(FIELD_CriteriaType))); //
         _Job.readExternalData(vals.get(SINGLEREFERENCE_Job));
         
     }
@@ -1081,7 +1081,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
 
         vals.put (FIELD_Name, HELPER_Name.writeExternal (_Name));
         vals.put (FIELD_Importance, HELPER_Importance.writeExternal (_Importance));
-        vals.put (FIELD_AssessmentType, HELPER_AssessmentType.writeExternal (_AssessmentType));
+        vals.put (FIELD_CriteriaType, HELPER_CriteriaType.writeExternal (_CriteriaType));
         vals.put (SINGLEREFERENCE_Job, _Job.writeExternalData());
         
     }
@@ -1104,9 +1104,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
             {
                 listener.notifyFieldChange(this, other, FIELD_Importance, HELPER_Importance.toObject(this._Importance), HELPER_Importance.toObject(otherAssessmentCriteria._Importance));
             }
-            if (!HELPER_AssessmentType.compare(this._AssessmentType, otherAssessmentCriteria._AssessmentType))
+            if (!HELPER_CriteriaType.compare(this._CriteriaType, otherAssessmentCriteria._CriteriaType))
             {
-                listener.notifyFieldChange(this, other, FIELD_AssessmentType, HELPER_AssessmentType.toObject(this._AssessmentType), HELPER_AssessmentType.toObject(otherAssessmentCriteria._AssessmentType));
+                listener.notifyFieldChange(this, other, FIELD_CriteriaType, HELPER_CriteriaType.toObject(this._CriteriaType), HELPER_CriteriaType.toObject(otherAssessmentCriteria._CriteriaType));
             }
 
             // Compare single assocs
@@ -1133,7 +1133,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
 
         visitor.visitField(this, FIELD_Name, HELPER_Name.toObject(getName()));
         visitor.visitField(this, FIELD_Importance, HELPER_Importance.toObject(getImportance()));
-        visitor.visitField(this, FIELD_AssessmentType, HELPER_AssessmentType.toObject(getAssessmentType()));
+        visitor.visitField(this, FIELD_CriteriaType, HELPER_CriteriaType.toObject(getCriteriaType()));
         visitor.visitAssociation (_Job);
         
     }
@@ -1180,9 +1180,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         {
             return filter.matches (getImportance ());
         }
-        else if (attribName.equals (FIELD_AssessmentType))
+        else if (attribName.equals (FIELD_CriteriaType))
         {
-            return filter.matches (getAssessmentType ());
+            return filter.matches (getCriteriaType ());
         }
         else if (attribName.equals (SINGLEREFERENCE_Job))
         {
@@ -1231,9 +1231,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
                 return this;
             }
             
-            public SearchAll andAssessmentType (QueryFilter<AssessmentType> filter)
+            public SearchAll andCriteriaType (QueryFilter<CriteriaType> filter)
             {
-                filter.addFilter (context, "tl_assessment_criteria.assessment_type", "AssessmentType");
+                filter.addFilter (context, "tl_assessment_criteria.assessment_type", "CriteriaType");
                 return this;
             }
             
@@ -1286,9 +1286,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         {
             return HELPER_Importance.toObject (getImportance ());
         }
-        else if (attribName.equals (FIELD_AssessmentType))
+        else if (attribName.equals (FIELD_CriteriaType))
         {
-            return HELPER_AssessmentType.toObject (getAssessmentType ());
+            return HELPER_CriteriaType.toObject (getCriteriaType ());
         }
         else
         {
@@ -1311,9 +1311,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         {
             return HELPER_Importance;
         }
-        else if (attribName.equals (FIELD_AssessmentType))
+        else if (attribName.equals (FIELD_CriteriaType))
         {
-            return HELPER_AssessmentType;
+            return HELPER_CriteriaType;
         }
         else
         {
@@ -1336,9 +1336,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         {
             setImportance ((Importance)(HELPER_Importance.fromObject (_Importance, attribValue)));            
         }
-        else if (attribName.equals (FIELD_AssessmentType))
+        else if (attribName.equals (FIELD_CriteriaType))
         {
-            setAssessmentType ((AssessmentType)(HELPER_AssessmentType.fromObject (_AssessmentType, attribValue)));            
+            setCriteriaType ((CriteriaType)(HELPER_CriteriaType.fromObject (_CriteriaType, attribValue)));            
         }
         else
         {
@@ -1368,9 +1368,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         {
             return getWriteability_Importance ();
         }
-        else if (fieldName.equals (FIELD_AssessmentType))
+        else if (fieldName.equals (FIELD_CriteriaType))
         {
-            return getWriteability_AssessmentType ();
+            return getWriteability_CriteriaType ();
         }
         else if (fieldName.equals (SINGLEREFERENCE_Job))
         {
@@ -1396,9 +1396,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
                 fields.add (FIELD_Importance);
             }
         
-            if (getWriteability_AssessmentType () != FieldWriteability.TRUE)
+            if (getWriteability_CriteriaType () != FieldWriteability.TRUE)
             {
-                fields.add (FIELD_AssessmentType);
+                fields.add (FIELD_CriteriaType);
             }
         
 
@@ -1412,7 +1412,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         
         result.add(HELPER_Name.getAttribObject (getClass (), _Name, false, FIELD_Name));
         result.add(HELPER_Importance.getAttribObject (getClass (), _Importance, false, FIELD_Importance));
-        result.add(HELPER_AssessmentType.getAttribObject (getClass (), _AssessmentType, false, FIELD_AssessmentType));
+        result.add(HELPER_CriteriaType.getAttribObject (getClass (), _CriteriaType, false, FIELD_CriteriaType));
 
         return result;
     }
@@ -1500,21 +1500,21 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
     }
 
     /**
-     * Get the attribute AssessmentType
+     * Get the attribute CriteriaType
      */
-    public AssessmentType getAssessmentType (AssessmentCriteria obj, AssessmentType original)
+    public CriteriaType getCriteriaType (AssessmentCriteria obj, CriteriaType original)
     {
         return original;
     }
 
     /**
-     * Change the value set for attribute AssessmentType.
+     * Change the value set for attribute CriteriaType.
      * May modify the field beforehand
      * Occurs before validation.
      */
-    public AssessmentType setAssessmentType (AssessmentCriteria obj, AssessmentType newAssessmentType) throws FieldException
+    public CriteriaType setCriteriaType (AssessmentCriteria obj, CriteriaType newCriteriaType) throws FieldException
     {
-        return newAssessmentType;
+        return newCriteriaType;
     }
 
     }
@@ -1577,9 +1577,9 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
             {
                 return toImportance ();
             }                
-            if (name.equals ("AssessmentType"))
+            if (name.equals ("CriteriaType"))
             {
-                return toAssessmentType ();
+                return toCriteriaType ();
             }                
             if (name.equals ("Job"))
             {
@@ -1595,7 +1595,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
         
         public PipeLine<From, Importance> toImportance () { return pipe(new ORMAttributePipe<Me, Importance>(FIELD_Importance));  }
         
-        public PipeLine<From, AssessmentType> toAssessmentType () { return pipe(new ORMAttributePipe<Me, AssessmentType>(FIELD_AssessmentType));  }
+        public PipeLine<From, CriteriaType> toCriteriaType () { return pipe(new ORMAttributePipe<Me, CriteriaType>(FIELD_CriteriaType));  }
         public Job.JobPipeLineFactory<From, Job> toJob () { return toJob (Filter.ALL); }
 
         public Job.JobPipeLineFactory<From, Job> toJob (Filter<Job> filter) 

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

@@ -20,16 +20,12 @@ public class AssessmentType extends AbstractEnumerated
     
     public static final EnumeratedFactory FACTORY_AssessmentType = new AssessmentTypeFactory();
     
-    public static final AssessmentType SKILL = new AssessmentType ("SKILL", "SKILL", "Skill", false);
+    public static final AssessmentType COMPREHENSIVE = new AssessmentType ("COMPREHENSIVE", "COMPREHENSIVE", "Comprehensive", false);
     
-    public static final AssessmentType QUALIFICATION = new AssessmentType ("QUALIFICATION", "QUALIFICATION", "Qualification", false);
-    
-    public static final AssessmentType EXPERIENCE = new AssessmentType ("EXPERIENCE", "EXPERIENCE", "Experience", false);
-    
-    public static final AssessmentType KNOWLEDGE = new AssessmentType ("KNOWLEDGE", "KNOWLEDGE", "Knowledge", false);
+    public static final AssessmentType EXPRESS = new AssessmentType ("EXPRESS", "EXPRESS", "Express", false);
 
     private static final AssessmentType[] allAssessmentTypes =
-        new AssessmentType[] { SKILL,QUALIFICATION,EXPERIENCE,KNOWLEDGE};
+        new AssessmentType[] { COMPREHENSIVE,EXPRESS};
 
 
     private static AssessmentType[] getAllAssessmentTypes ()

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

@@ -3,10 +3,8 @@
 <ROOT>
     <CONSTANT package="performa.orm.types"  name="AssessmentType">
                 
-        <VALUE name="SKILL"         value="SKILL"           description="Skill"/>
-        <VALUE name="QUALIFICATION" value="QUALIFICATION"   description="Qualification"/>
-        <VALUE name="EXPERIENCE"    value="EXPERIENCE"      description="Experience"/>
-        <VALUE name="KNOWLEDGE"     value="KNOWLEDGE"       description="Knowledge"/>
+        <VALUE name="COMPREHENSIVE" value="COMPREHENSIVE"   description="Comprehensive"/>
+        <VALUE name="EXPRESS"       value="EXPRESS"         description="Express"/>
         
     </CONSTANT>
 </ROOT>
\ No newline at end of file

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

+
+    
+package performa.orm.types;
+
+import java.util.*;
+import oneit.utils.*;
+
+
+
+/**
+ * This class was generated using constGen.bat.
+ * DO NOT MODIFY THIS CODE.
+ * Edit the associated .xml file, and regenerate this file
+ * constGen (directory) (file minus extension)
+ * e.g. constGen C:\...\sql FieldType
+ */
+
+public class CriteriaType extends AbstractEnumerated
+{
+    
+    public static final EnumeratedFactory FACTORY_CriteriaType = new CriteriaTypeFactory();
+    
+    public static final CriteriaType SKILL = new CriteriaType ("SKILL", "SKILL", "Skill", false);
+    
+    public static final CriteriaType QUALIFICATION = new CriteriaType ("QUALIFICATION", "QUALIFICATION", "Qualification", false);
+    
+    public static final CriteriaType EXPERIENCE = new CriteriaType ("EXPERIENCE", "EXPERIENCE", "Experience", false);
+    
+    public static final CriteriaType KNOWLEDGE = new CriteriaType ("KNOWLEDGE", "KNOWLEDGE", "Knowledge", false);
+
+    private static final CriteriaType[] allCriteriaTypes =
+        new CriteriaType[] { SKILL,QUALIFICATION,EXPERIENCE,KNOWLEDGE};
+
+
+    private static CriteriaType[] getAllCriteriaTypes ()
+    {
+        return allCriteriaTypes;
+    }
+
+    private CriteriaType (String name, String value, String description, boolean disabled)
+    {
+        super (name, value, description, disabled);
+    }
+    
+    public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allCriteriaTypes);
+
+
+
+    static
+    {
+        defineAdditionalData ();
+    }
+
+    public boolean isEqual (CriteriaType other)
+    {
+    return this.name.equals (other.name);
+    }
+
+    public Enumeration getAllInstances ()
+    {
+        return CriteriaType.getAll ();
+    }
+
+
+    private Object readResolve() throws java.io.ObjectStreamException
+    {
+        return CriteriaType.forName (this.name);
+    }
+
+
+    public EnumeratedFactory getFactory ()
+    {
+        return FACTORY_CriteriaType;
+    }
+
+    public static CriteriaType forName (String name)
+    {
+        if (name == null) { return null; }
+
+        CriteriaType[] all = getAllCriteriaTypes();
+        int enumIndex = AbstractEnumerated.getIndexForName (all, name);
+
+        return all[enumIndex];
+    }
+
+
+    public static CriteriaType forValue (String value)
+    {
+        if (value == null) { return null; }
+
+        CriteriaType[] all = getAllCriteriaTypes();
+        int enumIndex = AbstractEnumerated.getIndexForValue (getAllCriteriaTypes (), value);
+
+        return all[enumIndex];
+    }
+
+
+    public static java.util.Enumeration getAll ()
+    {
+        return AbstractEnumerated.getAll (getAllCriteriaTypes());
+    }
+    
+    
+    public static CriteriaType[] getCriteriaTypeArray ()
+    {
+        return (CriteriaType[])getAllCriteriaTypes().clone ();
+    }
+
+
+    public static void defineAdditionalData ()
+    {
+        
+    }
+
+
+    static class CriteriaTypeFactory implements EnumeratedFactory
+    {
+        public AbstractEnumerated getForName (String name)
+        {
+            return CriteriaType.forName (name);
+        }
+
+        public AbstractEnumerated getForValue (String name)
+        {
+            return CriteriaType.forValue (name);
+        }
+
+        public Enumeration getAll ()
+        {
+            return CriteriaType.getAll ();
+        }
+    }
+
+
+    public Map getAdditionalAttributes ()
+    {
+        Map attribs = new HashMap ();
+
+        
+        return attribs;
+    }
+}
+

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

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT>
+    <CONSTANT package="performa.orm.types"  name="CriteriaType">
+                
+        <VALUE name="SKILL"         value="SKILL"           description="Skill"/>
+        <VALUE name="QUALIFICATION" value="QUALIFICATION"   description="Qualification"/>
+        <VALUE name="EXPERIENCE"    value="EXPERIENCE"      description="Experience"/>
+        <VALUE name="KNOWLEDGE"     value="KNOWLEDGE"       description="Knowledge"/>
+        
+    </CONSTANT>
+</ROOT>

cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp

@@ -156,36 +156,41 @@
                                     %>
                                 </div>
                                 <%
+
+                                    FormTag     jobForm     = FormTag.getActiveFormTag(request);
+                                    FormBuilder formBuilder = jobForm.getFormBuilder();
+
                                     for (AssessmentCriteria qualification : qualifications)
                                     {
+                                        String  optionKey   = WebUtils.getInputKey(request, qualification, AssessmentCriteria.FIELD_Importance);
+                                        String  formValue   = formBuilder.fieldValue (optionKey, qualification.getImportance() == null ? "" : qualification.getImportance().getName());
                                 %>
                                         <div class="main-qualification">
                                             <span class="delete-qualification"><span></span></span>
                                             <oneit:ormInput obj="<%= qualification %>"  type="text" attributeName="Name"    cssClass="form-control" />
-                                            <div class="radio radio-primary qualification-radio">
-                                                <input type="radio" name="radio1" id="radio5" value="option1" checked="">
-                                                <label for="radio5">
-                                                    Essential
-                                                </label>
-                                            </div>
-                                            <div class="radio radio-primary qualification-radio">
-                                                <input type="radio" name="radio1" id="radio6" value="option1">
-                                                <label for="radio6">
-                                                    Highly Desirable
-                                                </label>
-                                            </div>
-                                            <div class="radio radio-primary qualification-radio">
-                                                <input type="radio" name="radio1" id="radio7" value="option1">
-                                                <label for="radio7">
-                                                    Desirable
-                                                </label>
-                                            </div>
+                                            <%
+                                                for(Importance importance : Importance.getImportanceArray())
+                                                {
+                                                    boolean isSelected  = CollectionUtils.equals(formValue, importance.getName());
+                                                    String  id          = "importance_" + importance.getName();
+                                                    String  selectedStr = (isSelected) ? "checked" : "";
+                                            %>
+                                                    <div class="radio radio-primary qualification-radio">
+                                                        <input type="radio" name="<%= optionKey %>" value="<%= importance.getName() %>" id="<%= id %>" <%= selectedStr %>/>
+                                                        <label for="<%= id %>"><oneit:toString value="<%= importance %>" mode="EscapeHTML" /></label>
+                                                    </div>
+                                            
+                                            <%
+                                                }
+                                            %>
                                         </div>
                                 <%
                                     }
                                 %>
                                 <div class="main-add-more">
-                                  <div class="add-more-btn"><img src="images/plus-img.png"> Add Qualification</div>
+                                    <oneit:button   value="Add Qualification"  name="gotoPage" cssClass="add-more-btn" 
+                                            requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage)
+                                                                                .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()).toMap() %>"/>
                                 </div>
                             </div>
                             <div class="form-brack-line-sub"></div>
@@ -239,7 +244,9 @@
                                         <input type="text" placeholder="Template Name" class="form-control" id="email">
                                     </div>
                                     <span class="input-group-btn">
-                                        <button class="btn btn-primary" type="button">SAVE</button>
+                                        <oneit:button   value="SAVE"  name="gotoPage" cssClass="btn btn-primary" 
+                                            requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage)
+                                                                                .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()).toMap() %>"/>
                                     </span>
                                 </div>
                             </div>