Skip to content

P
PERFORMA_REPLICA
Commit f65a7271 by Nilu
Options

J002 , J003 and J005 modifications (requrements, culture, review)

parent a1e4b9ae
Showing with 752 additions and 183 deletions
cmsWebApp/sql/CultureCriteria.xml
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="importance" type="String" nullable="false" length="200"/> <column name="importance" type="String" nullable="true" length="200"/>
<column name="is_applicable" type="Boolean" nullable="true"/>
<column name="culture_element_id" type="Long" length="11" nullable="false"/> <column name="culture_element_id" type="Long" length="11" nullable="false"/>
<column name="culture_element_rating_id" type="Long" length="11" nullable="true"/> <column name="culture_element_rating_id" type="Long" length="11" nullable="true"/>
<column name="job_id" type="Long" length="11" nullable="true"/> <column name="job_id" type="Long" length="11" nullable="true"/>
......
cmsWebApp/sql/Job.xml
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<column name="last_edited" type="Date" nullable="true"/> <column name="last_edited" type="Date" nullable="true"/>
<column name="is_ppj" type="Boolean" nullable="true"/> <column name="is_ppj" type="Boolean" nullable="true"/>
<column name="industry" type="String" nullable="true" length="200"/> <column name="industry" type="String" nullable="true" length="200"/>
<column name="culture_statement" type="String" nullable="true" length="2000"/>
<column name="level_id" type="Long" length="11" nullable="true"/> <column name="level_id" type="Long" length="11" nullable="true"/>
<column name="client_id" type="Long" length="11" nullable="true"/> <column name="client_id" type="Long" length="11" nullable="true"/>
<column name="job_owner_id" type="Long" length="11" nullable="true"/> <column name="job_owner_id" type="Long" length="11" nullable="true"/>
......
cmsWebApp/sql/ms/CultureCriteria.sql
...@@ -8,7 +8,8 @@ CREATE TABLE tl_culture_criteria ( ...@@ -8,7 +8,8 @@ CREATE TABLE tl_culture_criteria (
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
, ,
importance varchar(200) NOT NULL, importance varchar(200) NULL,
is_applicable char(1) NULL,
culture_element_id numeric(12) NOT NULL, culture_element_id numeric(12) NOT NULL,
culture_element_rating_id numeric(12) NULL, culture_element_rating_id numeric(12) NULL,
job_id numeric(12) NULL, job_id numeric(12) NULL,
......
cmsWebApp/sql/ms/Job.sql
...@@ -30,6 +30,7 @@ CREATE TABLE tl_job ( ...@@ -30,6 +30,7 @@ CREATE TABLE tl_job (
last_edited datetime NULL, last_edited datetime NULL,
is_ppj char(1) NULL, is_ppj char(1) NULL,
industry varchar(200) NULL, industry varchar(200) NULL,
culture_statement varchar(2000) NULL,
level_id numeric(12) NULL, level_id numeric(12) NULL,
client_id numeric(12) NULL, client_id numeric(12) NULL,
job_owner_id numeric(12) NULL, job_owner_id numeric(12) NULL,
......
cmsWebApp/sql/oracle/CultureCriteria.sql
...@@ -9,7 +9,8 @@ CREATE TABLE tl_culture_criteria ( ...@@ -9,7 +9,8 @@ CREATE TABLE tl_culture_criteria (
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
, ,
importance varchar2(200) NOT NULL, importance varchar2(200) NULL,
is_applicable char(1) NULL,
culture_element_id number(12) NOT NULL, culture_element_id number(12) NOT NULL,
culture_element_rating_id number(12) NULL, culture_element_rating_id number(12) NULL,
job_id number(12) NULL, job_id number(12) NULL,
......
cmsWebApp/sql/oracle/Job.sql
...@@ -31,6 +31,7 @@ CREATE TABLE tl_job ( ...@@ -31,6 +31,7 @@ CREATE TABLE tl_job (
last_edited date NULL, last_edited date NULL,
is_ppj char(1) NULL, is_ppj char(1) NULL,
industry varchar2(200) NULL, industry varchar2(200) NULL,
culture_statement varchar2(2000) NULL,
level_id number(12) NULL, level_id number(12) NULL,
client_id number(12) NULL, client_id number(12) NULL,
job_owner_id number(12) NULL, job_owner_id number(12) NULL,
......
cmsWebApp/sql/postgres/CultureCriteria.sql
...@@ -9,7 +9,8 @@ CREATE TABLE tl_culture_criteria ( ...@@ -9,7 +9,8 @@ CREATE TABLE tl_culture_criteria (
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
, ,
importance varchar(200) NOT NULL, importance varchar(200) NULL,
is_applicable char(1) NULL,
culture_element_id numeric(12) NOT NULL, culture_element_id numeric(12) NOT NULL,
culture_element_rating_id numeric(12) NULL, culture_element_rating_id numeric(12) NULL,
job_id numeric(12) NULL, job_id numeric(12) NULL,
......
cmsWebApp/sql/postgres/Job.sql
...@@ -31,6 +31,7 @@ CREATE TABLE tl_job ( ...@@ -31,6 +31,7 @@ CREATE TABLE tl_job (
last_edited timestamp NULL, last_edited timestamp NULL,
is_ppj char(1) NULL, is_ppj char(1) NULL,
industry varchar(200) NULL, industry varchar(200) NULL,
culture_statement varchar(2000) NULL,
level_id numeric(12) NULL, level_id numeric(12) NULL,
client_id numeric(12) NULL, client_id numeric(12) NULL,
job_owner_id numeric(12) NULL, job_owner_id numeric(12) NULL,
......
cmsWebApp/src/performa/batch/CloseJobBatch.java
...@@ -36,7 +36,7 @@ public class CloseJobBatch extends ORMBatch ...@@ -36,7 +36,7 @@ public class CloseJobBatch extends ORMBatch
} }
// Update closed job details to intercom // Update closed job details to intercom
Set<Company> companies = Job.pipesJob(expiringJobs).toCompanyUser().toCompany().uniqueVals(); Set<Company> companies = Job.pipesJob(expiringJobs).toCreatedBy().toCompany().uniqueVals();
for (Company company : companies) for (Company company : companies)
{ {
......
cmsWebApp/src/performa/form/CompleteApplicationFP.java
...@@ -49,9 +49,9 @@ public class CompleteApplicationFP extends SaveFP ...@@ -49,9 +49,9 @@ public class CompleteApplicationFP extends SaveFP
jobApplication = (JobApplication) process.getAttribute("JobApplication"); jobApplication = (JobApplication) process.getAttribute("JobApplication");
// Update company in intercom // Update company in intercom
if(jobApplication != null && jobApplication.getJob().getCompanyUser() != null) if(jobApplication != null && jobApplication.getJob().getCreatedBy() != null)
{ {
IntercomUtils.updateCompany(jobApplication.getJob().getCompanyUser().getCompany()); IntercomUtils.updateCompany(jobApplication.getJob().getCreatedBy().getCompany());
} }
return super.processForm(process, submission, params); return super.processForm(process, submission, params);
......
cmsWebApp/src/performa/form/ProcessCultureFP.java
...@@ -36,9 +36,11 @@ public class ProcessCultureFP extends SaveFP ...@@ -36,9 +36,11 @@ public class ProcessCultureFP extends SaveFP
for(CultureCriteria criteria: job.getCultureCriteriasSet()) for(CultureCriteria criteria: job.getCultureCriteriasSet())
{ {
if(criteria.isRatingRequired()) if(criteria.getIsApplicable())
{ {
BusinessObjectParser.assertFieldCondition(criteria.getCultureElementRating() != null, criteria , CultureCriteria.SINGLEREFERENCE_CultureElementRating, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(criteria.getCultureElementRating() != null, criteria , CultureCriteria.SINGLEREFERENCE_CultureElementRating, "mandatory", exceptions, true, request);
BusinessObjectParser.assertFieldCondition(criteria.getImportance() != null, criteria , CultureCriteria.FIELD_Importance, "mandatory", exceptions, true, request);
} }
} }
......
cmsWebApp/src/performa/orm/BaseCultureCriteria.java
...@@ -41,6 +41,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -41,6 +41,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
// Static constants corresponding to field names // Static constants corresponding to field names
public static final String FIELD_Importance = "Importance"; public static final String FIELD_Importance = "Importance";
public static final String FIELD_IsApplicable = "IsApplicable";
public static final String SINGLEREFERENCE_CultureElement = "CultureElement"; public static final String SINGLEREFERENCE_CultureElement = "CultureElement";
public static final String SINGLEREFERENCE_CultureElementRating = "CultureElementRating"; public static final String SINGLEREFERENCE_CultureElementRating = "CultureElementRating";
public static final String SINGLEREFERENCE_Job = "Job"; public static final String SINGLEREFERENCE_Job = "Job";
...@@ -54,10 +55,12 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -54,10 +55,12 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final EnumeratedAttributeHelper<CultureCriteria, Importance> HELPER_Importance = new EnumeratedAttributeHelper<CultureCriteria, Importance> (Importance.FACTORY_Importance); private static final EnumeratedAttributeHelper<CultureCriteria, Importance> HELPER_Importance = new EnumeratedAttributeHelper<CultureCriteria, Importance> (Importance.FACTORY_Importance);
private static final DefaultAttributeHelper<CultureCriteria> HELPER_IsApplicable = DefaultAttributeHelper.INSTANCE;
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private Importance _Importance; private Importance _Importance;
private Boolean _IsApplicable;
// Private attributes corresponding to single references // Private attributes corresponding to single references
...@@ -75,6 +78,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -75,6 +78,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
// Arrays of validators for each attribute // Arrays of validators for each attribute
private static final AttributeValidator[] FIELD_Importance_Validators; private static final AttributeValidator[] FIELD_Importance_Validators;
private static final AttributeValidator[] FIELD_IsApplicable_Validators;
// Arrays of behaviour decorators // Arrays of behaviour decorators
...@@ -95,6 +99,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -95,6 +99,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
setupAssocMetaData_Job(); setupAssocMetaData_Job();
setupAssocMetaData_Template(); setupAssocMetaData_Template();
FIELD_Importance_Validators = (AttributeValidator[])setupAttribMetaData_Importance(validatorMapping).toArray (new AttributeValidator[0]); FIELD_Importance_Validators = (AttributeValidator[])setupAttribMetaData_Importance(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_IsApplicable_Validators = (AttributeValidator[])setupAttribMetaData_IsApplicable(validatorMapping).toArray (new AttributeValidator[0]);
REFERENCE_CultureCriteria.initialiseReference (); REFERENCE_CultureCriteria.initialiseReference ();
...@@ -176,8 +181,6 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -176,8 +181,6 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
metaInfo.put ("attribHelper", "EnumeratedAttributeHelper"); metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
metaInfo.put ("dbcol", "importance"); metaInfo.put ("dbcol", "importance");
metaInfo.put ("defaultValue", "Importance.NOT_APPLICABLE");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "Importance"); metaInfo.put ("name", "Importance");
metaInfo.put ("type", "Importance"); metaInfo.put ("type", "Importance");
...@@ -190,6 +193,25 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -190,6 +193,25 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
return validators; return validators;
} }
// Meta Info setup
private static List setupAttribMetaData_IsApplicable(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "is_applicable");
metaInfo.put ("defaultValue", "Boolean.FALSE");
metaInfo.put ("name", "IsApplicable");
metaInfo.put ("type", "Boolean");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for CultureCriteria.IsApplicable:", metaInfo);
ATTRIBUTES_METADATA_CultureCriteria.put (FIELD_IsApplicable, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(CultureCriteria.class, "IsApplicable", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for CultureCriteria.IsApplicable:", validators);
return validators;
}
// END OF STATIC METADATA DEFINITION // END OF STATIC METADATA DEFINITION
...@@ -217,7 +239,8 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -217,7 +239,8 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
super._initialiseNewObjAttributes (transaction); super._initialiseNewObjAttributes (transaction);
_Importance = (Importance)(Importance.NOT_APPLICABLE); _Importance = (Importance)(HELPER_Importance.initialise (_Importance));
_IsApplicable = (Boolean)(Boolean.FALSE);
} }
...@@ -308,7 +331,6 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -308,7 +331,6 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
oldAndNewIdentical = HELPER_Importance.compare (_Importance, newImportance); oldAndNewIdentical = HELPER_Importance.compare (_Importance, newImportance);
} }
BusinessObjectParser.assertFieldCondition (newImportance != null, this, FIELD_Importance, "mandatory");
if (FIELD_Importance_Validators.length > 0) if (FIELD_Importance_Validators.length > 0)
...@@ -349,6 +371,104 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -349,6 +371,104 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
} }
} }
/**
* Get the attribute IsApplicable
*/
public Boolean getIsApplicable ()
{
assertValid();
Boolean valToReturn = _IsApplicable;
for (CultureCriteriaBehaviourDecorator bhd : CultureCriteria_BehaviourDecorators)
{
valToReturn = bhd.getIsApplicable ((CultureCriteria)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 preIsApplicableChange (Boolean newIsApplicable) 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 postIsApplicableChange () throws FieldException
{
}
public FieldWriteability getWriteability_IsApplicable ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute IsApplicable. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setIsApplicable (Boolean newIsApplicable) throws FieldException
{
boolean oldAndNewIdentical = HELPER_IsApplicable.compare (_IsApplicable, newIsApplicable);
try
{
for (CultureCriteriaBehaviourDecorator bhd : CultureCriteria_BehaviourDecorators)
{
newIsApplicable = bhd.setIsApplicable ((CultureCriteria)this, newIsApplicable);
oldAndNewIdentical = HELPER_IsApplicable.compare (_IsApplicable, newIsApplicable);
}
if (FIELD_IsApplicable_Validators.length > 0)
{
Object newIsApplicableObj = HELPER_IsApplicable.toObject (newIsApplicable);
if (newIsApplicableObj != null)
{
int loopMax = FIELD_IsApplicable_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_CultureCriteria.get (FIELD_IsApplicable);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_IsApplicable_Validators[v].checkAttribute (this, FIELD_IsApplicable, metadata, newIsApplicableObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_IsApplicable () != FieldWriteability.FALSE, "Field IsApplicable is not writeable");
preIsApplicableChange (newIsApplicable);
markFieldChange (FIELD_IsApplicable);
_IsApplicable = newIsApplicable;
postFieldChange (FIELD_IsApplicable);
postIsApplicableChange ();
}
}
/** /**
...@@ -1119,6 +1239,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1119,6 +1239,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
tl_culture_criteriaPSet.setAttrib (FIELD_ObjectID, myID); tl_culture_criteriaPSet.setAttrib (FIELD_ObjectID, myID);
tl_culture_criteriaPSet.setAttrib (FIELD_Importance, HELPER_Importance.toObject (_Importance)); // tl_culture_criteriaPSet.setAttrib (FIELD_Importance, HELPER_Importance.toObject (_Importance)); //
tl_culture_criteriaPSet.setAttrib (FIELD_IsApplicable, HELPER_IsApplicable.toObject (_IsApplicable)); //
_CultureElement.getPersistentSets (allSets); _CultureElement.getPersistentSets (allSets);
_CultureElementRating.getPersistentSets (allSets); _CultureElementRating.getPersistentSets (allSets);
_Job.getPersistentSets (allSets); _Job.getPersistentSets (allSets);
...@@ -1138,6 +1259,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1138,6 +1259,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
PersistentSet tl_culture_criteriaPSet = allSets.getPersistentSet (objectID, "tl_culture_criteria"); PersistentSet tl_culture_criteriaPSet = allSets.getPersistentSet (objectID, "tl_culture_criteria");
_Importance = (Importance)(HELPER_Importance.fromObject (_Importance, tl_culture_criteriaPSet.getAttrib (FIELD_Importance))); // _Importance = (Importance)(HELPER_Importance.fromObject (_Importance, tl_culture_criteriaPSet.getAttrib (FIELD_Importance))); //
_IsApplicable = (Boolean)(HELPER_IsApplicable.fromObject (_IsApplicable, tl_culture_criteriaPSet.getAttrib (FIELD_IsApplicable))); //
_CultureElement.setFromPersistentSets (objectID, allSets); _CultureElement.setFromPersistentSets (objectID, allSets);
_CultureElementRating.setFromPersistentSets (objectID, allSets); _CultureElementRating.setFromPersistentSets (objectID, allSets);
_Job.setFromPersistentSets (objectID, allSets); _Job.setFromPersistentSets (objectID, allSets);
...@@ -1166,6 +1288,15 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1166,6 +1288,15 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
e.addException (ex); e.addException (ex);
} }
try
{
setIsApplicable (otherCultureCriteria.getIsApplicable ());
}
catch (FieldException ex)
{
e.addException (ex);
}
} }
} }
...@@ -1182,6 +1313,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1182,6 +1313,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
BaseCultureCriteria sourceCultureCriteria = (BaseCultureCriteria)(source); BaseCultureCriteria sourceCultureCriteria = (BaseCultureCriteria)(source);
_Importance = sourceCultureCriteria._Importance; _Importance = sourceCultureCriteria._Importance;
_IsApplicable = sourceCultureCriteria._IsApplicable;
} }
} }
...@@ -1241,6 +1373,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1241,6 +1373,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
super.readExternalData(vals); super.readExternalData(vals);
_Importance = (Importance)(HELPER_Importance.readExternal (_Importance, vals.get(FIELD_Importance))); // _Importance = (Importance)(HELPER_Importance.readExternal (_Importance, vals.get(FIELD_Importance))); //
_IsApplicable = (Boolean)(HELPER_IsApplicable.readExternal (_IsApplicable, vals.get(FIELD_IsApplicable))); //
_CultureElement.readExternalData(vals.get(SINGLEREFERENCE_CultureElement)); _CultureElement.readExternalData(vals.get(SINGLEREFERENCE_CultureElement));
_CultureElementRating.readExternalData(vals.get(SINGLEREFERENCE_CultureElementRating)); _CultureElementRating.readExternalData(vals.get(SINGLEREFERENCE_CultureElementRating));
_Job.readExternalData(vals.get(SINGLEREFERENCE_Job)); _Job.readExternalData(vals.get(SINGLEREFERENCE_Job));
...@@ -1257,6 +1390,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1257,6 +1390,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
super.writeExternalData(vals); super.writeExternalData(vals);
vals.put (FIELD_Importance, HELPER_Importance.writeExternal (_Importance)); vals.put (FIELD_Importance, HELPER_Importance.writeExternal (_Importance));
vals.put (FIELD_IsApplicable, HELPER_IsApplicable.writeExternal (_IsApplicable));
vals.put (SINGLEREFERENCE_CultureElement, _CultureElement.writeExternalData()); vals.put (SINGLEREFERENCE_CultureElement, _CultureElement.writeExternalData());
vals.put (SINGLEREFERENCE_CultureElementRating, _CultureElementRating.writeExternalData()); vals.put (SINGLEREFERENCE_CultureElementRating, _CultureElementRating.writeExternalData());
vals.put (SINGLEREFERENCE_Job, _Job.writeExternalData()); vals.put (SINGLEREFERENCE_Job, _Job.writeExternalData());
...@@ -1278,6 +1412,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1278,6 +1412,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
{ {
listener.notifyFieldChange(this, other, FIELD_Importance, HELPER_Importance.toObject(this._Importance), HELPER_Importance.toObject(otherCultureCriteria._Importance)); listener.notifyFieldChange(this, other, FIELD_Importance, HELPER_Importance.toObject(this._Importance), HELPER_Importance.toObject(otherCultureCriteria._Importance));
} }
if (!HELPER_IsApplicable.compare(this._IsApplicable, otherCultureCriteria._IsApplicable))
{
listener.notifyFieldChange(this, other, FIELD_IsApplicable, HELPER_IsApplicable.toObject(this._IsApplicable), HELPER_IsApplicable.toObject(otherCultureCriteria._IsApplicable));
}
// Compare single assocs // Compare single assocs
_CultureElement.compare (otherCultureCriteria._CultureElement, listener); _CultureElement.compare (otherCultureCriteria._CultureElement, listener);
...@@ -1305,6 +1443,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1305,6 +1443,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
super.visitAttributes (visitor); super.visitAttributes (visitor);
visitor.visitField(this, FIELD_Importance, HELPER_Importance.toObject(getImportance())); visitor.visitField(this, FIELD_Importance, HELPER_Importance.toObject(getImportance()));
visitor.visitField(this, FIELD_IsApplicable, HELPER_IsApplicable.toObject(getIsApplicable()));
visitor.visitAssociation (_CultureElement); visitor.visitAssociation (_CultureElement);
visitor.visitAssociation (_CultureElementRating); visitor.visitAssociation (_CultureElementRating);
visitor.visitAssociation (_Job); visitor.visitAssociation (_Job);
...@@ -1362,6 +1501,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1362,6 +1501,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
{ {
return filter.matches (getImportance ()); return filter.matches (getImportance ());
} }
else if (attribName.equals (FIELD_IsApplicable))
{
return filter.matches (getIsApplicable ());
}
else if (attribName.equals (SINGLEREFERENCE_CultureElement)) else if (attribName.equals (SINGLEREFERENCE_CultureElement))
{ {
return filter.matches (getCultureElement ()); return filter.matches (getCultureElement ());
...@@ -1415,6 +1558,12 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1415,6 +1558,12 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
return this; return this;
} }
public SearchAll andIsApplicable (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_culture_criteria.is_applicable", "IsApplicable");
return this;
}
public SearchAll andCultureElement (QueryFilter<CultureElement> filter) public SearchAll andCultureElement (QueryFilter<CultureElement> filter)
{ {
filter.addFilter (context, "tl_culture_criteria.culture_element_id", "CultureElement"); filter.addFilter (context, "tl_culture_criteria.culture_element_id", "CultureElement");
...@@ -1478,6 +1627,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1478,6 +1627,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
{ {
return HELPER_Importance.toObject (getImportance ()); return HELPER_Importance.toObject (getImportance ());
} }
else if (attribName.equals (FIELD_IsApplicable))
{
return HELPER_IsApplicable.toObject (getIsApplicable ());
}
else else
{ {
return super.getAttribute (attribName); return super.getAttribute (attribName);
...@@ -1495,6 +1648,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1495,6 +1648,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
{ {
return HELPER_Importance; return HELPER_Importance;
} }
else if (attribName.equals (FIELD_IsApplicable))
{
return HELPER_IsApplicable;
}
else else
{ {
return super.getAttributeHelper (attribName); return super.getAttributeHelper (attribName);
...@@ -1512,6 +1669,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1512,6 +1669,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
{ {
setImportance ((Importance)(HELPER_Importance.fromObject (_Importance, attribValue))); setImportance ((Importance)(HELPER_Importance.fromObject (_Importance, attribValue)));
} }
else if (attribName.equals (FIELD_IsApplicable))
{
setIsApplicable ((Boolean)(HELPER_IsApplicable.fromObject (_IsApplicable, attribValue)));
}
else else
{ {
super.setAttribute (attribName, attribValue); super.setAttribute (attribName, attribValue);
...@@ -1536,6 +1697,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1536,6 +1697,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
{ {
return getWriteability_Importance (); return getWriteability_Importance ();
} }
else if (fieldName.equals (FIELD_IsApplicable))
{
return getWriteability_IsApplicable ();
}
else if (fieldName.equals (SINGLEREFERENCE_CultureElement)) else if (fieldName.equals (SINGLEREFERENCE_CultureElement))
{ {
return getWriteability_CultureElement (); return getWriteability_CultureElement ();
...@@ -1567,6 +1732,11 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1567,6 +1732,11 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
fields.add (FIELD_Importance); fields.add (FIELD_Importance);
} }
if (getWriteability_IsApplicable () != FieldWriteability.TRUE)
{
fields.add (FIELD_IsApplicable);
}
super.putUnwriteable (fields); super.putUnwriteable (fields);
} }
...@@ -1576,7 +1746,8 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1576,7 +1746,8 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
List result = super.getAttributes (); List result = super.getAttributes ();
result.add(HELPER_Importance.getAttribObject (getClass (), _Importance, true, FIELD_Importance)); result.add(HELPER_Importance.getAttribObject (getClass (), _Importance, false, FIELD_Importance));
result.add(HELPER_IsApplicable.getAttribObject (getClass (), _IsApplicable, false, FIELD_IsApplicable));
return result; return result;
} }
...@@ -1645,6 +1816,24 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1645,6 +1816,24 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
return newImportance; return newImportance;
} }
/**
* Get the attribute IsApplicable
*/
public Boolean getIsApplicable (CultureCriteria obj, Boolean original)
{
return original;
}
/**
* Change the value set for attribute IsApplicable.
* May modify the field beforehand
* Occurs before validation.
*/
public Boolean setIsApplicable (CultureCriteria obj, Boolean newIsApplicable) throws FieldException
{
return newIsApplicable;
}
} }
...@@ -1701,6 +1890,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1701,6 +1890,10 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
{ {
return toImportance (); return toImportance ();
} }
if (name.equals ("IsApplicable"))
{
return toIsApplicable ();
}
if (name.equals ("CultureElement")) if (name.equals ("CultureElement"))
{ {
return toCultureElement (); return toCultureElement ();
...@@ -1724,6 +1917,8 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass ...@@ -1724,6 +1917,8 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
public PipeLine<From, Importance> toImportance () { return pipe(new ORMAttributePipe<Me, Importance>(FIELD_Importance)); } public PipeLine<From, Importance> toImportance () { return pipe(new ORMAttributePipe<Me, Importance>(FIELD_Importance)); }
public PipeLine<From, Boolean> toIsApplicable () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsApplicable)); }
public CultureElement.CultureElementPipeLineFactory<From, CultureElement> toCultureElement () { return toCultureElement (Filter.ALL); } public CultureElement.CultureElementPipeLineFactory<From, CultureElement> toCultureElement () { return toCultureElement (Filter.ALL); }
public CultureElement.CultureElementPipeLineFactory<From, CultureElement> toCultureElement (Filter<CultureElement> filter) public CultureElement.CultureElementPipeLineFactory<From, CultureElement> toCultureElement (Filter<CultureElement> filter)
......
cmsWebApp/src/performa/orm/BaseJob.java
...@@ -66,6 +66,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -66,6 +66,7 @@ public abstract class BaseJob extends BaseBusinessClass
public static final String FIELD_LastEdited = "LastEdited"; public static final String FIELD_LastEdited = "LastEdited";
public static final String FIELD_IsPPJ = "IsPPJ"; public static final String FIELD_IsPPJ = "IsPPJ";
public static final String FIELD_Industry = "Industry"; public static final String FIELD_Industry = "Industry";
public static final String FIELD_CultureStatement = "CultureStatement";
public static final String FIELD_Email = "Email"; public static final String FIELD_Email = "Email";
public static final String FIELD_Password = "Password"; public static final String FIELD_Password = "Password";
public static final String FIELD_ConfirmPassword = "ConfirmPassword"; public static final String FIELD_ConfirmPassword = "ConfirmPassword";
...@@ -125,6 +126,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -125,6 +126,7 @@ public abstract class BaseJob extends BaseBusinessClass
private static final DefaultAttributeHelper<Job> HELPER_LastEdited = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Job> HELPER_LastEdited = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Job> HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper<Job, Industry> HELPER_Industry = new EnumeratedAttributeHelper<Job, Industry> (Industry.FACTORY_Industry); private static final EnumeratedAttributeHelper<Job, Industry> HELPER_Industry = new EnumeratedAttributeHelper<Job, Industry> (Industry.FACTORY_Industry);
private static final DefaultAttributeHelper<Job> HELPER_CultureStatement = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_Email = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Job> HELPER_Email = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_Password = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Job> HELPER_Password = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Job> HELPER_ConfirmPassword = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Job> HELPER_ConfirmPassword = DefaultAttributeHelper.INSTANCE;
...@@ -163,6 +165,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -163,6 +165,7 @@ public abstract class BaseJob extends BaseBusinessClass
private Date _LastEdited; private Date _LastEdited;
private Boolean _IsPPJ; private Boolean _IsPPJ;
private Industry _Industry; private Industry _Industry;
private String _CultureStatement;
private String _Email; private String _Email;
private String _Password; private String _Password;
private String _ConfirmPassword; private String _ConfirmPassword;
...@@ -235,6 +238,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -235,6 +238,7 @@ public abstract class BaseJob extends BaseBusinessClass
private static final AttributeValidator[] FIELD_LastEdited_Validators; private static final AttributeValidator[] FIELD_LastEdited_Validators;
private static final AttributeValidator[] FIELD_IsPPJ_Validators; private static final AttributeValidator[] FIELD_IsPPJ_Validators;
private static final AttributeValidator[] FIELD_Industry_Validators; private static final AttributeValidator[] FIELD_Industry_Validators;
private static final AttributeValidator[] FIELD_CultureStatement_Validators;
// Arrays of behaviour decorators // Arrays of behaviour decorators
...@@ -299,6 +303,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -299,6 +303,7 @@ public abstract class BaseJob extends BaseBusinessClass
FIELD_LastEdited_Validators = (AttributeValidator[])setupAttribMetaData_LastEdited(validatorMapping).toArray (new AttributeValidator[0]); FIELD_LastEdited_Validators = (AttributeValidator[])setupAttribMetaData_LastEdited(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_IsPPJ_Validators = (AttributeValidator[])setupAttribMetaData_IsPPJ(validatorMapping).toArray (new AttributeValidator[0]); FIELD_IsPPJ_Validators = (AttributeValidator[])setupAttribMetaData_IsPPJ(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_Industry_Validators = (AttributeValidator[])setupAttribMetaData_Industry(validatorMapping).toArray (new AttributeValidator[0]); FIELD_Industry_Validators = (AttributeValidator[])setupAttribMetaData_Industry(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CultureStatement_Validators = (AttributeValidator[])setupAttribMetaData_CultureStatement(validatorMapping).toArray (new AttributeValidator[0]);
REFERENCE_Job.initialiseReference (); REFERENCE_Job.initialiseReference ();
...@@ -1132,6 +1137,25 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -1132,6 +1137,25 @@ public abstract class BaseJob extends BaseBusinessClass
return validators; return validators;
} }
// Meta Info setup
private static List setupAttribMetaData_CultureStatement(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "culture_statement");
metaInfo.put ("length", "2000");
metaInfo.put ("name", "CultureStatement");
metaInfo.put ("type", "String");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.CultureStatement:", metaInfo);
ATTRIBUTES_METADATA_Job.put (FIELD_CultureStatement, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Job.class, "CultureStatement", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.CultureStatement:", validators);
return validators;
}
// END OF STATIC METADATA DEFINITION // END OF STATIC METADATA DEFINITION
...@@ -1181,6 +1205,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -1181,6 +1205,7 @@ public abstract class BaseJob extends BaseBusinessClass
_LastEdited = (Date)(HELPER_LastEdited.initialise (_LastEdited)); _LastEdited = (Date)(HELPER_LastEdited.initialise (_LastEdited));
_IsPPJ = (Boolean)(Boolean.FALSE); _IsPPJ = (Boolean)(Boolean.FALSE);
_Industry = (Industry)(HELPER_Industry.initialise (_Industry)); _Industry = (Industry)(HELPER_Industry.initialise (_Industry));
_CultureStatement = (String)(HELPER_CultureStatement.initialise (_CultureStatement));
_Email = (String)(HELPER_Email.initialise (_Email)); _Email = (String)(HELPER_Email.initialise (_Email));
_Password = (String)(HELPER_Password.initialise (_Password)); _Password = (String)(HELPER_Password.initialise (_Password));
_ConfirmPassword = (String)(HELPER_ConfirmPassword.initialise (_ConfirmPassword)); _ConfirmPassword = (String)(HELPER_ConfirmPassword.initialise (_ConfirmPassword));
...@@ -3405,6 +3430,104 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -3405,6 +3430,104 @@ public abstract class BaseJob extends BaseBusinessClass
} }
/** /**
* Get the attribute CultureStatement
*/
public String getCultureStatement ()
{
assertValid();
String valToReturn = _CultureStatement;
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
valToReturn = bhd.getCultureStatement ((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 preCultureStatementChange (String newCultureStatement) 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 postCultureStatementChange () throws FieldException
{
}
public FieldWriteability getWriteability_CultureStatement ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute CultureStatement. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setCultureStatement (String newCultureStatement) throws FieldException
{
boolean oldAndNewIdentical = HELPER_CultureStatement.compare (_CultureStatement, newCultureStatement);
try
{
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
newCultureStatement = bhd.setCultureStatement ((Job)this, newCultureStatement);
oldAndNewIdentical = HELPER_CultureStatement.compare (_CultureStatement, newCultureStatement);
}
if (FIELD_CultureStatement_Validators.length > 0)
{
Object newCultureStatementObj = HELPER_CultureStatement.toObject (newCultureStatement);
if (newCultureStatementObj != null)
{
int loopMax = FIELD_CultureStatement_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_CultureStatement);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_CultureStatement_Validators[v].checkAttribute (this, FIELD_CultureStatement, metadata, newCultureStatementObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_CultureStatement () != FieldWriteability.FALSE, "Field CultureStatement is not writeable");
preCultureStatementChange (newCultureStatement);
markFieldChange (FIELD_CultureStatement);
_CultureStatement = newCultureStatement;
postFieldChange (FIELD_CultureStatement);
postCultureStatementChange ();
}
}
/**
* Get the attribute Email * Get the attribute Email
*/ */
public String getEmail () public String getEmail ()
...@@ -6368,6 +6491,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6368,6 +6491,7 @@ public abstract class BaseJob extends BaseBusinessClass
tl_jobPSet.setAttrib (FIELD_LastEdited, HELPER_LastEdited.toObject (_LastEdited)); // tl_jobPSet.setAttrib (FIELD_LastEdited, HELPER_LastEdited.toObject (_LastEdited)); //
tl_jobPSet.setAttrib (FIELD_IsPPJ, HELPER_IsPPJ.toObject (_IsPPJ)); // tl_jobPSet.setAttrib (FIELD_IsPPJ, HELPER_IsPPJ.toObject (_IsPPJ)); //
tl_jobPSet.setAttrib (FIELD_Industry, HELPER_Industry.toObject (_Industry)); // tl_jobPSet.setAttrib (FIELD_Industry, HELPER_Industry.toObject (_Industry)); //
tl_jobPSet.setAttrib (FIELD_CultureStatement, HELPER_CultureStatement.toObject (_CultureStatement)); //
_Level.getPersistentSets (allSets); _Level.getPersistentSets (allSets);
_Client.getPersistentSets (allSets); _Client.getPersistentSets (allSets);
_JobOwner.getPersistentSets (allSets); _JobOwner.getPersistentSets (allSets);
...@@ -6410,6 +6534,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6410,6 +6534,7 @@ public abstract class BaseJob extends BaseBusinessClass
_LastEdited = (Date)(HELPER_LastEdited.fromObject (_LastEdited, tl_jobPSet.getAttrib (FIELD_LastEdited))); // _LastEdited = (Date)(HELPER_LastEdited.fromObject (_LastEdited, tl_jobPSet.getAttrib (FIELD_LastEdited))); //
_IsPPJ = (Boolean)(HELPER_IsPPJ.fromObject (_IsPPJ, tl_jobPSet.getAttrib (FIELD_IsPPJ))); // _IsPPJ = (Boolean)(HELPER_IsPPJ.fromObject (_IsPPJ, tl_jobPSet.getAttrib (FIELD_IsPPJ))); //
_Industry = (Industry)(HELPER_Industry.fromObject (_Industry, tl_jobPSet.getAttrib (FIELD_Industry))); // _Industry = (Industry)(HELPER_Industry.fromObject (_Industry, tl_jobPSet.getAttrib (FIELD_Industry))); //
_CultureStatement = (String)(HELPER_CultureStatement.fromObject (_CultureStatement, tl_jobPSet.getAttrib (FIELD_CultureStatement))); //
_Level.setFromPersistentSets (objectID, allSets); _Level.setFromPersistentSets (objectID, allSets);
_Client.setFromPersistentSets (objectID, allSets); _Client.setFromPersistentSets (objectID, allSets);
_JobOwner.setFromPersistentSets (objectID, allSets); _JobOwner.setFromPersistentSets (objectID, allSets);
...@@ -6629,6 +6754,15 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6629,6 +6754,15 @@ public abstract class BaseJob extends BaseBusinessClass
e.addException (ex); e.addException (ex);
} }
try
{
setCultureStatement (otherJob.getCultureStatement ());
}
catch (FieldException ex)
{
e.addException (ex);
}
} }
} }
...@@ -6666,6 +6800,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6666,6 +6800,7 @@ public abstract class BaseJob extends BaseBusinessClass
_LastEdited = sourceJob._LastEdited; _LastEdited = sourceJob._LastEdited;
_IsPPJ = sourceJob._IsPPJ; _IsPPJ = sourceJob._IsPPJ;
_Industry = sourceJob._Industry; _Industry = sourceJob._Industry;
_CultureStatement = sourceJob._CultureStatement;
_Email = sourceJob._Email; _Email = sourceJob._Email;
_Password = sourceJob._Password; _Password = sourceJob._Password;
_ConfirmPassword = sourceJob._ConfirmPassword; _ConfirmPassword = sourceJob._ConfirmPassword;
...@@ -6765,6 +6900,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6765,6 +6900,7 @@ public abstract class BaseJob extends BaseBusinessClass
_LastEdited = (Date)(HELPER_LastEdited.readExternal (_LastEdited, vals.get(FIELD_LastEdited))); // _LastEdited = (Date)(HELPER_LastEdited.readExternal (_LastEdited, vals.get(FIELD_LastEdited))); //
_IsPPJ = (Boolean)(HELPER_IsPPJ.readExternal (_IsPPJ, vals.get(FIELD_IsPPJ))); // _IsPPJ = (Boolean)(HELPER_IsPPJ.readExternal (_IsPPJ, vals.get(FIELD_IsPPJ))); //
_Industry = (Industry)(HELPER_Industry.readExternal (_Industry, vals.get(FIELD_Industry))); // _Industry = (Industry)(HELPER_Industry.readExternal (_Industry, vals.get(FIELD_Industry))); //
_CultureStatement = (String)(HELPER_CultureStatement.readExternal (_CultureStatement, vals.get(FIELD_CultureStatement))); //
_Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); // _Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); //
_Password = (String)(HELPER_Password.readExternal (_Password, vals.get(FIELD_Password))); // _Password = (String)(HELPER_Password.readExternal (_Password, vals.get(FIELD_Password))); //
_ConfirmPassword = (String)(HELPER_ConfirmPassword.readExternal (_ConfirmPassword, vals.get(FIELD_ConfirmPassword))); // _ConfirmPassword = (String)(HELPER_ConfirmPassword.readExternal (_ConfirmPassword, vals.get(FIELD_ConfirmPassword))); //
...@@ -6823,6 +6959,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6823,6 +6959,7 @@ public abstract class BaseJob extends BaseBusinessClass
vals.put (FIELD_LastEdited, HELPER_LastEdited.writeExternal (_LastEdited)); vals.put (FIELD_LastEdited, HELPER_LastEdited.writeExternal (_LastEdited));
vals.put (FIELD_IsPPJ, HELPER_IsPPJ.writeExternal (_IsPPJ)); vals.put (FIELD_IsPPJ, HELPER_IsPPJ.writeExternal (_IsPPJ));
vals.put (FIELD_Industry, HELPER_Industry.writeExternal (_Industry)); vals.put (FIELD_Industry, HELPER_Industry.writeExternal (_Industry));
vals.put (FIELD_CultureStatement, HELPER_CultureStatement.writeExternal (_CultureStatement));
vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email)); vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email));
vals.put (FIELD_Password, HELPER_Password.writeExternal (_Password)); vals.put (FIELD_Password, HELPER_Password.writeExternal (_Password));
vals.put (FIELD_ConfirmPassword, HELPER_ConfirmPassword.writeExternal (_ConfirmPassword)); vals.put (FIELD_ConfirmPassword, HELPER_ConfirmPassword.writeExternal (_ConfirmPassword));
...@@ -6949,6 +7086,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6949,6 +7086,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
listener.notifyFieldChange(this, other, FIELD_Industry, HELPER_Industry.toObject(this._Industry), HELPER_Industry.toObject(otherJob._Industry)); listener.notifyFieldChange(this, other, FIELD_Industry, HELPER_Industry.toObject(this._Industry), HELPER_Industry.toObject(otherJob._Industry));
} }
if (!HELPER_CultureStatement.compare(this._CultureStatement, otherJob._CultureStatement))
{
listener.notifyFieldChange(this, other, FIELD_CultureStatement, HELPER_CultureStatement.toObject(this._CultureStatement), HELPER_CultureStatement.toObject(otherJob._CultureStatement));
}
// Compare single assocs // Compare single assocs
_AssessmentTemplate.compare (otherJob._AssessmentTemplate, listener); _AssessmentTemplate.compare (otherJob._AssessmentTemplate, listener);
...@@ -7018,6 +7159,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7018,6 +7159,7 @@ public abstract class BaseJob extends BaseBusinessClass
visitor.visitField(this, FIELD_LastEdited, HELPER_LastEdited.toObject(getLastEdited())); visitor.visitField(this, FIELD_LastEdited, HELPER_LastEdited.toObject(getLastEdited()));
visitor.visitField(this, FIELD_IsPPJ, HELPER_IsPPJ.toObject(getIsPPJ())); visitor.visitField(this, FIELD_IsPPJ, HELPER_IsPPJ.toObject(getIsPPJ()));
visitor.visitField(this, FIELD_Industry, HELPER_Industry.toObject(getIndustry())); visitor.visitField(this, FIELD_Industry, HELPER_Industry.toObject(getIndustry()));
visitor.visitField(this, FIELD_CultureStatement, HELPER_CultureStatement.toObject(getCultureStatement()));
visitor.visitAssociation (_AssessmentTemplate); visitor.visitAssociation (_AssessmentTemplate);
visitor.visitAssociation (_CultureTemplate); visitor.visitAssociation (_CultureTemplate);
visitor.visitAssociation (_JobTemplate); visitor.visitAssociation (_JobTemplate);
...@@ -7199,6 +7341,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7199,6 +7341,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return filter.matches (getIndustry ()); return filter.matches (getIndustry ());
} }
else if (attribName.equals (FIELD_CultureStatement))
{
return filter.matches (getCultureStatement ());
}
else if (attribName.equals (SINGLEREFERENCE_Level)) else if (attribName.equals (SINGLEREFERENCE_Level))
{ {
return filter.matches (getLevel ()); return filter.matches (getLevel ());
...@@ -7386,6 +7532,12 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7386,6 +7532,12 @@ public abstract class BaseJob extends BaseBusinessClass
return this; return this;
} }
public SearchAll andCultureStatement (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_job.culture_statement", "CultureStatement");
return this;
}
public SearchAll andLevel (QueryFilter<Level> filter) public SearchAll andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "tl_job.level_id", "Level"); filter.addFilter (context, "tl_job.level_id", "Level");
...@@ -7617,6 +7769,12 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7617,6 +7769,12 @@ public abstract class BaseJob extends BaseBusinessClass
return this; return this;
} }
public SearchJobKey andCultureStatement (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_job.culture_statement", "CultureStatement");
return this;
}
public SearchJobKey andLevel (QueryFilter<Level> filter) public SearchJobKey andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "tl_job.level_id", "Level"); filter.addFilter (context, "tl_job.level_id", "Level");
...@@ -7842,6 +8000,12 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7842,6 +8000,12 @@ public abstract class BaseJob extends BaseBusinessClass
return this; return this;
} }
public SearchCompany andCultureStatement (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_job.culture_statement", "CultureStatement");
return this;
}
public SearchCompany andLevel (QueryFilter<Level> filter) public SearchCompany andLevel (QueryFilter<Level> filter)
{ {
filter.addFilter (context, "tl_job.level_id", "Level"); filter.addFilter (context, "tl_job.level_id", "Level");
...@@ -8002,6 +8166,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8002,6 +8166,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return HELPER_Industry.toObject (getIndustry ()); return HELPER_Industry.toObject (getIndustry ());
} }
else if (attribName.equals (FIELD_CultureStatement))
{
return HELPER_CultureStatement.toObject (getCultureStatement ());
}
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
return HELPER_Email.toObject (getEmail ()); return HELPER_Email.toObject (getEmail ());
...@@ -8155,6 +8323,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8155,6 +8323,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return HELPER_Industry; return HELPER_Industry;
} }
else if (attribName.equals (FIELD_CultureStatement))
{
return HELPER_CultureStatement;
}
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
return HELPER_Email; return HELPER_Email;
...@@ -8308,6 +8480,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8308,6 +8480,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
setIndustry ((Industry)(HELPER_Industry.fromObject (_Industry, attribValue))); setIndustry ((Industry)(HELPER_Industry.fromObject (_Industry, attribValue)));
} }
else if (attribName.equals (FIELD_CultureStatement))
{
setCultureStatement ((String)(HELPER_CultureStatement.fromObject (_CultureStatement, attribValue)));
}
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
setEmail ((String)(HELPER_Email.fromObject (_Email, attribValue))); setEmail ((String)(HELPER_Email.fromObject (_Email, attribValue)));
...@@ -8468,6 +8644,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8468,6 +8644,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return getWriteability_Industry (); return getWriteability_Industry ();
} }
else if (fieldName.equals (FIELD_CultureStatement))
{
return getWriteability_CultureStatement ();
}
else if (fieldName.equals (MULTIPLEREFERENCE_JobApplications)) else if (fieldName.equals (MULTIPLEREFERENCE_JobApplications))
{ {
return getWriteability_JobApplications (); return getWriteability_JobApplications ();
...@@ -8688,6 +8868,11 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8688,6 +8868,11 @@ public abstract class BaseJob extends BaseBusinessClass
fields.add (FIELD_Industry); fields.add (FIELD_Industry);
} }
if (getWriteability_CultureStatement () != FieldWriteability.TRUE)
{
fields.add (FIELD_CultureStatement);
}
if (getWriteability_Email () != FieldWriteability.TRUE) if (getWriteability_Email () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_Email); fields.add (FIELD_Email);
...@@ -8784,6 +8969,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8784,6 +8969,7 @@ public abstract class BaseJob extends BaseBusinessClass
result.add(HELPER_LastEdited.getAttribObject (getClass (), _LastEdited, false, FIELD_LastEdited)); result.add(HELPER_LastEdited.getAttribObject (getClass (), _LastEdited, false, FIELD_LastEdited));
result.add(HELPER_IsPPJ.getAttribObject (getClass (), _IsPPJ, false, FIELD_IsPPJ)); result.add(HELPER_IsPPJ.getAttribObject (getClass (), _IsPPJ, false, FIELD_IsPPJ));
result.add(HELPER_Industry.getAttribObject (getClass (), _Industry, false, FIELD_Industry)); result.add(HELPER_Industry.getAttribObject (getClass (), _Industry, false, FIELD_Industry));
result.add(HELPER_CultureStatement.getAttribObject (getClass (), _CultureStatement, false, FIELD_CultureStatement));
result.add(HELPER_Email.getAttribObject (getClass (), _Email, false, FIELD_Email)); result.add(HELPER_Email.getAttribObject (getClass (), _Email, false, FIELD_Email));
result.add(HELPER_Password.getAttribObject (getClass (), _Password, false, FIELD_Password)); result.add(HELPER_Password.getAttribObject (getClass (), _Password, false, FIELD_Password));
result.add(HELPER_ConfirmPassword.getAttribObject (getClass (), _ConfirmPassword, false, FIELD_ConfirmPassword)); result.add(HELPER_ConfirmPassword.getAttribObject (getClass (), _ConfirmPassword, false, FIELD_ConfirmPassword));
...@@ -9244,6 +9430,24 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -9244,6 +9430,24 @@ public abstract class BaseJob extends BaseBusinessClass
} }
/** /**
* Get the attribute CultureStatement
*/
public String getCultureStatement (Job obj, String original)
{
return original;
}
/**
* Change the value set for attribute CultureStatement.
* May modify the field beforehand
* Occurs before validation.
*/
public String setCultureStatement (Job obj, String newCultureStatement) throws FieldException
{
return newCultureStatement;
}
/**
* Get the attribute Email * Get the attribute Email
*/ */
public String getEmail (Job obj, String original) public String getEmail (Job obj, String original)
...@@ -9693,6 +9897,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -9693,6 +9897,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return toIndustry (); return toIndustry ();
} }
if (name.equals ("CultureStatement"))
{
return toCultureStatement ();
}
if (name.equals ("Level")) if (name.equals ("Level"))
{ {
return toLevel (); return toLevel ();
...@@ -9792,6 +10000,8 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -9792,6 +10000,8 @@ public abstract class BaseJob extends BaseBusinessClass
public PipeLine<From, Boolean> toIsPPJ () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsPPJ)); } public PipeLine<From, Boolean> toIsPPJ () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsPPJ)); }
public PipeLine<From, Industry> toIndustry () { return pipe(new ORMAttributePipe<Me, Industry>(FIELD_Industry)); } public PipeLine<From, Industry> toIndustry () { return pipe(new ORMAttributePipe<Me, Industry>(FIELD_Industry)); }
public PipeLine<From, String> toCultureStatement () { return pipe(new ORMAttributePipe<Me, String>(FIELD_CultureStatement)); }
public AssessmentCriteriaTemplate.AssessmentCriteriaTemplatePipeLineFactory<From, AssessmentCriteriaTemplate> toAssessmentTemplate () { return toAssessmentTemplate (Filter.ALL); } public AssessmentCriteriaTemplate.AssessmentCriteriaTemplatePipeLineFactory<From, AssessmentCriteriaTemplate> toAssessmentTemplate () { return toAssessmentTemplate (Filter.ALL); }
public AssessmentCriteriaTemplate.AssessmentCriteriaTemplatePipeLineFactory<From, AssessmentCriteriaTemplate> toAssessmentTemplate (Filter<AssessmentCriteriaTemplate> filter) public AssessmentCriteriaTemplate.AssessmentCriteriaTemplatePipeLineFactory<From, AssessmentCriteriaTemplate> toAssessmentTemplate (Filter<AssessmentCriteriaTemplate> filter)
......
cmsWebApp/src/performa/orm/CultureCriteria.xml
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
<TABLE name="tl_culture_criteria" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_culture_criteria" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="Importance.NOT_APPLICABLE"/> <ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" />
<ATTRIB name="IsApplicable" type="Boolean" dbcol="is_applicable" defaultValue="Boolean.FALSE" />
<SINGLEREFERENCE name="CultureElement" type="CultureElement" dbcol="culture_element_id" mandatory="true" /> <SINGLEREFERENCE name="CultureElement" type="CultureElement" dbcol="culture_element_id" mandatory="true" />
<SINGLEREFERENCE name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_id" mandatory="false" /> <SINGLEREFERENCE name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_id" mandatory="false" />
......
cmsWebApp/src/performa/orm/CultureCriteriaPersistenceMgr.java
...@@ -28,10 +28,12 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr ...@@ -28,10 +28,12 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private Importance dummyImportance; private Importance dummyImportance;
private Boolean dummyIsApplicable;
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final EnumeratedAttributeHelper HELPER_Importance = new EnumeratedAttributeHelper (Importance.FACTORY_Importance); private static final EnumeratedAttributeHelper HELPER_Importance = new EnumeratedAttributeHelper (Importance.FACTORY_Importance);
private static final DefaultAttributeHelper HELPER_IsApplicable = DefaultAttributeHelper.INSTANCE;
...@@ -39,10 +41,11 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr ...@@ -39,10 +41,11 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
public CultureCriteriaPersistenceMgr () public CultureCriteriaPersistenceMgr ()
{ {
dummyImportance = (Importance)(HELPER_Importance.initialise (dummyImportance)); dummyImportance = (Importance)(HELPER_Importance.initialise (dummyImportance));
dummyIsApplicable = (Boolean)(HELPER_IsApplicable.initialise (dummyIsApplicable));
} }
private String SELECT_COLUMNS = "{PREFIX}tl_culture_criteria.object_id as id, {PREFIX}tl_culture_criteria.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_criteria.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_criteria.importance, {PREFIX}tl_culture_criteria.culture_element_id, {PREFIX}tl_culture_criteria.culture_element_rating_id, {PREFIX}tl_culture_criteria.job_id, {PREFIX}tl_culture_criteria.template_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_culture_criteria.object_id as id, {PREFIX}tl_culture_criteria.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_criteria.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_criteria.importance, {PREFIX}tl_culture_criteria.is_applicable, {PREFIX}tl_culture_criteria.culture_element_id, {PREFIX}tl_culture_criteria.culture_element_rating_id, {PREFIX}tl_culture_criteria.job_id, {PREFIX}tl_culture_criteria.template_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -94,6 +97,7 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr ...@@ -94,6 +97,7 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !tl_culture_criteriaPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_culture_criteriaPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!tl_culture_criteriaPSet.containsAttrib(CultureCriteria.FIELD_Importance)|| !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.FIELD_Importance)||
!tl_culture_criteriaPSet.containsAttrib(CultureCriteria.FIELD_IsApplicable)||
!tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_CultureElement)|| !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_CultureElement)||
!tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_CultureElementRating)|| !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_CultureElementRating)||
!tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_Job)|| !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_Job)||
...@@ -187,10 +191,10 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr ...@@ -187,10 +191,10 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_culture_criteria " + "UPDATE {PREFIX}tl_culture_criteria " +
"SET importance = ?, culture_element_id = ? , culture_element_rating_id = ? , job_id = ? , template_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET importance = ?, is_applicable = ?, culture_element_id = ? , culture_element_rating_id = ? , job_id = ? , template_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_culture_criteria.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_culture_criteria.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))).listEntry (HELPER_IsApplicable.getForSQL(dummyIsApplicable, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_IsApplicable))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -447,6 +451,7 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr ...@@ -447,6 +451,7 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
tl_culture_criteriaPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_culture_criteriaPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
tl_culture_criteriaPSet.setAttrib(CultureCriteria.FIELD_Importance, HELPER_Importance.getFromRS(dummyImportance, r, "importance")); tl_culture_criteriaPSet.setAttrib(CultureCriteria.FIELD_Importance, HELPER_Importance.getFromRS(dummyImportance, r, "importance"));
tl_culture_criteriaPSet.setAttrib(CultureCriteria.FIELD_IsApplicable, HELPER_IsApplicable.getFromRS(dummyIsApplicable, r, "is_applicable"));
tl_culture_criteriaPSet.setAttrib(CultureCriteria.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_id")); tl_culture_criteriaPSet.setAttrib(CultureCriteria.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_id"));
tl_culture_criteriaPSet.setAttrib(CultureCriteria.SINGLEREFERENCE_CultureElementRating, r.getObject ("culture_element_rating_id")); tl_culture_criteriaPSet.setAttrib(CultureCriteria.SINGLEREFERENCE_CultureElementRating, r.getObject ("culture_element_rating_id"));
...@@ -468,10 +473,10 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr ...@@ -468,10 +473,10 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_culture_criteria " + "INSERT INTO {PREFIX}tl_culture_criteria " +
" (importance, culture_element_id, culture_element_rating_id, job_id, template_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (importance, is_applicable, culture_element_id, culture_element_rating_id, job_id, template_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))) .listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))).listEntry (HELPER_IsApplicable.getForSQL(dummyIsApplicable, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_IsApplicable))) .listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))) .listEntry (objectID.longID ()).toList().toArray());
tl_culture_criteriaPSet.setStatus (PersistentSetStatus.PROCESSED); tl_culture_criteriaPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/src/performa/orm/HiringTeam.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<IMPORT value="oneit.business.shopping.orm.*"/> <IMPORT value="oneit.business.shopping.orm.*"/>
<MULTIPLEREFERENCE name="Users" type="CompanyUserHiringTeamLink" backreferenceName="HiringTeam" /> <MULTIPLEREFERENCE name="Users" type="CompanyUserHiringTeamLink" backreferenceName="HiringTeam" />
<!-- <MULTIPLEREFERENCE name="Clients" type="Client" backreferenceName="HiringTeam" />--> <MULTIPLEREFERENCE name="Clients" type="Client" backreferenceName="HiringTeam" />
<TRANSIENT name="IsLogoDeleted" type="Boolean" defaultValue="Boolean.FALSE"/> <TRANSIENT name="IsLogoDeleted" type="Boolean" defaultValue="Boolean.FALSE"/>
......
cmsWebApp/src/performa/orm/Job.java
...@@ -445,10 +445,10 @@ public class Job extends BaseJob ...@@ -445,10 +445,10 @@ public class Job extends BaseJob
location.append(getCountry().getDescription()).append("."); location.append(getCountry().getDescription()).append(".");
} }
if(getRemote() != null && getRemote()) // if(getRemote() != null && getRemote())
{ // {
location.append(" (Remote OK)"); // location.append(" (Remote OK)");
} // }
return location.toString(); return location.toString();
} }
......
cmsWebApp/src/performa/orm/Job.xml
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<ATTRIB name="LastEdited" type="Date" dbcol="last_edited" /> <ATTRIB name="LastEdited" type="Date" dbcol="last_edited" />
<ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.FALSE"/> <ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.FALSE"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="Industry" type="Industry" dbcol="industry" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="CultureStatement" type="String" dbcol="culture_statement" length="2000"/>
<SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" mandatory="false"/> <SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" mandatory="false"/>
<SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" backreferenceName="Jobs"/> <SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" backreferenceName="Jobs"/>
......
cmsWebApp/src/performa/orm/JobPersistenceMgr.java
...@@ -51,6 +51,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -51,6 +51,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
private Date dummyLastEdited; private Date dummyLastEdited;
private Boolean dummyIsPPJ; private Boolean dummyIsPPJ;
private Industry dummyIndustry; private Industry dummyIndustry;
private String dummyCultureStatement;
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
...@@ -76,6 +77,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -76,6 +77,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
private static final DefaultAttributeHelper HELPER_LastEdited = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_LastEdited = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper HELPER_Industry = new EnumeratedAttributeHelper (Industry.FACTORY_Industry); private static final EnumeratedAttributeHelper HELPER_Industry = new EnumeratedAttributeHelper (Industry.FACTORY_Industry);
private static final DefaultAttributeHelper HELPER_CultureStatement = DefaultAttributeHelper.INSTANCE;
...@@ -104,10 +106,11 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -104,10 +106,11 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
dummyLastEdited = (Date)(HELPER_LastEdited.initialise (dummyLastEdited)); dummyLastEdited = (Date)(HELPER_LastEdited.initialise (dummyLastEdited));
dummyIsPPJ = (Boolean)(HELPER_IsPPJ.initialise (dummyIsPPJ)); dummyIsPPJ = (Boolean)(HELPER_IsPPJ.initialise (dummyIsPPJ));
dummyIndustry = (Industry)(HELPER_Industry.initialise (dummyIndustry)); dummyIndustry = (Industry)(HELPER_Industry.initialise (dummyIndustry));
dummyCultureStatement = (String)(HELPER_CultureStatement.initialise (dummyCultureStatement));
} }
private String SELECT_COLUMNS = "{PREFIX}tl_job.object_id as id, {PREFIX}tl_job.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_job.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_job.job_title, {PREFIX}tl_job.job_description, {PREFIX}tl_job.job_status, {PREFIX}tl_job.open_date, {PREFIX}tl_job.apply_by, {PREFIX}tl_job.include_assessment_criteria, {PREFIX}tl_job.assessment_type, {PREFIX}tl_job.random_key, {PREFIX}tl_job.job_type, {PREFIX}tl_job.ref_number, {PREFIX}tl_job.last_status_change_date, {PREFIX}tl_job.remote, {PREFIX}tl_job.city, {PREFIX}tl_job.postcode, {PREFIX}tl_job.location_radius, {PREFIX}tl_job.state, {PREFIX}tl_job.country, {PREFIX}tl_job.require_cv, {PREFIX}tl_job.manually_closed, {PREFIX}tl_job.last_edited, {PREFIX}tl_job.is_ppj, {PREFIX}tl_job.industry, {PREFIX}tl_job.level_id, {PREFIX}tl_job.client_id, {PREFIX}tl_job.job_owner_id, {PREFIX}tl_job.company_user_id, {PREFIX}tl_job.hiring_team_id, {PREFIX}tl_job.shortened_url_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_job.object_id as id, {PREFIX}tl_job.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_job.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_job.job_title, {PREFIX}tl_job.job_description, {PREFIX}tl_job.job_status, {PREFIX}tl_job.open_date, {PREFIX}tl_job.apply_by, {PREFIX}tl_job.include_assessment_criteria, {PREFIX}tl_job.assessment_type, {PREFIX}tl_job.random_key, {PREFIX}tl_job.job_type, {PREFIX}tl_job.ref_number, {PREFIX}tl_job.last_status_change_date, {PREFIX}tl_job.remote, {PREFIX}tl_job.city, {PREFIX}tl_job.postcode, {PREFIX}tl_job.location_radius, {PREFIX}tl_job.state, {PREFIX}tl_job.country, {PREFIX}tl_job.require_cv, {PREFIX}tl_job.manually_closed, {PREFIX}tl_job.last_edited, {PREFIX}tl_job.is_ppj, {PREFIX}tl_job.industry, {PREFIX}tl_job.culture_statement, {PREFIX}tl_job.level_id, {PREFIX}tl_job.client_id, {PREFIX}tl_job.job_owner_id, {PREFIX}tl_job.company_user_id, {PREFIX}tl_job.hiring_team_id, {PREFIX}tl_job.shortened_url_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -180,6 +183,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -180,6 +183,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
!tl_jobPSet.containsAttrib(Job.FIELD_LastEdited)|| !tl_jobPSet.containsAttrib(Job.FIELD_LastEdited)||
!tl_jobPSet.containsAttrib(Job.FIELD_IsPPJ)|| !tl_jobPSet.containsAttrib(Job.FIELD_IsPPJ)||
!tl_jobPSet.containsAttrib(Job.FIELD_Industry)|| !tl_jobPSet.containsAttrib(Job.FIELD_Industry)||
!tl_jobPSet.containsAttrib(Job.FIELD_CultureStatement)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_Level)|| !tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_Level)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_Client)|| !tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_Client)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_JobOwner)|| !tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_JobOwner)||
...@@ -265,10 +269,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -265,10 +269,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_job " + "UPDATE {PREFIX}tl_job " +
"SET job_title = ?, job_description = ?, job_status = ?, open_date = ?, apply_by = ?, include_assessment_criteria = ?, assessment_type = ?, random_key = ?, job_type = ?, ref_number = ?, last_status_change_date = ?, remote = ?, city = ?, postcode = ?, location_radius = ?, state = ?, country = ?, require_cv = ?, manually_closed = ?, last_edited = ?, is_ppj = ?, industry = ?, level_id = ? , client_id = ? , job_owner_id = ? , company_user_id = ? , hiring_team_id = ? , shortened_url_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET job_title = ?, job_description = ?, job_status = ?, open_date = ?, apply_by = ?, include_assessment_criteria = ?, assessment_type = ?, random_key = ?, job_type = ?, ref_number = ?, last_status_change_date = ?, remote = ?, city = ?, postcode = ?, location_radius = ?, state = ?, country = ?, require_cv = ?, manually_closed = ?, last_edited = ?, is_ppj = ?, industry = ?, culture_statement = ?, level_id = ? , client_id = ? , job_owner_id = ? , company_user_id = ? , hiring_team_id = ? , shortened_url_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_job.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_job.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_jobPSet.getAttrib (Job.FIELD_PostCode))).listEntry (HELPER_ExpectedCandidateRadius.getForSQL(dummyExpectedCandidateRadius, tl_jobPSet.getAttrib (Job.FIELD_ExpectedCandidateRadius))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_RequireCV.getForSQL(dummyRequireCV, tl_jobPSet.getAttrib (Job.FIELD_RequireCV))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_jobPSet.getAttrib (Job.FIELD_Industry))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_JobOwner)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CreatedBy)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_jobPSet.getAttrib (Job.FIELD_PostCode))).listEntry (HELPER_ExpectedCandidateRadius.getForSQL(dummyExpectedCandidateRadius, tl_jobPSet.getAttrib (Job.FIELD_ExpectedCandidateRadius))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_RequireCV.getForSQL(dummyRequireCV, tl_jobPSet.getAttrib (Job.FIELD_RequireCV))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_jobPSet.getAttrib (Job.FIELD_Industry))).listEntry (HELPER_CultureStatement.getForSQL(dummyCultureStatement, tl_jobPSet.getAttrib (Job.FIELD_CultureStatement))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_JobOwner)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CreatedBy)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -656,6 +660,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -656,6 +660,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
tl_jobPSet.setAttrib(Job.FIELD_LastEdited, HELPER_LastEdited.getFromRS(dummyLastEdited, r, "last_edited")); tl_jobPSet.setAttrib(Job.FIELD_LastEdited, HELPER_LastEdited.getFromRS(dummyLastEdited, r, "last_edited"));
tl_jobPSet.setAttrib(Job.FIELD_IsPPJ, HELPER_IsPPJ.getFromRS(dummyIsPPJ, r, "is_ppj")); tl_jobPSet.setAttrib(Job.FIELD_IsPPJ, HELPER_IsPPJ.getFromRS(dummyIsPPJ, r, "is_ppj"));
tl_jobPSet.setAttrib(Job.FIELD_Industry, HELPER_Industry.getFromRS(dummyIndustry, r, "industry")); tl_jobPSet.setAttrib(Job.FIELD_Industry, HELPER_Industry.getFromRS(dummyIndustry, r, "industry"));
tl_jobPSet.setAttrib(Job.FIELD_CultureStatement, HELPER_CultureStatement.getFromRS(dummyCultureStatement, r, "culture_statement"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_Level, r.getObject ("level_id")); tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_Level, r.getObject ("level_id"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_Client, r.getObject ("client_id")); tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_Client, r.getObject ("client_id"));
...@@ -679,10 +684,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -679,10 +684,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_job " + "INSERT INTO {PREFIX}tl_job " +
" (job_title, job_description, job_status, open_date, apply_by, include_assessment_criteria, assessment_type, random_key, job_type, ref_number, last_status_change_date, remote, city, postcode, location_radius, state, country, require_cv, manually_closed, last_edited, is_ppj, industry, level_id, client_id, job_owner_id, company_user_id, hiring_team_id, shortened_url_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (job_title, job_description, job_status, open_date, apply_by, include_assessment_criteria, assessment_type, random_key, job_type, ref_number, last_status_change_date, remote, city, postcode, location_radius, state, country, require_cv, manually_closed, last_edited, is_ppj, industry, culture_statement, level_id, client_id, job_owner_id, company_user_id, hiring_team_id, shortened_url_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_jobPSet.getAttrib (Job.FIELD_PostCode))).listEntry (HELPER_ExpectedCandidateRadius.getForSQL(dummyExpectedCandidateRadius, tl_jobPSet.getAttrib (Job.FIELD_ExpectedCandidateRadius))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_RequireCV.getForSQL(dummyRequireCV, tl_jobPSet.getAttrib (Job.FIELD_RequireCV))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_jobPSet.getAttrib (Job.FIELD_Industry))) .listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_JobOwner)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CreatedBy)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_jobPSet.getAttrib (Job.FIELD_PostCode))).listEntry (HELPER_ExpectedCandidateRadius.getForSQL(dummyExpectedCandidateRadius, tl_jobPSet.getAttrib (Job.FIELD_ExpectedCandidateRadius))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_RequireCV.getForSQL(dummyRequireCV, tl_jobPSet.getAttrib (Job.FIELD_RequireCV))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_jobPSet.getAttrib (Job.FIELD_Industry))).listEntry (HELPER_CultureStatement.getForSQL(dummyCultureStatement, tl_jobPSet.getAttrib (Job.FIELD_CultureStatement))) .listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_JobOwner)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CreatedBy)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))) .listEntry (objectID.longID ()).toList().toArray());
tl_jobPSet.setStatus (PersistentSetStatus.PROCESSED); tl_jobPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/src/performa/utils/MenuItemDisableTransformFactory.java
...@@ -7,7 +7,6 @@ import oneit.components.DefaultInitialisable; ...@@ -7,7 +7,6 @@ import oneit.components.DefaultInitialisable;
import oneit.objstore.ObjectTransaction; import oneit.objstore.ObjectTransaction;
import oneit.security.SecUser; import oneit.security.SecUser;
import oneit.utils.ObjectTransform; import oneit.utils.ObjectTransform;
import performa.orm.Company;
import performa.orm.CompanyUser; import performa.orm.CompanyUser;
...@@ -27,7 +26,6 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory, ...@@ -27,7 +26,6 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory,
ObjectTransaction transaction; ObjectTransaction transaction;
SecUser secUser; SecUser secUser;
CompanyUser companyUser; CompanyUser companyUser;
Company company;
public MenuItemDisableTransform(Article article, HttpServletRequest request, ObjectTransaction transaction) public MenuItemDisableTransform(Article article, HttpServletRequest request, ObjectTransaction transaction)
{ {
...@@ -35,14 +33,14 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory, ...@@ -35,14 +33,14 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory,
this.request = request; this.request = request;
this.transaction = transaction; this.transaction = transaction;
this.secUser = SecUser.getTXUser(transaction); this.secUser = SecUser.getTXUser(transaction);
this.companyUser = this.secUser!=null ? this.secUser.getExtension(CompanyUser.REFERENCE_CompanyUser) : null; this.companyUser = this.secUser != null ? this.secUser.getExtension(CompanyUser.REFERENCE_CompanyUser) : null;
this.company = this.companyUser!=null ? this.companyUser.getCompany() : null;
} }
@Override
public Object transform(Object original) public Object transform(Object original)
{ {
if((Boolean)article.getAdditionalAttribute("Allow Disable", Boolean.FALSE) if((Boolean)article.getAdditionalAttribute("Allow Disable", Boolean.FALSE)
&& this.company !=null && !this.company.showHasClientSupport()) && this.companyUser != null && this.companyUser.getSelectedTeam() != null && !this.companyUser.getSelectedTeam().showHasClientSupport())
{ {
return String.valueOf(original); return String.valueOf(original);
} }
......
cmsWebApp/src/performa/utils/Utils.java
...@@ -86,6 +86,22 @@ public class Utils ...@@ -86,6 +86,22 @@ public class Utils
return importances.toArray(new Importance[0]); return importances.toArray(new Importance[0]);
} }
public static Importance[] getImportancesForCulture()
{
List<Importance> importances = new ArrayList<>();
for(Importance importance : Importance.getImportanceArray())
{
if(importance.getConsiderForAssessment())
{
importances.add(importance);
}
}
// Collections.sort(importances, (a, b) -> b.getWeightingScore().compareTo(a.getWeightingScore()));
return importances.toArray(new Importance[0]);
}
//to sort jobs list //to sort jobs list
public static List<Job> getJobsSorted(Job[] jobs, JobSortOption jobSortOption, JobStatus jobStatus) public static List<Job> getJobsSorted(Job[] jobs, JobSortOption jobSortOption, JobStatus jobStatus)
{ {
...@@ -313,12 +329,12 @@ public class Utils ...@@ -313,12 +329,12 @@ public class Utils
} }
public static Client[] getClientsByCompany(ObjectTransaction transaction) public static Client[] getClientsByHiringTeam(ObjectTransaction transaction)
{ {
SecUser secUser = SecUser.getTXUser(transaction); SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
return companyUser.getCompany().getClientsSet().toArray(new Client[0]); return companyUser.getSelectedTeam().getClientsSet().toArray(new Client[0]);
} }
......
cmsWebApp/webroot/css/common.css
...@@ -1176,7 +1176,6 @@ span.skill-label span{ ...@@ -1176,7 +1176,6 @@ span.skill-label span{
font-weight: 500; font-weight: 500;
color: #4e5258; color: #4e5258;
display: inline-block; display: inline-block;
width: 100%;
margin-bottom: 5px; margin-bottom: 5px;
} }
.main-review-label { .main-review-label {
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
String samePage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA); String samePage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
// String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE); String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String jobPage = WebUtils.getSamePageInRenderMode(request, "Page"); String jobPage = WebUtils.getSamePageInRenderMode(request, "Page");
......
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<div class="col-sm-6 col-xs-12 form-group"> <div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label> <label><oneit:label GUIName="Client"/></label>
<div class="wider-select"> <div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/> <tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
</div> </div>
</div> </div>
<% <%
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<div class="col-sm-6 col-xs-12 form-group"> <div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label> <label><oneit:label GUIName="Client"/></label>
<div class="wider-select"> <div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/> <tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
</div> </div>
</div> </div>
<% <%
......
cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
String firstPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB); String firstPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA); String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE); String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA); // String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
boolean savedJob = job.getStatus() != ObjectStatus.NEW; boolean savedJob = job.getStatus() != ObjectStatus.NEW;
boolean fromJobMatch = pageNumber == "1"; boolean fromJobMatch = pageNumber == "1";
%> %>
...@@ -50,16 +49,6 @@ ...@@ -50,16 +49,6 @@
Culture Culture
</oneit:button> </oneit:button>
</li> </li>
<li class="<%= pageNumber == "5" ? "active" : ""%>">
<oneit:button value=" " name="processCulture" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fifthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.mapEntry("fromJobMatch", fromJobMatch)
.toMap() %>">
<span>5</span>
Review
</oneit:button>
</li>
</ul> </ul>
</div> </div>
</oneit:dynIncluded> </oneit:dynIncluded>
cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<% <%
} }
%> %>
</span> by <oneit:toString value="<%= job.getCompanyUser() %>" mode="EscapeHTML" nullValue=""/> </span> by <oneit:toString value="<%= job.getCreatedBy() %>" mode="EscapeHTML" nullValue=""/>
</div> </div>
</div> </div>
<div class="applicant-right-status"> <div class="applicant-right-status">
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<label><oneit:label GUIName="Client "/><span>(Optional)</span></label> <label><oneit:label GUIName="Client "/><span>(Optional)</span></label>
<div class="wider-select"> <div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/> <tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
</div> </div>
</div> </div>
<% <%
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
String firstPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB); String firstPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA); String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE); String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW); String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String jobsPage = WebUtils.getSamePageInRenderMode(request, "Page"); String jobsPage = WebUtils.getSamePageInRenderMode(request, "Page");
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
process.setAttribute("Job", job); process.setAttribute("Job", job);
} }
CompanyUser companyUser = job.getCompanyUser(); CompanyUser companyUser = job.getCreatedBy();
Company company = companyUser.getCompany(); Company company = companyUser.getCompany();
Debug.assertion(job != null, "Job is null in admin portal create job"); Debug.assertion(job != null, "Job is null in admin portal create job");
...@@ -54,140 +54,164 @@ ...@@ -54,140 +54,164 @@
%> %>
</h1> </h1>
<oneit:dynInclude page="/extensions/adminportal/inc/job_main_tabs.jsp" PageNumber="5" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="form-page-area"> <div class="form-page-area">
<div class="create-job"> <div class="create-job">
<div class="assessment-criteria"> <div class="assessment-criteria">
<div class="form-group"> <div class="form-group">
<label class="label-16">Details</label> <label class="label-16">Job Details</label>
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link" <oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/> .toMap() %>"/>
</div> </div>
<div class="form-group">
<div class="review-medium-title"> <div class="form-brack-line-sub"></div>
<div class="form-group row">
<div class="col-md-6 review-medium-title">
<oneit:label GUIName="Job Title" /> <oneit:label GUIName="Job Title" />
<span class="skill-label"> <span class="skill-label">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" /> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" />
</span> </span>
</div> </div>
<div class="col-md-6 review-medium-title">
<oneit:label GUIName="Reference Number" />
<span class="skill-label">
<oneit:toString value="<%= job.getReferenceNumber() %>" mode="EscapeHTML" />
</span>
</div> </div>
<div class="form-group"> </div>
<div class="review-medium-title"> <div class="form-group row">
<div class="col-md-12 review-medium-title">
<oneit:label GUIName="Job Description" /> <oneit:label GUIName="Job Description" />
<span class="skill-label"> <span class="skill-label">
<oneit:toString value="<%= job.getJobDescription() %>" mode="ParagraphHTML" /> <oneit:toString value="<%= job.getJobDescription() %>" mode="ParagraphHTML" />
</span> </span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group row">
<div class="row main-review-label"> <div class="col-md-6 review-medium-title">
<div class="col-sm-3 col-xs-12 review-label"> <oneit:label GUIName="Job Owner" />
<oneit:label GUIName="Job Type" /> <span class="skill-label">
</div> <oneit:toString value="<%= job.getJobOwner() %>" mode="EscapeHTML" />
<div class="col-sm-9 col-xs-12 review-data"> </span>
<oneit:toString value="<%= job.getJobType() %>" mode="EscapeHTML" />
</div>
</div> </div>
<% <%
// SecUser txUser = SecUser.getTXUser(process.getTransaction()); if(job.getHiringTeam().showHasClientSupport())
// CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
// Company company = companyUser.getCompany();
if(company.showHasClientSupport())
{ {
%> %>
<div class="row main-review-label"> <div class="col-md-6 review-medium-title">
<div class="col-sm-3 col-xs-12 review-label">
<oneit:label GUIName="Client" /> <oneit:label GUIName="Client" />
</div> <span class="skill-label">
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getClient() %>" mode="EscapeHTML" /> <oneit:toString value="<%= job.getClient() %>" mode="EscapeHTML" />
</div> </span>
</div> </div>
<% <%
} }
%> %>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">
<oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" />
</div> </div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getReferenceNumber() %>" mode="EscapeHTML" /> <div class="form-brack-line-sub"></div>
<div class="form-group row">
<div class="col-md-4 review-medium-title">
<oneit:label GUIName="Location" />
</div> </div>
<div class="col-md-8">
<span class="skill-label">
<oneit:toString value="<%= job.getLocation() %>" mode="ParagraphHTML" />
</span>
</div> </div>
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-group row">
<div class="col-md-4 review-medium-title">
<div class="form-group"> <oneit:label GUIName="Expected Candidate Radius" />
<label class="label-16">Role</label>
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</div> </div>
<div class="form-group"> <div class="col-md-8">
<div class="row main-review-label"> <span class="skill-label">
<div class="col-sm-3 col-xs-12 review-label"> <oneit:toString value="<%= job.getExpectedCandidateRadius() != null ? job.getExpectedCandidateRadius().getDescription() : "" %>" mode="ParagraphHTML" />
<oneit:label GUIName="Role Type" /> </span>
</div> </div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getLevel() %>" mode="EscapeHTML" />
</div> </div>
<div class="form-group row">
<div class="col-md-4 review-medium-title">
<oneit:label GUIName="Working remote is an option" />
</div> </div>
<div class="beloning job-match-ass"> <div class="col-md-8">
<oneit:toString value="<%= job.getAssessmentType().getTestDescr() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/> <span class="skill-label">
<oneit:toString value="<%= job.getRemote() ? "Yes" : "No" %>" mode="ParagraphHTML" />
</span>
</div> </div>
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group row">
<label class="label-16">Culture</label> <div class="col-md-4 review-medium-title">
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link" <oneit:label GUIName="Job Type" />
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</div> </div>
<div class="form-group"> <div class="col-md-8">
<div class="row main-review-label"> <span class="skill-label">
<div class="col-sm-3 col-xs-12 review-label"> <oneit:toString value="<%= job.getJobType() != null ? job.getJobType().getDescription() : "" %>" mode="ParagraphHTML" />
<label><oneit:label GUIName="Location" /></label> </span>
</div> </div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getLocation() %>" mode="EscapeHTML"/>
</div> </div>
<div class="form-group row">
<div class="col-md-4 review-medium-title">
<oneit:label GUIName="Industry Classification" />
</div> </div>
<div class="col-md-8">
<span class="skill-label">
<oneit:toString value="<%= job.getIndustry() != null ? job.getIndustry().getDescription() : "" %>" mode="ParagraphHTML" />
</span>
</div> </div>
<% </div>
for(CultureClass cultureClass : CultureClass.getCultureClassArray()) <div class="form-group row">
{ <div class="col-md-4 review-medium-title">
%> <oneit:label GUIName="Job Occupation Classification" />
<div class="form-group"> </div>
<div class="beloning"> <div class="col-md-8">
<oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/> <span class="skill-label">
<oneit:toString value="<%= job.getIndustry() != null ? job.getIndustry().getDescription() : "" %>" mode="ParagraphHTML" />
</span>
</div>
</div>
<div class="form-group row">
<div class="col-md-4 review-medium-title">
<oneit:label GUIName="Require CV & Cover Letter" />
</div>
<div class="col-md-8">
<span class="skill-label">
<oneit:toString value="<%= job.getRequireCV() ? "Yes" : "No" %>" mode="ParagraphHTML" />
</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-brack-line-sub"></div>
<%
for (CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass)) <div class="form-group row">
{ <div class="col-md-4 review-medium-title">
%> <oneit:label GUIName="Role Assessment Type" />
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label culture-element">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div> </div>
<div class="col-sm-9 col-xs-12 review-data"> <div class="col-md-8">
<oneit:toString value="<%= criteria.getCultureElementRating()!= null ? criteria.getCultureElementRating().getDescription() : ""%>" mode="EscapeHTML"/> <span class="skill-label">
(<oneit:toString value="<%= criteria.getImportance() %>" mode="EscapeHTML"/>) <oneit:toString value="<%= job.getAssessmentType().getTestDescr() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/>
</span>
</div> </div>
</div> </div>
<% } %>
<div class="form-brack-line-sub"></div>
<div class="form-group row">
<div class="col-md-4 review-medium-title">
<oneit:label GUIName="Appllicant Workflow / Tabs" />
</div>
<div class="col-md-8">
<span class="skill-label">
</span>
</div> </div>
<% } %> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
...@@ -197,6 +221,8 @@ ...@@ -197,6 +221,8 @@
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/> .toMap() %>"/>
</div> </div>
<% <%
for(CriteriaType criteria : CriteriaType.getCriteriaTypeArray()) for(CriteriaType criteria : CriteriaType.getCriteriaTypeArray())
{ {
...@@ -207,23 +233,90 @@ ...@@ -207,23 +233,90 @@
continue; continue;
} }
%> %>
<div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
<div class="beloning"> <div class="beloning">
<oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/> <oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/>
</div> </div>
</div> </div>
<div class="form-group">
<% <%
for (AssessmentCriteria assessmentCriteria : assessmentCriterias) for (AssessmentCriteria assessmentCriteria : assessmentCriterias)
{ {
%> %>
<span class="skill-label"> <div class="form-group row">
<oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/> - <div class="col-md-5 review-medium-title">
<oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/>
</div>
<div class="col-md-2">
<oneit:toString value="<%= assessmentCriteria.getImportance() %>" mode="EscapeHTML"/> <oneit:toString value="<%= assessmentCriteria.getImportance() %>" mode="EscapeHTML"/>
</div>
<div class="col-md-5">
<oneit:toString value="<%= assessmentCriteria.getImportance() == Importance.ESSENTIAL ? "This field will be mandatory for applicants" : "" %>" mode="EscapeHTML" />
</div>
</div>
<% }
}
%>
<div class="form-group">
<label class="label-16">Culture</label>
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</div>
<div class="form-brack-line-sub"></div>
<div class="form-group row">
<div class="col-md-12 review-medium-title">
<oneit:label GUIName="Organisation Culture Statement" />
<span class="skill-label">
<oneit:toString value="<%= job.getCultureStatement() %>" mode="ParagraphHTML" />
</span> </span>
<% } %>
</div> </div>
<% } %> </div>
<%
for(CultureClass cultureClass : CultureClass.getCultureClassArray())
{
boolean firstCulture = true;
for (CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass))
{
if(criteria.getIsApplicable())
{
if(firstCulture)
{
firstCulture = false;
%>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<div class="beloning">
<oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/>
</div>
</div>
<%
}
%>
<div class="form-group row">
<div class="col-md-4 review-label culture-element">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div>
<div class="col-md-8 review-data">
<oneit:toString value="<%= criteria.getCultureElementRating()!= null ? criteria.getCultureElementRating().getDescription() : ""%>" mode="EscapeHTML"/>
(<oneit:toString value="<%= criteria.getImportance() %>" mode="EscapeHTML"/>)
</div>
</div>
<%
}
}
firstCulture = true;
}
%>
<div class="text-center"> <div class="text-center">
<oneit:button value="Save as Draft and go to your jobs" name="saveJob" cssClass="btn btn-primary btn-gray largeBtn" <oneit:button value="Save as Draft and go to your jobs" name="saveJob" cssClass="btn btn-primary btn-gray largeBtn"
......
cmsWebApp/webroot/extensions/adminportal/list_clients.jsp
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
String clientPage = WebUtils.getSamePageInRenderMode(request, "Page"); String clientPage = WebUtils.getSamePageInRenderMode(request, "Page");
ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption"); ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption");
Client[] clients = (Client[]) process.getAttribute("Clients"); Client[] clients = (Client[]) process.getAttribute("Clients");
if( request.getParameter("ClientSortOption") != null) if( request.getParameter("ClientSortOption") != null)
{ {
clientSortOpt = ClientSortOption.forName((String) request.getParameter("ClientSortOption")); clientSortOpt = ClientSortOption.forName((String) request.getParameter("ClientSortOption"));
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
if(clients == null) if(clients == null)
{ {
clients = Utils.getClientsByCompany(transaction); clients = Utils.getClientsByHiringTeam(transaction);
process.setAttribute("Clients", clients); process.setAttribute("Clients", clients);
} }
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20181008_Alter_CultureCriteria.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_culture_criteria</tableName>
<column name="is_applicable" type="Boolean" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20181009_Alter_CultureCriteria.sql 0 → 100644
-- @AutoRun
ALTER TABLE tl_culture_criteria ALTER COLUMN importance DROP NOT NULL;
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20181009_Alter_Job.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_job</tableName>
<column name="culture_statement" type="String" nullable="true" length="2000"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<oneit:dynIncluded> <oneit:dynIncluded>
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA); String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String jobPage = WebUtils.getSamePageInRenderMode(request, "Page"); String jobPage = WebUtils.getSamePageInRenderMode(request, "Page");
Debug.assertion(job != null, "Job is null in admin portal create job"); Debug.assertion(job != null, "Job is null in admin portal create job");
...@@ -16,23 +16,17 @@ ...@@ -16,23 +16,17 @@
<script type="text/javascript"> <script type="text/javascript">
function enableElementRating(importanceRadio){ function moveImportanceSection(elementRating){
var importanceGroup = $(importanceRadio).closest('.rate-toggle'); var importanceDiv = $(elementRating).closest('.criteria_section').find('.work-rating');
var radioGroup = $("[name='" + $(elementRating).attr('name') +"']");
importanceGroup.find('li.active').removeClass("active" ); if(radioGroup.is(':checked')){
importanceGroup.find("input[type='radio']:checked").closest('li').addClass("active" ); importanceDiv.insertAfter($("[name='" + $(elementRating).attr('name') +"']:checked").parent());
importanceDiv.show();
var criteriaDiv = $(importanceRadio).closest('.criteria_section');
if(importanceGroup.find("input[type='radio']:checked").val() !== 'NOT_APPLICABLE')
{
criteriaDiv.find(".element_rating_radio").removeProp("disabled");
} }
else else{
{ importanceDiv.hide();
criteriaDiv.find(".element_rating_radio").prop("disabled",true);
criteriaDiv.find(".element_rating_radio").prop('checked', false);
} }
} }
...@@ -40,11 +34,19 @@ ...@@ -40,11 +34,19 @@
recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true});
$(".importance_radio").change(function(){ $(".element_rating_radio").each(function (){
enableElementRating(this); moveImportanceSection(this);
}); });
$(".importance_radio").each(function(){
enableElementRating(this); $(".element_rating_radio").change(function(){
moveImportanceSection(this);
});
$(".importance_radio").change(function(){
var importanceGroup = $(this).closest('.rate-toggle');
importanceGroup.find('li.active').removeClass("active" );
importanceGroup.find("input[type='radio']:checked").closest('li').addClass("active" );
}); });
$("select[name$='CultureTemplate']").change(function(){ $("select[name$='CultureTemplate']").change(function(){
...@@ -102,7 +104,10 @@ ...@@ -102,7 +104,10 @@
<% <%
} }
%> %>
<div class="form-group">
<label><oneit:label GUIName="Organisation Culture Statement" /></label>
<oneit:ormtextarea obj="<%= job %>" attributeName="CultureStatement" cssClass="form-control textarea-box"/>
</div>
<% <%
FormTag jobForm = FormTag.getActiveFormTag(request); FormTag jobForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = jobForm.getFormBuilder(); FormBuilder formBuilder = jobForm.getFormBuilder();
...@@ -127,6 +132,31 @@ ...@@ -127,6 +132,31 @@
<div class="work-radio-title"> <div class="work-radio-title">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/> <oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div> </div>
<span class="pull-right">
<label class="switch">
<oneit:recalcClass htmlTag="span" classScript="criteria.getIsApplicable() ? 'checkbox checked': 'checkbox unchecked'" criteria="<%= criteria %>">
<oneit:ormInput obj="<%= criteria %>" attributeName="IsApplicable" type="checkbox"/>
</oneit:recalcClass>
<div class="slider round"></div>
</label>
</span>
<oneit:recalcClass htmlTag="div" classScript="criteria.getIsApplicable() ? 'show': 'hide'" criteria="<%= criteria %>">
<%
for (CultureElementRating rating : criteria.getCultureElement().getRatingsSet())
{
String ratingId = String.valueOf(rating.getID().longID());
String selectedStr = (CollectionUtils.equals(ratingId, formValue) ? "checked" : "");
%>
<div class="<%= "radio radio-primary workplace-radio " %>">
<input type="radio" name="<%= optionKey %>" id="<%= ratingId %>" class="element_rating_radio" value="<%= ratingId %>" <%= selectedStr %> >
<label for="<%= ratingId %>">
<oneit:toString value="<%= rating %>" mode="EscapeHTML"/>
</label>
</div>
<%
}
%>
</oneit:recalcClass>
<div class="work-rating"> <div class="work-rating">
<div class="rate-background"> <div class="rate-background">
<span class="arrow-up-gray"></span> <span class="arrow-up-gray"></span>
...@@ -139,7 +169,7 @@ ...@@ -139,7 +169,7 @@
String importanceKey = WebUtils.getInputKey(request, criteria, CultureCriteria.FIELD_Importance); String importanceKey = WebUtils.getInputKey(request, criteria, CultureCriteria.FIELD_Importance);
String importanceValue = formBuilder.fieldValue (importanceKey, criteria.getImportance() == null ? "" : criteria.getImportance().getName()); String importanceValue = formBuilder.fieldValue (importanceKey, criteria.getImportance() == null ? "" : criteria.getImportance().getName());
for(Importance importance : Importance.getImportanceArray()) for(Importance importance : Utils.getImportancesForCulture())
{ {
boolean isSelected = CollectionUtils.equals(importanceValue, importance.getName()); boolean isSelected = CollectionUtils.equals(importanceValue, importance.getName());
String importanceId = String.valueOf(criteria.getID().longID()) + "_importance_" + importance.getName(); String importanceId = String.valueOf(criteria.getID().longID()) + "_importance_" + importance.getName();
...@@ -150,7 +180,7 @@ ...@@ -150,7 +180,7 @@
<a href="javascript:void(0)" class="importance"> <a href="javascript:void(0)" class="importance">
<input type="radio" name="<%= importanceKey %>" id="<%= importanceId %>" class="importance_radio" value="<%= importance.getName() %>" <%= selected %>/> <input type="radio" name="<%= importanceKey %>" id="<%= importanceId %>" class="importance_radio" value="<%= importance.getName() %>" <%= selected %>/>
<label for="<%= importanceId %>"><oneit:toString value="<%= importance.getCultureDescription() %>" mode="EscapeHTML" /></label> <label for="<%= importanceId %>"><oneit:toString value="<%= importance.getDescription() %>" mode="EscapeHTML" /></label>
</a> </a>
</li> </li>
<% <%
...@@ -160,23 +190,6 @@ ...@@ -160,23 +190,6 @@
</span> </span>
</div> </div>
</div> </div>
<oneit:recalcClass htmlTag="div" classScript="criteria.isRatingRequired() ? 'show': 'hide'" criteria="<%= criteria %>">
<%
for (CultureElementRating rating : criteria.getCultureElement().getRatingsSet())
{
String ratingId = String.valueOf(rating.getID().longID());
String selectedStr = (CollectionUtils.equals(ratingId, formValue) ? "checked" : "");
%>
<div class="<%= "radio radio-primary workplace-radio " %>">
<input type="radio" name="<%= optionKey %>" id="<%= ratingId %>" class="element_rating_radio" value="<%= ratingId %>" <%= selectedStr %> >
<label for="<%= ratingId %>">
<oneit:toString value="<%= rating %>" mode="EscapeHTML"/>
</label>
</div>
<%
}
%>
</oneit:recalcClass>
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<% <%
...@@ -217,7 +230,7 @@ ...@@ -217,7 +230,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/> .toMap() %>"/>
<oneit:button value="Proceed to Requirements" name="processCulture" cssClass="btn btn-primary top-margin-25 largeBtn" <oneit:button value="Review Job Details" name="processCulture" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Job", job) .mapEntry("Job", job)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).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