Skip to content

P
PERFORMA_REPLICA
Commit 832c9a82 by Nilu Committed by Harsh Shah
Options

corrections in job creation flow buttons and tab numbers 

template saving validation fixes (name not null and unique constraint for name and user)
parent 9739e063
Showing with 466 additions and 126 deletions
cmsWebApp/src/performa/form/SaveCultureTemplateFP.java
......@@ -12,6 +12,7 @@ import oneit.logging.LogMgr;
import oneit.logging.LoggingArea;
import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException;
import oneit.objstore.parser.BusinessObjectParser;
import oneit.security.SecUser;
import oneit.servlets.forms.RedisplayResult;
import oneit.servlets.forms.SubmissionDetails;
......@@ -34,23 +35,26 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor
{
final HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction();
CultureCriteriaTemplate template = (CultureCriteriaTemplate) request.getAttribute("CultureCriteriaTemplate");
Job job = (Job) process.getAttribute("Job");
Job job = (Job) request.getAttribute("Job");
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveCultureTemplateFP for create new template.");
BusinessObjectParser.assertFieldCondition(job.getCultureTemplateName() != null, job , Job.FIELD_CultureTemplateName, "mandatory");
objTran.runInNewTX((ObjectTransaction newObjTran) -> {
CultureCriteriaTemplate newTemplate = CultureCriteriaTemplate.createCultureCriteriaTemplate(newObjTran);
newTemplate.setTemplateName(template.getTemplateName());
newTemplate.setUser(SecUser.getTXUser(newObjTran));
newTemplate.setTemplateName(job.getCultureTemplateName());
for(CultureCriteria criteria : job.getCultureCriteriasSet())
{
CultureCriteria criteriaCopy = CultureCriteria.createCultureCriteria(newObjTran);
criteriaCopy.copyAttributesFrom(criteria);
criteriaCopy.setCultureElement(criteria.getCultureElement().getInTransaction(newObjTran));
criteriaCopy.setImportance(criteria.getImportance());
criteriaCopy.setCultureElementRating(criteria.getCultureElementRating().getInTransaction(newObjTran));
newTemplate.addToCultureCriterias(criteriaCopy);
}
......
cmsWebApp/src/performa/form/SaveRequirementsTemplateFP.java
......@@ -12,6 +12,7 @@ import oneit.logging.LogMgr;
import oneit.logging.LoggingArea;
import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException;
import oneit.objstore.parser.BusinessObjectParser;
import oneit.security.SecUser;
import oneit.servlets.forms.RedisplayResult;
import oneit.servlets.forms.SubmissionDetails;
......@@ -34,17 +35,18 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor
{
final HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction();
AssessmentCriteriaTemplate template = (AssessmentCriteriaTemplate) request.getAttribute("AssessmentCriteriaTemplate");
Job job = (Job) process.getAttribute("Job");
Job job = (Job) request.getAttribute("Job");
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveRequirementsTemplateFP for create new template.");
BusinessObjectParser.assertFieldCondition(job.getAssessmentTemplateName()!= null, job , Job.FIELD_AssessmentTemplateName, "mandatory");
objTran.runInNewTX((ObjectTransaction newObjTran) -> {
AssessmentCriteriaTemplate newTemplate = AssessmentCriteriaTemplate.createAssessmentCriteriaTemplate(newObjTran);
newTemplate.setTemplateName(template.getTemplateName());
newTemplate.setUser(SecUser.getTXUser(newObjTran));
newTemplate.setTemplateName(job.getAssessmentTemplateName());
for (AssessmentCriteria criteria : job.getAssessmentCriteriasSet())
{
......
cmsWebApp/src/performa/orm/BaseJob.java
......@@ -55,7 +55,9 @@ public abstract class BaseJob extends BaseBusinessClass
public static final String FIELD_CompletedCulture = "CompletedCulture";
public static final String FIELD_CompletedAssessmentType = "CompletedAssessmentType";
public static final String FIELD_SaveAssessmentTemplate = "SaveAssessmentTemplate";
public static final String FIELD_SaveCriteriaTemplate = "SaveCriteriaTemplate";
public static final String FIELD_SaveCultureTemplate = "SaveCultureTemplate";
public static final String FIELD_AssessmentTemplateName = "AssessmentTemplateName";
public static final String FIELD_CultureTemplateName = "CultureTemplateName";
public static final String SINGLEREFERENCE_AssessmentTemplate = "AssessmentTemplate";
public static final String SINGLEREFERENCE_CultureTemplate = "CultureTemplate";
public static final String SINGLEREFERENCE_JobTemplate = "JobTemplate";
......@@ -87,7 +89,9 @@ public abstract class BaseJob extends BaseBusinessClass
private static final DefaultAttributeHelper<Job> HELPER_CompletedCulture = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_CompletedAssessmentType = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_SaveAssessmentTemplate = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_SaveCriteriaTemplate = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_SaveCultureTemplate = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_AssessmentTemplateName = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_CultureTemplateName = DefaultAttributeHelper.INSTANCE;
// Private attributes corresponding to business object data
......@@ -104,7 +108,9 @@ public abstract class BaseJob extends BaseBusinessClass
private Boolean _CompletedCulture;
private Boolean _CompletedAssessmentType;
private Boolean _SaveAssessmentTemplate;
private Boolean _SaveCriteriaTemplate;
private Boolean _SaveCultureTemplate;
private String _AssessmentTemplateName;
private String _CultureTemplateName;
// Private attributes corresponding to single references
......@@ -131,7 +137,9 @@ public abstract class BaseJob extends BaseBusinessClass
private static final AttributeValidator[] FIELD_CompletedCulture_Validators;
private static final AttributeValidator[] FIELD_CompletedAssessmentType_Validators;
private static final AttributeValidator[] FIELD_SaveAssessmentTemplate_Validators;
private static final AttributeValidator[] FIELD_SaveCriteriaTemplate_Validators;
private static final AttributeValidator[] FIELD_SaveCultureTemplate_Validators;
private static final AttributeValidator[] FIELD_AssessmentTemplateName_Validators;
private static final AttributeValidator[] FIELD_CultureTemplateName_Validators;
private static final AttributeValidator[] FIELD_JobTitle_Validators;
private static final AttributeValidator[] FIELD_JobDescription_Validators;
private static final AttributeValidator[] FIELD_JobStatus_Validators;
......@@ -169,7 +177,9 @@ public abstract class BaseJob extends BaseBusinessClass
FIELD_CompletedCulture_Validators = (AttributeValidator[])setupAttribMetaData_CompletedCulture(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompletedAssessmentType_Validators = (AttributeValidator[])setupAttribMetaData_CompletedAssessmentType(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_SaveAssessmentTemplate_Validators = (AttributeValidator[])setupAttribMetaData_SaveAssessmentTemplate(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_SaveCriteriaTemplate_Validators = (AttributeValidator[])setupAttribMetaData_SaveCriteriaTemplate(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_SaveCultureTemplate_Validators = (AttributeValidator[])setupAttribMetaData_SaveCultureTemplate(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_AssessmentTemplateName_Validators = (AttributeValidator[])setupAttribMetaData_AssessmentTemplateName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CultureTemplateName_Validators = (AttributeValidator[])setupAttribMetaData_CultureTemplateName(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]);
......@@ -410,19 +420,53 @@ public abstract class BaseJob extends BaseBusinessClass
}
// Meta Info setup
private static List setupAttribMetaData_SaveCriteriaTemplate(Map validatorMapping)
private static List setupAttribMetaData_SaveCultureTemplate(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("defaultValue", "Boolean.FALSE");
metaInfo.put ("name", "SaveCriteriaTemplate");
metaInfo.put ("name", "SaveCultureTemplate");
metaInfo.put ("type", "Boolean");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.SaveCriteriaTemplate:", metaInfo);
ATTRIBUTES_METADATA_Job.put (FIELD_SaveCriteriaTemplate, Collections.unmodifiableMap (metaInfo));
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.SaveCultureTemplate:", metaInfo);
ATTRIBUTES_METADATA_Job.put (FIELD_SaveCultureTemplate, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Job.class, "SaveCriteriaTemplate", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.SaveCriteriaTemplate:", validators);
List validators = BaseBusinessClass.getAttribValidators(Job.class, "SaveCultureTemplate", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.SaveCultureTemplate:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_AssessmentTemplateName(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("name", "AssessmentTemplateName");
metaInfo.put ("type", "String");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.AssessmentTemplateName:", metaInfo);
ATTRIBUTES_METADATA_Job.put (FIELD_AssessmentTemplateName, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Job.class, "AssessmentTemplateName", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.AssessmentTemplateName:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_CultureTemplateName(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("name", "CultureTemplateName");
metaInfo.put ("type", "String");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.CultureTemplateName:", metaInfo);
ATTRIBUTES_METADATA_Job.put (FIELD_CultureTemplateName, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Job.class, "CultureTemplateName", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.CultureTemplateName:", validators);
return validators;
}
......@@ -605,7 +649,9 @@ public abstract class BaseJob extends BaseBusinessClass
_CompletedCulture = (Boolean)(Boolean.FALSE);
_CompletedAssessmentType = (Boolean)(Boolean.FALSE);
_SaveAssessmentTemplate = (Boolean)(Boolean.FALSE);
_SaveCriteriaTemplate = (Boolean)(Boolean.FALSE);
_SaveCultureTemplate = (Boolean)(Boolean.FALSE);
_AssessmentTemplateName = (String)(HELPER_AssessmentTemplateName.initialise (_AssessmentTemplateName));
_CultureTemplateName = (String)(HELPER_CultureTemplateName.initialise (_CultureTemplateName));
}
......@@ -1926,16 +1972,212 @@ public abstract class BaseJob extends BaseBusinessClass
}
/**
* Get the attribute SaveCriteriaTemplate
* Get the attribute SaveCultureTemplate
*/
public Boolean getSaveCultureTemplate ()
{
assertValid();
Boolean valToReturn = _SaveCultureTemplate;
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
valToReturn = bhd.getSaveCultureTemplate ((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 preSaveCultureTemplateChange (Boolean newSaveCultureTemplate) 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 postSaveCultureTemplateChange () throws FieldException
{
}
public FieldWriteability getWriteability_SaveCultureTemplate ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute SaveCultureTemplate. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setSaveCultureTemplate (Boolean newSaveCultureTemplate) throws FieldException
{
boolean oldAndNewIdentical = HELPER_SaveCultureTemplate.compare (_SaveCultureTemplate, newSaveCultureTemplate);
try
{
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
newSaveCultureTemplate = bhd.setSaveCultureTemplate ((Job)this, newSaveCultureTemplate);
oldAndNewIdentical = HELPER_SaveCultureTemplate.compare (_SaveCultureTemplate, newSaveCultureTemplate);
}
if (FIELD_SaveCultureTemplate_Validators.length > 0)
{
Object newSaveCultureTemplateObj = HELPER_SaveCultureTemplate.toObject (newSaveCultureTemplate);
if (newSaveCultureTemplateObj != null)
{
int loopMax = FIELD_SaveCultureTemplate_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_SaveCultureTemplate);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_SaveCultureTemplate_Validators[v].checkAttribute (this, FIELD_SaveCultureTemplate, metadata, newSaveCultureTemplateObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_SaveCultureTemplate () != FieldWriteability.FALSE, "Field SaveCultureTemplate is not writeable");
preSaveCultureTemplateChange (newSaveCultureTemplate);
markFieldChange (FIELD_SaveCultureTemplate);
_SaveCultureTemplate = newSaveCultureTemplate;
postFieldChange (FIELD_SaveCultureTemplate);
postSaveCultureTemplateChange ();
}
}
/**
* Get the attribute AssessmentTemplateName
*/
public String getAssessmentTemplateName ()
{
assertValid();
String valToReturn = _AssessmentTemplateName;
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
valToReturn = bhd.getAssessmentTemplateName ((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 preAssessmentTemplateNameChange (String newAssessmentTemplateName) 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 postAssessmentTemplateNameChange () throws FieldException
{
}
public FieldWriteability getWriteability_AssessmentTemplateName ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute AssessmentTemplateName. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setAssessmentTemplateName (String newAssessmentTemplateName) throws FieldException
{
boolean oldAndNewIdentical = HELPER_AssessmentTemplateName.compare (_AssessmentTemplateName, newAssessmentTemplateName);
try
{
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
newAssessmentTemplateName = bhd.setAssessmentTemplateName ((Job)this, newAssessmentTemplateName);
oldAndNewIdentical = HELPER_AssessmentTemplateName.compare (_AssessmentTemplateName, newAssessmentTemplateName);
}
if (FIELD_AssessmentTemplateName_Validators.length > 0)
{
Object newAssessmentTemplateNameObj = HELPER_AssessmentTemplateName.toObject (newAssessmentTemplateName);
if (newAssessmentTemplateNameObj != null)
{
int loopMax = FIELD_AssessmentTemplateName_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_AssessmentTemplateName);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_AssessmentTemplateName_Validators[v].checkAttribute (this, FIELD_AssessmentTemplateName, metadata, newAssessmentTemplateNameObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_AssessmentTemplateName () != FieldWriteability.FALSE, "Field AssessmentTemplateName is not writeable");
preAssessmentTemplateNameChange (newAssessmentTemplateName);
markFieldChange (FIELD_AssessmentTemplateName);
_AssessmentTemplateName = newAssessmentTemplateName;
postFieldChange (FIELD_AssessmentTemplateName);
postAssessmentTemplateNameChange ();
}
}
/**
* Get the attribute CultureTemplateName
*/
public Boolean getSaveCriteriaTemplate ()
public String getCultureTemplateName ()
{
assertValid();
Boolean valToReturn = _SaveCriteriaTemplate;
String valToReturn = _CultureTemplateName;
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
valToReturn = bhd.getSaveCriteriaTemplate ((Job)this, valToReturn);
valToReturn = bhd.getCultureTemplateName ((Job)this, valToReturn);
}
return valToReturn;
......@@ -1947,7 +2189,7 @@ public abstract class BaseJob extends BaseBusinessClass
* 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 preSaveCriteriaTemplateChange (Boolean newSaveCriteriaTemplate) throws FieldException
protected void preCultureTemplateNameChange (String newCultureTemplateName) throws FieldException
{
}
......@@ -1957,46 +2199,46 @@ public abstract class BaseJob extends BaseBusinessClass
* If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back
*/
protected void postSaveCriteriaTemplateChange () throws FieldException
protected void postCultureTemplateNameChange () throws FieldException
{
}
public FieldWriteability getWriteability_SaveCriteriaTemplate ()
public FieldWriteability getWriteability_CultureTemplateName ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute SaveCriteriaTemplate. Checks to ensure a new value
* Set the attribute CultureTemplateName. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setSaveCriteriaTemplate (Boolean newSaveCriteriaTemplate) throws FieldException
public void setCultureTemplateName (String newCultureTemplateName) throws FieldException
{
boolean oldAndNewIdentical = HELPER_SaveCriteriaTemplate.compare (_SaveCriteriaTemplate, newSaveCriteriaTemplate);
boolean oldAndNewIdentical = HELPER_CultureTemplateName.compare (_CultureTemplateName, newCultureTemplateName);
try
{
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
newSaveCriteriaTemplate = bhd.setSaveCriteriaTemplate ((Job)this, newSaveCriteriaTemplate);
oldAndNewIdentical = HELPER_SaveCriteriaTemplate.compare (_SaveCriteriaTemplate, newSaveCriteriaTemplate);
newCultureTemplateName = bhd.setCultureTemplateName ((Job)this, newCultureTemplateName);
oldAndNewIdentical = HELPER_CultureTemplateName.compare (_CultureTemplateName, newCultureTemplateName);
}
if (FIELD_SaveCriteriaTemplate_Validators.length > 0)
if (FIELD_CultureTemplateName_Validators.length > 0)
{
Object newSaveCriteriaTemplateObj = HELPER_SaveCriteriaTemplate.toObject (newSaveCriteriaTemplate);
Object newCultureTemplateNameObj = HELPER_CultureTemplateName.toObject (newCultureTemplateName);
if (newSaveCriteriaTemplateObj != null)
if (newCultureTemplateNameObj != null)
{
int loopMax = FIELD_SaveCriteriaTemplate_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_SaveCriteriaTemplate);
int loopMax = FIELD_CultureTemplateName_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_CultureTemplateName);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_SaveCriteriaTemplate_Validators[v].checkAttribute (this, FIELD_SaveCriteriaTemplate, metadata, newSaveCriteriaTemplateObj);
FIELD_CultureTemplateName_Validators[v].checkAttribute (this, FIELD_CultureTemplateName, metadata, newCultureTemplateNameObj);
}
}
}
......@@ -2014,12 +2256,12 @@ public abstract class BaseJob extends BaseBusinessClass
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_SaveCriteriaTemplate () != FieldWriteability.FALSE, "Field SaveCriteriaTemplate is not writeable");
preSaveCriteriaTemplateChange (newSaveCriteriaTemplate);
markFieldChange (FIELD_SaveCriteriaTemplate);
_SaveCriteriaTemplate = newSaveCriteriaTemplate;
postFieldChange (FIELD_SaveCriteriaTemplate);
postSaveCriteriaTemplateChange ();
Debug.assertion (getWriteability_CultureTemplateName () != FieldWriteability.FALSE, "Field CultureTemplateName is not writeable");
preCultureTemplateNameChange (newCultureTemplateName);
markFieldChange (FIELD_CultureTemplateName);
_CultureTemplateName = newCultureTemplateName;
postFieldChange (FIELD_CultureTemplateName);
postCultureTemplateNameChange ();
}
}
......@@ -3347,7 +3589,9 @@ public abstract class BaseJob extends BaseBusinessClass
_CompletedCulture = sourceJob._CompletedCulture;
_CompletedAssessmentType = sourceJob._CompletedAssessmentType;
_SaveAssessmentTemplate = sourceJob._SaveAssessmentTemplate;
_SaveCriteriaTemplate = sourceJob._SaveCriteriaTemplate;
_SaveCultureTemplate = sourceJob._SaveCultureTemplate;
_AssessmentTemplateName = sourceJob._AssessmentTemplateName;
_CultureTemplateName = sourceJob._CultureTemplateName;
}
}
......@@ -3423,7 +3667,9 @@ public abstract class BaseJob extends BaseBusinessClass
_CompletedCulture = (Boolean)(HELPER_CompletedCulture.readExternal (_CompletedCulture, vals.get(FIELD_CompletedCulture))); //
_CompletedAssessmentType = (Boolean)(HELPER_CompletedAssessmentType.readExternal (_CompletedAssessmentType, vals.get(FIELD_CompletedAssessmentType))); //
_SaveAssessmentTemplate = (Boolean)(HELPER_SaveAssessmentTemplate.readExternal (_SaveAssessmentTemplate, vals.get(FIELD_SaveAssessmentTemplate))); //
_SaveCriteriaTemplate = (Boolean)(HELPER_SaveCriteriaTemplate.readExternal (_SaveCriteriaTemplate, vals.get(FIELD_SaveCriteriaTemplate))); //
_SaveCultureTemplate = (Boolean)(HELPER_SaveCultureTemplate.readExternal (_SaveCultureTemplate, vals.get(FIELD_SaveCultureTemplate))); //
_AssessmentTemplateName = (String)(HELPER_AssessmentTemplateName.readExternal (_AssessmentTemplateName, vals.get(FIELD_AssessmentTemplateName))); //
_CultureTemplateName = (String)(HELPER_CultureTemplateName.readExternal (_CultureTemplateName, vals.get(FIELD_CultureTemplateName))); //
_AssessmentTemplate.readExternalData(vals.get(SINGLEREFERENCE_AssessmentTemplate));
_CultureTemplate.readExternalData(vals.get(SINGLEREFERENCE_CultureTemplate));
_JobTemplate.readExternalData(vals.get(SINGLEREFERENCE_JobTemplate));
......@@ -3456,7 +3702,9 @@ public abstract class BaseJob extends BaseBusinessClass
vals.put (FIELD_CompletedCulture, HELPER_CompletedCulture.writeExternal (_CompletedCulture));
vals.put (FIELD_CompletedAssessmentType, HELPER_CompletedAssessmentType.writeExternal (_CompletedAssessmentType));
vals.put (FIELD_SaveAssessmentTemplate, HELPER_SaveAssessmentTemplate.writeExternal (_SaveAssessmentTemplate));
vals.put (FIELD_SaveCriteriaTemplate, HELPER_SaveCriteriaTemplate.writeExternal (_SaveCriteriaTemplate));
vals.put (FIELD_SaveCultureTemplate, HELPER_SaveCultureTemplate.writeExternal (_SaveCultureTemplate));
vals.put (FIELD_AssessmentTemplateName, HELPER_AssessmentTemplateName.writeExternal (_AssessmentTemplateName));
vals.put (FIELD_CultureTemplateName, HELPER_CultureTemplateName.writeExternal (_CultureTemplateName));
vals.put (SINGLEREFERENCE_AssessmentTemplate, _AssessmentTemplate.writeExternalData());
vals.put (SINGLEREFERENCE_CultureTemplate, _CultureTemplate.writeExternalData());
vals.put (SINGLEREFERENCE_JobTemplate, _JobTemplate.writeExternalData());
......@@ -3534,7 +3782,9 @@ public abstract class BaseJob extends BaseBusinessClass
visitor.visitField(this, FIELD_CompletedCulture, HELPER_CompletedCulture.toObject(getCompletedCulture()));
visitor.visitField(this, FIELD_CompletedAssessmentType, HELPER_CompletedAssessmentType.toObject(getCompletedAssessmentType()));
visitor.visitField(this, FIELD_SaveAssessmentTemplate, HELPER_SaveAssessmentTemplate.toObject(getSaveAssessmentTemplate()));
visitor.visitField(this, FIELD_SaveCriteriaTemplate, HELPER_SaveCriteriaTemplate.toObject(getSaveCriteriaTemplate()));
visitor.visitField(this, FIELD_SaveCultureTemplate, HELPER_SaveCultureTemplate.toObject(getSaveCultureTemplate()));
visitor.visitField(this, FIELD_AssessmentTemplateName, HELPER_AssessmentTemplateName.toObject(getAssessmentTemplateName()));
visitor.visitField(this, FIELD_CultureTemplateName, HELPER_CultureTemplateName.toObject(getCultureTemplateName()));
}
......@@ -3948,9 +4198,17 @@ public abstract class BaseJob extends BaseBusinessClass
{
return HELPER_SaveAssessmentTemplate.toObject (getSaveAssessmentTemplate ());
}
else if (attribName.equals (FIELD_SaveCriteriaTemplate))
else if (attribName.equals (FIELD_SaveCultureTemplate))
{
return HELPER_SaveCultureTemplate.toObject (getSaveCultureTemplate ());
}
else if (attribName.equals (FIELD_AssessmentTemplateName))
{
return HELPER_AssessmentTemplateName.toObject (getAssessmentTemplateName ());
}
else if (attribName.equals (FIELD_CultureTemplateName))
{
return HELPER_SaveCriteriaTemplate.toObject (getSaveCriteriaTemplate ());
return HELPER_CultureTemplateName.toObject (getCultureTemplateName ());
}
else
{
......@@ -4017,9 +4275,17 @@ public abstract class BaseJob extends BaseBusinessClass
{
return HELPER_SaveAssessmentTemplate;
}
else if (attribName.equals (FIELD_SaveCriteriaTemplate))
else if (attribName.equals (FIELD_SaveCultureTemplate))
{
return HELPER_SaveCriteriaTemplate;
return HELPER_SaveCultureTemplate;
}
else if (attribName.equals (FIELD_AssessmentTemplateName))
{
return HELPER_AssessmentTemplateName;
}
else if (attribName.equals (FIELD_CultureTemplateName))
{
return HELPER_CultureTemplateName;
}
else
{
......@@ -4086,9 +4352,17 @@ public abstract class BaseJob extends BaseBusinessClass
{
setSaveAssessmentTemplate ((Boolean)(HELPER_SaveAssessmentTemplate.fromObject (_SaveAssessmentTemplate, attribValue)));
}
else if (attribName.equals (FIELD_SaveCriteriaTemplate))
else if (attribName.equals (FIELD_SaveCultureTemplate))
{
setSaveCultureTemplate ((Boolean)(HELPER_SaveCultureTemplate.fromObject (_SaveCultureTemplate, attribValue)));
}
else if (attribName.equals (FIELD_AssessmentTemplateName))
{
setAssessmentTemplateName ((String)(HELPER_AssessmentTemplateName.fromObject (_AssessmentTemplateName, attribValue)));
}
else if (attribName.equals (FIELD_CultureTemplateName))
{
setSaveCriteriaTemplate ((Boolean)(HELPER_SaveCriteriaTemplate.fromObject (_SaveCriteriaTemplate, attribValue)));
setCultureTemplateName ((String)(HELPER_CultureTemplateName.fromObject (_CultureTemplateName, attribValue)));
}
else
{
......@@ -4182,9 +4456,17 @@ public abstract class BaseJob extends BaseBusinessClass
{
return getWriteability_SaveAssessmentTemplate ();
}
else if (fieldName.equals (FIELD_SaveCriteriaTemplate))
else if (fieldName.equals (FIELD_SaveCultureTemplate))
{
return getWriteability_SaveCriteriaTemplate ();
return getWriteability_SaveCultureTemplate ();
}
else if (fieldName.equals (FIELD_AssessmentTemplateName))
{
return getWriteability_AssessmentTemplateName ();
}
else if (fieldName.equals (FIELD_CultureTemplateName))
{
return getWriteability_CultureTemplateName ();
}
else if (fieldName.equals (SINGLEREFERENCE_AssessmentTemplate))
{
......@@ -4273,9 +4555,19 @@ public abstract class BaseJob extends BaseBusinessClass
fields.add (FIELD_SaveAssessmentTemplate);
}
if (getWriteability_SaveCriteriaTemplate () != FieldWriteability.TRUE)
if (getWriteability_SaveCultureTemplate () != FieldWriteability.TRUE)
{
fields.add (FIELD_SaveCultureTemplate);
}
if (getWriteability_AssessmentTemplateName () != FieldWriteability.TRUE)
{
fields.add (FIELD_SaveCriteriaTemplate);
fields.add (FIELD_AssessmentTemplateName);
}
if (getWriteability_CultureTemplateName () != FieldWriteability.TRUE)
{
fields.add (FIELD_CultureTemplateName);
}
......@@ -4300,7 +4592,9 @@ public abstract class BaseJob extends BaseBusinessClass
result.add(HELPER_CompletedCulture.getAttribObject (getClass (), _CompletedCulture, false, FIELD_CompletedCulture));
result.add(HELPER_CompletedAssessmentType.getAttribObject (getClass (), _CompletedAssessmentType, false, FIELD_CompletedAssessmentType));
result.add(HELPER_SaveAssessmentTemplate.getAttribObject (getClass (), _SaveAssessmentTemplate, false, FIELD_SaveAssessmentTemplate));
result.add(HELPER_SaveCriteriaTemplate.getAttribObject (getClass (), _SaveCriteriaTemplate, false, FIELD_SaveCriteriaTemplate));
result.add(HELPER_SaveCultureTemplate.getAttribObject (getClass (), _SaveCultureTemplate, false, FIELD_SaveCultureTemplate));
result.add(HELPER_AssessmentTemplateName.getAttribObject (getClass (), _AssessmentTemplateName, false, FIELD_AssessmentTemplateName));
result.add(HELPER_CultureTemplateName.getAttribObject (getClass (), _CultureTemplateName, false, FIELD_CultureTemplateName));
return result;
}
......@@ -4586,21 +4880,57 @@ public abstract class BaseJob extends BaseBusinessClass
}
/**
* Get the attribute SaveCriteriaTemplate
* Get the attribute SaveCultureTemplate
*/
public Boolean getSaveCultureTemplate (Job obj, Boolean original)
{
return original;
}
/**
* Change the value set for attribute SaveCultureTemplate.
* May modify the field beforehand
* Occurs before validation.
*/
public Boolean setSaveCultureTemplate (Job obj, Boolean newSaveCultureTemplate) throws FieldException
{
return newSaveCultureTemplate;
}
/**
* Get the attribute AssessmentTemplateName
*/
public String getAssessmentTemplateName (Job obj, String original)
{
return original;
}
/**
* Change the value set for attribute AssessmentTemplateName.
* May modify the field beforehand
* Occurs before validation.
*/
public String setAssessmentTemplateName (Job obj, String newAssessmentTemplateName) throws FieldException
{
return newAssessmentTemplateName;
}
/**
* Get the attribute CultureTemplateName
*/
public Boolean getSaveCriteriaTemplate (Job obj, Boolean original)
public String getCultureTemplateName (Job obj, String original)
{
return original;
}
/**
* Change the value set for attribute SaveCriteriaTemplate.
* Change the value set for attribute CultureTemplateName.
* May modify the field beforehand
* Occurs before validation.
*/
public Boolean setSaveCriteriaTemplate (Job obj, Boolean newSaveCriteriaTemplate) throws FieldException
public String setCultureTemplateName (Job obj, String newCultureTemplateName) throws FieldException
{
return newSaveCriteriaTemplate;
return newCultureTemplateName;
}
}
......@@ -4691,9 +5021,17 @@ public abstract class BaseJob extends BaseBusinessClass
{
return toSaveAssessmentTemplate ();
}
if (name.equals ("SaveCriteriaTemplate"))
if (name.equals ("SaveCultureTemplate"))
{
return toSaveCriteriaTemplate ();
return toSaveCultureTemplate ();
}
if (name.equals ("AssessmentTemplateName"))
{
return toAssessmentTemplateName ();
}
if (name.equals ("CultureTemplateName"))
{
return toCultureTemplateName ();
}
if (name.equals ("AssessmentTemplate"))
{
......@@ -4761,7 +5099,11 @@ public abstract class BaseJob extends BaseBusinessClass
public PipeLine<From, Boolean> toSaveAssessmentTemplate () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_SaveAssessmentTemplate)); }
public PipeLine<From, Boolean> toSaveCriteriaTemplate () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_SaveCriteriaTemplate)); }
public PipeLine<From, Boolean> toSaveCultureTemplate () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_SaveCultureTemplate)); }
public PipeLine<From, String> toAssessmentTemplateName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_AssessmentTemplateName)); }
public PipeLine<From, String> toCultureTemplateName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_CultureTemplateName)); }
public PipeLine<From, String> toJobTitle () { return pipe(new ORMAttributePipe<Me, String>(FIELD_JobTitle)); }
......@@ -4860,7 +5202,17 @@ public abstract class BaseJob extends BaseBusinessClass
return true;
}
if(CollectionUtils.equals(attribName, "SaveCriteriaTemplate"))
if(CollectionUtils.equals(attribName, "SaveCultureTemplate"))
{
return true;
}
if(CollectionUtils.equals(attribName, "AssessmentTemplateName"))
{
return true;
}
if(CollectionUtils.equals(attribName, "CultureTemplateName"))
{
return true;
}
......
cmsWebApp/src/performa/orm/Job.xml
......@@ -16,7 +16,9 @@
<TRANSIENT name="CompletedCulture" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="CompletedAssessmentType" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="SaveAssessmentTemplate" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="SaveCriteriaTemplate" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="SaveCultureTemplate" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="AssessmentTemplateName" type="String"/>
<TRANSIENT name="CultureTemplateName" type="String"/>
<TRANSIENTSINGLE name="AssessmentTemplate" type="AssessmentCriteriaTemplate" />
<TRANSIENTSINGLE name="CultureTemplate" type="CultureCriteriaTemplate" />
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
......@@ -12,9 +12,6 @@
Debug.assertion(job != null, "Job is null in admin portal create job");
AssessmentCriteriaTemplate[] templates = job.getAssessmentTemplates();
AssessmentCriteriaTemplate template = AssessmentCriteriaTemplate.createAssessmentCriteriaTemplate(transaction);
process.setAttribute("AssessmentCriteriaTemplate", template);
%>
<script type="text/javascript">
......@@ -172,33 +169,21 @@
</div>
</div>
</div>
<oneit:button value=" " name="changeAssessmentTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry ("AssessmentCriteriaTemplate", template)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<%
if(template != null)
{
%>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
<oneit:button value="SAVE" name="requirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("AssessmentCriteriaTemplate", template)
.toMap() %>" />
</span>
</div>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= job %>" type="text" attributeName="AssessmentTemplateName" cssClass="form-control" />
</div>
<%
}
%>
<span class="input-group-btn">
<oneit:button value="SAVE" name="requirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.toMap() %>" />
</span>
</div>
</div>
</div>
<div class="text-center">
<oneit:button value="Proceed to Workplace Culture" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
<oneit:button value="Review Details" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" />
......
cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp
......@@ -33,7 +33,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>">
<span><%= job.getCompletedAssessmentType() || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
<span><%= job.getCompletedAssessmentType() || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Profile Assessment
</oneit:button>
</li>
......@@ -51,7 +51,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>">
<span><%= job.getCompletedRequirements() || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
<span><%= job.getCompletedRequirements() || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
Requirements
</oneit:button>
</li>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
......@@ -92,7 +92,7 @@
</div>
</div>
<div class="text-center">
<oneit:button value="Proceed to Assessment Criteria" name="gotoPage" cssClass="btn btn-primary largeBtn"
<oneit:button value="Proceed to Profile" name="gotoPage" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
......
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
......@@ -103,7 +103,7 @@
}
%>
<div class="text-center">
<oneit:button value="Review Details" name="gotoPage" cssClass="btn btn-primary top-margin-37 largeBtn"
<oneit:button value="Proceed to Culture" name="gotoPage" cssClass="btn btn-primary top-margin-37 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
......@@ -3,7 +3,13 @@ Job.JobTitle = Job Title
Job.JobDescription = Job Description
Job.Level = Role Type
Job.SaveAssessmentTemplate = Save these requirements as a template
Job.SaveCriteriaTemplate = Save this Culture as a template
Job.SaveCultureTemplate = Save this Culture as a template
Job.AssessmentTemplateName = Template Name
Job.CultureTemplateName = Template Name
CultureCriteria.Importance = Rate Importance
CultureCriteria.CultureElementRating = Rating
AssessmentCriteriaTemplate.TemplateName = Template Name
CultureCriteriaTemplate.TemplateName = Template Name
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
......@@ -11,7 +11,6 @@
Debug.assertion(job != null, "Job is null in admin portal create job");
CultureCriteriaTemplate[] templates = job.getCultureTemplates();
CultureCriteriaTemplate template = CultureCriteriaTemplate.createCultureCriteriaTemplate(transaction);
%>
<script type="text/javascript">
......@@ -177,38 +176,27 @@
<div class="form-group">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveCriteriaTemplate" type="checkbox"/>
<oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveCultureTemplate" type="checkbox"/>
<label for="save-assess-check">
<oneit:ormlabel obj="<%= job %>" field="SaveCriteriaTemplate" />
<oneit:ormlabel obj="<%= job %>" field="SaveCultureTemplate" />
</label>
</div>
</div>
</div>
<oneit:button value=" " name="changeCultureTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<%
if(template != null)
{
%>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
<oneit:button value="SAVE" name="cultureTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("CultureCriteriaTemplate", template)
.toMap() %>" />
</span>
</div>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= job %>" type="text" attributeName="CultureTemplateName" cssClass="form-control" />
</div>
<%
}
%>
<span class="input-group-btn">
<oneit:button value="SAVE" name="cultureTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.toMap() %>" />
</span>
</div>
</div>
<div class="text-center">
<oneit:button value="Proceed to Job Match" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
<oneit:button value="Proceed to Requirements" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment