Skip to content

P
PERFORMA_REPLICA
Commit 13b6c23f by nilu
Options

S42973328 # Matchd / Talentology - No Plan [Enhancement] #Hiring Team Stats -… 

S42973328 # Matchd / Talentology - No Plan [Enhancement] #Hiring Team Stats - Active / Cancelled / Closed
parent 7b0f220f
Showing with 795 additions and 28 deletions
cmsWebApp/sql/SearchHiringTeam.xml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<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="xxxx" type="CLOB" nullable="true"/> <column name="xxxx" type="CLOB" nullable="true"/>
<column name="" type="String" nullable="true" length="200"/>
</NODE> </NODE>
</NODE></OBJECTS> </NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/ms/SearchHiringTeam.sql
...@@ -8,7 +8,8 @@ CREATE TABLE it_does_not_matter ( ...@@ -8,7 +8,8 @@ CREATE TABLE it_does_not_matter (
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
, ,
xxxx text NULL xxxx text NULL,
varchar(200) NULL
); );
......
cmsWebApp/sql/oracle/SearchHiringTeam.sql
...@@ -9,7 +9,8 @@ CREATE TABLE it_does_not_matter ( ...@@ -9,7 +9,8 @@ CREATE TABLE it_does_not_matter (
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
, ,
xxxx clob NULL xxxx clob NULL,
varchar2(200) NULL
); );
......
cmsWebApp/sql/postgres/SearchHiringTeam.sql
...@@ -9,7 +9,8 @@ CREATE TABLE it_does_not_matter ( ...@@ -9,7 +9,8 @@ CREATE TABLE it_does_not_matter (
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
, ,
xxxx text NULL xxxx text NULL,
varchar(200) NULL
); );
......
cmsWebApp/src/performa/form/ChangeCompanyFP.java
...@@ -77,6 +77,8 @@ public class ChangeCompanyFP extends SaveFP ...@@ -77,6 +77,8 @@ public class ChangeCompanyFP extends SaveFP
link.setRole(RoleType.OWNER); link.setRole(RoleType.OWNER);
} }
hiringTeam.getCompany().setCompanyStatus(hiringTeam.getCompanyStatus());
return super.processForm(process, submission, params); return super.processForm(process, submission, params);
} }
} }
\ No newline at end of file
cmsWebApp/src/performa/orm/BaseHiringTeam.java
...@@ -83,6 +83,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -83,6 +83,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
public static final String FIELD_StripeLast4 = "StripeLast4"; public static final String FIELD_StripeLast4 = "StripeLast4";
public static final String FIELD_CompanyName = "CompanyName"; public static final String FIELD_CompanyName = "CompanyName";
public static final String FIELD_CompanyType = "CompanyType"; public static final String FIELD_CompanyType = "CompanyType";
public static final String FIELD_CompanyStatus = "CompanyStatus";
public static final String FIELD_CompanyTimeZone = "CompanyTimeZone"; public static final String FIELD_CompanyTimeZone = "CompanyTimeZone";
public static final String SINGLEREFERENCE_Company = "Company"; public static final String SINGLEREFERENCE_Company = "Company";
public static final String BACKREF_Company = ""; public static final String BACKREF_Company = "";
...@@ -102,6 +103,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -102,6 +103,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
// Static constants corresponding to searches // Static constants corresponding to searches
public static final String SEARCH_All = "All"; public static final String SEARCH_All = "All";
public static final String SEARCH_Company = "Company";
public static final String SEARCH_BillingTeams = "BillingTeams"; public static final String SEARCH_BillingTeams = "BillingTeams";
...@@ -147,6 +149,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -147,6 +149,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeLast4 = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_StripeLast4 = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<HiringTeam> HELPER_CompanyName = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<HiringTeam> HELPER_CompanyName = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper<HiringTeam, HiringTeamType> HELPER_CompanyType = new EnumeratedAttributeHelper<HiringTeam, HiringTeamType> (HiringTeamType.FACTORY_HiringTeamType); private static final EnumeratedAttributeHelper<HiringTeam, HiringTeamType> HELPER_CompanyType = new EnumeratedAttributeHelper<HiringTeam, HiringTeamType> (HiringTeamType.FACTORY_HiringTeamType);
private static final EnumeratedAttributeHelper<HiringTeam, CompanyStatus> HELPER_CompanyStatus = new EnumeratedAttributeHelper<HiringTeam, CompanyStatus> (CompanyStatus.FACTORY_CompanyStatus);
private static final EnumeratedAttributeHelper<HiringTeam, TimeZone> HELPER_CompanyTimeZone = new EnumeratedAttributeHelper<HiringTeam, TimeZone> (TimeZone.FACTORY_TimeZone); private static final EnumeratedAttributeHelper<HiringTeam, TimeZone> HELPER_CompanyTimeZone = new EnumeratedAttributeHelper<HiringTeam, TimeZone> (TimeZone.FACTORY_TimeZone);
...@@ -192,6 +195,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -192,6 +195,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
private String _StripeLast4; private String _StripeLast4;
private String _CompanyName; private String _CompanyName;
private HiringTeamType _CompanyType; private HiringTeamType _CompanyType;
private CompanyStatus _CompanyStatus;
private TimeZone _CompanyTimeZone; private TimeZone _CompanyTimeZone;
...@@ -221,6 +225,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -221,6 +225,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
private static final AttributeValidator[] FIELD_StripeLast4_Validators; private static final AttributeValidator[] FIELD_StripeLast4_Validators;
private static final AttributeValidator[] FIELD_CompanyName_Validators; private static final AttributeValidator[] FIELD_CompanyName_Validators;
private static final AttributeValidator[] FIELD_CompanyType_Validators; private static final AttributeValidator[] FIELD_CompanyType_Validators;
private static final AttributeValidator[] FIELD_CompanyStatus_Validators;
private static final AttributeValidator[] FIELD_CompanyTimeZone_Validators; private static final AttributeValidator[] FIELD_CompanyTimeZone_Validators;
private static final AttributeValidator[] FIELD_HiringTeamName_Validators; private static final AttributeValidator[] FIELD_HiringTeamName_Validators;
private static final AttributeValidator[] FIELD_HiringTeamLogo_Validators; private static final AttributeValidator[] FIELD_HiringTeamLogo_Validators;
...@@ -291,6 +296,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -291,6 +296,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
FIELD_StripeLast4_Validators = (AttributeValidator[])setupAttribMetaData_StripeLast4(validatorMapping).toArray (new AttributeValidator[0]); FIELD_StripeLast4_Validators = (AttributeValidator[])setupAttribMetaData_StripeLast4(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyName_Validators = (AttributeValidator[])setupAttribMetaData_CompanyName(validatorMapping).toArray (new AttributeValidator[0]); FIELD_CompanyName_Validators = (AttributeValidator[])setupAttribMetaData_CompanyName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyType_Validators = (AttributeValidator[])setupAttribMetaData_CompanyType(validatorMapping).toArray (new AttributeValidator[0]); FIELD_CompanyType_Validators = (AttributeValidator[])setupAttribMetaData_CompanyType(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyStatus_Validators = (AttributeValidator[])setupAttribMetaData_CompanyStatus(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyTimeZone_Validators = (AttributeValidator[])setupAttribMetaData_CompanyTimeZone(validatorMapping).toArray (new AttributeValidator[0]); FIELD_CompanyTimeZone_Validators = (AttributeValidator[])setupAttribMetaData_CompanyTimeZone(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_HiringTeamName_Validators = (AttributeValidator[])setupAttribMetaData_HiringTeamName(validatorMapping).toArray (new AttributeValidator[0]); FIELD_HiringTeamName_Validators = (AttributeValidator[])setupAttribMetaData_HiringTeamName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_HiringTeamLogo_Validators = (AttributeValidator[])setupAttribMetaData_HiringTeamLogo(validatorMapping).toArray (new AttributeValidator[0]); FIELD_HiringTeamLogo_Validators = (AttributeValidator[])setupAttribMetaData_HiringTeamLogo(validatorMapping).toArray (new AttributeValidator[0]);
...@@ -597,6 +603,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -597,6 +603,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_CompanyStatus(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
metaInfo.put ("name", "CompanyStatus");
metaInfo.put ("type", "CompanyStatus");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for HiringTeam.CompanyStatus:", metaInfo);
ATTRIBUTES_METADATA_HiringTeam.put (FIELD_CompanyStatus, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(HiringTeam.class, "CompanyStatus", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for HiringTeam.CompanyStatus:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_CompanyTimeZone(Map validatorMapping) private static List setupAttribMetaData_CompanyTimeZone(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -1337,6 +1361,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -1337,6 +1361,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
_StripeLast4 = (String)(HELPER_StripeLast4.initialise (_StripeLast4)); _StripeLast4 = (String)(HELPER_StripeLast4.initialise (_StripeLast4));
_CompanyName = (String)(HELPER_CompanyName.initialise (_CompanyName)); _CompanyName = (String)(HELPER_CompanyName.initialise (_CompanyName));
_CompanyType = (HiringTeamType)(HELPER_CompanyType.initialise (_CompanyType)); _CompanyType = (HiringTeamType)(HELPER_CompanyType.initialise (_CompanyType));
_CompanyStatus = (CompanyStatus)(HELPER_CompanyStatus.initialise (_CompanyStatus));
_CompanyTimeZone = (TimeZone)(HELPER_CompanyTimeZone.initialise (_CompanyTimeZone)); _CompanyTimeZone = (TimeZone)(HELPER_CompanyTimeZone.initialise (_CompanyTimeZone));
} }
...@@ -5401,6 +5426,104 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -5401,6 +5426,104 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
/** /**
* Get the attribute CompanyStatus
*/
public CompanyStatus getCompanyStatus ()
{
assertValid();
CompanyStatus valToReturn = _CompanyStatus;
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
valToReturn = bhd.getCompanyStatus ((HiringTeam)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 preCompanyStatusChange (CompanyStatus newCompanyStatus) 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 postCompanyStatusChange () throws FieldException
{
}
public FieldWriteability getWriteability_CompanyStatus ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute CompanyStatus. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setCompanyStatus (CompanyStatus newCompanyStatus) throws FieldException
{
boolean oldAndNewIdentical = HELPER_CompanyStatus.compare (_CompanyStatus, newCompanyStatus);
try
{
for (HiringTeamBehaviourDecorator bhd : HiringTeam_BehaviourDecorators)
{
newCompanyStatus = bhd.setCompanyStatus ((HiringTeam)this, newCompanyStatus);
oldAndNewIdentical = HELPER_CompanyStatus.compare (_CompanyStatus, newCompanyStatus);
}
if (FIELD_CompanyStatus_Validators.length > 0)
{
Object newCompanyStatusObj = HELPER_CompanyStatus.toObject (newCompanyStatus);
if (newCompanyStatusObj != null)
{
int loopMax = FIELD_CompanyStatus_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_HiringTeam.get (FIELD_CompanyStatus);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_CompanyStatus_Validators[v].checkAttribute (this, FIELD_CompanyStatus, metadata, newCompanyStatusObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_CompanyStatus () != FieldWriteability.FALSE, "Field CompanyStatus is not writeable");
preCompanyStatusChange (newCompanyStatus);
markFieldChange (FIELD_CompanyStatus);
_CompanyStatus = newCompanyStatus;
postFieldChange (FIELD_CompanyStatus);
postCompanyStatusChange ();
}
}
/**
* Get the attribute CompanyTimeZone * Get the attribute CompanyTimeZone
*/ */
public TimeZone getCompanyTimeZone () public TimeZone getCompanyTimeZone ()
...@@ -7339,6 +7462,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -7339,6 +7462,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
_StripeLast4 = sourceHiringTeam._StripeLast4; _StripeLast4 = sourceHiringTeam._StripeLast4;
_CompanyName = sourceHiringTeam._CompanyName; _CompanyName = sourceHiringTeam._CompanyName;
_CompanyType = sourceHiringTeam._CompanyType; _CompanyType = sourceHiringTeam._CompanyType;
_CompanyStatus = sourceHiringTeam._CompanyStatus;
_CompanyTimeZone = sourceHiringTeam._CompanyTimeZone; _CompanyTimeZone = sourceHiringTeam._CompanyTimeZone;
} }
...@@ -7446,6 +7570,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -7446,6 +7570,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
_StripeLast4 = (String)(HELPER_StripeLast4.readExternal (_StripeLast4, vals.get(FIELD_StripeLast4))); // _StripeLast4 = (String)(HELPER_StripeLast4.readExternal (_StripeLast4, vals.get(FIELD_StripeLast4))); //
_CompanyName = (String)(HELPER_CompanyName.readExternal (_CompanyName, vals.get(FIELD_CompanyName))); // _CompanyName = (String)(HELPER_CompanyName.readExternal (_CompanyName, vals.get(FIELD_CompanyName))); //
_CompanyType = (HiringTeamType)(HELPER_CompanyType.readExternal (_CompanyType, vals.get(FIELD_CompanyType))); // _CompanyType = (HiringTeamType)(HELPER_CompanyType.readExternal (_CompanyType, vals.get(FIELD_CompanyType))); //
_CompanyStatus = (CompanyStatus)(HELPER_CompanyStatus.readExternal (_CompanyStatus, vals.get(FIELD_CompanyStatus))); //
_CompanyTimeZone = (TimeZone)(HELPER_CompanyTimeZone.readExternal (_CompanyTimeZone, vals.get(FIELD_CompanyTimeZone))); // _CompanyTimeZone = (TimeZone)(HELPER_CompanyTimeZone.readExternal (_CompanyTimeZone, vals.get(FIELD_CompanyTimeZone))); //
_Company.readExternalData(vals.get(SINGLEREFERENCE_Company)); _Company.readExternalData(vals.get(SINGLEREFERENCE_Company));
_BilledByTeam.readExternalData(vals.get(SINGLEREFERENCE_BilledByTeam)); _BilledByTeam.readExternalData(vals.get(SINGLEREFERENCE_BilledByTeam));
...@@ -7508,6 +7633,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -7508,6 +7633,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
vals.put (FIELD_StripeLast4, HELPER_StripeLast4.writeExternal (_StripeLast4)); vals.put (FIELD_StripeLast4, HELPER_StripeLast4.writeExternal (_StripeLast4));
vals.put (FIELD_CompanyName, HELPER_CompanyName.writeExternal (_CompanyName)); vals.put (FIELD_CompanyName, HELPER_CompanyName.writeExternal (_CompanyName));
vals.put (FIELD_CompanyType, HELPER_CompanyType.writeExternal (_CompanyType)); vals.put (FIELD_CompanyType, HELPER_CompanyType.writeExternal (_CompanyType));
vals.put (FIELD_CompanyStatus, HELPER_CompanyStatus.writeExternal (_CompanyStatus));
vals.put (FIELD_CompanyTimeZone, HELPER_CompanyTimeZone.writeExternal (_CompanyTimeZone)); vals.put (FIELD_CompanyTimeZone, HELPER_CompanyTimeZone.writeExternal (_CompanyTimeZone));
vals.put (SINGLEREFERENCE_Company, _Company.writeExternalData()); vals.put (SINGLEREFERENCE_Company, _Company.writeExternalData());
vals.put (SINGLEREFERENCE_BilledByTeam, _BilledByTeam.writeExternalData()); vals.put (SINGLEREFERENCE_BilledByTeam, _BilledByTeam.writeExternalData());
...@@ -7697,6 +7823,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -7697,6 +7823,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
visitor.visitField(this, FIELD_StripeLast4, HELPER_StripeLast4.toObject(getStripeLast4())); visitor.visitField(this, FIELD_StripeLast4, HELPER_StripeLast4.toObject(getStripeLast4()));
visitor.visitField(this, FIELD_CompanyName, HELPER_CompanyName.toObject(getCompanyName())); visitor.visitField(this, FIELD_CompanyName, HELPER_CompanyName.toObject(getCompanyName()));
visitor.visitField(this, FIELD_CompanyType, HELPER_CompanyType.toObject(getCompanyType())); visitor.visitField(this, FIELD_CompanyType, HELPER_CompanyType.toObject(getCompanyType()));
visitor.visitField(this, FIELD_CompanyStatus, HELPER_CompanyStatus.toObject(getCompanyStatus()));
visitor.visitField(this, FIELD_CompanyTimeZone, HELPER_CompanyTimeZone.toObject(getCompanyTimeZone())); visitor.visitField(this, FIELD_CompanyTimeZone, HELPER_CompanyTimeZone.toObject(getCompanyTimeZone()));
} }
...@@ -8266,6 +8393,298 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -8266,6 +8393,298 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
.search (transaction); .search (transaction);
} }
public static SearchCompany SearchByCompany () { return new SearchCompany (); }
public static class SearchCompany extends SearchObject<HiringTeam>
{
public SearchCompany byCompanyStatus (CompanyStatus CompanyStatus)
{
by ("CompanyStatus", CompanyStatus);
return this;
}
public SearchCompany andObjectID (QueryFilter<Long> filter)
{
filter.addFilter (context, "tl_hiring_team.object_id", FIELD_ObjectID);
return this;
}
public SearchCompany andObjectCreated (QueryFilter<Date> filter)
{
filter.addFilter (context, "tl_hiring_team.object_created_date", FIELD_ObjectCreated);
return this;
}
public SearchCompany andObjectLastModified (QueryFilter<Date> filter)
{
filter.addFilter (context, "tl_hiring_team.object_last_updated_date", FIELD_ObjectLastModified);
return this;
}
public SearchCompany andHiringTeamName (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.hiring_team_name", "HiringTeamName");
return this;
}
public SearchCompany andHiringTeamLogo (QueryFilter<BinaryContent> filter)
{
filter.addFilter (context, "tl_hiring_team.hiring_team_logo", "HiringTeamLogo");
return this;
}
public SearchCompany andHiringTeamType (QueryFilter<HiringTeamType> filter)
{
filter.addFilter (context, "tl_hiring_team.hiring_team_type", "HiringTeamType");
return this;
}
public SearchCompany andIndustry (QueryFilter<Industry> filter)
{
filter.addFilter (context, "tl_hiring_team.industry", "Industry");
return this;
}
public SearchCompany andTimeZone (QueryFilter<TimeZone> filter)
{
filter.addFilter (context, "tl_hiring_team.time_zone", "TimeZone");
return this;
}
public SearchCompany andState (QueryFilter<State> filter)
{
filter.addFilter (context, "tl_hiring_team.state", "State");
return this;
}
public SearchCompany andCountry (QueryFilter<Countries> filter)
{
filter.addFilter (context, "tl_hiring_team.country", "Country");
return this;
}
public SearchCompany andPostCode (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.post_code", "PostCode");
return this;
}
public SearchCompany andCity (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.city", "City");
return this;
}
public SearchCompany andHasClientSupport (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_hiring_team.has_client_support", "HasClientSupport");
return this;
}
public SearchCompany andHasDiversity (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_hiring_team.has_diversity", "HasDiversity");
return this;
}
public SearchCompany andManageOwnBilling (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_hiring_team.manage_own_billing", "ManageOwnBilling");
return this;
}
public SearchCompany andStripeReference (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.stripe_reference", "StripeReference");
return this;
}
public SearchCompany andStripeSubscription (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.stripe_subscription", "StripeSubscription");
return this;
}
public SearchCompany andStripeFixedSubItem (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.stripe_fixed_sub_item", "StripeFixedSubItem");
return this;
}
public SearchCompany andStripeMeteredSubItem (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.stripe_metered_sub_item", "StripeMeteredSubItem");
return this;
}
public SearchCompany andNameOnCard (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.name_on_card", "NameOnCard");
return this;
}
public SearchCompany andCardPostCode (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.card_post_code", "CardPostCode");
return this;
}
public SearchCompany andCardID (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.card_id", "CardID");
return this;
}
public SearchCompany andPlanRenewedOn (QueryFilter<Date> filter)
{
filter.addFilter (context, "tl_hiring_team.plan_renewed_on", "PlanRenewedOn");
return this;
}
public SearchCompany andPPJCredits (QueryFilter<Integer> filter)
{
filter.addFilter (context, "tl_hiring_team.ppj_credits", "PPJCredits");
return this;
}
public SearchCompany andUsedCredits (QueryFilter<Integer> filter)
{
filter.addFilter (context, "tl_hiring_team.used_credits", "UsedCredits");
return this;
}
public SearchCompany andAvailableCredits (QueryFilter<Integer> filter)
{
filter.addFilter (context, "tl_hiring_team.available_credits", "AvailableCredits");
return this;
}
public SearchCompany andIsPPJ (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_hiring_team.is_ppj", "IsPPJ");
return this;
}
public SearchCompany andHasCap (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_hiring_team.has_cap", "HasCap");
return this;
}
public SearchCompany andMaxCap (QueryFilter<Integer> filter)
{
filter.addFilter (context, "tl_hiring_team.max_cap", "MaxCap");
return this;
}
public SearchCompany andCouponExpiryDate (QueryFilter<Date> filter)
{
filter.addFilter (context, "tl_hiring_team.coupon_expiry_date", "CouponExpiryDate");
return this;
}
public SearchCompany andLastPlanAmount (QueryFilter<Double> filter)
{
filter.addFilter (context, "tl_hiring_team.last_plan_amount", "LastPlanAmount");
return this;
}
public SearchCompany andGoogleAddressText (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_hiring_team.google_address_text", "GoogleAddressText");
return this;
}
public SearchCompany andPlanCancelled (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_hiring_team.plan_cancelled", "PlanCancelled");
return this;
}
public SearchCompany andOnTrial (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_hiring_team.on_trial", "OnTrial");
return this;
}
public SearchCompany andTrialJobCount (QueryFilter<Integer> filter)
{
filter.addFilter (context, "tl_hiring_team.trial_job_count", "TrialJobCount");
return this;
}
public SearchCompany andMessageID (QueryFilter<Integer> filter)
{
filter.addFilter (context, "tl_hiring_team.message_id", "MessageID");
return this;
}
public SearchCompany andHTStatus (QueryFilter<HTStatus> filter)
{
filter.addFilter (context, "tl_hiring_team.ht_status", "HTStatus");
return this;
}
public SearchCompany andCompany (QueryFilter<Company> filter)
{
filter.addFilter (context, "tl_hiring_team.company_id", "Company");
return this;
}
public SearchCompany andBilledByTeam (QueryFilter<HiringTeam> filter)
{
filter.addFilter (context, "tl_hiring_team.billing_team_id", "BilledByTeam");
return this;
}
public SearchCompany andAddedByUser (QueryFilter<CompanyUser> filter)
{
filter.addFilter (context, "tl_hiring_team.added_by_user_id", "AddedByUser");
return this;
}
public SearchCompany andPaymentPlan (QueryFilter<PaymentPlan> filter)
{
filter.addFilter (context, "tl_hiring_team.payment_plan_id", "PaymentPlan");
return this;
}
public SearchCompany andCoupon (QueryFilter<StripeCoupon> filter)
{
filter.addFilter (context, "tl_hiring_team.coupon_id", "Coupon");
return this;
}
public HiringTeam[]
search (ObjectTransaction transaction) throws StorageException
{
BaseBusinessClass[] results = super.search (transaction, REFERENCE_HiringTeam, SEARCH_Company, criteria);
Set<HiringTeam> typedResults = new LinkedHashSet <HiringTeam> ();
for (BaseBusinessClass bbcResult : results)
{
HiringTeam aResult = (HiringTeam)bbcResult;
typedResults.add (aResult);
}
return ObjstoreUtils.removeDeleted(transaction, typedResults).toArray (new HiringTeam[0]);
}
}
public static HiringTeam[]
searchCompany (ObjectTransaction transaction, CompanyStatus CompanyStatus) throws StorageException
{
return SearchByCompany ()
.byCompanyStatus (CompanyStatus)
.search (transaction);
}
public static SearchBillingTeams SearchByBillingTeams () { return new SearchBillingTeams (); } public static SearchBillingTeams SearchByBillingTeams () { return new SearchBillingTeams (); }
public static class SearchBillingTeams extends SearchObject<HiringTeam> public static class SearchBillingTeams extends SearchObject<HiringTeam>
...@@ -8723,6 +9142,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -8723,6 +9142,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return HELPER_CompanyType.toObject (getCompanyType ()); return HELPER_CompanyType.toObject (getCompanyType ());
} }
else if (attribName.equals (FIELD_CompanyStatus))
{
return HELPER_CompanyStatus.toObject (getCompanyStatus ());
}
else if (attribName.equals (FIELD_CompanyTimeZone)) else if (attribName.equals (FIELD_CompanyTimeZone))
{ {
return HELPER_CompanyTimeZone.toObject (getCompanyTimeZone ()); return HELPER_CompanyTimeZone.toObject (getCompanyTimeZone ());
...@@ -8904,6 +9327,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -8904,6 +9327,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return HELPER_CompanyType; return HELPER_CompanyType;
} }
else if (attribName.equals (FIELD_CompanyStatus))
{
return HELPER_CompanyStatus;
}
else if (attribName.equals (FIELD_CompanyTimeZone)) else if (attribName.equals (FIELD_CompanyTimeZone))
{ {
return HELPER_CompanyTimeZone; return HELPER_CompanyTimeZone;
...@@ -9085,6 +9512,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -9085,6 +9512,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
setCompanyType ((HiringTeamType)(HELPER_CompanyType.fromObject (_CompanyType, attribValue))); setCompanyType ((HiringTeamType)(HELPER_CompanyType.fromObject (_CompanyType, attribValue)));
} }
else if (attribName.equals (FIELD_CompanyStatus))
{
setCompanyStatus ((CompanyStatus)(HELPER_CompanyStatus.fromObject (_CompanyStatus, attribValue)));
}
else if (attribName.equals (FIELD_CompanyTimeZone)) else if (attribName.equals (FIELD_CompanyTimeZone))
{ {
setCompanyTimeZone ((TimeZone)(HELPER_CompanyTimeZone.fromObject (_CompanyTimeZone, attribValue))); setCompanyTimeZone ((TimeZone)(HELPER_CompanyTimeZone.fromObject (_CompanyTimeZone, attribValue)));
...@@ -9309,6 +9740,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -9309,6 +9740,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return getWriteability_CompanyType (); return getWriteability_CompanyType ();
} }
else if (fieldName.equals (FIELD_CompanyStatus))
{
return getWriteability_CompanyStatus ();
}
else if (fieldName.equals (FIELD_CompanyTimeZone)) else if (fieldName.equals (FIELD_CompanyTimeZone))
{ {
return getWriteability_CompanyTimeZone (); return getWriteability_CompanyTimeZone ();
...@@ -9528,6 +9963,11 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -9528,6 +9963,11 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
fields.add (FIELD_CompanyType); fields.add (FIELD_CompanyType);
} }
if (getWriteability_CompanyStatus () != FieldWriteability.TRUE)
{
fields.add (FIELD_CompanyStatus);
}
if (getWriteability_CompanyTimeZone () != FieldWriteability.TRUE) if (getWriteability_CompanyTimeZone () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_CompanyTimeZone); fields.add (FIELD_CompanyTimeZone);
...@@ -9583,6 +10023,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -9583,6 +10023,7 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
result.add(HELPER_StripeLast4.getAttribObject (getClass (), _StripeLast4, false, FIELD_StripeLast4)); result.add(HELPER_StripeLast4.getAttribObject (getClass (), _StripeLast4, false, FIELD_StripeLast4));
result.add(HELPER_CompanyName.getAttribObject (getClass (), _CompanyName, false, FIELD_CompanyName)); result.add(HELPER_CompanyName.getAttribObject (getClass (), _CompanyName, false, FIELD_CompanyName));
result.add(HELPER_CompanyType.getAttribObject (getClass (), _CompanyType, false, FIELD_CompanyType)); result.add(HELPER_CompanyType.getAttribObject (getClass (), _CompanyType, false, FIELD_CompanyType));
result.add(HELPER_CompanyStatus.getAttribObject (getClass (), _CompanyStatus, false, FIELD_CompanyStatus));
result.add(HELPER_CompanyTimeZone.getAttribObject (getClass (), _CompanyTimeZone, false, FIELD_CompanyTimeZone)); result.add(HELPER_CompanyTimeZone.getAttribObject (getClass (), _CompanyTimeZone, false, FIELD_CompanyTimeZone));
return result; return result;
...@@ -10391,6 +10832,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -10391,6 +10832,24 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
} }
/** /**
* Get the attribute CompanyStatus
*/
public CompanyStatus getCompanyStatus (HiringTeam obj, CompanyStatus original)
{
return original;
}
/**
* Change the value set for attribute CompanyStatus.
* May modify the field beforehand
* Occurs before validation.
*/
public CompanyStatus setCompanyStatus (HiringTeam obj, CompanyStatus newCompanyStatus) throws FieldException
{
return newCompanyStatus;
}
/**
* Get the attribute CompanyTimeZone * Get the attribute CompanyTimeZone
*/ */
public TimeZone getCompanyTimeZone (HiringTeam obj, TimeZone original) public TimeZone getCompanyTimeZone (HiringTeam obj, TimeZone original)
...@@ -10504,6 +10963,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -10504,6 +10963,10 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
{ {
return toCompanyType (); return toCompanyType ();
} }
if (name.equals ("CompanyStatus"))
{
return toCompanyStatus ();
}
if (name.equals ("CompanyTimeZone")) if (name.equals ("CompanyTimeZone"))
{ {
return toCompanyTimeZone (); return toCompanyTimeZone ();
...@@ -10684,6 +11147,8 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -10684,6 +11147,8 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
public PipeLine<From, HiringTeamType> toCompanyType () { return pipe(new ORMAttributePipe<Me, HiringTeamType>(FIELD_CompanyType)); } public PipeLine<From, HiringTeamType> toCompanyType () { return pipe(new ORMAttributePipe<Me, HiringTeamType>(FIELD_CompanyType)); }
public PipeLine<From, CompanyStatus> toCompanyStatus () { return pipe(new ORMAttributePipe<Me, CompanyStatus>(FIELD_CompanyStatus)); }
public PipeLine<From, TimeZone> toCompanyTimeZone () { return pipe(new ORMAttributePipe<Me, TimeZone>(FIELD_CompanyTimeZone)); } public PipeLine<From, TimeZone> toCompanyTimeZone () { return pipe(new ORMAttributePipe<Me, TimeZone>(FIELD_CompanyTimeZone)); }
public PipeLine<From, String> toHiringTeamName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_HiringTeamName)); } public PipeLine<From, String> toHiringTeamName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_HiringTeamName)); }
...@@ -10848,6 +11313,11 @@ public abstract class BaseHiringTeam extends BaseBusinessClass ...@@ -10848,6 +11313,11 @@ public abstract class BaseHiringTeam extends BaseBusinessClass
return true; return true;
} }
if(CollectionUtils.equals(attribName, "CompanyStatus"))
{
return true;
}
if(CollectionUtils.equals(attribName, "CompanyTimeZone")) if(CollectionUtils.equals(attribName, "CompanyTimeZone"))
{ {
return true; return true;
......
cmsWebApp/src/performa/orm/HiringTeam.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<TRANSIENT name="StripeLast4" type="String" /> <TRANSIENT name="StripeLast4" type="String" />
<TRANSIENT name="CompanyName" type="String" /> <TRANSIENT name="CompanyName" type="String" />
<TRANSIENT name="CompanyType" type="HiringTeamType" attribHelper="EnumeratedAttributeHelper"/> <TRANSIENT name="CompanyType" type="HiringTeamType" attribHelper="EnumeratedAttributeHelper"/>
<TRANSIENT name="CompanyStatus" type="CompanyStatus" attribHelper="EnumeratedAttributeHelper"/>
<TRANSIENT name="CompanyTimeZone" type="TimeZone" attribHelper="EnumeratedAttributeHelper"/> <TRANSIENT name="CompanyTimeZone" type="TimeZone" attribHelper="EnumeratedAttributeHelper"/>
<TABLE name="tl_hiring_team" tablePrefix="object"> <TABLE name="tl_hiring_team" tablePrefix="object">
...@@ -69,6 +70,13 @@ ...@@ -69,6 +70,13 @@
<SEARCH type="All" paramFilter="tl_hiring_team.object_id is not null" > <SEARCH type="All" paramFilter="tl_hiring_team.object_id is not null" >
</SEARCH> </SEARCH>
<SEARCH type="Company" paramFilter="tl_hiring_team.object_id is not null" orderBy="tl_hiring_team.object_id">
<TABLE name="tl_company" join="tl_company.object_id = tl_hiring_team.company_id"/>
<PARAM name="CompanyStatus" type="CompanyStatus" transform='CompanyStatus.getValue()' paramFilter="tl_company.company_status = ${CompanyStatus}" />
</SEARCH>
<SEARCH type="BillingTeams" paramFilter="tl_hiring_team.object_id is not null and (is_ppj = 'Y' or (is_ppj = 'N' and payment_plan_id is not null))" > <SEARCH type="BillingTeams" paramFilter="tl_hiring_team.object_id is not null and (is_ppj = 'Y' or (is_ppj = 'N' and payment_plan_id is not null))" >
</SEARCH> </SEARCH>
......
cmsWebApp/src/performa/orm/HiringTeamPersistenceMgr.java
...@@ -412,6 +412,10 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -412,6 +412,10 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
{ {
throw new RuntimeException ("NOT implemented: executeSearchQueryAll"); throw new RuntimeException ("NOT implemented: executeSearchQueryAll");
} }
public ResultSet executeSearchQueryCompany (SQLManager sqlMgr, CompanyStatus CompanyStatus) throws SQLException
{
throw new RuntimeException ("NOT implemented: executeSearchQueryCompany");
}
public ResultSet executeSearchQueryBillingTeams (SQLManager sqlMgr) throws SQLException public ResultSet executeSearchQueryBillingTeams (SQLManager sqlMgr) throws SQLException
{ {
throw new RuntimeException ("NOT implemented: executeSearchQueryBillingTeams"); throw new RuntimeException ("NOT implemented: executeSearchQueryBillingTeams");
...@@ -565,6 +569,56 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr ...@@ -565,6 +569,56 @@ public class HiringTeamPersistenceMgr extends ObjectPersistenceMgr
return results; return results;
} }
else if (searchType.equals (HiringTeam.SEARCH_Company))
{
// Local scope for transformed variables
{
if (criteria.containsKey("CompanyStatus"))
{
CompanyStatus CompanyStatus = (CompanyStatus)(criteria.get("CompanyStatus"));
criteria.put ("CompanyStatus", CompanyStatus.getValue());
}
}
String orderBy = " ORDER BY tl_hiring_team.object_id";
String tables = ", tl_company ";
Set<String> joinTableSet = new HashSet<String>();
String filter;
Object[] searchParams; // paramFilter: tl_hiring_team.object_id is not null
String preFilter = "(tl_hiring_team.object_id is not null)"
+ " AND (tl_company.object_id = tl_hiring_team.company_id) ";
if (criteria.containsKey("CompanyStatus"))
{
preFilter += " AND (tl_company.company_status = ${CompanyStatus}) ";
preFilter += "";
}
preFilter += context.getLoadingAttributes ().getCustomSQL() ;
SearchParamTransform tx = new SearchParamTransform (criteria);
filter = StringUtils.replaceParams (preFilter, tx);
searchParams = tx.getParamsArray();
Integer maxRows = context.getLoadingAttributes ().getMaxRows ();
boolean truncateExtra = !context.getLoadingAttributes ().isFailIfMaxExceeded();
String query = "SELECT " + SELECT_COLUMNS +
"FROM {PREFIX}tl_hiring_team " + tables + tableSetToSQL(joinTableSet) +
"WHERE " + SELECT_JOINS + " " + filter + orderBy;
BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, searchParams, maxRows, truncateExtra);
return results;
}
else if (searchType.equals (HiringTeam.SEARCH_BillingTeams)) else if (searchType.equals (HiringTeam.SEARCH_BillingTeams))
{ {
// Local scope for transformed variables // Local scope for transformed variables
......
cmsWebApp/src/performa/search/BaseSearchHiringTeam.java
...@@ -28,6 +28,8 @@ import oneit.utils.parsers.FieldException; ...@@ -28,6 +28,8 @@ import oneit.utils.parsers.FieldException;
import oneit.servlets.orm.*; import oneit.servlets.orm.*;
import performa.orm.types.*;
public abstract class BaseSearchHiringTeam extends SearchExecutor public abstract class BaseSearchHiringTeam extends SearchExecutor
...@@ -41,16 +43,19 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -41,16 +43,19 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
// Static constants corresponding to field names // Static constants corresponding to field names
public static final String FIELD_Details = "Details"; public static final String FIELD_Details = "Details";
public static final String FIELD_CompanyStatus = "CompanyStatus";
// Static constants corresponding to searches // Static constants corresponding to searches
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper<SearchHiringTeam> HELPER_Details = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<SearchHiringTeam> HELPER_Details = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper<SearchHiringTeam, CompanyStatus> HELPER_CompanyStatus = new EnumeratedAttributeHelper<SearchHiringTeam, CompanyStatus> (CompanyStatus.FACTORY_CompanyStatus);
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String _Details; private String _Details;
private CompanyStatus _CompanyStatus;
// Private attributes corresponding to single references // Private attributes corresponding to single references
...@@ -64,6 +69,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -64,6 +69,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
// Arrays of validators for each attribute // Arrays of validators for each attribute
private static final AttributeValidator[] FIELD_Details_Validators; private static final AttributeValidator[] FIELD_Details_Validators;
private static final AttributeValidator[] FIELD_CompanyStatus_Validators;
// Arrays of behaviour decorators // Arrays of behaviour decorators
...@@ -78,6 +84,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -78,6 +84,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
Map validatorMapping = ((Map)ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "ValidatorMapping")); Map validatorMapping = ((Map)ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "ValidatorMapping"));
FIELD_Details_Validators = (AttributeValidator[])setupAttribMetaData_Details(validatorMapping).toArray (new AttributeValidator[0]); FIELD_Details_Validators = (AttributeValidator[])setupAttribMetaData_Details(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyStatus_Validators = (AttributeValidator[])setupAttribMetaData_CompanyStatus(validatorMapping).toArray (new AttributeValidator[0]);
REFERENCE_SearchHiringTeam.initialiseReference (); REFERENCE_SearchHiringTeam.initialiseReference ();
...@@ -110,6 +117,24 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -110,6 +117,24 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
return validators; return validators;
} }
// Meta Info setup
private static List setupAttribMetaData_CompanyStatus(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
metaInfo.put ("name", "CompanyStatus");
metaInfo.put ("type", "CompanyStatus");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for SearchHiringTeam.CompanyStatus:", metaInfo);
ATTRIBUTES_METADATA_SearchHiringTeam.put (FIELD_CompanyStatus, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(SearchHiringTeam.class, "CompanyStatus", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for SearchHiringTeam.CompanyStatus:", validators);
return validators;
}
// END OF STATIC METADATA DEFINITION // END OF STATIC METADATA DEFINITION
...@@ -138,6 +163,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -138,6 +163,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
_Details = (String)(HELPER_Details.initialise (_Details)); _Details = (String)(HELPER_Details.initialise (_Details));
_CompanyStatus = (CompanyStatus)(HELPER_CompanyStatus.initialise (_CompanyStatus));
} }
...@@ -260,6 +286,104 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -260,6 +286,104 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
} }
} }
/**
* Get the attribute CompanyStatus
*/
public CompanyStatus getCompanyStatus ()
{
assertValid();
CompanyStatus valToReturn = _CompanyStatus;
for (SearchHiringTeamBehaviourDecorator bhd : SearchHiringTeam_BehaviourDecorators)
{
valToReturn = bhd.getCompanyStatus ((SearchHiringTeam)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 preCompanyStatusChange (CompanyStatus newCompanyStatus) 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 postCompanyStatusChange () throws FieldException
{
}
public FieldWriteability getWriteability_CompanyStatus ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute CompanyStatus. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setCompanyStatus (CompanyStatus newCompanyStatus) throws FieldException
{
boolean oldAndNewIdentical = HELPER_CompanyStatus.compare (_CompanyStatus, newCompanyStatus);
try
{
for (SearchHiringTeamBehaviourDecorator bhd : SearchHiringTeam_BehaviourDecorators)
{
newCompanyStatus = bhd.setCompanyStatus ((SearchHiringTeam)this, newCompanyStatus);
oldAndNewIdentical = HELPER_CompanyStatus.compare (_CompanyStatus, newCompanyStatus);
}
if (FIELD_CompanyStatus_Validators.length > 0)
{
Object newCompanyStatusObj = HELPER_CompanyStatus.toObject (newCompanyStatus);
if (newCompanyStatusObj != null)
{
int loopMax = FIELD_CompanyStatus_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_SearchHiringTeam.get (FIELD_CompanyStatus);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_CompanyStatus_Validators[v].checkAttribute (this, FIELD_CompanyStatus, metadata, newCompanyStatusObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_CompanyStatus () != FieldWriteability.FALSE, "Field CompanyStatus is not writeable");
preCompanyStatusChange (newCompanyStatus);
markFieldChange (FIELD_CompanyStatus);
_CompanyStatus = newCompanyStatus;
postFieldChange (FIELD_CompanyStatus);
postCompanyStatusChange ();
}
}
/** /**
...@@ -519,6 +643,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -519,6 +643,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
it_does_not_matterPSet.setAttrib (FIELD_ObjectID, myID); it_does_not_matterPSet.setAttrib (FIELD_ObjectID, myID);
it_does_not_matterPSet.setAttrib (FIELD_Details, HELPER_Details.toObject (_Details)); // it_does_not_matterPSet.setAttrib (FIELD_Details, HELPER_Details.toObject (_Details)); //
it_does_not_matterPSet.setAttrib (FIELD_CompanyStatus, HELPER_CompanyStatus.toObject (_CompanyStatus)); //
} }
...@@ -534,6 +659,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -534,6 +659,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
PersistentSet it_does_not_matterPSet = allSets.getPersistentSet (objectID, "it_does_not_matter"); PersistentSet it_does_not_matterPSet = allSets.getPersistentSet (objectID, "it_does_not_matter");
_Details = (String)(HELPER_Details.fromObject (_Details, it_does_not_matterPSet.getAttrib (FIELD_Details))); // _Details = (String)(HELPER_Details.fromObject (_Details, it_does_not_matterPSet.getAttrib (FIELD_Details))); //
_CompanyStatus = (CompanyStatus)(HELPER_CompanyStatus.fromObject (_CompanyStatus, it_does_not_matterPSet.getAttrib (FIELD_CompanyStatus))); //
} }
...@@ -558,6 +684,15 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -558,6 +684,15 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
e.addException (ex); e.addException (ex);
} }
try
{
setCompanyStatus (otherSearchHiringTeam.getCompanyStatus ());
}
catch (FieldException ex)
{
e.addException (ex);
}
} }
} }
...@@ -574,6 +709,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -574,6 +709,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
BaseSearchHiringTeam sourceSearchHiringTeam = (BaseSearchHiringTeam)(source); BaseSearchHiringTeam sourceSearchHiringTeam = (BaseSearchHiringTeam)(source);
_Details = sourceSearchHiringTeam._Details; _Details = sourceSearchHiringTeam._Details;
_CompanyStatus = sourceSearchHiringTeam._CompanyStatus;
} }
} }
...@@ -627,6 +763,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -627,6 +763,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
super.readExternalData(vals); super.readExternalData(vals);
_Details = (String)(HELPER_Details.readExternal (_Details, vals.get(FIELD_Details))); // _Details = (String)(HELPER_Details.readExternal (_Details, vals.get(FIELD_Details))); //
_CompanyStatus = (CompanyStatus)(HELPER_CompanyStatus.readExternal (_CompanyStatus, vals.get(FIELD_CompanyStatus))); //
} }
...@@ -639,6 +776,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -639,6 +776,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
super.writeExternalData(vals); super.writeExternalData(vals);
vals.put (FIELD_Details, HELPER_Details.writeExternal (_Details)); vals.put (FIELD_Details, HELPER_Details.writeExternal (_Details));
vals.put (FIELD_CompanyStatus, HELPER_CompanyStatus.writeExternal (_CompanyStatus));
} }
...@@ -656,6 +794,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -656,6 +794,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
{ {
listener.notifyFieldChange(this, other, FIELD_Details, HELPER_Details.toObject(this._Details), HELPER_Details.toObject(otherSearchHiringTeam._Details)); listener.notifyFieldChange(this, other, FIELD_Details, HELPER_Details.toObject(this._Details), HELPER_Details.toObject(otherSearchHiringTeam._Details));
} }
if (!HELPER_CompanyStatus.compare(this._CompanyStatus, otherSearchHiringTeam._CompanyStatus))
{
listener.notifyFieldChange(this, other, FIELD_CompanyStatus, HELPER_CompanyStatus.toObject(this._CompanyStatus), HELPER_CompanyStatus.toObject(otherSearchHiringTeam._CompanyStatus));
}
// Compare single assocs // Compare single assocs
...@@ -679,6 +821,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -679,6 +821,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
super.visitAttributes (visitor); super.visitAttributes (visitor);
visitor.visitField(this, FIELD_Details, HELPER_Details.toObject(getDetails())); visitor.visitField(this, FIELD_Details, HELPER_Details.toObject(getDetails()));
visitor.visitField(this, FIELD_CompanyStatus, HELPER_CompanyStatus.toObject(getCompanyStatus()));
} }
...@@ -716,6 +859,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -716,6 +859,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
{ {
return filter.matches (getDetails ()); return filter.matches (getDetails ());
} }
else if (attribName.equals (FIELD_CompanyStatus))
{
return filter.matches (getCompanyStatus ());
}
else else
{ {
return super.testFilter (attribName, filter); return super.testFilter (attribName, filter);
...@@ -735,6 +882,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -735,6 +882,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
{ {
return HELPER_Details.toObject (getDetails ()); return HELPER_Details.toObject (getDetails ());
} }
else if (attribName.equals (FIELD_CompanyStatus))
{
return HELPER_CompanyStatus.toObject (getCompanyStatus ());
}
else else
{ {
return super.getAttribute (attribName); return super.getAttribute (attribName);
...@@ -752,6 +903,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -752,6 +903,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
{ {
return HELPER_Details; return HELPER_Details;
} }
else if (attribName.equals (FIELD_CompanyStatus))
{
return HELPER_CompanyStatus;
}
else else
{ {
return super.getAttributeHelper (attribName); return super.getAttributeHelper (attribName);
...@@ -769,6 +924,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -769,6 +924,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
{ {
setDetails ((String)(HELPER_Details.fromObject (_Details, attribValue))); setDetails ((String)(HELPER_Details.fromObject (_Details, attribValue)));
} }
else if (attribName.equals (FIELD_CompanyStatus))
{
setCompanyStatus ((CompanyStatus)(HELPER_CompanyStatus.fromObject (_CompanyStatus, attribValue)));
}
else else
{ {
super.setAttribute (attribName, attribValue); super.setAttribute (attribName, attribValue);
...@@ -793,6 +952,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -793,6 +952,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
{ {
return getWriteability_Details (); return getWriteability_Details ();
} }
else if (fieldName.equals (FIELD_CompanyStatus))
{
return getWriteability_CompanyStatus ();
}
else else
{ {
return super.getWriteable (fieldName); return super.getWriteable (fieldName);
...@@ -808,6 +971,11 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -808,6 +971,11 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
fields.add (FIELD_Details); fields.add (FIELD_Details);
} }
if (getWriteability_CompanyStatus () != FieldWriteability.TRUE)
{
fields.add (FIELD_CompanyStatus);
}
super.putUnwriteable (fields); super.putUnwriteable (fields);
} }
...@@ -818,6 +986,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -818,6 +986,7 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
result.add(HELPER_Details.getAttribObject (getClass (), _Details, false, FIELD_Details)); result.add(HELPER_Details.getAttribObject (getClass (), _Details, false, FIELD_Details));
result.add(HELPER_CompanyStatus.getAttribObject (getClass (), _CompanyStatus, false, FIELD_CompanyStatus));
return result; return result;
} }
...@@ -886,6 +1055,24 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -886,6 +1055,24 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
return newDetails; return newDetails;
} }
/**
* Get the attribute CompanyStatus
*/
public CompanyStatus getCompanyStatus (SearchHiringTeam obj, CompanyStatus original)
{
return original;
}
/**
* Change the value set for attribute CompanyStatus.
* May modify the field beforehand
* Occurs before validation.
*/
public CompanyStatus setCompanyStatus (SearchHiringTeam obj, CompanyStatus newCompanyStatus) throws FieldException
{
return newCompanyStatus;
}
} }
...@@ -942,6 +1129,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -942,6 +1129,10 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
{ {
return toDetails (); return toDetails ();
} }
if (name.equals ("CompanyStatus"))
{
return toCompanyStatus ();
}
return super.to(name); return super.to(name);
...@@ -950,6 +1141,8 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor ...@@ -950,6 +1141,8 @@ public abstract class BaseSearchHiringTeam extends SearchExecutor
public PipeLine<From, String> toDetails () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Details)); } public PipeLine<From, String> toDetails () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Details)); }
public PipeLine<From, CompanyStatus> toCompanyStatus () { return pipe(new ORMAttributePipe<Me, CompanyStatus>(FIELD_CompanyStatus)); }
} }
public boolean isTransientAttrib(String attribName) public boolean isTransientAttrib(String attribName)
......
cmsWebApp/src/performa/search/SearchHiringTeam.java
...@@ -18,6 +18,9 @@ public class SearchHiringTeam extends BaseSearchHiringTeam ...@@ -18,6 +18,9 @@ public class SearchHiringTeam extends BaseSearchHiringTeam
@Override @Override
public BaseBusinessClass[] doSearch() public BaseBusinessClass[] doSearch()
{ {
return HiringTeam.SearchByAll().andHiringTeamName(new ILikeFilter(getDetails(), "%", "%")).search(getTransaction()); return HiringTeam.SearchByCompany()
.byCompanyStatus(getCompanyStatus())
.andHiringTeamName(new ILikeFilter(getDetails(), "%", "%"))
.search(getTransaction());
} }
} }
\ No newline at end of file
cmsWebApp/src/performa/search/SearchHiringTeam.xml
...@@ -5,11 +5,13 @@ ...@@ -5,11 +5,13 @@
<BUSINESSCLASS name="SearchHiringTeam" package="performa.search" superclass="SearchExecutor" > <BUSINESSCLASS name="SearchHiringTeam" package="performa.search" superclass="SearchExecutor" >
<IMPORT value="oneit.servlets.orm.*" /> <IMPORT value="oneit.servlets.orm.*" />
<IMPORT value="performa.orm.types.*" />
<TABLE name="it_does_not_matter" tablePrefix="object" polymorphic="FALSE" > <TABLE name="it_does_not_matter" tablePrefix="object" polymorphic="FALSE" >
<ATTRIB name="Details" type="String" dbcol="xxxx" /> <ATTRIB name="Details" type="String" dbcol="xxxx" />
<ATTRIB name="CompanyStatus" type="CompanyStatus" attribHelper="EnumeratedAttributeHelper"/>
</TABLE> </TABLE>
</BUSINESSCLASS> </BUSINESSCLASS>
......
cmsWebApp/src/performa/search/SearchHiringTeamPersistenceMgr.java
...@@ -15,6 +15,7 @@ import oneit.utils.resource.*; ...@@ -15,6 +15,7 @@ import oneit.utils.resource.*;
import oneit.utils.*; import oneit.utils.*;
import oneit.utils.threading.*; import oneit.utils.threading.*;
import oneit.servlets.orm.*; import oneit.servlets.orm.*;
import performa.orm.types.*;
...@@ -28,10 +29,12 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr ...@@ -28,10 +29,12 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String dummyDetails; private String dummyDetails;
private CompanyStatus dummyCompanyStatus;
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper HELPER_Details = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_Details = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper HELPER_CompanyStatus = new EnumeratedAttributeHelper (CompanyStatus.FACTORY_CompanyStatus);
...@@ -39,10 +42,11 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr ...@@ -39,10 +42,11 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr
public SearchHiringTeamPersistenceMgr () public SearchHiringTeamPersistenceMgr ()
{ {
dummyDetails = (String)(HELPER_Details.initialise (dummyDetails)); dummyDetails = (String)(HELPER_Details.initialise (dummyDetails));
dummyCompanyStatus = (CompanyStatus)(HELPER_CompanyStatus.initialise (dummyCompanyStatus));
} }
private String SELECT_COLUMNS = "{PREFIX}it_does_not_matter.object_id as id, {PREFIX}it_does_not_matter.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}it_does_not_matter.object_CREATED_DATE as CREATED_DATE, {PREFIX}it_does_not_matter.xxxx, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}it_does_not_matter.object_id as id, {PREFIX}it_does_not_matter.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}it_does_not_matter.object_CREATED_DATE as CREATED_DATE, {PREFIX}it_does_not_matter.xxxx, {PREFIX}it_does_not_matter., 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
...@@ -93,7 +97,8 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr ...@@ -93,7 +97,8 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !it_does_not_matterPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !it_does_not_matterPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!it_does_not_matterPSet.containsAttrib(SearchHiringTeam.FIELD_Details)) !it_does_not_matterPSet.containsAttrib(SearchHiringTeam.FIELD_Details)||
!it_does_not_matterPSet.containsAttrib(SearchHiringTeam.FIELD_CompanyStatus))
{ {
// We will need to retrieve it // We will need to retrieve it
idsToFetch.add (id.longValue()); idsToFetch.add (id.longValue());
...@@ -163,10 +168,10 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr ...@@ -163,10 +168,10 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}it_does_not_matter " + "UPDATE {PREFIX}it_does_not_matter " +
"SET xxxx = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET xxxx = ?, = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE it_does_not_matter.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE it_does_not_matter.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Details.getForSQL(dummyDetails, it_does_not_matterPSet.getAttrib (SearchHiringTeam.FIELD_Details))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Details.getForSQL(dummyDetails, it_does_not_matterPSet.getAttrib (SearchHiringTeam.FIELD_Details))).listEntry (HELPER_CompanyStatus.getForSQL(dummyCompanyStatus, it_does_not_matterPSet.getAttrib (SearchHiringTeam.FIELD_CompanyStatus))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -401,6 +406,7 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr ...@@ -401,6 +406,7 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr
it_does_not_matterPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); it_does_not_matterPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
it_does_not_matterPSet.setAttrib(SearchHiringTeam.FIELD_Details, HELPER_Details.getFromRS(dummyDetails, r, "xxxx")); it_does_not_matterPSet.setAttrib(SearchHiringTeam.FIELD_Details, HELPER_Details.getFromRS(dummyDetails, r, "xxxx"));
it_does_not_matterPSet.setAttrib(SearchHiringTeam.FIELD_CompanyStatus, HELPER_CompanyStatus.getFromRS(dummyCompanyStatus, r, ""));
} }
...@@ -418,10 +424,10 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr ...@@ -418,10 +424,10 @@ public class SearchHiringTeamPersistenceMgr extends SearchExecutorPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}it_does_not_matter " + "INSERT INTO {PREFIX}it_does_not_matter " +
" (xxxx, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (xxxx, , 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_Details.getForSQL(dummyDetails, it_does_not_matterPSet.getAttrib (SearchHiringTeam.FIELD_Details))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Details.getForSQL(dummyDetails, it_does_not_matterPSet.getAttrib (SearchHiringTeam.FIELD_Details))).listEntry (HELPER_CompanyStatus.getForSQL(dummyCompanyStatus, it_does_not_matterPSet.getAttrib (SearchHiringTeam.FIELD_CompanyStatus))) .listEntry (objectID.longID ()).toList().toArray());
it_does_not_matterPSet.setStatus (PersistentSetStatus.PROCESSED); it_does_not_matterPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/webroot/css/common.css
...@@ -7710,7 +7710,7 @@ input{ ...@@ -7710,7 +7710,7 @@ input{
font-size: 15px; font-size: 15px;
text-align: center; text-align: center;
border-color: #03a0e7 !important; border-color: #03a0e7 !important;
width: 190px; width: 170px;
height: 50px; height: 50px;
margin-top: 10px; margin-top: 10px;
margin-right: 20px; margin-right: 20px;
......
cmsWebApp/webroot/extensions/adminportal/inc/view_applicants_list.jsp
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
jobApplication.setWorkFlow(workflow); jobApplication.setWorkFlow(workflow);
%> %>
<div class="appli-row" id="<%= jobApplication.getID() %>"> <div class="appli-row" id="<%= jobApplication.getID() %>">
<div class="appli-checkbox appli-l eq-second-height"> <div class="appli-checkbox appli-l eq-second-height">
<div class="checkbox-list"> <div class="checkbox-list">
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190813_Company.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_company</tableName> <tableName factory="String">tl_company</tableName>
<column name="company_status" type="String" nullable="false" length="200"/> <column name="company_status" type="String" nullable="true" length="200"/>
</NODE> </NODE>
</NODE> </NODE>
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190813_HiringTeam.xml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation"> <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_hiring_team</tableName> <tableName factory="String">tl_hiring_team</tableName>
<column name="ht_status" type="String" nullable="false" length="200"/> <column name="ht_status" type="String" nullable="true" length="200"/>
</NODE> </NODE>
</NODE> </NODE>
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190813_UpdateCompanyAndHT.sql
-- @AutoRun -- @AutoRun
update tl_company set company_status = "ACTIVE"; update tl_company set company_status = 'ACTIVE';
update tl_hiring_team set ht_status = "ACTIVE"; update tl_hiring_team set ht_status = 'ACTIVE';
\ No newline at end of file \ No newline at end of file
cmsWebApp/webroot/extensions/performa/customers.jsp
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
color: #4e5258; color: #4e5258;
} }
</style> </style>
<div class="dashboard-content-area second-part">
<script type="text/javascript"> <script type="text/javascript">
var Popup = null; var Popup = null;
...@@ -72,6 +74,14 @@ ...@@ -72,6 +74,14 @@
setupRecalc ($("form"), {'recalcOnError':true}); setupRecalc ($("form"), {'recalcOnError':true});
$(".change-company-btn").prop('title', 'Change Customer'); $(".change-company-btn").prop('title', 'Change Customer');
$(".htstatus").change(function() {
$('.save').click();
});
$(".company-status").change(function() {
$('.search-real-btn').click();
});
}); });
$(function(){ $(function(){
...@@ -80,18 +90,20 @@ ...@@ -80,18 +90,20 @@
}); });
}); });
</script> </script>
<div class="dashboard-content-area second-part">
<div class="jobs-list-shorting"> <div class="jobs-list-shorting">
<div class="d-job-title all-jobs-title">Customers</div> <div class="d-job-title all-jobs-title">Customers</div>
<div class="shorting-dropdown relative-parent"> <div class="shorting-dropdown relative-parent">
<div class="order-label">Search Customers</div> <div class="order-label">Search Customers</div>
<oneit:ormInput obj="<%= searchHT %>" type="text" attributeName="Details" cssClass="form-control search-input" id="searchText" /> <oneit:ormInput obj="<%= searchHT %>" type="text" attributeName="Details" cssClass="form-control search-input" id="searchText" />
<span class="search-icon-btn"></span> <span class="search-icon-btn"></span>
</div> </div>
<div class="shorting-dropdown relative-parent">
<div class="order-label">Customer Status</div>
<oneit:ormEnum obj="<%= searchHT %>" attributeName="CompanyStatus" cssClass="form-control company-status"/>
</div>
<oneit:button value="Search" name="search" cssClass="btn btn-primary search-real-btn hidden" /> <oneit:button value="Search" name="search" cssClass="btn btn-primary search-real-btn hidden" />
<oneit:button value=" " name="save" cssClass="btn" requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage).toMap() %>" id="save"/> <oneit:button value=" " name="save" cssClass="btn save" requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage).toMap() %>" id="save"/>
<div class="shorting-dropdown"> <div class="shorting-dropdown">
<span class="order-label">order by</span> <span class="order-label">order by</span>
<select class="form-control" onChange="location=this.value"> <select class="form-control" onChange="location=this.value">
...@@ -127,7 +139,7 @@ ...@@ -127,7 +139,7 @@
%> %>
<div class="client-list"> <div class="client-list">
<div class="client-row" > <div class="client-row" >
<div class="client-name-cell jl-c" style="width:30%;"> <div class="client-name-cell jl-c" style="width:25%;">
<div class="client-name"> <div class="client-name">
<oneit:toString value="<%= hiringTeam.getHiringTeamName() %>" mode="EscapeHTML" /> <oneit:toString value="<%= hiringTeam.getHiringTeamName() %>" mode="EscapeHTML" />
</div> </div>
...@@ -155,7 +167,10 @@ ...@@ -155,7 +167,10 @@
<oneit:toString value="<%= filledCount %>" mode="EscapeHTML" nullValue="0"/> <oneit:toString value="<%= filledCount %>" mode="EscapeHTML" nullValue="0"/>
<span class="grey-span">Jobs Filled</span> <span class="grey-span">Jobs Filled</span>
</div> </div>
<div class="application-count jl-c" style="width:20%;"> <div class="application-count jl-c" style="width:12%;">
<oneit:ormEnum obj="<%= hiringTeam %>" attributeName="HTStatus" cssClass="form-control htstatus"/>
</div>
<div class="application-count jl-c" style="width:13%;padding: 11px 6px 17px 20px;">
<oneit:button value="Login as Admin" name="assume" cssClass="btn btn-primary loginAsAdmin" <oneit:button value="Login as Admin" name="assume" cssClass="btn btn-primary loginAsAdmin"
requestAttribs="<%= CollectionUtils.mapEntry("HiringTeam", hiringTeam) requestAttribs="<%= CollectionUtils.mapEntry("HiringTeam", hiringTeam)
.toMap()%>"/> .toMap()%>"/>
......
cmsWebApp/webroot/extensions/performa/inc/changeCompanyPopup.jsp
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
ObjectTransaction objTran = process.getTransaction (); ObjectTransaction objTran = process.getTransaction ();
HiringTeam hiringTeam = (HiringTeam) process.getAttribute("HiringTeam"); HiringTeam hiringTeam = (HiringTeam) process.getAttribute("HiringTeam");
hiringTeam.setCompanyStatus(hiringTeam.getCompany().getCompanyStatus());
request.setAttribute("oneit.pageFormDetails", CollectionUtils.mapEntry("name", "changeCompanyPopup").mapEntry("enctype", "multipart/form-data").toMap()); request.setAttribute("oneit.pageFormDetails", CollectionUtils.mapEntry("name", "changeCompanyPopup").mapEntry("enctype", "multipart/form-data").toMap());
request.setAttribute("oneit.pageHeaderTitle", "Change Customer Popup"); request.setAttribute("oneit.pageHeaderTitle", "Change Customer Popup");
%> %>
...@@ -29,6 +31,10 @@ ...@@ -29,6 +31,10 @@
<oneit:layout_field width="1"><oneit:toString value="<%= hiringTeam.getHiringTeamName() %>" mode="EscapeHTML"/></oneit:layout_field> <oneit:layout_field width="1"><oneit:toString value="<%= hiringTeam.getHiringTeamName() %>" mode="EscapeHTML"/></oneit:layout_field>
</oneit:skin> </oneit:skin>
<oneit:skin tagName="layout_row"> <oneit:skin tagName="layout_row">
<oneit:layout_label width="1"><oneit:label GUIName="Customer Status" /></oneit:layout_label>
<oneit:layout_field width="1"><oneit:ormEnum obj="<%= hiringTeam %>" attributeName="CompanyStatus" cssClass="form-control"/></oneit:layout_field>
</oneit:skin>
<oneit:skin tagName="layout_row">
<oneit:layout_label width="1"> <oneit:layout_label width="1">
<oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="ExistingCustomer" value="true"/> Existing Customer <oneit:ormInput obj="<%= hiringTeam %>" type="radio" attributeName="ExistingCustomer" value="true"/> Existing Customer
</oneit:layout_label> </oneit:layout_label>
......
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