Alter values of expected candidate radius as per client requirement

#1 ... 30km/20mi, 60km/40mi, 100km/65mi.
So these are the values that the Employer says are OK before the warning is shown ... let's default to 100km.

cmsWebApp/src/performa/orm/BaseJob.java

@@ -1100,7 +1100,7 @@ public abstract class BaseJob extends BaseBusinessClass
 
         metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
         metaInfo.put ("dbcol", "location_radius");
-        metaInfo.put ("defaultValue", "LocationRadius.NA");
+        metaInfo.put ("defaultValue", "LocationRadius.KM100");
         metaInfo.put ("mandatory", "true");
         metaInfo.put ("name", "ExpectedCandidateRadius");
         metaInfo.put ("type", "LocationRadius");
@@ -1346,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)(LocationRadius.NA);
+        _ExpectedCandidateRadius = (LocationRadius)(LocationRadius.KM100);
         _State = (State)(State.WA);
         _Country = (Countries)(Countries.AU);
         _RequireCV = (Boolean)(Boolean.FALSE);

cmsWebApp/src/performa/orm/Job.xml

@@ -49,7 +49,7 @@
             <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"     defaultValue="LocationRadius.NA"    attribHelper="EnumeratedAttributeHelper"    mandatory="true"/>
+            <ATTRIB name="ExpectedCandidateRadius"      type="LocationRadius"   dbcol="location_radius"     defaultValue="LocationRadius.KM100" 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"/>

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

@@ -20,20 +20,14 @@ public class LocationRadius extends AbstractEnumerated
     
     public static final EnumeratedFactory FACTORY_LocationRadius = new LocationRadiusFactory();
     
-    public static final LocationRadius NA = new LocationRadius ("NA", "NA", "N/A", false);
+    public static final LocationRadius KM30 = new LocationRadius ("KM30", "KM30", "30km/20mi", false);
     
-    public static final LocationRadius KM5 = new LocationRadius ("KM5", "KM5", "5 kms or 3 mi", false);
+    public static final LocationRadius KM60 = new LocationRadius ("KM60", "KM60", "60km/40mi", 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);
+    public static final LocationRadius KM100 = new LocationRadius ("KM100", "KM100", "100km/65mi", false);
 
     private static final LocationRadius[] allLocationRadiuss =
-        new LocationRadius[] { NA,KM5,KM10,KM25,KM50,KM100};
+        new LocationRadius[] { KM30,KM60,KM100};
 
 
     private static LocationRadius[] getAllLocationRadiuss ()

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

@@ -3,12 +3,9 @@
 <ROOT>
     <CONSTANT package="performa.orm.types"  name="LocationRadius">
                 
-        <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"/>
+        <VALUE name="KM30"  value="KM30"    description="30km/20mi"/>
+        <VALUE name="KM60"  value="KM60"    description="60km/40mi"/>
+        <VALUE name="KM100" value="KM100"   description="100km/65mi"/>
         
     </CONSTANT>
 </ROOT>
\ No newline at end of file

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

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