adding occupation reference to job

cmsWebApp/sql/Job.xml

@@ -36,6 +36,7 @@
 			<column name="job_owner_id" type="Long" length="11" nullable="true"/>
 			<column name="company_user_id" type="Long" length="11" nullable="true"/>
 			<column name="hiring_team_id" type="Long" length="11" nullable="true"/>
+			<column name="occupation_id" type="Long" length="11" nullable="true"/>
 			<column name="shortened_url_id" type="Long" length="11" nullable="true"/>
 			</NODE>
         

cmsWebApp/sql/ms/Job.sql

@@ -36,6 +36,7 @@ CREATE TABLE tl_job (
     job_owner_id numeric(12)  NULL,
     company_user_id numeric(12)  NULL,
     hiring_team_id numeric(12)  NULL,
+    occupation_id numeric(12)  NULL,
     shortened_url_id numeric(12)  NULL
     );
 

cmsWebApp/sql/oracle/Job.sql

@@ -37,6 +37,7 @@ CREATE TABLE tl_job (
     job_owner_id number(12)  NULL,
     company_user_id number(12)  NULL,
     hiring_team_id number(12)  NULL,
+    occupation_id number(12)  NULL,
     shortened_url_id number(12)  NULL
     );
 

cmsWebApp/sql/postgres/Job.sql

@@ -37,6 +37,7 @@ CREATE TABLE tl_job (
     job_owner_id numeric(12)  NULL,
     company_user_id numeric(12)  NULL,
     hiring_team_id numeric(12)  NULL,
+    occupation_id numeric(12)  NULL,
     shortened_url_id numeric(12)  NULL
     );
 

cmsWebApp/src/performa/orm/Job.xml

@@ -60,6 +60,7 @@
             <SINGLEREFERENCE    name="JobOwner"     type="CompanyUser"  dbcol="job_owner_id"        />
             <SINGLEREFERENCE    name="CreatedBy"    type="CompanyUser"  dbcol="company_user_id"     />
             <SINGLEREFERENCE    name="HiringTeam"   type="HiringTeam"   dbcol="hiring_team_id"      />
+            <SINGLEREFERENCE    name="Occupation"   type="Occupation"   dbcol="occupation_id"       />
             <SINGLEREFERENCE    name="ShortenedURL" type="ShortenedURL" dbcol="shortened_url_id"    />
             
         </TABLE>

cmsWebApp/src/performa/orm/Occupation.java

-
-
-    
 package performa.orm;
 
-import java.io.*;
-import java.util.*;
-import oneit.appservices.config.*;
-import oneit.logging.*;
-import oneit.objstore.*;
-import oneit.utils.*;
-
-import performa.orm.types.*;
-
-
-
 
 public class Occupation extends BaseOccupation
 {
@@ -24,5 +10,10 @@ public class Occupation extends BaseOccupation
     {
         // Do not add any code to this, always put it in initialiseNewObject
     }
-}
 
+    @Override
+    public String getToString() 
+    {
+        return getName();
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/utils/WebUtils.java

@@ -19,6 +19,7 @@ public class WebUtils
     public static final String ADMIN_HOME       = "AdminHome";
     public static final String APPLICANT_HOME   = "ApplicantHome";
     public static final String CREATE_JOB       = "CreateJob";
+    public static final String OCCUPATION       = "Occupation";
     public static final String ASSESSMENT_CRITERIA  = "AssessmentCriteria";
     public static final String WORKPLACE_CULTURE    = "WorkplaceCulture";
     public static final String JOB_MATCH        = "JobMatchAssessment";
@@ -155,6 +156,7 @@ public class WebUtils
                 renderMode.equals(CARD_PAYMENT) || 
                 renderMode.equals(REPLACE_CARD) || 
                 renderMode.equals(EDIT_CARD) || 
+                renderMode.equals(OCCUPATION) || 
                 renderMode.equals(CREATED_JOB);
     }
     

cmsWebApp/webroot/extensions/adminportal/GeneralConfig_adminPortal.xml

@@ -45,6 +45,7 @@
                 <RenderMode name="CreatedJob"           preIncludeJSP="extensions/adminportal/created_job.jsp"/>
                 <RenderMode name="ReplaceCard"          preIncludeJSP="extensions/adminportal/replace_card_payment.jsp"/>
                 <RenderMode name="EditCard"             preIncludeJSP="extensions/adminportal/edit_card_payment.jsp"/>
+                <RenderMode name="Occupation"           preIncludeJSP="extensions/adminportal/occupation_selector.jsp"/>
             </NODE>
         </MAP>
         

cmsWebApp/webroot/extensions/adminportal/job_detail.jsp

@@ -175,6 +175,7 @@
                         </div>
                         <div class="col-md-6">
                             <label><oneit:label GUIName="Job Occupation Classification" /></label>
+                            <tagfile:ormsingleasso_select obj="<%= job %>"  assocName="Occupation"    options="<%= Occupation.searchAll(transaction) %>"/>
                         </div>
                     </div>
                     <div class="form-group row">

cmsWebApp/webroot/extensions/adminportal/occupation_selector.jsp

+<%@ page extends="oneit.servlets.jsp.JSPInclude" %>
+
+<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
+<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
+<%@ include file="/extensions/performa/inc/stdimports.jsp" %>
+
+<oneit:dynIncluded>
+<%
+    String  nextPage    =   WebUtils.getSamePageInRenderMode(request, "Occupation");
+    String  jobPage     =   WebUtils.getSamePageInRenderMode(request, "CreateJob");
+
+%>  
+    <oneit:form name="editJob" method="post"    enctype="multipart/form-data">
+
+        <div class="container-fluid">
+                        
+            <h1 class="page-title">Create a job</h1>
+
+            <div class="form-page-area">
+                <div>
+                    <ul>
+                    <%
+                        for (Occupation occupation : Occupation.SearchByAll().andLevel(new EqualsFilter<>(OccupationLevel.LEVEL_1)).search(transaction))
+                        {
+                    %>
+                            <li>
+                                <%= occupation%>
+                            </li>
+                    <%
+                        }
+                    %>
+                    </ul>
+                </div>
+                <div>
+                    <ul>
+                    <%
+                        for (Occupation occupation : Occupation.SearchByAll().andLevel(new EqualsFilter<>(OccupationLevel.LEVEL_1)).search(transaction))
+                        {
+                    %>
+                            <li>
+                                <%= occupation%>
+                            </li>
+                    <%
+                        }
+                    %>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </oneit:form>
+</oneit:dynIncluded>

cmsWebApp/webroot/extensions/adminportal/upgrades/20181013_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="occupation_id" type="Long" length="11" nullable="true"/>
+        </NODE>
+    </NODE>
+</OBJECTS>
\ No newline at end of file