saving occupation

cmsWebApp/src/performa/form/ProcessCultureFP.java

@@ -12,6 +12,7 @@ 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
 {
@@ -19,6 +20,13 @@ 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)
+        {
+            job.setOccupation(Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId())));
+        }
+        
         return new ProcessRedirectResult((String) submission.getRequest().getAttribute("nextPage"),  new String[0]);
     }
     

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -85,6 +85,11 @@ public class SaveJobFP extends SaveFP
             job.setDraftLocation(draftLocation);
         }
         
+        if(job.getOccupationId() != null)
+        {
+            job.setOccupation(Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId())));
+        }
+        
         // restarting process as custom attributes needs to be updated to intercom
         completeProcessRestartAndRestoreAttribs(process, request);
         

cmsWebApp/src/performa/orm/BaseJob.java

@@ -82,6 +82,7 @@ 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_AssessmentTemplate = "AssessmentTemplate";
     public static final String SINGLEREFERENCE_CultureTemplate = "CultureTemplate";
     public static final String SINGLEREFERENCE_JobTemplate = "JobTemplate";
@@ -149,6 +150,7 @@ 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
@@ -190,6 +192,7 @@ public abstract class BaseJob extends BaseBusinessClass
     private String _CultureTemplateName;
     private AppProcessOption _AppProcessOption;
     private Boolean _RankingCompleted;
+    private String _OccupationId;
     
 
     // Private attributes corresponding to single references
@@ -231,6 +234,7 @@ 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;
@@ -302,6 +306,7 @@ 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]);
@@ -796,6 +801,23 @@ 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 ();
@@ -1321,6 +1343,7 @@ 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));
     }
 
 
@@ -5105,6 +5128,104 @@ 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 ();
+        }
+    }
+
 
 
     /**
@@ -7480,6 +7601,7 @@ public abstract class BaseJob extends BaseBusinessClass
             _CultureTemplateName = sourceJob._CultureTemplateName;
             _AppProcessOption = sourceJob._AppProcessOption;
             _RankingCompleted = sourceJob._RankingCompleted;
+            _OccupationId = sourceJob._OccupationId;
             
         }
     }
@@ -7585,6 +7707,7 @@ 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))); //
         _AssessmentTemplate.readExternalData(vals.get(SINGLEREFERENCE_AssessmentTemplate));
         _CultureTemplate.readExternalData(vals.get(SINGLEREFERENCE_CultureTemplate));
         _JobTemplate.readExternalData(vals.get(SINGLEREFERENCE_JobTemplate));
@@ -7649,6 +7772,7 @@ 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_AssessmentTemplate, _AssessmentTemplate.writeExternalData());
         vals.put (SINGLEREFERENCE_CultureTemplate, _CultureTemplate.writeExternalData());
         vals.put (SINGLEREFERENCE_JobTemplate, _JobTemplate.writeExternalData());
@@ -7816,6 +7940,7 @@ 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()));
         
     }
 
@@ -9221,6 +9346,10 @@ 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);
@@ -9386,6 +9515,10 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return HELPER_RankingCompleted;
         }
+        else if (attribName.equals (FIELD_OccupationId))
+        {
+            return HELPER_OccupationId;
+        }
         else
         {
             return super.getAttributeHelper (attribName);
@@ -9551,6 +9684,10 @@ 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);
@@ -9767,6 +9904,10 @@ public abstract class BaseJob extends BaseBusinessClass
         {
             return getWriteability_RankingCompleted ();
         }
+        else if (fieldName.equals (FIELD_OccupationId))
+        {
+            return getWriteability_OccupationId ();
+        }
         else if (fieldName.equals (SINGLEREFERENCE_AssessmentTemplate))
         {
             return getWriteability_AssessmentTemplate ();
@@ -9983,6 +10124,11 @@ public abstract class BaseJob extends BaseBusinessClass
                 fields.add (FIELD_RankingCompleted);
             }
         
+            if (getWriteability_OccupationId () != FieldWriteability.TRUE)
+            {
+                fields.add (FIELD_OccupationId);
+            }
+        
 
         super.putUnwriteable (fields);
     }
@@ -10030,6 +10176,7 @@ 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;
     }
@@ -10764,6 +10911,24 @@ 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;
+    }
+
     }
 
     
@@ -10888,6 +11053,10 @@ public abstract class BaseJob extends BaseBusinessClass
             {
                 return toRankingCompleted ();
             }                
+            if (name.equals ("OccupationId"))
+            {
+                return toOccupationId ();
+            }                
             if (name.equals ("AssessmentTemplate"))
             {
                 return toAssessmentTemplate ();
@@ -11062,6 +11231,8 @@ 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));  }
@@ -11275,6 +11446,11 @@ public abstract class BaseJob extends BaseBusinessClass
             return true;
         }
         
+        if(CollectionUtils.equals(attribName, "OccupationId"))
+        {
+            return true;
+        }
+        
 
         return super.isTransientAttrib(attribName);
     }

cmsWebApp/src/performa/orm/Job.xml

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

cmsWebApp/webroot/extensions/adminportal/job_detail.jsp

@@ -252,9 +252,7 @@
                             <label><oneit:label GUIName="Job Occupation Classification" /></label>
                             <input type="text" class="form-control select-occupation search-input " placeholder="Select the occupation classification"
                                    value="<%= job.getOccupation() != null ? job.getOccupation() : "Select the occupation classification"%>"></input>
-                            <input type="hidden" id="select-occupation-id" />
-                            <!--<tagfile:ormsingleasso_select obj="<%= job %>"  assocName="Occupation"    options="<%= Occupation.searchAll(transaction) %>"/>-->
-
+                            <oneit:ormInput obj="<%= job %>"  id="select-occupation-id"    attributeName="OccupationId" type="hidden"/>
                         </div>
                     </div>
                     <div class="form-group row">