Skip to content

P
PERFORMA_REPLICA
Commit a8869d9f by nilu
Options

S35301241 # Client - Incoming Issues (raised by Client) #Ask whether Client… 

S35301241 # Client - Incoming Issues (raised by Client) #Ask whether Client details to appear in Job landing page
parent a323c912
Showing with 254 additions and 20 deletions
cmsWebApp/sql/Client.xml
......@@ -10,6 +10,7 @@
<column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="client_name" type="String" nullable="false" length="30"/>
<column name="client_logo" type="BLOB" nullable="true"/>
<column name="use_client_details" type="Boolean" nullable="true"/>
<column name="email" type="String" nullable="true" length="100"/>
<column name="contact_name" type="String" nullable="true" length="100"/>
<column name="contact_surname" type="String" nullable="true" length="100"/>
......
cmsWebApp/sql/ms/Client.sql
......@@ -10,6 +10,7 @@ CREATE TABLE tl_client (
,
client_name varchar(30) NOT NULL,
client_logo image NULL,
use_client_details char(1) NULL,
email varchar(100) NULL,
contact_name varchar(100) NULL,
contact_surname varchar(100) NULL,
......
cmsWebApp/sql/oracle/Client.sql
......@@ -11,6 +11,7 @@ CREATE TABLE tl_client (
,
client_name varchar2(30) NOT NULL,
client_logo blob NULL,
use_client_details char(1) NULL,
email varchar2(100) NULL,
contact_name varchar2(100) NULL,
contact_surname varchar2(100) NULL,
......
cmsWebApp/sql/postgres/Client.sql
......@@ -11,6 +11,7 @@ CREATE TABLE tl_client (
,
client_name varchar(30) NOT NULL,
client_logo bytea NULL,
use_client_details char(1) NULL,
email varchar(100) NULL,
contact_name varchar(100) NULL,
contact_surname varchar(100) NULL,
......
cmsWebApp/src/performa/orm/BaseClient.java
......@@ -44,6 +44,7 @@ public abstract class BaseClient extends BaseBusinessClass
public static final String FIELD_ClientName = "ClientName";
public static final String FIELD_ClientLogo = "ClientLogo";
public static final String FIELD_UseClientDetails = "UseClientDetails";
public static final String FIELD_Email = "Email";
public static final String FIELD_ContactName = "ContactName";
public static final String FIELD_ContactSurname = "ContactSurname";
......@@ -68,6 +69,7 @@ public abstract class BaseClient extends BaseBusinessClass
// Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper<Client> HELPER_ClientName = DefaultAttributeHelper.INSTANCE;
private static final BLOBAttributeHelper HELPER_ClientLogo = BLOBAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Client> HELPER_UseClientDetails = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Client> HELPER_Email = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Client> HELPER_ContactName = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Client> HELPER_ContactSurname = DefaultAttributeHelper.INSTANCE;
......@@ -83,6 +85,7 @@ public abstract class BaseClient extends BaseBusinessClass
// Private attributes corresponding to business object data
private String _ClientName;
private BinaryContent _ClientLogo;
private Boolean _UseClientDetails;
private String _Email;
private String _ContactName;
private String _ContactSurname;
......@@ -111,6 +114,7 @@ public abstract class BaseClient extends BaseBusinessClass
private static final AttributeValidator[] FIELD_IsLogoDeleted_Validators;
private static final AttributeValidator[] FIELD_ClientName_Validators;
private static final AttributeValidator[] FIELD_ClientLogo_Validators;
private static final AttributeValidator[] FIELD_UseClientDetails_Validators;
private static final AttributeValidator[] FIELD_Email_Validators;
private static final AttributeValidator[] FIELD_ContactName_Validators;
private static final AttributeValidator[] FIELD_ContactSurname_Validators;
......@@ -142,6 +146,7 @@ public abstract class BaseClient extends BaseBusinessClass
FIELD_IsLogoDeleted_Validators = (AttributeValidator[])setupAttribMetaData_IsLogoDeleted(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_ClientName_Validators = (AttributeValidator[])setupAttribMetaData_ClientName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_ClientLogo_Validators = (AttributeValidator[])setupAttribMetaData_ClientLogo(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_UseClientDetails_Validators = (AttributeValidator[])setupAttribMetaData_UseClientDetails(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_Email_Validators = (AttributeValidator[])setupAttribMetaData_Email(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_ContactName_Validators = (AttributeValidator[])setupAttribMetaData_ContactName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_ContactSurname_Validators = (AttributeValidator[])setupAttribMetaData_ContactSurname(validatorMapping).toArray (new AttributeValidator[0]);
......@@ -272,6 +277,26 @@ public abstract class BaseClient extends BaseBusinessClass
}
// Meta Info setup
private static List setupAttribMetaData_UseClientDetails(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "use_client_details");
metaInfo.put ("defaultValue", "Boolean.TRUE");
metaInfo.put ("mandatory", "false");
metaInfo.put ("name", "UseClientDetails");
metaInfo.put ("type", "Boolean");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Client.UseClientDetails:", metaInfo);
ATTRIBUTES_METADATA_Client.put (FIELD_UseClientDetails, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Client.class, "UseClientDetails", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Client.UseClientDetails:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_Email(Map validatorMapping)
{
Map metaInfo = new HashMap ();
......@@ -483,6 +508,7 @@ public abstract class BaseClient extends BaseBusinessClass
_ClientName = (String)(HELPER_ClientName.initialise (_ClientName));
_ClientLogo = (BinaryContent)(HELPER_ClientLogo.initialise (_ClientLogo));
_UseClientDetails = (Boolean)(Boolean.TRUE);
_Email = (String)(HELPER_Email.initialise (_Email));
_ContactName = (String)(HELPER_ContactName.initialise (_ContactName));
_ContactSurname = (String)(HELPER_ContactSurname.initialise (_ContactSurname));
......@@ -721,6 +747,104 @@ public abstract class BaseClient extends BaseBusinessClass
}
/**
* Get the attribute UseClientDetails
*/
public Boolean getUseClientDetails ()
{
assertValid();
Boolean valToReturn = _UseClientDetails;
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{
valToReturn = bhd.getUseClientDetails ((Client)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 preUseClientDetailsChange (Boolean newUseClientDetails) 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 postUseClientDetailsChange () throws FieldException
{
}
public FieldWriteability getWriteability_UseClientDetails ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute UseClientDetails. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setUseClientDetails (Boolean newUseClientDetails) throws FieldException
{
boolean oldAndNewIdentical = HELPER_UseClientDetails.compare (_UseClientDetails, newUseClientDetails);
try
{
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{
newUseClientDetails = bhd.setUseClientDetails ((Client)this, newUseClientDetails);
oldAndNewIdentical = HELPER_UseClientDetails.compare (_UseClientDetails, newUseClientDetails);
}
if (FIELD_UseClientDetails_Validators.length > 0)
{
Object newUseClientDetailsObj = HELPER_UseClientDetails.toObject (newUseClientDetails);
if (newUseClientDetailsObj != null)
{
int loopMax = FIELD_UseClientDetails_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Client.get (FIELD_UseClientDetails);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_UseClientDetails_Validators[v].checkAttribute (this, FIELD_UseClientDetails, metadata, newUseClientDetailsObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_UseClientDetails () != FieldWriteability.FALSE, "Field UseClientDetails is not writeable");
preUseClientDetailsChange (newUseClientDetails);
markFieldChange (FIELD_UseClientDetails);
_UseClientDetails = newUseClientDetails;
postFieldChange (FIELD_UseClientDetails);
postUseClientDetailsChange ();
}
}
/**
* Get the attribute Email
*/
public String getEmail ()
......@@ -2365,6 +2489,7 @@ public abstract class BaseClient extends BaseBusinessClass
tl_clientPSet.setAttrib (FIELD_ObjectID, myID);
tl_clientPSet.setAttrib (FIELD_ClientName, HELPER_ClientName.toObject (_ClientName)); //
tl_clientPSet.setAttrib (FIELD_ClientLogo, HELPER_ClientLogo.toObject (_ClientLogo)); //
tl_clientPSet.setAttrib (FIELD_UseClientDetails, HELPER_UseClientDetails.toObject (_UseClientDetails)); //
tl_clientPSet.setAttrib (FIELD_Email, HELPER_Email.toObject (_Email)); //
tl_clientPSet.setAttrib (FIELD_ContactName, HELPER_ContactName.toObject (_ContactName)); //
tl_clientPSet.setAttrib (FIELD_ContactSurname, HELPER_ContactSurname.toObject (_ContactSurname)); //
......@@ -2392,6 +2517,7 @@ public abstract class BaseClient extends BaseBusinessClass
_ClientName = (String)(HELPER_ClientName.fromObject (_ClientName, tl_clientPSet.getAttrib (FIELD_ClientName))); //
_ClientLogo = (BinaryContent)(HELPER_ClientLogo.fromObject (_ClientLogo, tl_clientPSet.getAttrib (FIELD_ClientLogo))); //
_UseClientDetails = (Boolean)(HELPER_UseClientDetails.fromObject (_UseClientDetails, tl_clientPSet.getAttrib (FIELD_UseClientDetails))); //
_Email = (String)(HELPER_Email.fromObject (_Email, tl_clientPSet.getAttrib (FIELD_Email))); //
_ContactName = (String)(HELPER_ContactName.fromObject (_ContactName, tl_clientPSet.getAttrib (FIELD_ContactName))); //
_ContactSurname = (String)(HELPER_ContactSurname.fromObject (_ContactSurname, tl_clientPSet.getAttrib (FIELD_ContactSurname))); //
......@@ -2438,6 +2564,15 @@ public abstract class BaseClient extends BaseBusinessClass
try
{
setUseClientDetails (otherClient.getUseClientDetails ());
}
catch (FieldException ex)
{
e.addException (ex);
}
try
{
setEmail (otherClient.getEmail ());
}
catch (FieldException ex)
......@@ -2534,6 +2669,7 @@ public abstract class BaseClient extends BaseBusinessClass
_ClientName = sourceClient._ClientName;
_ClientLogo = sourceClient._ClientLogo;
_UseClientDetails = sourceClient._UseClientDetails;
_Email = sourceClient._Email;
_ContactName = sourceClient._ContactName;
_ContactSurname = sourceClient._ContactSurname;
......@@ -2603,6 +2739,7 @@ public abstract class BaseClient extends BaseBusinessClass
_ClientName = (String)(HELPER_ClientName.readExternal (_ClientName, vals.get(FIELD_ClientName))); //
_ClientLogo = (BinaryContent)(HELPER_ClientLogo.readExternal (_ClientLogo, vals.get(FIELD_ClientLogo))); //
_UseClientDetails = (Boolean)(HELPER_UseClientDetails.readExternal (_UseClientDetails, vals.get(FIELD_UseClientDetails))); //
_Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); //
_ContactName = (String)(HELPER_ContactName.readExternal (_ContactName, vals.get(FIELD_ContactName))); //
_ContactSurname = (String)(HELPER_ContactSurname.readExternal (_ContactSurname, vals.get(FIELD_ContactSurname))); //
......@@ -2629,6 +2766,7 @@ public abstract class BaseClient extends BaseBusinessClass
vals.put (FIELD_ClientName, HELPER_ClientName.writeExternal (_ClientName));
vals.put (FIELD_ClientLogo, HELPER_ClientLogo.writeExternal (_ClientLogo));
vals.put (FIELD_UseClientDetails, HELPER_UseClientDetails.writeExternal (_UseClientDetails));
vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email));
vals.put (FIELD_ContactName, HELPER_ContactName.writeExternal (_ContactName));
vals.put (FIELD_ContactSurname, HELPER_ContactSurname.writeExternal (_ContactSurname));
......@@ -2663,6 +2801,10 @@ public abstract class BaseClient extends BaseBusinessClass
{
listener.notifyFieldChange(this, other, FIELD_ClientLogo, HELPER_ClientLogo.toObject(this._ClientLogo), HELPER_ClientLogo.toObject(otherClient._ClientLogo));
}
if (!HELPER_UseClientDetails.compare(this._UseClientDetails, otherClient._UseClientDetails))
{
listener.notifyFieldChange(this, other, FIELD_UseClientDetails, HELPER_UseClientDetails.toObject(this._UseClientDetails), HELPER_UseClientDetails.toObject(otherClient._UseClientDetails));
}
if (!HELPER_Email.compare(this._Email, otherClient._Email))
{
listener.notifyFieldChange(this, other, FIELD_Email, HELPER_Email.toObject(this._Email), HELPER_Email.toObject(otherClient._Email));
......@@ -2727,6 +2869,7 @@ public abstract class BaseClient extends BaseBusinessClass
visitor.visitField(this, FIELD_ClientName, HELPER_ClientName.toObject(getClientName()));
visitor.visitField(this, FIELD_ClientLogo, HELPER_ClientLogo.toObject(getClientLogo()));
visitor.visitField(this, FIELD_UseClientDetails, HELPER_UseClientDetails.toObject(getUseClientDetails()));
visitor.visitField(this, FIELD_Email, HELPER_Email.toObject(getEmail()));
visitor.visitField(this, FIELD_ContactName, HELPER_ContactName.toObject(getContactName()));
visitor.visitField(this, FIELD_ContactSurname, HELPER_ContactSurname.toObject(getContactSurname()));
......@@ -2792,6 +2935,10 @@ public abstract class BaseClient extends BaseBusinessClass
{
return filter.matches (getClientLogo ());
}
else if (attribName.equals (FIELD_UseClientDetails))
{
return filter.matches (getUseClientDetails ());
}
else if (attribName.equals (FIELD_Email))
{
return filter.matches (getEmail ());
......@@ -2879,6 +3026,12 @@ public abstract class BaseClient extends BaseBusinessClass
return this;
}
public SearchAll andUseClientDetails (QueryFilter<Boolean> filter)
{
filter.addFilter (context, "tl_client.use_client_details", "UseClientDetails");
return this;
}
public SearchAll andEmail (QueryFilter<String> filter)
{
filter.addFilter (context, "tl_client.email", "Email");
......@@ -2988,6 +3141,10 @@ public abstract class BaseClient extends BaseBusinessClass
{
return HELPER_ClientLogo.toObject (getClientLogo ());
}
else if (attribName.equals (FIELD_UseClientDetails))
{
return HELPER_UseClientDetails.toObject (getUseClientDetails ());
}
else if (attribName.equals (FIELD_Email))
{
return HELPER_Email.toObject (getEmail ());
......@@ -3049,6 +3206,10 @@ public abstract class BaseClient extends BaseBusinessClass
{
return HELPER_ClientLogo;
}
else if (attribName.equals (FIELD_UseClientDetails))
{
return HELPER_UseClientDetails;
}
else if (attribName.equals (FIELD_Email))
{
return HELPER_Email;
......@@ -3110,6 +3271,10 @@ public abstract class BaseClient extends BaseBusinessClass
{
setClientLogo ((BinaryContent)(HELPER_ClientLogo.fromObject (_ClientLogo, attribValue)));
}
else if (attribName.equals (FIELD_UseClientDetails))
{
setUseClientDetails ((Boolean)(HELPER_UseClientDetails.fromObject (_UseClientDetails, attribValue)));
}
else if (attribName.equals (FIELD_Email))
{
setEmail ((String)(HELPER_Email.fromObject (_Email, attribValue)));
......@@ -3178,6 +3343,10 @@ public abstract class BaseClient extends BaseBusinessClass
{
return getWriteability_ClientLogo ();
}
else if (fieldName.equals (FIELD_UseClientDetails))
{
return getWriteability_UseClientDetails ();
}
else if (fieldName.equals (FIELD_Email))
{
return getWriteability_Email ();
......@@ -3250,6 +3419,11 @@ public abstract class BaseClient extends BaseBusinessClass
fields.add (FIELD_ClientLogo);
}
if (getWriteability_UseClientDetails () != FieldWriteability.TRUE)
{
fields.add (FIELD_UseClientDetails);
}
if (getWriteability_Email () != FieldWriteability.TRUE)
{
fields.add (FIELD_Email);
......@@ -3311,6 +3485,7 @@ public abstract class BaseClient extends BaseBusinessClass
result.add(HELPER_ClientName.getAttribObject (getClass (), _ClientName, true, FIELD_ClientName));
result.add(HELPER_ClientLogo.getAttribObject (getClass (), _ClientLogo, false, FIELD_ClientLogo));
result.add(HELPER_UseClientDetails.getAttribObject (getClass (), _UseClientDetails, false, FIELD_UseClientDetails));
result.add(HELPER_Email.getAttribObject (getClass (), _Email, false, FIELD_Email));
result.add(HELPER_ContactName.getAttribObject (getClass (), _ContactName, false, FIELD_ContactName));
result.add(HELPER_ContactSurname.getAttribObject (getClass (), _ContactSurname, false, FIELD_ContactSurname));
......@@ -3426,6 +3601,24 @@ public abstract class BaseClient extends BaseBusinessClass
}
/**
* Get the attribute UseClientDetails
*/
public Boolean getUseClientDetails (Client obj, Boolean original)
{
return original;
}
/**
* Change the value set for attribute UseClientDetails.
* May modify the field beforehand
* Occurs before validation.
*/
public Boolean setUseClientDetails (Client obj, Boolean newUseClientDetails) throws FieldException
{
return newUseClientDetails;
}
/**
* Get the attribute Email
*/
public String getEmail (Client obj, String original)
......@@ -3673,6 +3866,10 @@ public abstract class BaseClient extends BaseBusinessClass
{
return toClientLogo ();
}
if (name.equals ("UseClientDetails"))
{
return toUseClientDetails ();
}
if (name.equals ("Email"))
{
return toEmail ();
......@@ -3729,6 +3926,8 @@ public abstract class BaseClient extends BaseBusinessClass
public PipeLine<From, BinaryContent> toClientLogo () { return pipe(new ORMAttributePipe<Me, BinaryContent>(FIELD_ClientLogo)); }
public PipeLine<From, Boolean> toUseClientDetails () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_UseClientDetails)); }
public PipeLine<From, String> toEmail () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Email)); }
public PipeLine<From, String> toContactName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_ContactName)); }
......
cmsWebApp/src/performa/orm/Client.java
......@@ -32,4 +32,9 @@ public class Client extends BaseClient
{
return StringUtils.subNulls(getClientName(), super.getToString());
}
public boolean showUseClientDetails()
{
return isTrue(getUseClientDetails());
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/Client.xml
......@@ -15,6 +15,7 @@
<ATTRIB name="ClientName" type="String" dbcol="client_name" mandatory="true" length="30"/>
<ATTRIB name="ClientLogo" type="BinaryContent" dbcol="client_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" />
<ATTRIB name="UseClientDetails" type="Boolean" dbcol="use_client_details" mandatory="false" defaultValue="Boolean.TRUE" />
<ATTRIB name="Email" type="String" dbcol="email" mandatory="false" length="100" validators="Email" />
<ATTRIB name="ContactName" type="String" dbcol="contact_name" mandatory="false" length="100"/>
<ATTRIB name="ContactSurname" type="String" dbcol="contact_surname" mandatory="false" length="100"/>
......
cmsWebApp/src/performa/orm/ClientPersistenceMgr.java
......@@ -30,6 +30,7 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
// Private attributes corresponding to business object data
private String dummyClientName;
private BinaryContent dummyClientLogo;
private Boolean dummyUseClientDetails;
private String dummyEmail;
private String dummyContactName;
private String dummyContactSurname;
......@@ -44,6 +45,7 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
// Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper HELPER_ClientName = DefaultAttributeHelper.INSTANCE;
private static final BLOBAttributeHelper HELPER_ClientLogo = BLOBAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_UseClientDetails = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_Email = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_ContactName = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_ContactSurname = DefaultAttributeHelper.INSTANCE;
......@@ -61,6 +63,7 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
{
dummyClientName = (String)(HELPER_ClientName.initialise (dummyClientName));
dummyClientLogo = (BinaryContent)(HELPER_ClientLogo.initialise (dummyClientLogo));
dummyUseClientDetails = (Boolean)(HELPER_UseClientDetails.initialise (dummyUseClientDetails));
dummyEmail = (String)(HELPER_Email.initialise (dummyEmail));
dummyContactName = (String)(HELPER_ContactName.initialise (dummyContactName));
dummyContactSurname = (String)(HELPER_ContactSurname.initialise (dummyContactSurname));
......@@ -73,7 +76,7 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
}
private String SELECT_COLUMNS = "{PREFIX}tl_client.object_id as id, {PREFIX}tl_client.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_client.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_client.client_name, {PREFIX}tl_client.client_logo, {PREFIX}tl_client.email, {PREFIX}tl_client.contact_name, {PREFIX}tl_client.contact_surname, {PREFIX}tl_client.phone, {PREFIX}tl_client.state, {PREFIX}tl_client.country, {PREFIX}tl_client.post_code, {PREFIX}tl_client.city, {PREFIX}tl_client.time_zone, {PREFIX}tl_client.hiring_team_id, {PREFIX}tl_client.company_id, 1 AS commasafe ";
private String SELECT_COLUMNS = "{PREFIX}tl_client.object_id as id, {PREFIX}tl_client.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_client.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_client.client_name, {PREFIX}tl_client.client_logo, {PREFIX}tl_client.use_client_details, {PREFIX}tl_client.email, {PREFIX}tl_client.contact_name, {PREFIX}tl_client.contact_surname, {PREFIX}tl_client.phone, {PREFIX}tl_client.state, {PREFIX}tl_client.country, {PREFIX}tl_client.post_code, {PREFIX}tl_client.city, {PREFIX}tl_client.time_zone, {PREFIX}tl_client.hiring_team_id, {PREFIX}tl_client.company_id, 1 AS commasafe ";
private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
......@@ -126,6 +129,7 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
if (false || !tl_clientPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!tl_clientPSet.containsAttrib(Client.FIELD_ClientName)||
!tl_clientPSet.containsAttrib(Client.FIELD_ClientLogo)||
!tl_clientPSet.containsAttrib(Client.FIELD_UseClientDetails)||
!tl_clientPSet.containsAttrib(Client.FIELD_Email)||
!tl_clientPSet.containsAttrib(Client.FIELD_ContactName)||
!tl_clientPSet.containsAttrib(Client.FIELD_ContactSurname)||
......@@ -226,10 +230,10 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
{
int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_client " +
"SET client_name = ?, client_logo = ?, email = ?, contact_name = ?, contact_surname = ?, phone = ?, state = ?, country = ?, post_code = ?, city = ?, time_zone = ?, hiring_team_id = ? , company_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"SET client_name = ?, client_logo = ?, use_client_details = ?, email = ?, contact_name = ?, contact_surname = ?, phone = ?, state = ?, country = ?, post_code = ?, city = ?, time_zone = ?, hiring_team_id = ? , company_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_client.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_ClientName.getForSQL(dummyClientName, tl_clientPSet.getAttrib (Client.FIELD_ClientName))).listEntry (HELPER_ClientLogo.getForSQL(dummyClientLogo, tl_clientPSet.getAttrib (Client.FIELD_ClientLogo))).listEntry (HELPER_Email.getForSQL(dummyEmail, tl_clientPSet.getAttrib (Client.FIELD_Email))).listEntry (HELPER_ContactName.getForSQL(dummyContactName, tl_clientPSet.getAttrib (Client.FIELD_ContactName))).listEntry (HELPER_ContactSurname.getForSQL(dummyContactSurname, tl_clientPSet.getAttrib (Client.FIELD_ContactSurname))).listEntry (HELPER_Phone.getForSQL(dummyPhone, tl_clientPSet.getAttrib (Client.FIELD_Phone))).listEntry (HELPER_State.getForSQL(dummyState, tl_clientPSet.getAttrib (Client.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_clientPSet.getAttrib (Client.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_clientPSet.getAttrib (Client.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_clientPSet.getAttrib (Client.FIELD_City))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_clientPSet.getAttrib (Client.FIELD_TimeZone))).listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_Company)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
CollectionUtils.listEntry (HELPER_ClientName.getForSQL(dummyClientName, tl_clientPSet.getAttrib (Client.FIELD_ClientName))).listEntry (HELPER_ClientLogo.getForSQL(dummyClientLogo, tl_clientPSet.getAttrib (Client.FIELD_ClientLogo))).listEntry (HELPER_UseClientDetails.getForSQL(dummyUseClientDetails, tl_clientPSet.getAttrib (Client.FIELD_UseClientDetails))).listEntry (HELPER_Email.getForSQL(dummyEmail, tl_clientPSet.getAttrib (Client.FIELD_Email))).listEntry (HELPER_ContactName.getForSQL(dummyContactName, tl_clientPSet.getAttrib (Client.FIELD_ContactName))).listEntry (HELPER_ContactSurname.getForSQL(dummyContactSurname, tl_clientPSet.getAttrib (Client.FIELD_ContactSurname))).listEntry (HELPER_Phone.getForSQL(dummyPhone, tl_clientPSet.getAttrib (Client.FIELD_Phone))).listEntry (HELPER_State.getForSQL(dummyState, tl_clientPSet.getAttrib (Client.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_clientPSet.getAttrib (Client.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_clientPSet.getAttrib (Client.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_clientPSet.getAttrib (Client.FIELD_City))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_clientPSet.getAttrib (Client.FIELD_TimeZone))).listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_Company)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1)
{
......@@ -487,6 +491,7 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
tl_clientPSet.setAttrib(Client.FIELD_ClientName, HELPER_ClientName.getFromRS(dummyClientName, r, "client_name"));
tl_clientPSet.setAttrib(Client.FIELD_ClientLogo, HELPER_ClientLogo.getFromRS(dummyClientLogo, r, "client_logo"));
tl_clientPSet.setAttrib(Client.FIELD_UseClientDetails, HELPER_UseClientDetails.getFromRS(dummyUseClientDetails, r, "use_client_details"));
tl_clientPSet.setAttrib(Client.FIELD_Email, HELPER_Email.getFromRS(dummyEmail, r, "email"));
tl_clientPSet.setAttrib(Client.FIELD_ContactName, HELPER_ContactName.getFromRS(dummyContactName, r, "contact_name"));
tl_clientPSet.setAttrib(Client.FIELD_ContactSurname, HELPER_ContactSurname.getFromRS(dummyContactSurname, r, "contact_surname"));
......@@ -515,10 +520,10 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
{
executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_client " +
" (client_name, client_logo, email, contact_name, contact_surname, phone, state, country, post_code, city, time_zone, hiring_team_id, company_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
" (client_name, client_logo, use_client_details, email, contact_name, contact_surname, phone, state, country, post_code, city, time_zone, hiring_team_id, company_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_ClientName.getForSQL(dummyClientName, tl_clientPSet.getAttrib (Client.FIELD_ClientName))).listEntry (HELPER_ClientLogo.getForSQL(dummyClientLogo, tl_clientPSet.getAttrib (Client.FIELD_ClientLogo))).listEntry (HELPER_Email.getForSQL(dummyEmail, tl_clientPSet.getAttrib (Client.FIELD_Email))).listEntry (HELPER_ContactName.getForSQL(dummyContactName, tl_clientPSet.getAttrib (Client.FIELD_ContactName))).listEntry (HELPER_ContactSurname.getForSQL(dummyContactSurname, tl_clientPSet.getAttrib (Client.FIELD_ContactSurname))).listEntry (HELPER_Phone.getForSQL(dummyPhone, tl_clientPSet.getAttrib (Client.FIELD_Phone))).listEntry (HELPER_State.getForSQL(dummyState, tl_clientPSet.getAttrib (Client.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_clientPSet.getAttrib (Client.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_clientPSet.getAttrib (Client.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_clientPSet.getAttrib (Client.FIELD_City))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_clientPSet.getAttrib (Client.FIELD_TimeZone))) .listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_Company)))) .listEntry (objectID.longID ()).toList().toArray());
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_ClientName.getForSQL(dummyClientName, tl_clientPSet.getAttrib (Client.FIELD_ClientName))).listEntry (HELPER_ClientLogo.getForSQL(dummyClientLogo, tl_clientPSet.getAttrib (Client.FIELD_ClientLogo))).listEntry (HELPER_UseClientDetails.getForSQL(dummyUseClientDetails, tl_clientPSet.getAttrib (Client.FIELD_UseClientDetails))).listEntry (HELPER_Email.getForSQL(dummyEmail, tl_clientPSet.getAttrib (Client.FIELD_Email))).listEntry (HELPER_ContactName.getForSQL(dummyContactName, tl_clientPSet.getAttrib (Client.FIELD_ContactName))).listEntry (HELPER_ContactSurname.getForSQL(dummyContactSurname, tl_clientPSet.getAttrib (Client.FIELD_ContactSurname))).listEntry (HELPER_Phone.getForSQL(dummyPhone, tl_clientPSet.getAttrib (Client.FIELD_Phone))).listEntry (HELPER_State.getForSQL(dummyState, tl_clientPSet.getAttrib (Client.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_clientPSet.getAttrib (Client.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_clientPSet.getAttrib (Client.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_clientPSet.getAttrib (Client.FIELD_City))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_clientPSet.getAttrib (Client.FIELD_TimeZone))) .listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_Company)))) .listEntry (objectID.longID ()).toList().toArray());
tl_clientPSet.setStatus (PersistentSetStatus.PROCESSED);
}
......
cmsWebApp/src/performa/orm/Job.java
......@@ -472,7 +472,7 @@ public class Job extends BaseJob
title.append("Matchd - ");
if(isClientAvailable())
if(isClientAvailable() && getClient().showUseClientDetails())
{
title.append(getClient()).append(" - ");
}
......@@ -559,30 +559,23 @@ public class Job extends BaseJob
public BinaryContent getLogo()
{
if(isClientAvailable() && getClient().getClientLogo() != null)
if(isClientAvailable() && getClient().showUseClientDetails())
{
return getClient().getClientLogo();
}
else if(getHiringTeam() != null)
{
return getHiringTeam().getHiringTeamLogo();
}
return null;
return getHiringTeam() != null ? getHiringTeam().getHiringTeamLogo() : null;
}
public String getTeamName()
{
if(isClientAvailable())
if(isClientAvailable() && getClient().showUseClientDetails())
{
return getClient().getClientName();
}
else if(getHiringTeam() != null)
{
return getHiringTeam().getHiringTeamName();
}
return "";
return getHiringTeam() != null ? getHiringTeam().getHiringTeamName() : "";
}
......
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
......@@ -72,7 +72,18 @@
</span>
</div>
</div>
<div class="form-group">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= client %>" id="use-client-details" attributeName="UseClientDetails" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="client.showUseClientDetails() ? 'checked': 'unchecked'" client="<%= client %>">
<label for="use-client-details">
<oneit:ormlabel obj="<%= client %>" field="UseClientDetails" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
<div class="form-brack-line-sub"></div>
<div class="form-group">
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
......@@ -33,6 +33,7 @@ Client.ContactName = Contact First Name
Client.ContactSurname = Contact Last Name
Client.ClientLogo = Client Logo
Client.State = State or Province
Client.UseClientDetails = Display client name and logo for job applicants (if No, then use Hiring Team details)
Company.TimeZone = Time zone
Company.HasClientSupport = We help clients with hiring
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190514_Alter_Client.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_client</tableName>
<column name="use_client_details" 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