S12520321 # Client - Incoming Issues (raised by Client) #Job Occupation…

S12520321 # Client - Incoming Issues (raised by Client) #Job Occupation Classification to me mandatory

cmsWebApp/sql/Job.xml

@@ -38,7 +38,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="occupation_id" type="Long" length="11" nullable="false"/>
 			<column name="shortened_url_id" type="Long" length="11" nullable="true"/>
 			</NODE>
         

cmsWebApp/sql/ms/Job.sql

@@ -38,7 +38,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,
+    occupation_id numeric(12)  NOT NULL,
     shortened_url_id numeric(12)  NULL
     );
 

cmsWebApp/sql/oracle/Job.sql

@@ -39,7 +39,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,
+    occupation_id number(12)  NOT NULL,
     shortened_url_id number(12)  NULL
     );
 

cmsWebApp/sql/postgres/Job.sql

@@ -39,7 +39,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,
+    occupation_id numeric(12)  NOT NULL,
     shortened_url_id numeric(12)  NULL
     );
 

cmsWebApp/src/performa/form/ProcessCultureFP.java

@@ -54,6 +54,8 @@ public class ProcessCultureFP extends SaveFP
         
         if(fromJobMatch)
         {
+            BusinessObjectParser.assertFieldCondition(job.getOccupation() != null, job , Job.SINGLEREFERENCE_Occupation, "mandatory", exceptions, true, request);
+            
             BusinessObjectParser.assertFieldCondition(job.getLevel()!= null, job , Job.SINGLEREFERENCE_Level, "mandatory", exceptions, true, request);
             
             if(job.getLevel() != null)

cmsWebApp/src/performa/orm/BaseJob.java

@@ -536,6 +536,7 @@ public abstract class BaseJob extends BaseBusinessClass
         Map metaInfo = new HashMap ();
 
         metaInfo.put ("dbcol", "occupation_id");
+        metaInfo.put ("mandatory", "true");
         metaInfo.put ("name", "Occupation");
         metaInfo.put ("type", "Occupation");
         
@@ -6596,6 +6597,7 @@ public abstract class BaseJob extends BaseBusinessClass
      */
     public void setOccupation (Occupation newOccupation) throws StorageException, FieldException
     {
+        BusinessObjectParser.assertFieldCondition (newOccupation != null, this, SINGLEREFERENCE_Occupation, "mandatory");
         
 
         if (_Occupation.wouldReferencedChange (newOccupation))
@@ -7794,6 +7796,8 @@ public abstract class BaseJob extends BaseBusinessClass
         super.validate (context);
 
         
+        context.check (getOccupationID() != null, this, SINGLEREFERENCE_Occupation, "mandatory");
+        
     }
 
 

cmsWebApp/src/performa/orm/Job.xml

@@ -66,7 +66,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="Occupation"   type="Occupation"   dbcol="occupation_id"       mandatory="true"/>
             <SINGLEREFERENCE    name="ShortenedURL" type="ShortenedURL" dbcol="shortened_url_id"    />
             
         </TABLE>

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

@@ -10,6 +10,7 @@ Job.JobType                 =   Job Type
 Job.ReferenceNumber         =   Reference Number
 Job.State                   =   State or Province
 Job.JobTemplate             =   Job Template
+Job.Occupation              =   Job Occupation Classification
 
 CultureCriteria.Importance              =   Rate Importance
 CultureCriteria.CultureElementRating    =   Rating