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/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>