adding location details to J003, J005, J008, C001

cmsWebApp/sql/Job.xml

@@ -19,6 +19,10 @@
 			<column name="job_type" type="String" nullable="false" length="200"/>
 			<column name="ref_number" type="String" nullable="true" length="100"/>
 			<column name="last_status_change_date" type="Date" nullable="true"/>
+			<column name="remote" type="Boolean" nullable="true"/>
+			<column name="city" type="String" nullable="true" length="100"/>
+			<column name="state" type="String" nullable="true" length="200"/>
+			<column name="country" type="String" nullable="true" 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

@@ -19,6 +19,10 @@ CREATE TABLE tl_job (
     job_type varchar(200) NOT NULL,
     ref_number varchar(100) NULL,
     last_status_change_date datetime NULL,
+    remote char(1) NULL,
+    city varchar(100) NULL,
+    state varchar(200) NULL,
+    country varchar(200) NULL,
     level_id numeric(12)  NOT NULL,
     secuser_id numeric(12)  NULL
     );

cmsWebApp/sql/oracle/Job.sql

@@ -20,6 +20,10 @@ CREATE TABLE tl_job (
     job_type varchar2(200) NOT NULL,
     ref_number varchar2(100) NULL,
     last_status_change_date date NULL,
+    remote char(1) NULL,
+    city varchar2(100) NULL,
+    state varchar2(200) NULL,
+    country varchar2(200) NULL,
     level_id number(12)  NOT NULL,
     secuser_id number(12)  NULL
     );

cmsWebApp/sql/postgres/Job.sql

@@ -20,6 +20,10 @@ CREATE TABLE tl_job (
     job_type varchar(200) NOT NULL,
     ref_number varchar(100) NULL,
     last_status_change_date timestamp NULL,
+    remote char(1) NULL,
+    city varchar(100) NULL,
+    state varchar(200) NULL,
+    country varchar(200) NULL,
     level_id numeric(12)  NOT NULL,
     secuser_id numeric(12)  NULL
     );

cmsWebApp/src/performa/orm/Job.java

@@ -370,4 +370,32 @@ public class Job extends BaseJob
         
         return title.toString();
     }
+    
+    
+    public String getLocation()
+    {
+        StringBuilder   location    = new StringBuilder();
+        
+        if(getCity() != null)
+        {
+            location.append(getCity()).append(", ");
+        }
+        
+        if(getState() != null)
+        {
+            location.append(getState().getDescription()).append(", ");
+        }
+        
+        if(getCountry() != null)
+        {
+            location.append(getCountry().getDescription()).append(".");
+        }
+        
+        if(getRemote() != null && getRemote())
+        {
+            location.append(" (Remote OK)");
+        }
+        
+        return location.toString(); 
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Job.xml

@@ -5,7 +5,8 @@
     <BUSINESSCLASS  name="Job"  package="performa.orm">
         <IMPORT value="performa.orm.types.*"/>    
         <IMPORT value="oneit.security.*"/>
-                
+        <IMPORT value="oneit.business.shopping.orm.*"/>
+
         <MULTIPLEREFERENCE  name="JobApplications"      type="JobApplication"       backreferenceName="Job" />
         <MULTIPLEREFERENCE  name="AssessmentCriterias"  type="AssessmentCriteria"   backreferenceName="Job" />
         <MULTIPLEREFERENCE  name="CultureCriterias"     type="CultureCriteria"      backreferenceName="Job" />
@@ -38,6 +39,10 @@
             <ATTRIB name="JobType"                      type="JobType"          dbcol="job_type"        attribHelper="EnumeratedAttributeHelper"    mandatory="true"    defaultValue="JobType.FULL_TIME"/>
             <ATTRIB name="ReferenceNumber"              type="String"           dbcol="ref_number"      length="100"/>
             <ATTRIB name="LastStatusChangeDate"         type="Date"             dbcol="last_status_change_date"/>
+            <ATTRIB name="Remote"                       type="Boolean"          dbcol="remote"          defaultValue="Boolean.FALSE"/>
+            <ATTRIB name="City"                         type="String"           dbcol="city"            length="100"/>
+            <ATTRIB name="State"                        type="State"            dbcol="state"           defaultValue="State.WA"     attribHelper="EnumeratedAttributeHelper"/>
+            <ATTRIB name="Country"                      type="Countries"        dbcol="country"         defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
 
             <SINGLEREFERENCE    name="Level"    type="Level"    dbcol="level_id"    mandatory="true"/>
             <SINGLEREFERENCE    name="SecUser"  type="SecUser"  dbcol="secuser_id"  />

cmsWebApp/src/performa/orm/types/State.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 State extends AbstractEnumerated
+{
+    
+    public static final EnumeratedFactory FACTORY_State = new StateFactory();
+    
+    public static final State WA = new State ("WA", "WA", "Western Australia", false);
+    
+    public static final State NSW = new State ("NSW", "NSW", "New South Wales", false);
+    
+    public static final State VIC = new State ("VIC", "VIC", "Victoria", false);
+    
+    public static final State TAS = new State ("TAS", "TAS", "Tasmania", false);
+    
+    public static final State QLD = new State ("QLD", "QLD", "Queensland", false);
+    
+    public static final State SA = new State ("SA", "SA", "South Australia", false);
+    
+    public static final State ACT = new State ("ACT", "ACT", "Australian Capital Territory", false);
+    
+    public static final State NT = new State ("NT", "NT", "Northern Territory", false);
+    
+    public static final State OS = new State ("OS", "OS", "Outside Australia", false);
+
+    private static final State[] allStates =
+        new State[] { WA,NSW,VIC,TAS,QLD,SA,ACT,NT,OS};
+
+
+    private static State[] getAllStates ()
+    {
+        return allStates;
+    }
+
+    private State (String name, String value, String description, boolean disabled)
+    {
+        super (name, value, description, disabled);
+    }
+    
+    public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allStates);
+
+
+
+    static
+    {
+        defineAdditionalData ();
+    }
+
+    public boolean isEqual (State other)
+    {
+    return this.name.equals (other.name);
+    }
+
+    public Enumeration getAllInstances ()
+    {
+        return State.getAll ();
+    }
+
+
+    private Object readResolve() throws java.io.ObjectStreamException
+    {
+        return State.forName (this.name);
+    }
+
+
+    public EnumeratedFactory getFactory ()
+    {
+        return FACTORY_State;
+    }
+
+    public static State forName (String name)
+    {
+        if (name == null) { return null; }
+
+        State[] all = getAllStates();
+        int enumIndex = AbstractEnumerated.getIndexForName (all, name);
+
+        return all[enumIndex];
+    }
+
+
+    public static State forValue (String value)
+    {
+        if (value == null) { return null; }
+
+        State[] all = getAllStates();
+        int enumIndex = AbstractEnumerated.getIndexForValue (getAllStates (), value);
+
+        return all[enumIndex];
+    }
+
+
+    public static java.util.Enumeration getAll ()
+    {
+        return AbstractEnumerated.getAll (getAllStates());
+    }
+    
+    
+    public static State[] getStateArray ()
+    {
+        return (State[])getAllStates().clone ();
+    }
+
+
+    public static void defineAdditionalData ()
+    {
+        
+    }
+
+
+    static class StateFactory implements EnumeratedFactory
+    {
+        public AbstractEnumerated getForName (String name)
+        {
+            return State.forName (name);
+        }
+
+        public AbstractEnumerated getForValue (String name)
+        {
+            return State.forValue (name);
+        }
+
+        public Enumeration getAll ()
+        {
+            return State.getAll ();
+        }
+    }
+
+
+    public Map getAdditionalAttributes ()
+    {
+        Map attribs = new HashMap ();
+
+        
+        return attribs;
+    }
+}
+

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

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT>
+    <CONSTANT package="performa.orm.types" name="State">  
+                     
+        <VALUE name="WA"    value="WA"  description="Western Australia"/>
+        <VALUE name="NSW"   value="NSW" description="New South Wales"/>
+        <VALUE name="VIC"   value="VIC" description="Victoria"/>
+        <VALUE name="TAS"   value="TAS" description="Tasmania"/>
+        <VALUE name="QLD"   value="QLD" description="Queensland"/>
+        <VALUE name="SA"    value="SA"  description="South Australia"/>
+        <VALUE name="ACT"   value="ACT" description="Australian Capital Territory"/>
+        <VALUE name="NT"    value="NT"  description="Northern Territory"/>
+        <VALUE name="OS"    value="OS"  description="Outside Australia"/>
+        
+    </CONSTANT>
+</ROOT>
\ No newline at end of file

cmsWebApp/src/performa/orm/types/StateType.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 StateType extends AbstractEnumerated
+{
+    
+    public static final EnumeratedFactory FACTORY_StateType = new StateTypeFactory();
+    
+    public static final StateType WA = new StateType ("WA", "WA", "Western Australia", false);
+    
+    public static final StateType NSW = new StateType ("NSW", "NSW", "New South Wales", false);
+    
+    public static final StateType VIC = new StateType ("VIC", "VIC", "Victoria", false);
+    
+    public static final StateType TAS = new StateType ("TAS", "TAS", "Tasmania", false);
+    
+    public static final StateType QLD = new StateType ("QLD", "QLD", "Queensland", false);
+    
+    public static final StateType SA = new StateType ("SA", "SA", "South Australia", false);
+    
+    public static final StateType ACT = new StateType ("ACT", "ACT", "Australian Capital Territory", false);
+    
+    public static final StateType NT = new StateType ("NT", "NT", "Northern Territory", false);
+    
+    public static final StateType OS = new StateType ("OS", "OS", "Outside Australia", false);
+
+    private static final StateType[] allStateTypes =
+        new StateType[] { WA,NSW,VIC,TAS,QLD,SA,ACT,NT,OS};
+
+
+    private static StateType[] getAllStateTypes ()
+    {
+        return allStateTypes;
+    }
+
+    private StateType (String name, String value, String description, boolean disabled)
+    {
+        super (name, value, description, disabled);
+    }
+    
+    public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allStateTypes);
+
+
+
+    static
+    {
+        defineAdditionalData ();
+    }
+
+    public boolean isEqual (StateType other)
+    {
+    return this.name.equals (other.name);
+    }
+
+    public Enumeration getAllInstances ()
+    {
+        return StateType.getAll ();
+    }
+
+
+    private Object readResolve() throws java.io.ObjectStreamException
+    {
+        return StateType.forName (this.name);
+    }
+
+
+    public EnumeratedFactory getFactory ()
+    {
+        return FACTORY_StateType;
+    }
+
+    public static StateType forName (String name)
+    {
+        if (name == null) { return null; }
+
+        StateType[] all = getAllStateTypes();
+        int enumIndex = AbstractEnumerated.getIndexForName (all, name);
+
+        return all[enumIndex];
+    }
+
+
+    public static StateType forValue (String value)
+    {
+        if (value == null) { return null; }
+
+        StateType[] all = getAllStateTypes();
+        int enumIndex = AbstractEnumerated.getIndexForValue (getAllStateTypes (), value);
+
+        return all[enumIndex];
+    }
+
+
+    public static java.util.Enumeration getAll ()
+    {
+        return AbstractEnumerated.getAll (getAllStateTypes());
+    }
+    
+    
+    public static StateType[] getStateTypeArray ()
+    {
+        return (StateType[])getAllStateTypes().clone ();
+    }
+
+
+    public static void defineAdditionalData ()
+    {
+        
+    }
+
+
+    static class StateTypeFactory implements EnumeratedFactory
+    {
+        public AbstractEnumerated getForName (String name)
+        {
+            return StateType.forName (name);
+        }
+
+        public AbstractEnumerated getForValue (String name)
+        {
+            return StateType.forValue (name);
+        }
+
+        public Enumeration getAll ()
+        {
+            return StateType.getAll ();
+        }
+    }
+
+
+    public Map getAdditionalAttributes ()
+    {
+        Map attribs = new HashMap ();
+
+        
+        return attribs;
+    }
+}
+

cmsWebApp/webroot/extensions/adminportal/edit_job.jsp

@@ -82,6 +82,16 @@
                                     <div class="form-group">
                                         <label class="label-16">Culture</label>
                                     </div>
+                                    <div class="form-group">
+                                        <div class="row main-review-label">
+                                            <div class="col-sm-3 col-xs-12 review-label">
+                                                <label><oneit:label GUIName="Location" /></label>
+                                            </div>
+                                            <div class="col-sm-9 col-xs-12 review-data">
+                                                <oneit:toString value="<%= job.getLocation() %>" mode="EscapeHTML"/> 
+                                            </div>
+                                        </div>
+                                    </div>
                                 <%
                                     for(CultureClass cultureClass : CultureClass.getCultureClassArray())
                                     {

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

@@ -59,6 +59,7 @@
             
             <span class="edit-btn-dropdown">
                 <oneit:button   value="Share"   cssClass="leftbtn"  name="gotoPage" skin="link"
+                                disabled="<%= job.getJobStatus() != JobStatus.OPEN ? "true" : "false" %>"
                                 requestAttribs="<%= CollectionUtils.mapEntry("nextPage", sharePage + "&JobID=" + job.getObjectID())
                                                                 .mapEntry("cancelProcess", true)
                                                                 .toMap() %>"/>

cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp

@@ -58,14 +58,6 @@
                     </div>
                     <div class="form-group">
                         <div class="row main-review-label">
-                            <div class="col-sm-3 col-xs-12 review-label">
-                                <oneit:label GUIName="Job Type" />
-                            </div>
-                            <div class="col-sm-9 col-xs-12 review-data">
-                                <oneit:toString value="<%= job.getLevel() %>"   mode="EscapeHTML" />
-                            </div>
-                        </div>
-                        <div class="row main-review-label">
                             <div class="col-sm-3 col-xs-12 review-label">Client</div>
                             <div class="col-sm-9 col-xs-12 review-data">Australia Post</div>
                         </div>
@@ -80,7 +72,6 @@
                     </div>
                     <div class="form-brack-line-sub"></div>
                     
-                    
                     <div class="form-group">
                         <label class="label-16">Job Match Assessment</label>
                         <oneit:button   value="EDIT"   name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right"   skin="link"
@@ -88,11 +79,19 @@
                                                                     .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
                                                                     .toMap() %>"/>
                         
-                        <div class="form-group">              
-                            <div class="beloning job-match-ass">
-                                <oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/> 
+                    </div>
+                    <div class="form-group">              
+                        <div class="row main-review-label">
+                            <div class="col-sm-3 col-xs-12 review-label">
+                                <oneit:label GUIName="Job Type" />
+                            </div>
+                            <div class="col-sm-9 col-xs-12 review-data">
+                                <oneit:toString value="<%= job.getLevel() %>"   mode="EscapeHTML" />
                             </div>
                         </div>
+                        <div class="beloning job-match-ass">
+                            <oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/> 
+                        </div>
                     </div>
                     <div class="form-brack-line-sub"></div>
                     
@@ -103,6 +102,16 @@
                                                                     .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
                                                                     .toMap() %>"/>
                     </div>
+                    <div class="form-group">
+                        <div class="row main-review-label">
+                            <div class="col-sm-3 col-xs-12 review-label">
+                                <label><oneit:label GUIName="Location" /></label>
+                            </div>
+                            <div class="col-sm-9 col-xs-12 review-data">
+                                <oneit:toString value="<%= job.getLocation() %>" mode="EscapeHTML"/> 
+                            </div>
+                        </div>
+                    </div>
                     <%
                         for(CultureClass cultureClass : CultureClass.getCultureClassArray())
                         {
@@ -168,13 +177,13 @@
                     <%  }   %>
                     
                     <div class="text-center">
-                        <oneit:button   value="Save and go to your jobs"    name="save" cssClass="btn btn-primary btn-green largeBtn"
+                        <oneit:button   value="Save and go to your jobs"    name="save" cssClass="btn btn-primary btn-green largeBtn"   
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
                                                                         .mapEntry ("restartProcess", Boolean.TRUE)
                                                                         .mapEntry ("attribNamesToRestore", Collections.singleton("Job"))
                                                                         .toMap() %>" />
                         
-                        <oneit:button   value="Confirm and make payment"    name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn"
+                        <oneit:button   value="Open Job"    name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn"
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
                                                                         .mapEntry ("restartProcess", Boolean.TRUE)
                                                                         .mapEntry ("attribNamesToRestore", Collections.singleton("Job"))

cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp

@@ -86,13 +86,45 @@
                             if(templates.length > 0)
                             {
                         %>
-                                <div class="form-group wider-select">
+                                <div class="form-group row wider-select">
+                                    <div class="col-md-12">
                                     <tagfile:ormsingleasso_select   obj="<%= job %>"    assocName="CultureTemplate" options="<%= templates %>"  
                                                                     blankValue="Optional: Select from previously defined Cultures"/>
+                                    </div>
                                 </div>              
                         <%
                             }
                         %>
+                        <div class="form-group row">
+                            <div class="col-md-4">
+                                <label><oneit:ormlabel  obj="<%= job %>"    field="Country" /></label>
+                                <oneit:ormEnum  obj="<%= job %>"    attributeName="Country" cssClass="form-control"/>
+                            </div>
+                            <div class="col-md-4">
+                                <label><oneit:ormlabel  obj="<%= job %>"    field="State" /></label>
+                                <oneit:ormEnum  obj="<%= job %>"    attributeName="State" cssClass="form-control"/>
+                            </div>
+                            <div class="col-md-4">
+                                <label><oneit:ormlabel  obj="<%= job %>"    field="City" /></label>
+                                <oneit:ormInput obj="<%= job %>"    type="text" attributeName="City"    cssClass="form-control" />      
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <div class="col-md-4">
+                            <div class="styled_checkboxes">
+                            <div class="checkbox checkbox-primary">
+                                <oneit:ormInput obj="<%= job %>"  id="is-remote"    attributeName="Remote"  type="checkbox"/>
+                                <oneit:recalcClass  htmlTag="span"  classScript="job.getRemote() != null && job.getRemote() ? 'checked': 'unchecked'"    job="<%= job %>">
+                                    <label for="is-remote">
+                                        <oneit:label GUIName="Remote?" />
+                                    </label>
+                                </oneit:recalcClass>
+                            </div>
+                        </div>
+                        </div>
+                        </div>
+                        
+                        
                         <div class="form-brack-line-sub"></div> 
                     <%
                         FormTag     jobForm     = FormTag.getActiveFormTag(request);

cmsWebApp/webroot/extensions/applicantportal/job_overview.jsp

@@ -45,15 +45,15 @@
                 <tbody>
                     <tr>
                         <td class="pos-tabel-td">Location:</td>
-                        <td class="pos-tabel-second">Perth, Western Australia</td>
+                        <td class="pos-tabel-second"><oneit:toString    value="<%= job.getLocation() %>"    mode="EscapeHTML"   nullValue="-"/></td>
                     </tr>
                     <tr>
                         <td class="pos-tabel-td">Type:</td>
-                        <td class="pos-tabel-second"><oneit:toString    value="<%= job.getJobType() %>"  mode="EscapeHTML"   nullValue="-"/></td>
+                        <td class="pos-tabel-second"><oneit:toString    value="<%= job.getJobType() %>" mode="EscapeHTML"   nullValue="-"/></td>
                     </tr>
                     <tr>
                         <td class="pos-tabel-td">Apply by:</td>
-                        <td class="pos-tabel-second"><oneit:toString    value="<%= job.getApplyBy() %>"         mode="MidDate"      nullValue="-"/></td>
+                        <td class="pos-tabel-second"><oneit:toString    value="<%= job.getApplyBy() %>" mode="MidDate"      nullValue="-"/></td>
                     </tr>
                 </tbody>
             </table>

cmsWebApp/webroot/extensions/performa/upgrades/20170809_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="remote" type="Boolean" nullable="true"/>
+            <column name="city" type="String" nullable="true" length="100"/>
+            <column name="state" type="String" nullable="true" length="200"/>
+            <column name="country" type="String" nullable="true" length="200"/>
+        </NODE>
+
+    </NODE>
+</OBJECTS>
\ No newline at end of file