fix issue job created without level

cmsWebApp/src/performa/form/ProcessCultureFP.java

@@ -3,7 +3,7 @@ package performa.form;
 import oneit.servlets.forms.*;
 import oneit.utils.*;
 import performa.orm.CultureCriteria;
- import java.util.Map;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import oneit.objstore.StorageException;
 import oneit.servlets.forms.SubmissionDetails;
@@ -12,7 +12,6 @@ import performa.orm.Job;
 import oneit.objstore.parser.BusinessObjectParser;
 import oneit.servlets.process.ProcessRedirectResult;
 import oneit.servlets.process.SaveFP;
-import performa.orm.Occupation;
 
 public class ProcessCultureFP extends SaveFP
 {
@@ -20,17 +19,6 @@ public class ProcessCultureFP extends SaveFP
     @Override
     public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
     {
-        Job     job     =   (Job) process.getAttribute("Job");
-
-        if(job.getOccupationId() != null)
-        {
-            Occupation  occupation  =   Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId()));
-            
-            job.setOccupation(occupation);
-            job.setLevel(occupation.getAssessmentLevel());
-            job.setAssessmentType(occupation.getAssessmentType());
-        }
-        
         return new ProcessRedirectResult((String) submission.getRequest().getAttribute("nextPage"),  new String[0]);
     }
     
@@ -51,17 +39,7 @@ public class ProcessCultureFP extends SaveFP
         
         if(fromJobMatch)
         {
-            if(job.getOccupationId() == null || Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId())) == null)
-            {
-                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)
-//            {
-//                BusinessObjectParser.assertFieldCondition(job.showLevelOption(job.getLevel()), job , Job.SINGLEREFERENCE_Level, "invalid", exceptions, true, request);
-//            }
+            BusinessObjectParser.assertFieldCondition(job.getILOJobTitle() != null, job , Job.SINGLEREFERENCE_ILOJobTitle, "mandatory", exceptions, true, request);
         }
                 
         if(fromCulture)

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -79,15 +79,6 @@ public class SaveJobFP extends SaveFP
             job.setDraftLocation(draftLocation);
         }
         
-        if(job.getOccupationId() != null)
-        {
-            Occupation  occupation  =   Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId()));
-            
-            job.setOccupation(occupation);
-            job.setLevel(occupation.getAssessmentLevel());
-            job.setAssessmentType(occupation.getAssessmentType());
-        }
-        
         return super.processForm(process, submission, params);
     }
     

cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.java

@@ -3,7 +3,6 @@ package performa.orm;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
-import oneit.objstore.FieldWriteability;
 import oneit.objstore.rdbms.filters.EqualsFilter;
 import oneit.objstore.rdbms.filters.GreaterThanFilter;
 import oneit.objstore.rdbms.filters.LessThanFilter;
@@ -99,7 +98,13 @@ public class AssessmentCriteriaTemplate extends BaseAssessmentCriteriaTemplate
     protected void postILOJobTitleChange() throws FieldException
     {
         Occupation  occupation  =   getILOJobTitle() != null ? getILOJobTitle().getOccupation() : null;
+        
+        if(occupation != null)
+        {
             setOccupation(occupation);
+            setLevel(occupation.getAssessmentLevel());
+            setAssessmentType(occupation.getAssessmentType());
+        }
         
         super.postILOJobTitleChange(); 
     }

cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.xml

@@ -7,8 +7,6 @@
         <IMPORT value="performa.orm.types.*"/>    
         <IMPORT value="oneit.security.*"/>
                         
-        <TRANSIENT  name="OccupationId" type="String"   />
-
         <MULTIPLEREFERENCE  name="AssessmentCriterias"  type="AssessmentCriteria"   backreferenceName="Template" />
         <MULTIPLEREFERENCE  name="WorkFlows"            type="WorkFlow"             backreferenceName="Template" />
         

cmsWebApp/src/performa/orm/BaseAssessmentCriteriaTemplate.java

@@ -54,7 +54,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
     public static final String FIELD_RequireCV = "RequireCV";
     public static final String FIELD_AssessmentType = "AssessmentType";
     public static final String FIELD_IncludeAssessmentCriteria = "IncludeAssessmentCriteria";
-    public static final String FIELD_OccupationId = "OccupationId";
     public static final String SINGLEREFERENCE_Level = "Level";
     public static final String SINGLEREFERENCE_Occupation = "Occupation";
     public static final String SINGLEREFERENCE_JobOwner = "JobOwner";
@@ -85,7 +84,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
     private static final DefaultAttributeHelper<AssessmentCriteriaTemplate> HELPER_RequireCV = DefaultAttributeHelper.INSTANCE;
     private static final EnumeratedAttributeHelper<AssessmentCriteriaTemplate, AssessmentType> HELPER_AssessmentType =  new EnumeratedAttributeHelper<AssessmentCriteriaTemplate, AssessmentType> (AssessmentType.FACTORY_AssessmentType);
     private static final DefaultAttributeHelper<AssessmentCriteriaTemplate> HELPER_IncludeAssessmentCriteria = DefaultAttributeHelper.INSTANCE;
-    private static final DefaultAttributeHelper<AssessmentCriteriaTemplate> HELPER_OccupationId = DefaultAttributeHelper.INSTANCE;
     
 
     // Private attributes corresponding to business object data
@@ -101,7 +99,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
     private Boolean _RequireCV;
     private AssessmentType _AssessmentType;
     private Boolean _IncludeAssessmentCriteria;
-    private String _OccupationId;
     
 
     // Private attributes corresponding to single references
@@ -124,7 +121,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
     private static final Map ATTRIBUTES_METADATA_AssessmentCriteriaTemplate = new HashMap ();
 
     // Arrays of validators for each attribute
-    private static final AttributeValidator[] FIELD_OccupationId_Validators;
     private static final AttributeValidator[] FIELD_TemplateName_Validators;
     private static final AttributeValidator[] FIELD_JobTitle_Validators;
     private static final AttributeValidator[] FIELD_JobDescription_Validators;
@@ -162,7 +158,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
             setupAssocMetaData_HiringTeam();
             setupAssocMetaData_CompanyUser();
             setupAssocMetaData_ILOJobTitle();
-            FIELD_OccupationId_Validators = (AttributeValidator[])setupAttribMetaData_OccupationId(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_TemplateName_Validators = (AttributeValidator[])setupAttribMetaData_TemplateName(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_JobTitle_Validators = (AttributeValidator[])setupAttribMetaData_JobTitle(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_JobDescription_Validators = (AttributeValidator[])setupAttribMetaData_JobDescription(validatorMapping).toArray (new AttributeValidator[0]);
@@ -335,23 +330,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
     
     
     // Meta Info setup
-    private static List setupAttribMetaData_OccupationId(Map validatorMapping)
-    {
-        Map  metaInfo   = new HashMap ();
-
-        metaInfo.put ("name", "OccupationId");
-        metaInfo.put ("type", "String");
-        
-        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for AssessmentCriteriaTemplate.OccupationId:", metaInfo);
-        ATTRIBUTES_METADATA_AssessmentCriteriaTemplate.put (FIELD_OccupationId, Collections.unmodifiableMap (metaInfo));
-
-        List validators = BaseBusinessClass.getAttribValidators(AssessmentCriteriaTemplate.class, "OccupationId", metaInfo, validatorMapping);
-        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for AssessmentCriteriaTemplate.OccupationId:", validators);        
-
-        return validators;
-    }
-    
-    // Meta Info setup
     private static List setupAttribMetaData_TemplateName(Map validatorMapping)
     {
         Map  metaInfo   = new HashMap ();
@@ -627,7 +605,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         _RequireCV = (Boolean)(Boolean.FALSE);
         _AssessmentType = (AssessmentType)(AssessmentType.COMPREHENSIVE);
         _IncludeAssessmentCriteria = (Boolean)(Boolean.TRUE);
-        _OccupationId = (String)(HELPER_OccupationId.initialise (_OccupationId));
     }
 
 
@@ -1854,104 +1831,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         }
     }
 
-    /**
-     * Get the attribute OccupationId
-     */
-    public String getOccupationId ()
-    {
-        assertValid();
-        String valToReturn = _OccupationId;
-
-            for (AssessmentCriteriaTemplateBehaviourDecorator bhd : AssessmentCriteriaTemplate_BehaviourDecorators)
-            {
-                valToReturn = bhd.getOccupationId ((AssessmentCriteriaTemplate)this, valToReturn);
-            }
-            
-            return valToReturn;
-        
-    }
-
-
-    /**
-     * Called prior to the attribute changing.  Subclasses need not call super.  If a field exception
-     * is thrown, the attribute change will fail.  The new value is different to the old value.
-     */
-    protected void preOccupationIdChange (String newOccupationId) throws FieldException
-    {
-    }
-
-
-    /**
-     * Called after the attribute changes.
-     * If a field exception is thrown, the value is still changed, however it 
-     * may lead to the TX being rolled back
-     */
-    protected void postOccupationIdChange () throws FieldException
-    {
-    }
-
-    
-    public FieldWriteability getWriteability_OccupationId ()
-    {
-        return getFieldWritabilityUtil (FieldWriteability.TRUE);
-    }
-
-    /**
-     * Set the attribute OccupationId.  Checks to ensure a new value
-     * has been supplied.  If so, marks the field as altered and sets the attribute.
-     */
-    public void setOccupationId (String newOccupationId) throws FieldException
-    {
-        boolean oldAndNewIdentical = HELPER_OccupationId.compare (_OccupationId, newOccupationId);
-        
-        try
-        {
-            for (AssessmentCriteriaTemplateBehaviourDecorator bhd : AssessmentCriteriaTemplate_BehaviourDecorators)
-            {
-                newOccupationId = bhd.setOccupationId ((AssessmentCriteriaTemplate)this, newOccupationId);
-                oldAndNewIdentical = HELPER_OccupationId.compare (_OccupationId, newOccupationId);
-            }
-
-            
-
-            if (FIELD_OccupationId_Validators.length > 0)
-            {
-                Object newOccupationIdObj = HELPER_OccupationId.toObject (newOccupationId);
-
-                if (newOccupationIdObj != null)
-                {
-                    int     loopMax = FIELD_OccupationId_Validators.length;
-                    Map     metadata = (Map)ATTRIBUTES_METADATA_AssessmentCriteriaTemplate.get (FIELD_OccupationId);
-
-                    for (int v = 0 ; v < loopMax ; ++v)
-                    {
-                        FIELD_OccupationId_Validators[v].checkAttribute (this, FIELD_OccupationId, metadata, newOccupationIdObj);
-                    }
-                }
-            }
-        }
-        catch (FieldException e)
-        {
-            if (!oldAndNewIdentical)
-            {
-                e.setWouldModify ();
-            }
-            
-            throw e;
-        }
-
-        if (!oldAndNewIdentical)
-        {
-            assertValid();
-            Debug.assertion (getWriteability_OccupationId () != FieldWriteability.FALSE, "Field  OccupationId is not writeable");
-            preOccupationIdChange (newOccupationId);
-            markFieldChange (FIELD_OccupationId);
-            _OccupationId = newOccupationId;            
-            postFieldChange (FIELD_OccupationId);
-            postOccupationIdChange ();
-        }
-    }
-
 
 
     /**
@@ -3571,7 +3450,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
             _RequireCV = sourceAssessmentCriteriaTemplate._RequireCV;
             _AssessmentType = sourceAssessmentCriteriaTemplate._AssessmentType;
             _IncludeAssessmentCriteria = sourceAssessmentCriteriaTemplate._IncludeAssessmentCriteria;
-            _OccupationId = sourceAssessmentCriteriaTemplate._OccupationId;
             
         }
     }
@@ -3648,7 +3526,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         _RequireCV = (Boolean)(HELPER_RequireCV.readExternal (_RequireCV, vals.get(FIELD_RequireCV))); //
         _AssessmentType = (AssessmentType)(HELPER_AssessmentType.readExternal (_AssessmentType, vals.get(FIELD_AssessmentType))); //
         _IncludeAssessmentCriteria = (Boolean)(HELPER_IncludeAssessmentCriteria.readExternal (_IncludeAssessmentCriteria, vals.get(FIELD_IncludeAssessmentCriteria))); //
-        _OccupationId = (String)(HELPER_OccupationId.readExternal (_OccupationId, vals.get(FIELD_OccupationId))); //
         _Level.readExternalData(vals.get(SINGLEREFERENCE_Level));
         _Occupation.readExternalData(vals.get(SINGLEREFERENCE_Occupation));
         _JobOwner.readExternalData(vals.get(SINGLEREFERENCE_JobOwner));
@@ -3682,7 +3559,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         vals.put (FIELD_RequireCV, HELPER_RequireCV.writeExternal (_RequireCV));
         vals.put (FIELD_AssessmentType, HELPER_AssessmentType.writeExternal (_AssessmentType));
         vals.put (FIELD_IncludeAssessmentCriteria, HELPER_IncludeAssessmentCriteria.writeExternal (_IncludeAssessmentCriteria));
-        vals.put (FIELD_OccupationId, HELPER_OccupationId.writeExternal (_OccupationId));
         vals.put (SINGLEREFERENCE_Level, _Level.writeExternalData());
         vals.put (SINGLEREFERENCE_Occupation, _Occupation.writeExternalData());
         vals.put (SINGLEREFERENCE_JobOwner, _JobOwner.writeExternalData());
@@ -3778,7 +3654,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
     {
         super.visitAttributes (visitor);
 
-        visitor.visitField(this, FIELD_OccupationId, HELPER_OccupationId.toObject(getOccupationId()));
         
     }
 
@@ -4196,10 +4071,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         {
             return HELPER_IncludeAssessmentCriteria.toObject (getIncludeAssessmentCriteria ());
         }
-        else if (attribName.equals (FIELD_OccupationId))
-        {
-            return HELPER_OccupationId.toObject (getOccupationId ());
-        }
         else
         {
             return super.getAttribute (attribName);
@@ -4261,10 +4132,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         {
             return HELPER_IncludeAssessmentCriteria;
         }
-        else if (attribName.equals (FIELD_OccupationId))
-        {
-            return HELPER_OccupationId;
-        }
         else
         {
             return super.getAttributeHelper (attribName);
@@ -4326,10 +4193,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         {
             setIncludeAssessmentCriteria ((Boolean)(HELPER_IncludeAssessmentCriteria.fromObject (_IncludeAssessmentCriteria, attribValue)));            
         }
-        else if (attribName.equals (FIELD_OccupationId))
-        {
-            setOccupationId ((String)(HELPER_OccupationId.fromObject (_OccupationId, attribValue)));            
-        }
         else
         {
             super.setAttribute (attribName, attribValue);
@@ -4438,10 +4301,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         {
             return getWriteability_ILOJobTitle ();
         }
-        else if (fieldName.equals (FIELD_OccupationId))
-        {
-            return getWriteability_OccupationId ();
-        }
         else
         {
             return super.getWriteable (fieldName);
@@ -4512,11 +4371,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
                 fields.add (FIELD_IncludeAssessmentCriteria);
             }
         
-            if (getWriteability_OccupationId () != FieldWriteability.TRUE)
-            {
-                fields.add (FIELD_OccupationId);
-            }
-        
 
         super.putUnwriteable (fields);
     }
@@ -4538,7 +4392,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         result.add(HELPER_RequireCV.getAttribObject (getClass (), _RequireCV, false, FIELD_RequireCV));
         result.add(HELPER_AssessmentType.getAttribObject (getClass (), _AssessmentType, true, FIELD_AssessmentType));
         result.add(HELPER_IncludeAssessmentCriteria.getAttribObject (getClass (), _IncludeAssessmentCriteria, true, FIELD_IncludeAssessmentCriteria));
-        result.add(HELPER_OccupationId.getAttribObject (getClass (), _OccupationId, false, FIELD_OccupationId));
 
         return result;
     }
@@ -4805,24 +4658,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         return newIncludeAssessmentCriteria;
     }
 
-    /**
-     * Get the attribute OccupationId
-     */
-    public String getOccupationId (AssessmentCriteriaTemplate obj, String original)
-    {
-        return original;
-    }
-
-    /**
-     * Change the value set for attribute OccupationId.
-     * May modify the field beforehand
-     * Occurs before validation.
-     */
-    public String setOccupationId (AssessmentCriteriaTemplate obj, String newOccupationId) throws FieldException
-    {
-        return newOccupationId;
-    }
-
     }
 
     
@@ -4875,10 +4710,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         
         public PipeLine<From, ? extends Object> to(String name)
         {
-            if (name.equals ("OccupationId"))
-            {
-                return toOccupationId ();
-            }                
             if (name.equals ("AssessmentCriterias"))
             {
                 return toAssessmentCriterias ();
@@ -4973,8 +4804,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
         }
         
         
-        public PipeLine<From, String> toOccupationId () { return pipe(new ORMAttributePipe<Me, String>(FIELD_OccupationId));  }
-        
         public PipeLine<From, String> toTemplateName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_TemplateName));  }
         
         public PipeLine<From, String> toJobTitle () { return pipe(new ORMAttributePipe<Me, String>(FIELD_JobTitle));  }
@@ -5064,11 +4893,6 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
     public boolean isTransientAttrib(String attribName)
     {
         
-        if(CollectionUtils.equals(attribName, "OccupationId"))
-        {
-            return true;
-        }
-        
 
         return super.isTransientAttrib(attribName);
     }

cmsWebApp/src/performa/orm/BaseJob.java

@@ -81,7 +81,6 @@ public abstract class BaseJob extends BaseBusinessClass
     public static final String FIELD_CultureTemplateName = "CultureTemplateName";
     public static final String FIELD_AppProcessOption = "AppProcessOption";
     public static final String FIELD_RankingCompleted = "RankingCompleted";
-    public static final String FIELD_OccupationId = "OccupationId";
     public static final String SINGLEREFERENCE_CultureTemplate = "CultureTemplate";
     public static final String SINGLEREFERENCE_JobTemplate = "JobTemplate";
     public static final String SINGLEREFERENCE_AppStatusWorkFlow = "AppStatusWorkFlow";
@@ -151,7 +150,6 @@ public abstract class BaseJob extends BaseBusinessClass
     private static final DefaultAttributeHelper<Job> HELPER_CultureTemplateName = DefaultAttributeHelper.INSTANCE;
     private static final EnumeratedAttributeHelper<Job, AppProcessOption> HELPER_AppProcessOption =  new EnumeratedAttributeHelper<Job, AppProcessOption> (AppProcessOption.FACTORY_AppProcessOption);
     private static final DefaultAttributeHelper<Job> HELPER_RankingCompleted = DefaultAttributeHelper.INSTANCE;
-    private static final DefaultAttributeHelper<Job> HELPER_OccupationId = DefaultAttributeHelper.INSTANCE;
     
 
     // Private attributes corresponding to business object data
@@ -194,7 +192,6 @@ public abstract class BaseJob extends BaseBusinessClass
     private String _CultureTemplateName;
     private AppProcessOption _AppProcessOption;
     private Boolean _RankingCompleted;
-    private String _OccupationId;
     
 
     // Private attributes corresponding to single references
@@ -237,7 +234,6 @@ public abstract class BaseJob extends BaseBusinessClass
     private static final AttributeValidator[] FIELD_CultureTemplateName_Validators;
     private static final AttributeValidator[] FIELD_AppProcessOption_Validators;
     private static final AttributeValidator[] FIELD_RankingCompleted_Validators;
-    private static final AttributeValidator[] FIELD_OccupationId_Validators;
     private static final AttributeValidator[] FIELD_JobTitle_Validators;
     private static final AttributeValidator[] FIELD_JobDescription_Validators;
     private static final AttributeValidator[] FIELD_JobStatus_Validators;
@@ -311,7 +307,6 @@ public abstract class BaseJob extends BaseBusinessClass
             FIELD_CultureTemplateName_Validators = (AttributeValidator[])setupAttribMetaData_CultureTemplateName(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_AppProcessOption_Validators = (AttributeValidator[])setupAttribMetaData_AppProcessOption(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_RankingCompleted_Validators = (AttributeValidator[])setupAttribMetaData_RankingCompleted(validatorMapping).toArray (new AttributeValidator[0]);
-            FIELD_OccupationId_Validators = (AttributeValidator[])setupAttribMetaData_OccupationId(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_JobTitle_Validators = (AttributeValidator[])setupAttribMetaData_JobTitle(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_JobDescription_Validators = (AttributeValidator[])setupAttribMetaData_JobDescription(validatorMapping).toArray (new AttributeValidator[0]);
             FIELD_JobStatus_Validators = (AttributeValidator[])setupAttribMetaData_JobStatus(validatorMapping).toArray (new AttributeValidator[0]);
@@ -823,23 +818,6 @@ public abstract class BaseJob extends BaseBusinessClass
     }
     
     // Meta Info setup
-    private static List setupAttribMetaData_OccupationId(Map validatorMapping)
-    {
-        Map  metaInfo   = new HashMap ();
-
-        metaInfo.put ("name", "OccupationId");
-        metaInfo.put ("type", "String");
-        
-        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.OccupationId:", metaInfo);
-        ATTRIBUTES_METADATA_Job.put (FIELD_OccupationId, Collections.unmodifiableMap (metaInfo));
-
-        List validators = BaseBusinessClass.getAttribValidators(Job.class, "OccupationId", metaInfo, validatorMapping);
-        LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.OccupationId:", validators);        
-
-        return validators;
-    }
-    
-    // Meta Info setup
     private static List setupAttribMetaData_JobTitle(Map validatorMapping)
     {
         Map  metaInfo   = new HashMap ();
@@ -1387,7 +1365,6 @@ public abstract class BaseJob extends BaseBusinessClass
         _CultureTemplateName = (String)(HELPER_CultureTemplateName.initialise (_CultureTemplateName));
         _AppProcessOption = (AppProcessOption)(HELPER_AppProcessOption.initialise (_AppProcessOption));
         _RankingCompleted = (Boolean)(HELPER_RankingCompleted.initialise (_RankingCompleted));
-        _OccupationId = (String)(HELPER_OccupationId.initialise (_OccupationId));
     }
 
 
@@ -5273,104 +5250,6 @@ public abstract class BaseJob extends BaseBusinessClass
         }
     }
 
-    /**
-     * Get the attribute OccupationId
-     */
-    public String getOccupationId ()
-    {
-        assertValid();
-        String valToReturn = _OccupationId;
-
-            for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
-            {
-                valToReturn = bhd.getOccupationId ((Job)this, valToReturn);
-            }
-            
-            return valToReturn;
-        
-    }
-
-
-    /**
-     * Called prior to the attribute changing.  Subclasses need not call super.  If a field exception
-     * is thrown, the attribute change will fail.  The new value is different to the old value.
-     */
-    protected void preOccupationIdChange (String newOccupationId) throws FieldException
-    {
-    }
-
-
-    /**
-     * Called after the attribute changes.
-     * If a field exception is thrown, the value is still changed, however it 
-     * may lead to the TX being rolled back
-     */
-    protected void postOccupationIdChange () throws FieldException
-    {
-    }
-
-    
-    public FieldWriteability getWriteability_OccupationId ()
-    {
-        return getFieldWritabilityUtil (FieldWriteability.TRUE);
-    }
-
-    /**
-     * Set the attribute OccupationId.  Checks to ensure a new value
-     * has been supplied.  If so, marks the field as altered and sets the attribute.
-     */
-    public void setOccupationId (String newOccupationId) throws FieldException
-    {
-        boolean oldAndNewIdentical = HELPER_OccupationId.compare (_OccupationId, newOccupationId);
-        
-        try
-        {
-            for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
-            {
-                newOccupationId = bhd.setOccupationId ((Job)this, newOccupationId);
-                oldAndNewIdentical = HELPER_OccupationId.compare (_OccupationId, newOccupationId);
-            }
-
-            
-
-            if (FIELD_OccupationId_Validators.length > 0)
-            {
-                Object newOccupationIdObj = HELPER_OccupationId.toObject (newOccupationId);
-
-                if (newOccupationIdObj != null)
-                {
-                    int     loopMax = FIELD_OccupationId_Validators.length;
-                    Map     metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_OccupationId);
-
-                    for (int v = 0 ; v < loopMax ; ++v)
-                    {
-                        FIELD_OccupationId_Validators[v].checkAttribute (this, FIELD_OccupationId, metadata, newOccupationIdObj);
-                    }
-                }
-            }
-        }
-        catch (FieldException e)
-        {
-            if (!oldAndNewIdentical)
-            {
-                e.setWouldModify ();
-            }
-            
-            throw e;
-        }
-
-        if (!oldAndNewIdentical)
-        {
-            assertValid();
-            Debug.assertion (getWriteability_OccupationId () != FieldWriteability.FALSE, "Field  OccupationId is not writeable");
-            preOccupationIdChange (newOccupationId);
-            markFieldChange (FIELD_OccupationId);
-            _OccupationId = newOccupationId;            
-            postFieldChange (FIELD_OccupationId);
-            postOccupationIdChange ();
-        }
-    }
-
 
 
     /**
@@ -7880,7 +7759,6 @@ public abstract class BaseJob extends BaseBusinessClass
             _CultureTemplateName = sourceJob._CultureTemplateName;
             _AppProcessOption = sourceJob._AppProcessOption;
             _RankingCompleted = sourceJob._RankingCompleted;
-            _OccupationId = sourceJob._OccupationId;
             
         }
     }
@@ -7990,7 +7868,6 @@ public abstract class BaseJob extends BaseBusinessClass
         _CultureTemplateName = (String)(HELPER_CultureTemplateName.readExternal (_CultureTemplateName, vals.get(FIELD_CultureTemplateName))); //
         _AppProcessOption = (AppProcessOption)(HELPER_AppProcessOption.readExternal (_AppProcessOption, vals.get(FIELD_AppProcessOption))); //
         _RankingCompleted = (Boolean)(HELPER_RankingCompleted.readExternal (_RankingCompleted, vals.get(FIELD_RankingCompleted))); //
-        _OccupationId = (String)(HELPER_OccupationId.readExternal (_OccupationId, vals.get(FIELD_OccupationId))); //
         _CultureTemplate.readExternalData(vals.get(SINGLEREFERENCE_CultureTemplate));
         _JobTemplate.readExternalData(vals.get(SINGLEREFERENCE_JobTemplate));
         _AppStatusWorkFlow.readExternalData(vals.get(SINGLEREFERENCE_AppStatusWorkFlow));
@@ -8057,7 +7934,6 @@ public abstract class BaseJob extends BaseBusinessClass
         vals.put (FIELD_CultureTemplateName, HELPER_CultureTemplateName.writeExternal (_CultureTemplateName));
         vals.put (FIELD_AppProcessOption, HELPER_AppProcessOption.writeExternal (_AppProcessOption));
         vals.put (FIELD_RankingCompleted, HELPER_RankingCompleted.writeExternal (_RankingCompleted));
-        vals.put (FIELD_OccupationId, HELPER_OccupationId.writeExternal (_OccupationId));
         vals.put (SINGLEREFERENCE_CultureTemplate, _CultureTemplate.writeExternalData());
         vals.put (SINGLEREFERENCE_JobTemplate, _JobTemplate.writeExternalData());
         vals.put (SINGLEREFERENCE_AppStatusWorkFlow, _AppStatusWorkFlow.writeExternalData());
@@ -8231,7 +8107,6 @@ public abstract class BaseJob extends BaseBusinessClass
         visitor.visitField(this, FIELD_CultureTemplateName, HELPER_CultureTemplateName.toObject(getCultureTemplateName()));
         visitor.visitField(this, FIELD_AppProcessOption, HELPER_AppProcessOption.toObject(getAppProcessOption()));
         visitor.visitField(this, FIELD_RankingCompleted, HELPER_RankingCompleted.toObject(getRankingCompleted()));
-        visitor.visitField(this, FIELD_OccupationId, HELPER_OccupationId.toObject(getOccupationId()));
         
     }
 
@@ -9731,10 +9606,6 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return HELPER_RankingCompleted.toObject (getRankingCompleted ());
         }
-        else if (attribName.equals (FIELD_OccupationId))
-        {
-            return HELPER_OccupationId.toObject (getOccupationId ());
-        }
         else
         {
             return super.getAttribute (attribName);
@@ -9904,10 +9775,6 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return HELPER_RankingCompleted;
         }
-        else if (attribName.equals (FIELD_OccupationId))
-        {
-            return HELPER_OccupationId;
-        }
         else
         {
             return super.getAttributeHelper (attribName);
@@ -10077,10 +9944,6 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             setRankingCompleted ((Boolean)(HELPER_RankingCompleted.fromObject (_RankingCompleted, attribValue)));            
         }
-        else if (attribName.equals (FIELD_OccupationId))
-        {
-            setOccupationId ((String)(HELPER_OccupationId.fromObject (_OccupationId, attribValue)));            
-        }
         else
         {
             super.setAttribute (attribName, attribValue);
@@ -10309,10 +10172,6 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return getWriteability_RankingCompleted ();
         }
-        else if (fieldName.equals (FIELD_OccupationId))
-        {
-            return getWriteability_OccupationId ();
-        }
         else if (fieldName.equals (SINGLEREFERENCE_CultureTemplate))
         {
             return getWriteability_CultureTemplate ();
@@ -10530,11 +10389,6 @@ public abstract class BaseJob extends BaseBusinessClass
                 fields.add (FIELD_RankingCompleted);
             }
         
-            if (getWriteability_OccupationId () != FieldWriteability.TRUE)
-            {
-                fields.add (FIELD_OccupationId);
-            }
-        
 
         super.putUnwriteable (fields);
     }
@@ -10583,7 +10437,6 @@ public abstract class BaseJob extends BaseBusinessClass
         result.add(HELPER_CultureTemplateName.getAttribObject (getClass (), _CultureTemplateName, false, FIELD_CultureTemplateName));
         result.add(HELPER_AppProcessOption.getAttribObject (getClass (), _AppProcessOption, false, FIELD_AppProcessOption));
         result.add(HELPER_RankingCompleted.getAttribObject (getClass (), _RankingCompleted, false, FIELD_RankingCompleted));
-        result.add(HELPER_OccupationId.getAttribObject (getClass (), _OccupationId, false, FIELD_OccupationId));
 
         return result;
     }
@@ -11336,24 +11189,6 @@ public abstract class BaseJob extends BaseBusinessClass
         return newRankingCompleted;
     }
 
-    /**
-     * Get the attribute OccupationId
-     */
-    public String getOccupationId (Job obj, String original)
-    {
-        return original;
-    }
-
-    /**
-     * Change the value set for attribute OccupationId.
-     * May modify the field beforehand
-     * Occurs before validation.
-     */
-    public String setOccupationId (Job obj, String newOccupationId) throws FieldException
-    {
-        return newOccupationId;
-    }
-
     }
 
     
@@ -11478,10 +11313,6 @@ public abstract class BaseJob extends BaseBusinessClass
             {
                 return toRankingCompleted ();
             }                
-            if (name.equals ("OccupationId"))
-            {
-                return toOccupationId ();
-            }                
             if (name.equals ("CultureTemplate"))
             {
                 return toCultureTemplate ();
@@ -11664,8 +11495,6 @@ public abstract class BaseJob extends BaseBusinessClass
         
         public PipeLine<From, Boolean> toRankingCompleted () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_RankingCompleted));  }
         
-        public PipeLine<From, String> toOccupationId () { return pipe(new ORMAttributePipe<Me, String>(FIELD_OccupationId));  }
-        
         public PipeLine<From, String> toJobTitle () { return pipe(new ORMAttributePipe<Me, String>(FIELD_JobTitle));  }
         
         public PipeLine<From, String> toJobDescription () { return pipe(new ORMAttributePipe<Me, String>(FIELD_JobDescription));  }
@@ -11887,11 +11716,6 @@ public abstract class BaseJob extends BaseBusinessClass
             return true;
         }
         
-        if(CollectionUtils.equals(attribName, "OccupationId"))
-        {
-            return true;
-        }
-        
 
         return super.isTransientAttrib(attribName);
     }

cmsWebApp/src/performa/orm/Job.java

@@ -724,7 +724,13 @@ public class Job extends BaseJob
     protected void postILOJobTitleChange() throws FieldException
     {
         Occupation  occupation  =   getILOJobTitle() != null ? getILOJobTitle().getOccupation() : null;
+        
+        if(occupation != null)
+        {
             setOccupation(occupation);
+            setLevel(occupation.getAssessmentLevel());
+            setAssessmentType(occupation.getAssessmentType());
+        }
         
         super.postILOJobTitleChange(); 
     }

cmsWebApp/src/performa/orm/Job.xml

@@ -25,7 +25,6 @@
         <TRANSIENT  name="CultureTemplateName"      type="String"/>
         <TRANSIENT  name="AppProcessOption"         type="AppProcessOption"     attribHelper="EnumeratedAttributeHelper"/>
         <TRANSIENT  name="RankingCompleted"         type="Boolean"  />
-        <TRANSIENT  name="OccupationId"             type="String"  />
 
         <TRANSIENTSINGLE name="CultureTemplate"     type="CultureCriteriaTemplate" />
         <TRANSIENTSINGLE name="JobTemplate"         type="Job" />

cmsWebApp/src/performa/utils/Utils.java

@@ -614,6 +614,7 @@ public class Utils
         
         job.setJobType(jobTemplate.getJobType());
         job.setIndustry(jobTemplate.getIndustry());
+        job.setILOJobTitle(jobTemplate.getILOJobTitle());
         job.setOccupation(jobTemplate.getOccupation());
         job.setRequireCV(jobTemplate.getRequireCV());
         

cmsWebApp/webroot/extensions/applicantportal/verify_identity.jsp

@@ -31,7 +31,7 @@
     Boolean isCultureComplete       =   jobApplication.cultureCompleted();
     Boolean isAssesmentComplete     =   jobApplication.assessmentCompleted();
     Article jobApplicationArticle   =   WebUtils.getArticleByShortCut(transaction, WebUtils.JOB_APPLICATION);
-    String  nextPage                =   jobApplicationArticle.getLink(request);
+    String  nextPage                =   jobApplicationArticle.getLink(request) + "?JobID="+ job.getID().toString();;
 
     if(!jobApplication.hasStartedApplication())
     {