Added job type and removed 'active for 30 days' text from job creation pages

cmsWebApp/sql/Job.xml

@@ -15,6 +15,7 @@
 			<column name="include_assessment_criteria" type="Boolean" nullable="false"/>
 			<column name="assessment_type" type="String" nullable="false" length="200"/>
 			<column name="random_key" type="String" nullable="true" length="10"/>
+			<column name="job_type" type="String" nullable="false" length="200"/>
 			<column name="level_id" type="Long" length="11" nullable="false"/>
 			<column name="secuser_id" type="Long" length="11" nullable="true"/>
 			</NODE>

cmsWebApp/sql/ms/Job.sql

@@ -15,6 +15,7 @@ CREATE TABLE tl_job (
     include_assessment_criteria char(1) NOT NULL,
     assessment_type varchar(200) NOT NULL,
     random_key varchar(10) NULL,
+    job_type varchar(200) NOT NULL,
     level_id numeric(12)  NOT NULL,
     secuser_id numeric(12)  NULL
     );

cmsWebApp/sql/oracle/Job.sql

@@ -16,6 +16,7 @@ CREATE TABLE tl_job (
     include_assessment_criteria char(1) NOT NULL,
     assessment_type varchar2(200) NOT NULL,
     random_key varchar2(10) NULL,
+    job_type varchar2(200) NOT NULL,
     level_id number(12)  NOT NULL,
     secuser_id number(12)  NULL
     );

cmsWebApp/sql/postgres/Job.sql

@@ -16,6 +16,7 @@ CREATE TABLE tl_job (
     include_assessment_criteria char(1) NOT NULL,
     assessment_type varchar(200) NOT NULL,
     random_key varchar(10) NULL,
+    job_type varchar(200) NOT NULL,
     level_id numeric(12)  NOT NULL,
     secuser_id numeric(12)  NULL
     );

cmsWebApp/src/performa/orm/BaseJob.java

@@ -49,6 +49,7 @@ public abstract class BaseJob extends BaseBusinessClass
     public static final String FIELD_IncludeAssessmentCriteria = "IncludeAssessmentCriteria";
     public static final String FIELD_AssessmentType = "AssessmentType";
     public static final String FIELD_RandomKey = "RandomKey";
+    public static final String FIELD_JobType = "JobType";
     public static final String FIELD_Email = "Email";
     public static final String FIELD_CompletedDetails = "CompletedDetails";
     public static final String FIELD_CompletedRequirements = "CompletedRequirements";
@@ -83,6 +84,7 @@ public abstract class BaseJob extends BaseBusinessClass
     private static final DefaultAttributeHelper<Job> HELPER_IncludeAssessmentCriteria = DefaultAttributeHelper.INSTANCE;
     private static final EnumeratedAttributeHelper<Job, AssessmentType> HELPER_AssessmentType =  new EnumeratedAttributeHelper<Job, AssessmentType> (AssessmentType.FACTORY_AssessmentType);
     private static final DefaultAttributeHelper<Job> HELPER_RandomKey = DefaultAttributeHelper.INSTANCE;
+    private static final EnumeratedAttributeHelper<Job, JobType> HELPER_JobType =  new EnumeratedAttributeHelper<Job, JobType> (JobType.FACTORY_JobType);
     private static final DefaultAttributeHelper<Job> HELPER_Email = DefaultAttributeHelper.INSTANCE;
     private static final DefaultAttributeHelper<Job> HELPER_CompletedDetails = DefaultAttributeHelper.INSTANCE;
     private static final DefaultAttributeHelper<Job> HELPER_CompletedRequirements = DefaultAttributeHelper.INSTANCE;
@@ -102,6 +104,7 @@ public abstract class BaseJob extends BaseBusinessClass
     private Boolean _IncludeAssessmentCriteria;
     private AssessmentType _AssessmentType;
     private String _RandomKey;
+    private JobType _JobType;
     private String _Email;
     private Boolean _CompletedDetails;
     private Boolean _CompletedRequirements;
@@ -147,6 +150,7 @@ public abstract class BaseJob extends BaseBusinessClass
     private static final AttributeValidator[] FIELD_IncludeAssessmentCriteria_Validators;
     private static final AttributeValidator[] FIELD_AssessmentType_Validators;
     private static final AttributeValidator[] FIELD_RandomKey_Validators;
+    private static final AttributeValidator[] FIELD_JobType_Validators;
     
 
     // Arrays of behaviour decorators
@@ -187,6 +191,7 @@ public abstract class BaseJob extends BaseBusinessClass
             FIELD_IncludeAssessmentCriteria_Validators = (AttributeValidator[])setupAttribMetaData_IncludeAssessmentCriteria(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_AssessmentType_Validators = (AttributeValidator[])setupAttribMetaData_AssessmentType(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_RandomKey_Validators = (AttributeValidator[])setupAttribMetaData_RandomKey(validatorMapping).toArray (new AttributeValidator[0]);
+            FIELD_JobType_Validators = (AttributeValidator[])setupAttribMetaData_JobType(validatorMapping).toArray (new AttributeValidator[0]);
             
 
             REFERENCE_Job.initialiseReference ();
@@ -609,6 +614,27 @@ public abstract class BaseJob extends BaseBusinessClass
         return validators;
     }
     
+    // Meta Info setup
+    private static List setupAttribMetaData_JobType(Map validatorMapping)
+    {
+        Map  metaInfo   = new HashMap ();
+
+        metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
+        metaInfo.put ("dbcol", "job_type");
+        metaInfo.put ("defaultValue", "JobType.FULL_TIME");
+        metaInfo.put ("mandatory", "true");
+        metaInfo.put ("name", "JobType");
+        metaInfo.put ("type", "JobType");
+        
+        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.JobType:", metaInfo);
+        ATTRIBUTES_METADATA_Job.put (FIELD_JobType, Collections.unmodifiableMap (metaInfo));
+
+        List validators = BaseBusinessClass.getAttribValidators(Job.class, "JobType", metaInfo, validatorMapping);
+        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.JobType:", validators);        
+
+        return validators;
+    }
+    
     // END OF STATIC METADATA DEFINITION    
     
     
@@ -643,6 +669,7 @@ public abstract class BaseJob extends BaseBusinessClass
         _IncludeAssessmentCriteria = (Boolean)(Boolean.TRUE);
         _AssessmentType = (AssessmentType)(AssessmentType.COMPREHENSIVE);
         _RandomKey = (String)(HELPER_RandomKey.initialise (_RandomKey));
+        _JobType = (JobType)(JobType.FULL_TIME);
         _Email = (String)(HELPER_Email.initialise (_Email));
         _CompletedDetails = (Boolean)(Boolean.FALSE);
         _CompletedRequirements = (Boolean)(Boolean.FALSE);
@@ -1384,6 +1411,105 @@ public abstract class BaseJob extends BaseBusinessClass
     }
 
     /**
+     * Get the attribute JobType
+     */
+    public JobType getJobType ()
+    {
+        assertValid();
+        JobType valToReturn = _JobType;
+
+            for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
+            {
+                valToReturn = bhd.getJobType ((Job)this, valToReturn);
+            }
+            
+            return valToReturn;
+        
+    }
+
+
+    /**
+     * 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 preJobTypeChange (JobType newJobType) throws FieldException
+    {
+    }
+
+
+    /**
+     * Called after the attribute changes.
+     * If a field exception is thrown, the value is still changed, however it 
+     * may lead to the TX being rolled back
+     */
+    protected void postJobTypeChange () throws FieldException
+    {
+    }
+
+    
+    public FieldWriteability getWriteability_JobType ()
+    {
+        return getFieldWritabilityUtil (FieldWriteability.TRUE);
+    }
+
+    /**
+     * Set the attribute JobType.  Checks to ensure a new value
+     * has been supplied.  If so, marks the field as altered and sets the attribute.
+     */
+    public void setJobType (JobType newJobType) throws FieldException
+    {
+        boolean oldAndNewIdentical = HELPER_JobType.compare (_JobType, newJobType);
+        
+        try
+        {
+            for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
+            {
+                newJobType = bhd.setJobType ((Job)this, newJobType);
+                oldAndNewIdentical = HELPER_JobType.compare (_JobType, newJobType);
+            }
+
+            BusinessObjectParser.assertFieldCondition (newJobType != null, this, FIELD_JobType, "mandatory");
+            
+
+            if (FIELD_JobType_Validators.length > 0)
+            {
+                Object newJobTypeObj = HELPER_JobType.toObject (newJobType);
+
+                if (newJobTypeObj != null)
+                {
+                    int     loopMax = FIELD_JobType_Validators.length;
+                    Map     metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_JobType);
+
+                    for (int v = 0 ; v < loopMax ; ++v)
+                    {
+                        FIELD_JobType_Validators[v].checkAttribute (this, FIELD_JobType, metadata, newJobTypeObj);
+                    }
+                }
+            }
+        }
+        catch (FieldException e)
+        {
+            if (!oldAndNewIdentical)
+            {
+                e.setWouldModify ();
+            }
+            
+            throw e;
+        }
+
+        if (!oldAndNewIdentical)
+        {
+            assertValid();
+            Debug.assertion (getWriteability_JobType () != FieldWriteability.FALSE, "Field  JobType is not writeable");
+            preJobTypeChange (newJobType);
+            markFieldChange (FIELD_JobType);
+            _JobType = newJobType;            
+            postFieldChange (FIELD_JobType);
+            postJobTypeChange ();
+        }
+    }
+
+    /**
      * Get the attribute Email
      */
     public String getEmail ()
@@ -3458,6 +3584,7 @@ public abstract class BaseJob extends BaseBusinessClass
         tl_jobPSet.setAttrib (FIELD_IncludeAssessmentCriteria, HELPER_IncludeAssessmentCriteria.toObject (_IncludeAssessmentCriteria)); //
         tl_jobPSet.setAttrib (FIELD_AssessmentType, HELPER_AssessmentType.toObject (_AssessmentType)); //
         tl_jobPSet.setAttrib (FIELD_RandomKey, HELPER_RandomKey.toObject (_RandomKey)); //
+        tl_jobPSet.setAttrib (FIELD_JobType, HELPER_JobType.toObject (_JobType)); //
         _Level.getPersistentSets (allSets);
         _SecUser.getPersistentSets (allSets);
         
@@ -3481,6 +3608,7 @@ public abstract class BaseJob extends BaseBusinessClass
         _IncludeAssessmentCriteria = (Boolean)(HELPER_IncludeAssessmentCriteria.fromObject (_IncludeAssessmentCriteria, tl_jobPSet.getAttrib (FIELD_IncludeAssessmentCriteria))); //
         _AssessmentType = (AssessmentType)(HELPER_AssessmentType.fromObject (_AssessmentType, tl_jobPSet.getAttrib (FIELD_AssessmentType))); //
         _RandomKey = (String)(HELPER_RandomKey.fromObject (_RandomKey, tl_jobPSet.getAttrib (FIELD_RandomKey))); //
+        _JobType = (JobType)(HELPER_JobType.fromObject (_JobType, tl_jobPSet.getAttrib (FIELD_JobType))); //
         _Level.setFromPersistentSets (objectID, allSets);
         _SecUser.setFromPersistentSets (objectID, allSets);
         
@@ -3561,6 +3689,15 @@ public abstract class BaseJob extends BaseBusinessClass
                 e.addException (ex);
             }
             
+            try
+            {
+                setJobType (otherJob.getJobType ());
+            }
+            catch (FieldException ex)
+            {
+                e.addException (ex);
+            }
+            
         }
     }
 
@@ -3583,6 +3720,7 @@ public abstract class BaseJob extends BaseBusinessClass
             _IncludeAssessmentCriteria = sourceJob._IncludeAssessmentCriteria;
             _AssessmentType = sourceJob._AssessmentType;
             _RandomKey = sourceJob._RandomKey;
+            _JobType = sourceJob._JobType;
             _Email = sourceJob._Email;
             _CompletedDetails = sourceJob._CompletedDetails;
             _CompletedRequirements = sourceJob._CompletedRequirements;
@@ -3661,6 +3799,7 @@ public abstract class BaseJob extends BaseBusinessClass
         _IncludeAssessmentCriteria = (Boolean)(HELPER_IncludeAssessmentCriteria.readExternal (_IncludeAssessmentCriteria, vals.get(FIELD_IncludeAssessmentCriteria))); //
         _AssessmentType = (AssessmentType)(HELPER_AssessmentType.readExternal (_AssessmentType, vals.get(FIELD_AssessmentType))); //
         _RandomKey = (String)(HELPER_RandomKey.readExternal (_RandomKey, vals.get(FIELD_RandomKey))); //
+        _JobType = (JobType)(HELPER_JobType.readExternal (_JobType, vals.get(FIELD_JobType))); //
         _Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); //
         _CompletedDetails = (Boolean)(HELPER_CompletedDetails.readExternal (_CompletedDetails, vals.get(FIELD_CompletedDetails))); //
         _CompletedRequirements = (Boolean)(HELPER_CompletedRequirements.readExternal (_CompletedRequirements, vals.get(FIELD_CompletedRequirements))); //
@@ -3696,6 +3835,7 @@ public abstract class BaseJob extends BaseBusinessClass
         vals.put (FIELD_IncludeAssessmentCriteria, HELPER_IncludeAssessmentCriteria.writeExternal (_IncludeAssessmentCriteria));
         vals.put (FIELD_AssessmentType, HELPER_AssessmentType.writeExternal (_AssessmentType));
         vals.put (FIELD_RandomKey, HELPER_RandomKey.writeExternal (_RandomKey));
+        vals.put (FIELD_JobType, HELPER_JobType.writeExternal (_JobType));
         vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email));
         vals.put (FIELD_CompletedDetails, HELPER_CompletedDetails.writeExternal (_CompletedDetails));
         vals.put (FIELD_CompletedRequirements, HELPER_CompletedRequirements.writeExternal (_CompletedRequirements));
@@ -3754,6 +3894,10 @@ public abstract class BaseJob extends BaseBusinessClass
             {
                 listener.notifyFieldChange(this, other, FIELD_RandomKey, HELPER_RandomKey.toObject(this._RandomKey), HELPER_RandomKey.toObject(otherJob._RandomKey));
             }
+            if (!HELPER_JobType.compare(this._JobType, otherJob._JobType))
+            {
+                listener.notifyFieldChange(this, other, FIELD_JobType, HELPER_JobType.toObject(this._JobType), HELPER_JobType.toObject(otherJob._JobType));
+            }
 
             // Compare single assocs
             _AssessmentTemplate.compare (otherJob._AssessmentTemplate, listener);
@@ -3800,6 +3944,7 @@ public abstract class BaseJob extends BaseBusinessClass
         visitor.visitField(this, FIELD_IncludeAssessmentCriteria, HELPER_IncludeAssessmentCriteria.toObject(getIncludeAssessmentCriteria()));
         visitor.visitField(this, FIELD_AssessmentType, HELPER_AssessmentType.toObject(getAssessmentType()));
         visitor.visitField(this, FIELD_RandomKey, HELPER_RandomKey.toObject(getRandomKey()));
+        visitor.visitField(this, FIELD_JobType, HELPER_JobType.toObject(getJobType()));
         visitor.visitAssociation (_AssessmentTemplate);
         visitor.visitAssociation (_CultureTemplate);
         visitor.visitAssociation (_JobTemplate);
@@ -3901,6 +4046,10 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return filter.matches (getRandomKey ());
         }
+        else if (attribName.equals (FIELD_JobType))
+        {
+            return filter.matches (getJobType ());
+        }
         else if (attribName.equals (SINGLEREFERENCE_Level))
         {
             return filter.matches (getLevel ());
@@ -3982,6 +4131,12 @@ public abstract class BaseJob extends BaseBusinessClass
                 return this;
             }
             
+            public SearchAll andJobType (QueryFilter<JobType> filter)
+            {
+                filter.addFilter (context, "tl_job.job_type", "JobType");
+                return this;
+            }
+            
             public SearchAll andLevel (QueryFilter<Level> filter)
             {
                 filter.addFilter (context, "tl_job.level_id", "Level");
@@ -4099,6 +4254,12 @@ public abstract class BaseJob extends BaseBusinessClass
                 return this;
             }
             
+            public SearchJobKey andJobType (QueryFilter<JobType> filter)
+            {
+                filter.addFilter (context, "tl_job.job_type", "JobType");
+                return this;
+            }
+            
             public SearchJobKey andLevel (QueryFilter<Level> filter)
             {
                 filter.addFilter (context, "tl_job.level_id", "Level");
@@ -4174,6 +4335,10 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return HELPER_RandomKey.toObject (getRandomKey ());
         }
+        else if (attribName.equals (FIELD_JobType))
+        {
+            return HELPER_JobType.toObject (getJobType ());
+        }
         else if (attribName.equals (FIELD_Email))
         {
             return HELPER_Email.toObject (getEmail ());
@@ -4251,6 +4416,10 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return HELPER_RandomKey;
         }
+        else if (attribName.equals (FIELD_JobType))
+        {
+            return HELPER_JobType;
+        }
         else if (attribName.equals (FIELD_Email))
         {
             return HELPER_Email;
@@ -4328,6 +4497,10 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             setRandomKey ((String)(HELPER_RandomKey.fromObject (_RandomKey, attribValue)));            
         }
+        else if (attribName.equals (FIELD_JobType))
+        {
+            setJobType ((JobType)(HELPER_JobType.fromObject (_JobType, attribValue)));            
+        }
         else if (attribName.equals (FIELD_Email))
         {
             setEmail ((String)(HELPER_Email.fromObject (_Email, attribValue)));            
@@ -4412,6 +4585,10 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return getWriteability_RandomKey ();
         }
+        else if (fieldName.equals (FIELD_JobType))
+        {
+            return getWriteability_JobType ();
+        }
         else if (fieldName.equals (MULTIPLEREFERENCE_JobApplications))
         {
             return getWriteability_JobApplications ();
@@ -4525,6 +4702,11 @@ public abstract class BaseJob extends BaseBusinessClass
                 fields.add (FIELD_RandomKey);
             }
         
+            if (getWriteability_JobType () != FieldWriteability.TRUE)
+            {
+                fields.add (FIELD_JobType);
+            }
+        
             if (getWriteability_Email () != FieldWriteability.TRUE)
             {
                 fields.add (FIELD_Email);
@@ -4586,6 +4768,7 @@ public abstract class BaseJob extends BaseBusinessClass
         result.add(HELPER_IncludeAssessmentCriteria.getAttribObject (getClass (), _IncludeAssessmentCriteria, true, FIELD_IncludeAssessmentCriteria));
         result.add(HELPER_AssessmentType.getAttribObject (getClass (), _AssessmentType, true, FIELD_AssessmentType));
         result.add(HELPER_RandomKey.getAttribObject (getClass (), _RandomKey, false, FIELD_RandomKey));
+        result.add(HELPER_JobType.getAttribObject (getClass (), _JobType, true, FIELD_JobType));
         result.add(HELPER_Email.getAttribObject (getClass (), _Email, false, FIELD_Email));
         result.add(HELPER_CompletedDetails.getAttribObject (getClass (), _CompletedDetails, false, FIELD_CompletedDetails));
         result.add(HELPER_CompletedRequirements.getAttribObject (getClass (), _CompletedRequirements, false, FIELD_CompletedRequirements));
@@ -4772,6 +4955,24 @@ public abstract class BaseJob extends BaseBusinessClass
     }
 
     /**
+     * Get the attribute JobType
+     */
+    public JobType getJobType (Job obj, JobType original)
+    {
+        return original;
+    }
+
+    /**
+     * Change the value set for attribute JobType.
+     * May modify the field beforehand
+     * Occurs before validation.
+     */
+    public JobType setJobType (Job obj, JobType newJobType) throws FieldException
+    {
+        return newJobType;
+    }
+
+    /**
      * Get the attribute Email
      */
     public String getEmail (Job obj, String original)
@@ -5073,6 +5274,10 @@ public abstract class BaseJob extends BaseBusinessClass
             {
                 return toRandomKey ();
             }                
+            if (name.equals ("JobType"))
+            {
+                return toJobType ();
+            }                
             if (name.equals ("Level"))
             {
                 return toLevel ();
@@ -5118,6 +5323,8 @@ public abstract class BaseJob extends BaseBusinessClass
         public PipeLine<From, AssessmentType> toAssessmentType () { return pipe(new ORMAttributePipe<Me, AssessmentType>(FIELD_AssessmentType));  }
         
         public PipeLine<From, String> toRandomKey () { return pipe(new ORMAttributePipe<Me, String>(FIELD_RandomKey));  }
+        
+        public PipeLine<From, JobType> toJobType () { return pipe(new ORMAttributePipe<Me, JobType>(FIELD_JobType));  }
         public AssessmentCriteriaTemplate.AssessmentCriteriaTemplatePipeLineFactory<From, AssessmentCriteriaTemplate> toAssessmentTemplate () { return toAssessmentTemplate (Filter.ALL); }
 
         public AssessmentCriteriaTemplate.AssessmentCriteriaTemplatePipeLineFactory<From, AssessmentCriteriaTemplate> toAssessmentTemplate (Filter<AssessmentCriteriaTemplate> filter) 

cmsWebApp/src/performa/orm/Job.xml

@@ -33,6 +33,7 @@
             <ATTRIB name="IncludeAssessmentCriteria"    type="Boolean"          dbcol="include_assessment_criteria" mandatory="true"    defaultValue="Boolean.TRUE"/>
             <ATTRIB name="AssessmentType"               type="AssessmentType"   dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper"    mandatory="true"    defaultValue="AssessmentType.COMPREHENSIVE"/>
             <ATTRIB name="RandomKey"                    type="String"           dbcol="random_key"      length="10"/>
+            <ATTRIB name="JobType"                      type="JobType"          dbcol="job_type"        attribHelper="EnumeratedAttributeHelper"    mandatory="true"    defaultValue="JobType.FULL_TIME"/>
 
             <SINGLEREFERENCE    name="Level"    type="Level"    dbcol="level_id"    mandatory="true"/>
             <SINGLEREFERENCE    name="SecUser"  type="SecUser"  dbcol="secuser_id"  />

cmsWebApp/src/performa/orm/JobPersistenceMgr.java

@@ -35,6 +35,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
     private Boolean dummyIncludeAssessmentCriteria;
     private AssessmentType dummyAssessmentType;
     private String dummyRandomKey;
+    private JobType dummyJobType;
     
 
     // Static constants corresponding to attribute helpers
@@ -45,6 +46,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
     private static final DefaultAttributeHelper HELPER_IncludeAssessmentCriteria = DefaultAttributeHelper.INSTANCE;
     private static final EnumeratedAttributeHelper HELPER_AssessmentType = new EnumeratedAttributeHelper (AssessmentType.FACTORY_AssessmentType);
     private static final DefaultAttributeHelper HELPER_RandomKey = DefaultAttributeHelper.INSTANCE;
+    private static final EnumeratedAttributeHelper HELPER_JobType = new EnumeratedAttributeHelper (JobType.FACTORY_JobType);
     
 
 
@@ -58,10 +60,11 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
         dummyIncludeAssessmentCriteria = (Boolean)(HELPER_IncludeAssessmentCriteria.initialise (dummyIncludeAssessmentCriteria));
         dummyAssessmentType = (AssessmentType)(HELPER_AssessmentType.initialise (dummyAssessmentType));
         dummyRandomKey = (String)(HELPER_RandomKey.initialise (dummyRandomKey));
+        dummyJobType = (JobType)(HELPER_JobType.initialise (dummyJobType));
         
     }
 
-    private String  SELECT_COLUMNS = "{PREFIX}tl_job.object_id as id, {PREFIX}tl_job.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_job.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_job.job_title, {PREFIX}tl_job.job_description, {PREFIX}tl_job.job_status, {PREFIX}tl_job.apply_by, {PREFIX}tl_job.include_assessment_criteria, {PREFIX}tl_job.assessment_type, {PREFIX}tl_job.random_key, {PREFIX}tl_job.level_id, {PREFIX}tl_job.secuser_id,  1 AS commasafe ";
+    private String  SELECT_COLUMNS = "{PREFIX}tl_job.object_id as id, {PREFIX}tl_job.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_job.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_job.job_title, {PREFIX}tl_job.job_description, {PREFIX}tl_job.job_status, {PREFIX}tl_job.apply_by, {PREFIX}tl_job.include_assessment_criteria, {PREFIX}tl_job.assessment_type, {PREFIX}tl_job.random_key, {PREFIX}tl_job.job_type, {PREFIX}tl_job.level_id, {PREFIX}tl_job.secuser_id,  1 AS commasafe ";
     private String SELECT_JOINS = "";
 
     public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
@@ -119,6 +122,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
                     !tl_jobPSet.containsAttrib(Job.FIELD_IncludeAssessmentCriteria)||
                     !tl_jobPSet.containsAttrib(Job.FIELD_AssessmentType)||
                     !tl_jobPSet.containsAttrib(Job.FIELD_RandomKey)||
+                    !tl_jobPSet.containsAttrib(Job.FIELD_JobType)||
                     !tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_Level)||
                     !tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_SecUser))
             {
@@ -190,10 +194,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
             {
                 int rowsUpdated = executeStatement (sqlMgr, 
                                                            "UPDATE {PREFIX}tl_job " +
-                                                           "SET job_title = ?, job_description = ?, job_status = ?, apply_by = ?, include_assessment_criteria = ?, assessment_type = ?, random_key = ?, level_id = ? , secuser_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
+                                                           "SET job_title = ?, job_description = ?, job_status = ?, apply_by = ?, include_assessment_criteria = ?, assessment_type = ?, random_key = ?, job_type = ?, level_id = ? , secuser_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
                                                                 
                                                            "WHERE tl_job.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
-                                                           CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_SecUser)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
+                                                           CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_SecUser)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
 
                 if (rowsUpdated != 1)
                 {
@@ -512,6 +516,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
         tl_jobPSet.setAttrib(Job.FIELD_IncludeAssessmentCriteria, HELPER_IncludeAssessmentCriteria.getFromRS(dummyIncludeAssessmentCriteria, r, "include_assessment_criteria"));
         tl_jobPSet.setAttrib(Job.FIELD_AssessmentType, HELPER_AssessmentType.getFromRS(dummyAssessmentType, r, "assessment_type"));
         tl_jobPSet.setAttrib(Job.FIELD_RandomKey, HELPER_RandomKey.getFromRS(dummyRandomKey, r, "random_key"));
+        tl_jobPSet.setAttrib(Job.FIELD_JobType, HELPER_JobType.getFromRS(dummyJobType, r, "job_type"));
         
         tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_Level, r.getObject ("level_id"));
         tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_SecUser, r.getObject ("secuser_id"));
@@ -531,10 +536,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
         {
             executeStatement (sqlMgr, 
                                      "INSERT INTO {PREFIX}tl_job " +
-                                     "  (job_title, job_description, job_status, apply_by, include_assessment_criteria, assessment_type, random_key,  level_id, secuser_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
+                                     "  (job_title, job_description, job_status, apply_by, include_assessment_criteria, assessment_type, random_key, job_type,  level_id, secuser_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
                                      "VALUES " +
-                                     "  (?, ?, ?, ?, ?, ?, ?,  ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
-                                     CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))) .listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_SecUser)))) .listEntry (objectID.longID ()).toList().toArray());
+                                     "  (?, ?, ?, ?, ?, ?, ?, ?,  ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
+                                     CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))) .listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_SecUser)))) .listEntry (objectID.longID ()).toList().toArray());
 
             tl_jobPSet.setStatus (PersistentSetStatus.PROCESSED);
         }

cmsWebApp/src/performa/orm/types/JobType.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 JobType extends AbstractEnumerated
+{
+    
+    public static final EnumeratedFactory FACTORY_JobType = new JobTypeFactory();
+    
+    public static final JobType FULL_TIME = new JobType ("FULL_TIME", "FULL_TIME", "Full Time", false);
+    
+    public static final JobType PART_TIME = new JobType ("PART_TIME", "PART_TIME", "Part Time", false);
+    
+    public static final JobType CONTRACT = new JobType ("CONTRACT", "CONTRACT", "Contract", false);
+
+    private static final JobType[] allJobTypes =
+        new JobType[] { FULL_TIME,PART_TIME,CONTRACT};
+
+
+    private static JobType[] getAllJobTypes ()
+    {
+        return allJobTypes;
+    }
+
+    private JobType (String name, String value, String description, boolean disabled)
+    {
+        super (name, value, description, disabled);
+    }
+    
+    public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allJobTypes);
+
+
+
+    static
+    {
+        defineAdditionalData ();
+    }
+
+    public boolean isEqual (JobType other)
+    {
+    return this.name.equals (other.name);
+    }
+
+    public Enumeration getAllInstances ()
+    {
+        return JobType.getAll ();
+    }
+
+
+    private Object readResolve() throws java.io.ObjectStreamException
+    {
+        return JobType.forName (this.name);
+    }
+
+
+    public EnumeratedFactory getFactory ()
+    {
+        return FACTORY_JobType;
+    }
+
+    public static JobType forName (String name)
+    {
+        if (name == null) { return null; }
+
+        JobType[] all = getAllJobTypes();
+        int enumIndex = AbstractEnumerated.getIndexForName (all, name);
+
+        return all[enumIndex];
+    }
+
+
+    public static JobType forValue (String value)
+    {
+        if (value == null) { return null; }
+
+        JobType[] all = getAllJobTypes();
+        int enumIndex = AbstractEnumerated.getIndexForValue (getAllJobTypes (), value);
+
+        return all[enumIndex];
+    }
+
+
+    public static java.util.Enumeration getAll ()
+    {
+        return AbstractEnumerated.getAll (getAllJobTypes());
+    }
+    
+    
+    public static JobType[] getJobTypeArray ()
+    {
+        return (JobType[])getAllJobTypes().clone ();
+    }
+
+
+    public static void defineAdditionalData ()
+    {
+        
+    }
+
+
+    static class JobTypeFactory implements EnumeratedFactory
+    {
+        public AbstractEnumerated getForName (String name)
+        {
+            return JobType.forName (name);
+        }
+
+        public AbstractEnumerated getForValue (String name)
+        {
+            return JobType.forValue (name);
+        }
+
+        public Enumeration getAll ()
+        {
+            return JobType.getAll ();
+        }
+    }
+
+
+    public Map getAdditionalAttributes ()
+    {
+        Map attribs = new HashMap ();
+
+        
+        return attribs;
+    }
+}
+

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

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT>
+    <CONSTANT package="performa.orm.types"  name="JobType">
+                
+        <VALUE name="FULL_TIME" value="FULL_TIME"   description="Full Time"/>
+        <VALUE name="PART_TIME" value="PART_TIME"   description="Part Time"/>
+        <VALUE name="CONTRACT"  value="CONTRACT"    description="Contract"/>
+        
+    </CONSTANT>
+</ROOT>
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp

@@ -54,7 +54,7 @@
             
             <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>
             
-            <h1 class="page-title">Create a job <span class="active-time">(Active for 30 days)</span></h1>
+            <h1 class="page-title">Create a job</h1>
 
             <oneit:dynInclude   page="/extensions/adminportal/inc/job_main_tabs.jsp"    PageNumber="4"    data="<%= CollectionUtils.EMPTY_MAP%>"/>
 

cmsWebApp/webroot/extensions/adminportal/job_detail.jsp

@@ -35,7 +35,7 @@
             
             <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>
         
-            <h1 class="page-title">Create a job <span class="active-time">(Active for 30 days)</span> </h1>
+            <h1 class="page-title">Create a job</h1>
 
             <oneit:dynInclude   page="/extensions/adminportal/inc/job_main_tabs.jsp"    PageNumber="1"    data="<%= CollectionUtils.EMPTY_MAP%>"/>
             
@@ -69,7 +69,11 @@
                     </div>
                     <div class="form-group">
                         <label><oneit:ormlabel  obj="<%= job %>"    field="JobDescription" /></label>
-                        <oneit:ormtextarea    obj="<%= job %>"  attributeName="JobDescription"  cssClass="form-control textarea-box"/>
+                        <oneit:ormtextarea  obj="<%= job %>"    attributeName="JobDescription"  cssClass="form-control textarea-box"/>
+                    </div>
+                    <div class="form-group">
+                        <label><oneit:ormlabel  obj="<%= job %>"    field="JobType" /></label>
+                        <oneit:ormEnum  obj="<%= job %>"    attributeName="JobType" cssClass="form-control"/>
                     </div>
                     <div class="form-brack-line"></div>
                     <div class="">

cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp

@@ -30,7 +30,7 @@
             
             <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>
             
-            <h1 class="page-title">Create a job <span class="active-time">(Active for 30 days)</span> </h1>
+            <h1 class="page-title">Create a job</h1>
 
             <oneit:dynInclude   page="/extensions/adminportal/inc/job_main_tabs.jsp"    PageNumber="2"    data="<%= CollectionUtils.EMPTY_MAP%>"/>
 

cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp

@@ -61,7 +61,7 @@
                  
             <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>
             
-            <h1 class="page-title">Create a job <span class="active-time">(Active for 30 days)</span> </h1>
+            <h1 class="page-title">Create a job</h1>
        
             <oneit:dynInclude   page="/extensions/adminportal/inc/job_main_tabs.jsp"    PageNumber="3"    data="<%= CollectionUtils.EMPTY_MAP%>"/>
             

cmsWebApp/webroot/extensions/performa/upgrades/20170721_Alter_Job.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- @AutoRun -->
+
+<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
+    <NODE name="Script" factory="Vector">
+
+        <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
+            <tableName factory="String">tl_job</tableName>
+            
+            <column name="job_type" type="String" nullable="true" length="200"/>
+            
+        </NODE>
+
+    </NODE>
+</OBJECTS>
\ No newline at end of file