Commit 9052c03b by Nilu

adding IsPPJ attribute to job

parent de28186a
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<column name="country" type="String" nullable="true" length="200"/> <column name="country" type="String" nullable="true" length="200"/>
<column name="manually_closed" type="Boolean" nullable="true"/> <column name="manually_closed" type="Boolean" nullable="true"/>
<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="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="company_user_id" type="Long" length="11" nullable="true"/> <column name="company_user_id" type="Long" length="11" nullable="true"/>
......
...@@ -25,6 +25,7 @@ CREATE TABLE tl_job ( ...@@ -25,6 +25,7 @@ CREATE TABLE tl_job (
country varchar(200) NULL, country varchar(200) NULL,
manually_closed char(1) NULL, manually_closed char(1) NULL,
last_edited datetime NULL, last_edited datetime NULL,
is_ppj char(1) NULL,
level_id numeric(12) NULL, level_id numeric(12) NULL,
client_id numeric(12) NULL, client_id numeric(12) NULL,
company_user_id numeric(12) NULL, company_user_id numeric(12) NULL,
......
...@@ -26,6 +26,7 @@ CREATE TABLE tl_job ( ...@@ -26,6 +26,7 @@ CREATE TABLE tl_job (
country varchar2(200) NULL, country varchar2(200) NULL,
manually_closed char(1) NULL, manually_closed char(1) NULL,
last_edited date NULL, last_edited date NULL,
is_ppj char(1) NULL,
level_id number(12) NULL, level_id number(12) NULL,
client_id number(12) NULL, client_id number(12) NULL,
company_user_id number(12) NULL, company_user_id number(12) NULL,
......
...@@ -26,6 +26,7 @@ CREATE TABLE tl_job ( ...@@ -26,6 +26,7 @@ CREATE TABLE tl_job (
country varchar(200) NULL, country varchar(200) NULL,
manually_closed char(1) NULL, manually_closed char(1) NULL,
last_edited timestamp NULL, last_edited timestamp NULL,
is_ppj char(1) NULL,
level_id numeric(12) NULL, level_id numeric(12) NULL,
client_id numeric(12) NULL, client_id numeric(12) NULL,
company_user_id numeric(12) NULL, company_user_id numeric(12) NULL,
......
...@@ -94,6 +94,7 @@ public class MakePaymentFP extends SaveFP ...@@ -94,6 +94,7 @@ public class MakePaymentFP extends SaveFP
job.setOpenDate(new Date()); job.setOpenDate(new Date());
job.setJobStatus(JobStatus.OPEN); job.setJobStatus(JobStatus.OPEN);
job.setLastEdited(new Date()); job.setLastEdited(new Date());
job.setIsPPJ(ppj);
if(job.getShortenedURL() == null) if(job.getShortenedURL() == null)
{ {
......
...@@ -61,6 +61,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -61,6 +61,7 @@ public abstract class BaseJob extends BaseBusinessClass
public static final String FIELD_Country = "Country"; public static final String FIELD_Country = "Country";
public static final String FIELD_IsManuallyClosed = "IsManuallyClosed"; public static final String FIELD_IsManuallyClosed = "IsManuallyClosed";
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_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";
...@@ -113,6 +114,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -113,6 +114,7 @@ public abstract class BaseJob extends BaseBusinessClass
private static final EnumeratedAttributeHelper<Job, Countries> HELPER_Country = new EnumeratedAttributeHelper<Job, Countries> (Countries.FACTORY_Countries); private static final EnumeratedAttributeHelper<Job, Countries> HELPER_Country = new EnumeratedAttributeHelper<Job, Countries> (Countries.FACTORY_Countries);
private static final DefaultAttributeHelper<Job> HELPER_IsManuallyClosed = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Job> HELPER_IsManuallyClosed = DefaultAttributeHelper.INSTANCE;
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_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;
...@@ -146,6 +148,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -146,6 +148,7 @@ public abstract class BaseJob extends BaseBusinessClass
private Countries _Country; private Countries _Country;
private Boolean _IsManuallyClosed; private Boolean _IsManuallyClosed;
private Date _LastEdited; private Date _LastEdited;
private Boolean _IsPPJ;
private String _Email; private String _Email;
private String _Password; private String _Password;
private String _ConfirmPassword; private String _ConfirmPassword;
...@@ -211,6 +214,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -211,6 +214,7 @@ public abstract class BaseJob extends BaseBusinessClass
private static final AttributeValidator[] FIELD_Country_Validators; private static final AttributeValidator[] FIELD_Country_Validators;
private static final AttributeValidator[] FIELD_IsManuallyClosed_Validators; private static final AttributeValidator[] FIELD_IsManuallyClosed_Validators;
private static final AttributeValidator[] FIELD_LastEdited_Validators; private static final AttributeValidator[] FIELD_LastEdited_Validators;
private static final AttributeValidator[] FIELD_IsPPJ_Validators;
// Arrays of behaviour decorators // Arrays of behaviour decorators
...@@ -268,6 +272,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -268,6 +272,7 @@ public abstract class BaseJob extends BaseBusinessClass
FIELD_Country_Validators = (AttributeValidator[])setupAttribMetaData_Country(validatorMapping).toArray (new AttributeValidator[0]); FIELD_Country_Validators = (AttributeValidator[])setupAttribMetaData_Country(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_IsManuallyClosed_Validators = (AttributeValidator[])setupAttribMetaData_IsManuallyClosed(validatorMapping).toArray (new AttributeValidator[0]); FIELD_IsManuallyClosed_Validators = (AttributeValidator[])setupAttribMetaData_IsManuallyClosed(validatorMapping).toArray (new AttributeValidator[0]);
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]);
REFERENCE_Job.initialiseReference (); REFERENCE_Job.initialiseReference ();
...@@ -978,6 +983,25 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -978,6 +983,25 @@ public abstract class BaseJob extends BaseBusinessClass
return validators; return validators;
} }
// Meta Info setup
private static List setupAttribMetaData_IsPPJ(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "is_ppj");
metaInfo.put ("defaultValue", "Boolean.FALSE");
metaInfo.put ("name", "IsPPJ");
metaInfo.put ("type", "Boolean");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Job.IsPPJ:", metaInfo);
ATTRIBUTES_METADATA_Job.put (FIELD_IsPPJ, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Job.class, "IsPPJ", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Job.IsPPJ:", validators);
return validators;
}
// END OF STATIC METADATA DEFINITION // END OF STATIC METADATA DEFINITION
...@@ -1022,6 +1046,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -1022,6 +1046,7 @@ public abstract class BaseJob extends BaseBusinessClass
_Country = (Countries)(Countries.AU); _Country = (Countries)(Countries.AU);
_IsManuallyClosed = (Boolean)(Boolean.FALSE); _IsManuallyClosed = (Boolean)(Boolean.FALSE);
_LastEdited = (Date)(HELPER_LastEdited.initialise (_LastEdited)); _LastEdited = (Date)(HELPER_LastEdited.initialise (_LastEdited));
_IsPPJ = (Boolean)(Boolean.FALSE);
_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));
...@@ -2752,6 +2777,104 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -2752,6 +2777,104 @@ public abstract class BaseJob extends BaseBusinessClass
} }
/** /**
* Get the attribute IsPPJ
*/
public Boolean getIsPPJ ()
{
assertValid();
Boolean valToReturn = _IsPPJ;
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
valToReturn = bhd.getIsPPJ ((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 preIsPPJChange (Boolean newIsPPJ) 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 postIsPPJChange () throws FieldException
{
}
public FieldWriteability getWriteability_IsPPJ ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute IsPPJ. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setIsPPJ (Boolean newIsPPJ) throws FieldException
{
boolean oldAndNewIdentical = HELPER_IsPPJ.compare (_IsPPJ, newIsPPJ);
try
{
for (JobBehaviourDecorator bhd : Job_BehaviourDecorators)
{
newIsPPJ = bhd.setIsPPJ ((Job)this, newIsPPJ);
oldAndNewIdentical = HELPER_IsPPJ.compare (_IsPPJ, newIsPPJ);
}
if (FIELD_IsPPJ_Validators.length > 0)
{
Object newIsPPJObj = HELPER_IsPPJ.toObject (newIsPPJ);
if (newIsPPJObj != null)
{
int loopMax = FIELD_IsPPJ_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Job.get (FIELD_IsPPJ);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_IsPPJ_Validators[v].checkAttribute (this, FIELD_IsPPJ, metadata, newIsPPJObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_IsPPJ () != FieldWriteability.FALSE, "Field IsPPJ is not writeable");
preIsPPJChange (newIsPPJ);
markFieldChange (FIELD_IsPPJ);
_IsPPJ = newIsPPJ;
postFieldChange (FIELD_IsPPJ);
postIsPPJChange ();
}
}
/**
* Get the attribute Email * Get the attribute Email
*/ */
public String getEmail () public String getEmail ()
...@@ -5482,6 +5605,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -5482,6 +5605,7 @@ public abstract class BaseJob extends BaseBusinessClass
tl_jobPSet.setAttrib (FIELD_Country, HELPER_Country.toObject (_Country)); // tl_jobPSet.setAttrib (FIELD_Country, HELPER_Country.toObject (_Country)); //
tl_jobPSet.setAttrib (FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.toObject (_IsManuallyClosed)); // tl_jobPSet.setAttrib (FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.toObject (_IsManuallyClosed)); //
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)); //
_Level.getPersistentSets (allSets); _Level.getPersistentSets (allSets);
_Client.getPersistentSets (allSets); _Client.getPersistentSets (allSets);
_CompanyUser.getPersistentSets (allSets); _CompanyUser.getPersistentSets (allSets);
...@@ -5517,6 +5641,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -5517,6 +5641,7 @@ public abstract class BaseJob extends BaseBusinessClass
_Country = (Countries)(HELPER_Country.fromObject (_Country, tl_jobPSet.getAttrib (FIELD_Country))); // _Country = (Countries)(HELPER_Country.fromObject (_Country, tl_jobPSet.getAttrib (FIELD_Country))); //
_IsManuallyClosed = (Boolean)(HELPER_IsManuallyClosed.fromObject (_IsManuallyClosed, tl_jobPSet.getAttrib (FIELD_IsManuallyClosed))); // _IsManuallyClosed = (Boolean)(HELPER_IsManuallyClosed.fromObject (_IsManuallyClosed, tl_jobPSet.getAttrib (FIELD_IsManuallyClosed))); //
_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))); //
_Level.setFromPersistentSets (objectID, allSets); _Level.setFromPersistentSets (objectID, allSets);
_Client.setFromPersistentSets (objectID, allSets); _Client.setFromPersistentSets (objectID, allSets);
_CompanyUser.setFromPersistentSets (objectID, allSets); _CompanyUser.setFromPersistentSets (objectID, allSets);
...@@ -5689,6 +5814,15 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -5689,6 +5814,15 @@ public abstract class BaseJob extends BaseBusinessClass
e.addException (ex); e.addException (ex);
} }
try
{
setIsPPJ (otherJob.getIsPPJ ());
}
catch (FieldException ex)
{
e.addException (ex);
}
} }
} }
...@@ -5721,6 +5855,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -5721,6 +5855,7 @@ public abstract class BaseJob extends BaseBusinessClass
_Country = sourceJob._Country; _Country = sourceJob._Country;
_IsManuallyClosed = sourceJob._IsManuallyClosed; _IsManuallyClosed = sourceJob._IsManuallyClosed;
_LastEdited = sourceJob._LastEdited; _LastEdited = sourceJob._LastEdited;
_IsPPJ = sourceJob._IsPPJ;
_Email = sourceJob._Email; _Email = sourceJob._Email;
_Password = sourceJob._Password; _Password = sourceJob._Password;
_ConfirmPassword = sourceJob._ConfirmPassword; _ConfirmPassword = sourceJob._ConfirmPassword;
...@@ -5813,6 +5948,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -5813,6 +5948,7 @@ public abstract class BaseJob extends BaseBusinessClass
_Country = (Countries)(HELPER_Country.readExternal (_Country, vals.get(FIELD_Country))); // _Country = (Countries)(HELPER_Country.readExternal (_Country, vals.get(FIELD_Country))); //
_IsManuallyClosed = (Boolean)(HELPER_IsManuallyClosed.readExternal (_IsManuallyClosed, vals.get(FIELD_IsManuallyClosed))); // _IsManuallyClosed = (Boolean)(HELPER_IsManuallyClosed.readExternal (_IsManuallyClosed, vals.get(FIELD_IsManuallyClosed))); //
_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))); //
_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))); //
...@@ -5864,6 +6000,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -5864,6 +6000,7 @@ public abstract class BaseJob extends BaseBusinessClass
vals.put (FIELD_Country, HELPER_Country.writeExternal (_Country)); vals.put (FIELD_Country, HELPER_Country.writeExternal (_Country));
vals.put (FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.writeExternal (_IsManuallyClosed)); vals.put (FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.writeExternal (_IsManuallyClosed));
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_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));
...@@ -5968,6 +6105,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -5968,6 +6105,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
listener.notifyFieldChange(this, other, FIELD_LastEdited, HELPER_LastEdited.toObject(this._LastEdited), HELPER_LastEdited.toObject(otherJob._LastEdited)); listener.notifyFieldChange(this, other, FIELD_LastEdited, HELPER_LastEdited.toObject(this._LastEdited), HELPER_LastEdited.toObject(otherJob._LastEdited));
} }
if (!HELPER_IsPPJ.compare(this._IsPPJ, otherJob._IsPPJ))
{
listener.notifyFieldChange(this, other, FIELD_IsPPJ, HELPER_IsPPJ.toObject(this._IsPPJ), HELPER_IsPPJ.toObject(otherJob._IsPPJ));
}
// Compare single assocs // Compare single assocs
_AssessmentTemplate.compare (otherJob._AssessmentTemplate, listener); _AssessmentTemplate.compare (otherJob._AssessmentTemplate, listener);
...@@ -6030,6 +6171,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6030,6 +6171,7 @@ public abstract class BaseJob extends BaseBusinessClass
visitor.visitField(this, FIELD_Country, HELPER_Country.toObject(getCountry())); visitor.visitField(this, FIELD_Country, HELPER_Country.toObject(getCountry()));
visitor.visitField(this, FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.toObject(getIsManuallyClosed())); visitor.visitField(this, FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.toObject(getIsManuallyClosed()));
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.visitAssociation (_AssessmentTemplate); visitor.visitAssociation (_AssessmentTemplate);
visitor.visitAssociation (_CultureTemplate); visitor.visitAssociation (_CultureTemplate);
visitor.visitAssociation (_JobTemplate); visitor.visitAssociation (_JobTemplate);
...@@ -6181,6 +6323,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6181,6 +6323,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return filter.matches (getLastEdited ()); return filter.matches (getLastEdited ());
} }
else if (attribName.equals (FIELD_IsPPJ))
{
return filter.matches (getIsPPJ ());
}
else if (attribName.equals (SINGLEREFERENCE_Level)) else if (attribName.equals (SINGLEREFERENCE_Level))
{ {
return filter.matches (getLevel ()); return filter.matches (getLevel ());
...@@ -6330,6 +6476,12 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6330,6 +6476,12 @@ public abstract class BaseJob extends BaseBusinessClass
return this; return this;
} }
public SearchAll andIsPPJ (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_job.is_ppj", "IsPPJ");
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");
...@@ -6519,6 +6671,12 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6519,6 +6671,12 @@ public abstract class BaseJob extends BaseBusinessClass
return this; return this;
} }
public SearchJobKey andIsPPJ (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_job.is_ppj", "IsPPJ");
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");
...@@ -6702,6 +6860,12 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6702,6 +6860,12 @@ public abstract class BaseJob extends BaseBusinessClass
return this; return this;
} }
public SearchCompany andIsPPJ (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_job.is_ppj", "IsPPJ");
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");
...@@ -6830,6 +6994,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6830,6 +6994,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return HELPER_LastEdited.toObject (getLastEdited ()); return HELPER_LastEdited.toObject (getLastEdited ());
} }
else if (attribName.equals (FIELD_IsPPJ))
{
return HELPER_IsPPJ.toObject (getIsPPJ ());
}
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
return HELPER_Email.toObject (getEmail ()); return HELPER_Email.toObject (getEmail ());
...@@ -6963,6 +7131,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6963,6 +7131,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return HELPER_LastEdited; return HELPER_LastEdited;
} }
else if (attribName.equals (FIELD_IsPPJ))
{
return HELPER_IsPPJ;
}
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
return HELPER_Email; return HELPER_Email;
...@@ -7096,6 +7268,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7096,6 +7268,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
setLastEdited ((Date)(HELPER_LastEdited.fromObject (_LastEdited, attribValue))); setLastEdited ((Date)(HELPER_LastEdited.fromObject (_LastEdited, attribValue)));
} }
else if (attribName.equals (FIELD_IsPPJ))
{
setIsPPJ ((Boolean)(HELPER_IsPPJ.fromObject (_IsPPJ, 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)));
...@@ -7236,6 +7412,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7236,6 +7412,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return getWriteability_LastEdited (); return getWriteability_LastEdited ();
} }
else if (fieldName.equals (FIELD_IsPPJ))
{
return getWriteability_IsPPJ ();
}
else if (fieldName.equals (MULTIPLEREFERENCE_JobApplications)) else if (fieldName.equals (MULTIPLEREFERENCE_JobApplications))
{ {
return getWriteability_JobApplications (); return getWriteability_JobApplications ();
...@@ -7423,6 +7603,11 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7423,6 +7603,11 @@ public abstract class BaseJob extends BaseBusinessClass
fields.add (FIELD_LastEdited); fields.add (FIELD_LastEdited);
} }
if (getWriteability_IsPPJ () != FieldWriteability.TRUE)
{
fields.add (FIELD_IsPPJ);
}
if (getWriteability_Email () != FieldWriteability.TRUE) if (getWriteability_Email () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_Email); fields.add (FIELD_Email);
...@@ -7514,6 +7699,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7514,6 +7699,7 @@ public abstract class BaseJob extends BaseBusinessClass
result.add(HELPER_Country.getAttribObject (getClass (), _Country, false, FIELD_Country)); result.add(HELPER_Country.getAttribObject (getClass (), _Country, false, FIELD_Country));
result.add(HELPER_IsManuallyClosed.getAttribObject (getClass (), _IsManuallyClosed, false, FIELD_IsManuallyClosed)); result.add(HELPER_IsManuallyClosed.getAttribObject (getClass (), _IsManuallyClosed, false, FIELD_IsManuallyClosed));
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_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));
...@@ -7884,6 +8070,24 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7884,6 +8070,24 @@ public abstract class BaseJob extends BaseBusinessClass
} }
/** /**
* Get the attribute IsPPJ
*/
public Boolean getIsPPJ (Job obj, Boolean original)
{
return original;
}
/**
* Change the value set for attribute IsPPJ.
* May modify the field beforehand
* Occurs before validation.
*/
public Boolean setIsPPJ (Job obj, Boolean newIsPPJ) throws FieldException
{
return newIsPPJ;
}
/**
* Get the attribute Email * Get the attribute Email
*/ */
public String getEmail (Job obj, String original) public String getEmail (Job obj, String original)
...@@ -8313,6 +8517,10 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8313,6 +8517,10 @@ public abstract class BaseJob extends BaseBusinessClass
{ {
return toLastEdited (); return toLastEdited ();
} }
if (name.equals ("IsPPJ"))
{
return toIsPPJ ();
}
if (name.equals ("Level")) if (name.equals ("Level"))
{ {
return toLevel (); return toLevel ();
...@@ -8394,6 +8602,8 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -8394,6 +8602,8 @@ public abstract class BaseJob extends BaseBusinessClass
public PipeLine<From, Boolean> toIsManuallyClosed () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsManuallyClosed)); } public PipeLine<From, Boolean> toIsManuallyClosed () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsManuallyClosed)); }
public PipeLine<From, Date> toLastEdited () { return pipe(new ORMAttributePipe<Me, Date>(FIELD_LastEdited)); } public PipeLine<From, Date> toLastEdited () { return pipe(new ORMAttributePipe<Me, Date>(FIELD_LastEdited)); }
public PipeLine<From, Boolean> toIsPPJ () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsPPJ)); }
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)
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<ATTRIB name="Country" type="Countries" dbcol="country" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="Country" type="Countries" dbcol="country" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/> <ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/>
<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"/>
<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"/>
......
...@@ -46,6 +46,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -46,6 +46,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
private Countries dummyCountry; private Countries dummyCountry;
private Boolean dummyIsManuallyClosed; private Boolean dummyIsManuallyClosed;
private Date dummyLastEdited; private Date dummyLastEdited;
private Boolean dummyIsPPJ;
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
...@@ -66,6 +67,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -66,6 +67,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
private static final EnumeratedAttributeHelper HELPER_Country = new EnumeratedAttributeHelper (Countries.FACTORY_Countries); private static final EnumeratedAttributeHelper HELPER_Country = new EnumeratedAttributeHelper (Countries.FACTORY_Countries);
private static final DefaultAttributeHelper HELPER_IsManuallyClosed = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_IsManuallyClosed = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_LastEdited = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_LastEdited = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE;
...@@ -89,10 +91,11 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -89,10 +91,11 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
dummyCountry = (Countries)(HELPER_Country.initialise (dummyCountry)); dummyCountry = (Countries)(HELPER_Country.initialise (dummyCountry));
dummyIsManuallyClosed = (Boolean)(HELPER_IsManuallyClosed.initialise (dummyIsManuallyClosed)); dummyIsManuallyClosed = (Boolean)(HELPER_IsManuallyClosed.initialise (dummyIsManuallyClosed));
dummyLastEdited = (Date)(HELPER_LastEdited.initialise (dummyLastEdited)); dummyLastEdited = (Date)(HELPER_LastEdited.initialise (dummyLastEdited));
dummyIsPPJ = (Boolean)(HELPER_IsPPJ.initialise (dummyIsPPJ));
} }
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.state, {PREFIX}tl_job.country, {PREFIX}tl_job.manually_closed, {PREFIX}tl_job.last_edited, {PREFIX}tl_job.level_id, {PREFIX}tl_job.client_id, {PREFIX}tl_job.company_user_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.state, {PREFIX}tl_job.country, {PREFIX}tl_job.manually_closed, {PREFIX}tl_job.last_edited, {PREFIX}tl_job.is_ppj, {PREFIX}tl_job.level_id, {PREFIX}tl_job.client_id, {PREFIX}tl_job.company_user_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
...@@ -160,6 +163,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -160,6 +163,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
!tl_jobPSet.containsAttrib(Job.FIELD_Country)|| !tl_jobPSet.containsAttrib(Job.FIELD_Country)||
!tl_jobPSet.containsAttrib(Job.FIELD_IsManuallyClosed)|| !tl_jobPSet.containsAttrib(Job.FIELD_IsManuallyClosed)||
!tl_jobPSet.containsAttrib(Job.FIELD_LastEdited)|| !tl_jobPSet.containsAttrib(Job.FIELD_LastEdited)||
!tl_jobPSet.containsAttrib(Job.FIELD_IsPPJ)||
!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_CompanyUser)|| !tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_CompanyUser)||
...@@ -243,10 +247,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -243,10 +247,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 = ?, state = ?, country = ?, manually_closed = ?, last_edited = ?, level_id = ? , client_id = ? , company_user_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 = ?, state = ?, country = ?, manually_closed = ?, last_edited = ?, is_ppj = ?, level_id = ? , client_id = ? , company_user_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_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).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_CompanyUser)))).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_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).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 (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_CompanyUser)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -629,6 +633,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -629,6 +633,7 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
tl_jobPSet.setAttrib(Job.FIELD_Country, HELPER_Country.getFromRS(dummyCountry, r, "country")); tl_jobPSet.setAttrib(Job.FIELD_Country, HELPER_Country.getFromRS(dummyCountry, r, "country"));
tl_jobPSet.setAttrib(Job.FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.getFromRS(dummyIsManuallyClosed, r, "manually_closed")); tl_jobPSet.setAttrib(Job.FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.getFromRS(dummyIsManuallyClosed, r, "manually_closed"));
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.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"));
...@@ -650,10 +655,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr ...@@ -650,10 +655,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, state, country, manually_closed, last_edited, level_id, client_id, company_user_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, state, country, manually_closed, last_edited, is_ppj, level_id, client_id, company_user_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_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))) .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_CompanyUser)))).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_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).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 (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_CompanyUser)))).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);
} }
......
<?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="is_ppj" type="Boolean" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
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