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