J003 Workspace Culture changes

cmsWebApp/src/performa/orm/BaseCultureCriteria.java

@@ -176,6 +176,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
 
         metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
         metaInfo.put ("dbcol", "importance");
+        metaInfo.put ("defaultValue", "Importance.NOT_APPLICABLE");
         metaInfo.put ("mandatory", "true");
         metaInfo.put ("name", "Importance");
         metaInfo.put ("type", "Importance");
@@ -216,7 +217,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
         super._initialiseNewObjAttributes (transaction);
 
         
-        _Importance = (Importance)(HELPER_Importance.initialise (_Importance));
+        _Importance = (Importance)(Importance.NOT_APPLICABLE);
     }
 
 

cmsWebApp/src/performa/orm/CultureCriteria.xml

@@ -9,7 +9,7 @@
         
         <TABLE  name="tl_culture_criteria"  tablePrefix="object"    polymorphic="FALSE">
             
-            <ATTRIB name="Importance"   type="Importance"   dbcol="importance"  attribHelper="EnumeratedAttributeHelper"    mandatory="true"    />
+            <ATTRIB name="Importance"   type="Importance"   dbcol="importance"  attribHelper="EnumeratedAttributeHelper"    mandatory="true"    defaultValue="Importance.NOT_APPLICABLE"/>
 
             <SINGLEREFERENCE    name="CultureElement"       type="CultureElement"       dbcol="culture_element_id"          mandatory="true"    />
             <SINGLEREFERENCE    name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_id"   mandatory="true"    />

cmsWebApp/src/performa/orm/CultureElement.java

 package performa.orm;
 
+import oneit.utils.StringUtils;
+
 
 public class CultureElement extends BaseCultureElement
 {
@@ -16,4 +18,10 @@ public class CultureElement extends BaseCultureElement
     {
         return "CultureElement";
     }
+
+    @Override
+    public String getToString()
+    {
+        return StringUtils.subNulls(getDescription(), super.getToString());
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/CultureElementRating.java

 package performa.orm;
 
+import oneit.utils.StringUtils;
+
 
 public class CultureElementRating extends BaseCultureElementRating
 {
@@ -16,4 +18,10 @@ public class CultureElementRating extends BaseCultureElementRating
     {
         return "CultureElementRating";
     }
+
+    @Override
+    public String getToString()
+    {
+        return StringUtils.subNulls(getDescription(), super.getToString());
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Job.java

 package performa.orm;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import oneit.logging.LoggingArea;
 import oneit.objstore.ObjectStatus;
-import oneit.objstore.rdbms.filters.EqualsFilter;
+import oneit.objstore.rdbms.filters.*;
 import oneit.objstore.utils.ObjstoreUtils;
 import oneit.security.*;
 import oneit.utils.*;
 import oneit.utils.filter.CollectionFilter;
 import oneit.utils.filter.Filter;
 import oneit.utils.parsers.FieldException;
-import performa.orm.types.CriteriaType;
+import performa.orm.types.*;
 import performa.utils.Utils;
 
 
@@ -37,6 +35,14 @@ public class Job extends BaseJob
         
         setRandomKey(RandomStringGen.getRandomStringGen().generateAlphaNum(4));
         setSecUser(SecUser.getTXUser(getTransaction()));
+        
+        for(CultureElement cultureElement : CultureElement.searchAll(getTransaction()))
+        {
+            CultureCriteria cultureCriteria =   CultureCriteria.createCultureCriteria(getTransaction());
+            
+            cultureCriteria.setCultureElement(cultureElement);
+            addToCultureCriterias(cultureCriteria);
+        }
     }
     
     
@@ -119,4 +125,15 @@ public class Job extends BaseJob
                                 new ObjectTransform[] {Question.pipesQuestion().toSection().toObjectID(), Question.pipesQuestion().toObjectID()},  
                                 new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR, CollectionUtils.DEFAULT_COMPARATOR});
     }
+    
+    public Collection<CultureCriteria> getCultureCriteriasForClass(CultureClass cultureClass)
+    {
+        Filter  elementFilter   =   CultureElement.SearchByAll().andCultureClass(new EqualsFilter(cultureClass));
+        
+        Set<CultureElement> cultureElements =   pipelineJob().toCultureCriterias().toCultureElement(elementFilter).uniqueVals();
+        
+        Filter  criteriaFilter  =   CultureCriteria.SearchByAll().andCultureElement(new InFilter(cultureElements));
+        
+        return pipelineJob().toCultureCriterias(criteriaFilter).vals();
+    }
 }
\ No newline at end of file

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

@@ -20,6 +20,8 @@ public class Importance extends AbstractEnumerated
     
     public static final EnumeratedFactory FACTORY_Importance = new ImportanceFactory();
     
+    public static final Importance NOT_APPLICABLE = new Importance ("NOT_APPLICABLE", "NOT_APPLICABLE", "Not Applicable", false);
+    
     public static final Importance ESSENTIAL = new Importance ("ESSENTIAL", "ESSENTIAL", "Essential", false);
     
     public static final Importance HIGHLY_DESIRABLE = new Importance ("HIGHLY_DESIRABLE", "HIGHLY_DESIRABLE", "Highly Desirable", false);
@@ -27,7 +29,7 @@ public class Importance extends AbstractEnumerated
     public static final Importance DESIRABLE = new Importance ("DESIRABLE", "DESIRABLE", "Desirable", false);
 
     private static final Importance[] allImportances =
-        new Importance[] { ESSENTIAL,HIGHLY_DESIRABLE,DESIRABLE};
+        new Importance[] { NOT_APPLICABLE,ESSENTIAL,HIGHLY_DESIRABLE,DESIRABLE};
 
 
     private static Importance[] getAllImportances ()
@@ -35,11 +37,18 @@ public class Importance extends AbstractEnumerated
         return allImportances;
     }
 
+    private transient boolean ConsiderForAssessment;
+
     private Importance (String name, String value, String description, boolean disabled)
     {
         super (name, value, description, disabled);
     }
 
+    public boolean getConsiderForAssessment()
+    {
+    return ConsiderForAssessment;
+    }
+    
     public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allImportances);
 
 
@@ -107,6 +116,10 @@ public class Importance extends AbstractEnumerated
 
     public static void defineAdditionalData ()
     {
+        NOT_APPLICABLE.ConsiderForAssessment = false;
+        ESSENTIAL.ConsiderForAssessment = true;
+        HIGHLY_DESIRABLE.ConsiderForAssessment = true;
+        DESIRABLE.ConsiderForAssessment = true;
         
     }
 
@@ -134,6 +147,7 @@ public class Importance extends AbstractEnumerated
     {
         Map attribs = new HashMap ();
 
+        attribs.put ("ConsiderForAssessment", ArrayFormatter.toObject(getConsiderForAssessment()));
         
         return attribs;
     }

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

@@ -3,9 +3,12 @@
 <ROOT>
     <CONSTANT package="performa.orm.types"  name="Importance">
         
-        <VALUE name="ESSENTIAL"         description="Essential"/>
-        <VALUE name="HIGHLY_DESIRABLE"  description="Highly Desirable"/>
-        <VALUE name="DESIRABLE"         description="Desirable"/>
+        <DATA   name="ConsiderForAssessment"    type="boolean"  />
+                
+        <VALUE name="NOT_APPLICABLE"    description="Not Applicable"    ConsiderForAssessment="false"/>
+        <VALUE name="ESSENTIAL"         description="Essential"         ConsiderForAssessment="true"/>
+        <VALUE name="HIGHLY_DESIRABLE"  description="Highly Desirable"  ConsiderForAssessment="true"/>
+        <VALUE name="DESIRABLE"         description="Desirable"         ConsiderForAssessment="true"/>
         
     </CONSTANT>
 </ROOT>
\ No newline at end of file

cmsWebApp/src/performa/utils/Utils.java

 package performa.utils;
 
+import java.util.*;
 import oneit.objstore.ObjectTransaction;
 import oneit.security.*;
+import performa.orm.types.Importance;
 
 /**
  *
@@ -27,4 +29,18 @@ public class Utils
     {
         return (secUser != null && secUser.hasPrivilege(PRIV_ACCESS_ADMIN_PORTAL));
     }
+    
+    public static Importance[] getImportancesForAssessment()
+    {
+        List<Importance>    importances =   new ArrayList<>();
+        
+        for(Importance importance : Importance.getImportanceArray())
+        {
+            if(importance.getConsiderForAssessment())
+            {
+                importances.add(importance);
+            }
+        }
+        return importances.toArray(new Importance[0]);
+    }
 }

cmsWebApp/webroot/extensions/adminportal/inc/job_assessment_criteria_add.jsp

@@ -42,7 +42,7 @@
             
             <oneit:ormInput obj="<%= criteria %>"  type="text" attributeName="Name"    cssClass="form-control" />
             <%
-                for(Importance importance : Importance.getImportanceArray())
+                for(Importance importance : Utils.getImportancesForAssessment())
                 {
                     boolean isSelected  = CollectionUtils.equals(formValue, importance.getName());
                     String  id          = "importance_" + importance.getName();

cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp

@@ -10,7 +10,7 @@
     
     Debug.assertion(job != null, "Job is null in admin portal create job");
 %>
-    <oneit:form name="editJob" method="post" enctype="multipart/form-data" action="<%= fifthPage %>">
+    <oneit:form name="editJob" method="post" enctype="multipart/form-data">
         
         <div class="container-fluid">
             

cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt

@@ -3,3 +3,4 @@ Job.JobTitle        = Job Title
 Job.JobDescription  =   Job Description
 
 CultureCriteria.Importance              =   Rate Importance
+CultureCriteria.CultureElementRating    =   Rating