S12520042 # Client - Incoming Issues (raised by Client) #Expected Radius

added options given by austin. Not Applicable as well (suggested by client) - made N/A default in Job

cmsWebApp/sql/Job.xml

@@ -22,7 +22,7 @@
 			<column name="remote" type="Boolean" nullable="true"/>
 			<column name="city" type="String" nullable="true" length="100"/>
 			<column name="postcode" type="String" nullable="true" length="100"/>
-			<column name="location_radius" type="String" nullable="true" length="200"/>
+			<column name="location_radius" type="String" nullable="false" length="200"/>
 			<column name="state" type="String" nullable="true" length="200"/>
 			<column name="country" type="String" nullable="true" length="200"/>
 			<column name="require_cv" type="Boolean" nullable="true"/>

cmsWebApp/sql/ms/Job.sql

@@ -22,7 +22,7 @@ CREATE TABLE tl_job (
     remote char(1) NULL,
     city varchar(100) NULL,
     postcode varchar(100) NULL,
-    location_radius varchar(200) NULL,
+    location_radius varchar(200) NOT NULL,
     state varchar(200) NULL,
     country varchar(200) NULL,
     require_cv char(1) NULL,

cmsWebApp/sql/oracle/Job.sql

@@ -23,7 +23,7 @@ CREATE TABLE tl_job (
     remote char(1) NULL,
     city varchar2(100) NULL,
     postcode varchar2(100) NULL,
-    location_radius varchar2(200) NULL,
+    location_radius varchar2(200) NOT NULL,
     state varchar2(200) NULL,
     country varchar2(200) NULL,
     require_cv char(1) NULL,

cmsWebApp/sql/postgres/Job.sql

@@ -23,7 +23,7 @@ CREATE TABLE tl_job (
     remote char(1) NULL,
     city varchar(100) NULL,
     postcode varchar(100) NULL,
-    location_radius varchar(200) NULL,
+    location_radius varchar(200) NOT NULL,
     state varchar(200) NULL,
     country varchar(200) NULL,
     require_cv char(1) NULL,

cmsWebApp/src/performa/orm/BaseJob.java

@@ -1100,6 +1100,8 @@ public abstract class BaseJob extends BaseBusinessClass
 
         metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
         metaInfo.put ("dbcol", "location_radius");
+        metaInfo.put ("defaultValue", "LocationRadius.NA");
+        metaInfo.put ("mandatory", "true");
         metaInfo.put ("name", "ExpectedCandidateRadius");
         metaInfo.put ("type", "LocationRadius");
         
@@ -1344,7 +1346,7 @@ public abstract class BaseJob extends BaseBusinessClass
         _Remote = (Boolean)(Boolean.FALSE);
         _City = (String)(HELPER_City.initialise (_City));
         _PostCode = (String)(HELPER_PostCode.initialise (_PostCode));
-        _ExpectedCandidateRadius = (LocationRadius)(HELPER_ExpectedCandidateRadius.initialise (_ExpectedCandidateRadius));
+        _ExpectedCandidateRadius = (LocationRadius)(LocationRadius.NA);
         _State = (State)(State.WA);
         _Country = (Countries)(Countries.AU);
         _RequireCV = (Boolean)(Boolean.FALSE);
@@ -2860,6 +2862,7 @@ public abstract class BaseJob extends BaseBusinessClass
                 oldAndNewIdentical = HELPER_ExpectedCandidateRadius.compare (_ExpectedCandidateRadius, newExpectedCandidateRadius);
             }
 
+            BusinessObjectParser.assertFieldCondition (newExpectedCandidateRadius != null, this, FIELD_ExpectedCandidateRadius, "mandatory");
             
 
             if (FIELD_ExpectedCandidateRadius_Validators.length > 0)
@@ -10347,7 +10350,7 @@ public abstract class BaseJob extends BaseBusinessClass
         result.add(HELPER_Remote.getAttribObject (getClass (), _Remote, false, FIELD_Remote));
         result.add(HELPER_City.getAttribObject (getClass (), _City, false, FIELD_City));
         result.add(HELPER_PostCode.getAttribObject (getClass (), _PostCode, false, FIELD_PostCode));
-        result.add(HELPER_ExpectedCandidateRadius.getAttribObject (getClass (), _ExpectedCandidateRadius, false, FIELD_ExpectedCandidateRadius));
+        result.add(HELPER_ExpectedCandidateRadius.getAttribObject (getClass (), _ExpectedCandidateRadius, true, FIELD_ExpectedCandidateRadius));
         result.add(HELPER_State.getAttribObject (getClass (), _State, false, FIELD_State));
         result.add(HELPER_Country.getAttribObject (getClass (), _Country, false, FIELD_Country));
         result.add(HELPER_RequireCV.getAttribObject (getClass (), _RequireCV, false, FIELD_RequireCV));

cmsWebApp/src/performa/orm/Job.xml

@@ -49,9 +49,9 @@
             <ATTRIB name="Remote"                       type="Boolean"          dbcol="remote"              defaultValue="Boolean.FALSE"/>
             <ATTRIB name="City"                         type="String"           dbcol="city"                length="100"/>
             <ATTRIB name="PostCode"                     type="String"           dbcol="postcode"            length="100"/>
-            <ATTRIB name="ExpectedCandidateRadius"      type="LocationRadius"   dbcol="location_radius"     attribHelper="EnumeratedAttributeHelper"    />
-            <ATTRIB name="State"                        type="State"            dbcol="state"               defaultValue="State.WA"     attribHelper="EnumeratedAttributeHelper"/>
-            <ATTRIB name="Country"                      type="Countries"        dbcol="country"             defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
+            <ATTRIB name="ExpectedCandidateRadius"      type="LocationRadius"   dbcol="location_radius"     defaultValue="LocationRadius.NA"    attribHelper="EnumeratedAttributeHelper"    mandatory="true"/>
+            <ATTRIB name="State"                        type="State"            dbcol="state"               defaultValue="State.WA"             attribHelper="EnumeratedAttributeHelper"/>
+            <ATTRIB name="Country"                      type="Countries"        dbcol="country"             defaultValue="Countries.AU"         attribHelper="EnumeratedAttributeHelper"/>
             <ATTRIB name="RequireCV"                    type="Boolean"          dbcol="require_cv"          defaultValue="Boolean.FALSE"/>
             <ATTRIB name="IsManuallyClosed"             type="Boolean"          dbcol="manually_closed"     defaultValue="Boolean.FALSE"/>
             <ATTRIB name="LastEdited"                   type="Date"             dbcol="last_edited"     />

cmsWebApp/src/performa/orm/types/LocationRadius.java

@@ -20,10 +20,20 @@ public class LocationRadius extends AbstractEnumerated
     
     public static final EnumeratedFactory FACTORY_LocationRadius = new LocationRadiusFactory();
     
-    public static final LocationRadius KM100 = new LocationRadius ("KM100", "KM100", "100 km", false);
+    public static final LocationRadius NA = new LocationRadius ("NA", "NA", "N/A", false);
+    
+    public static final LocationRadius KM5 = new LocationRadius ("KM5", "KM5", "5 kms or 3 mi", false);
+    
+    public static final LocationRadius KM10 = new LocationRadius ("KM10", "KM10", "10 kms or 5 mi", false);
+    
+    public static final LocationRadius KM25 = new LocationRadius ("KM25", "KM25", "25 kms or 15 mi", false);
+    
+    public static final LocationRadius KM50 = new LocationRadius ("KM50", "KM50", "50 kms or 30 mi", false);
+    
+    public static final LocationRadius KM100 = new LocationRadius ("KM100", "KM100", "100 kms or 60 mi", false);
 
     private static final LocationRadius[] allLocationRadiuss =
-        new LocationRadius[] { KM100};
+        new LocationRadius[] { NA,KM5,KM10,KM25,KM50,KM100};
 
 
     private static LocationRadius[] getAllLocationRadiuss ()

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

@@ -3,7 +3,12 @@
 <ROOT>
     <CONSTANT package="performa.orm.types"  name="LocationRadius">
                 
-        <VALUE name="KM100" value="KM100"   description="100 km"/>
+        <VALUE name="NA"    value="NA"      description="N/A"/>
+        <VALUE name="KM5"   value="KM5"     description="5 kms or 3 mi"/>
+        <VALUE name="KM10"  value="KM10"    description="10 kms or 5 mi"/>
+        <VALUE name="KM25"  value="KM25"    description="25 kms or 15 mi"/>
+        <VALUE name="KM50"  value="KM50"    description="50 kms or 30 mi"/>
+        <VALUE name="KM100" value="KM100"   description="100 kms or 60 mi"/>
         
     </CONSTANT>
 </ROOT>
\ No newline at end of file

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

@@ -11,6 +11,7 @@ Job.ReferenceNumber         =   Reference Number
 Job.State                   =   State or Province
 Job.JobTemplate             =   Job Template
 Job.Occupation              =   Job Occupation Classification
+Job.ExpectedCandidateRadius =   Expected Candidate Radius
 
 CultureCriteria.Importance              =   Rate Importance
 CultureCriteria.CultureElementRating    =   Rating

cmsWebApp/webroot/extensions/adminportal/upgrades/20181119_Update_LocationRadius.sql

+UPDATE tl_job SET location_radius = 'NA' WHERE location_radius IS NULL;