Skip to content

P
PERFORMA_REPLICA
Commit 84725807 by chenith Committed by Harsh Shah
Options

Updated client column names.

parent dfe98ab4
Showing with 172 additions and 167 deletions
cmsWebApp/sql/Client.xml
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="company_name" type="String" nullable="false" length="100"/> <column name="client_name" type="String" nullable="false" length="100"/>
<column name="company_logo" type="BLOB" nullable="true"/> <column name="client_logo" type="BLOB" nullable="true"/>
<column name="email" type="String" nullable="true" length="100"/> <column name="email" type="String" nullable="true" length="100"/>
<column name="contact_name" 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"/> <column name="contact_surname" type="String" nullable="true" length="100"/>
......
cmsWebApp/sql/ms/Client.sql
...@@ -8,8 +8,8 @@ CREATE TABLE tl_client ( ...@@ -8,8 +8,8 @@ CREATE TABLE tl_client (
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
, ,
company_name varchar(100) NOT NULL, client_name varchar(100) NOT NULL,
company_logo image NULL, client_logo image NULL,
email varchar(100) NULL, email varchar(100) NULL,
contact_name varchar(100) NULL, contact_name varchar(100) NULL,
contact_surname varchar(100) NULL, contact_surname varchar(100) NULL,
......
cmsWebApp/sql/oracle/Client.sql
...@@ -9,8 +9,8 @@ CREATE TABLE tl_client ( ...@@ -9,8 +9,8 @@ CREATE TABLE tl_client (
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
, ,
company_name varchar2(100) NOT NULL, client_name varchar2(100) NOT NULL,
company_logo blob NULL, client_logo blob NULL,
email varchar2(100) NULL, email varchar2(100) NULL,
contact_name varchar2(100) NULL, contact_name varchar2(100) NULL,
contact_surname varchar2(100) NULL, contact_surname varchar2(100) NULL,
......
cmsWebApp/sql/postgres/Client.sql
...@@ -9,8 +9,8 @@ CREATE TABLE tl_client ( ...@@ -9,8 +9,8 @@ CREATE TABLE tl_client (
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
, ,
company_name varchar(100) NOT NULL, client_name varchar(100) NOT NULL,
company_logo bytea NULL, client_logo bytea NULL,
email varchar(100) NULL, email varchar(100) NULL,
contact_name varchar(100) NULL, contact_name varchar(100) NULL,
contact_surname varchar(100) NULL, contact_surname varchar(100) NULL,
......
cmsWebApp/src/performa/orm/BaseClient.java
...@@ -42,8 +42,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -42,8 +42,8 @@ public abstract class BaseClient extends BaseBusinessClass
// Static constants corresponding to field names // Static constants corresponding to field names
public static final String FIELD_CompanyName = "CompanyName"; public static final String FIELD_ClientName = "ClientName";
public static final String FIELD_CompanyLogo = "CompanyLogo"; public static final String FIELD_ClientLogo = "ClientLogo";
public static final String FIELD_Email = "Email"; public static final String FIELD_Email = "Email";
public static final String FIELD_ContactName = "ContactName"; public static final String FIELD_ContactName = "ContactName";
public static final String FIELD_ContactSurname = "ContactSurname"; public static final String FIELD_ContactSurname = "ContactSurname";
...@@ -59,8 +59,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -59,8 +59,8 @@ public abstract class BaseClient extends BaseBusinessClass
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper<Client> HELPER_CompanyName = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Client> HELPER_ClientName = DefaultAttributeHelper.INSTANCE;
private static final BLOBAttributeHelper HELPER_CompanyLogo = BLOBAttributeHelper.INSTANCE; private static final BLOBAttributeHelper HELPER_ClientLogo = BLOBAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Client> HELPER_Email = 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_ContactName = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Client> HELPER_ContactSurname = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Client> HELPER_ContactSurname = DefaultAttributeHelper.INSTANCE;
...@@ -71,8 +71,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -71,8 +71,8 @@ public abstract class BaseClient extends BaseBusinessClass
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String _CompanyName; private String _ClientName;
private BinaryContent _CompanyLogo; private BinaryContent _ClientLogo;
private String _Email; private String _Email;
private String _ContactName; private String _ContactName;
private String _ContactSurname; private String _ContactSurname;
...@@ -93,8 +93,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -93,8 +93,8 @@ public abstract class BaseClient extends BaseBusinessClass
private static final Map ATTRIBUTES_METADATA_Client = new HashMap (); private static final Map ATTRIBUTES_METADATA_Client = new HashMap ();
// Arrays of validators for each attribute // Arrays of validators for each attribute
private static final AttributeValidator[] FIELD_CompanyName_Validators; private static final AttributeValidator[] FIELD_ClientName_Validators;
private static final AttributeValidator[] FIELD_CompanyLogo_Validators; private static final AttributeValidator[] FIELD_ClientLogo_Validators;
private static final AttributeValidator[] FIELD_Email_Validators; private static final AttributeValidator[] FIELD_Email_Validators;
private static final AttributeValidator[] FIELD_ContactName_Validators; private static final AttributeValidator[] FIELD_ContactName_Validators;
private static final AttributeValidator[] FIELD_ContactSurname_Validators; private static final AttributeValidator[] FIELD_ContactSurname_Validators;
...@@ -117,8 +117,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -117,8 +117,8 @@ public abstract class BaseClient extends BaseBusinessClass
Map validatorMapping = ((Map)ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "ValidatorMapping")); Map validatorMapping = ((Map)ConfigMgr.getConfigObject ("CONFIG.ORMVALIDATOR", "ValidatorMapping"));
setupAssocMetaData_Company(); setupAssocMetaData_Company();
FIELD_CompanyName_Validators = (AttributeValidator[])setupAttribMetaData_CompanyName(validatorMapping).toArray (new AttributeValidator[0]); FIELD_ClientName_Validators = (AttributeValidator[])setupAttribMetaData_ClientName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyLogo_Validators = (AttributeValidator[])setupAttribMetaData_CompanyLogo(validatorMapping).toArray (new AttributeValidator[0]); FIELD_ClientLogo_Validators = (AttributeValidator[])setupAttribMetaData_ClientLogo(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_Email_Validators = (AttributeValidator[])setupAttribMetaData_Email(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_ContactName_Validators = (AttributeValidator[])setupAttribMetaData_ContactName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_ContactSurname_Validators = (AttributeValidator[])setupAttribMetaData_ContactSurname(validatorMapping).toArray (new AttributeValidator[0]); FIELD_ContactSurname_Validators = (AttributeValidator[])setupAttribMetaData_ContactSurname(validatorMapping).toArray (new AttributeValidator[0]);
...@@ -156,43 +156,43 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -156,43 +156,43 @@ public abstract class BaseClient extends BaseBusinessClass
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_CompanyName(Map validatorMapping) private static List setupAttribMetaData_ClientName(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "company_name"); metaInfo.put ("dbcol", "client_name");
metaInfo.put ("length", "100"); metaInfo.put ("length", "100");
metaInfo.put ("mandatory", "true"); metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "CompanyName"); metaInfo.put ("name", "ClientName");
metaInfo.put ("type", "String"); metaInfo.put ("type", "String");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Client.CompanyName:", metaInfo); LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Client.ClientName:", metaInfo);
ATTRIBUTES_METADATA_Client.put (FIELD_CompanyName, Collections.unmodifiableMap (metaInfo)); ATTRIBUTES_METADATA_Client.put (FIELD_ClientName, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Client.class, "CompanyName", metaInfo, validatorMapping); List validators = BaseBusinessClass.getAttribValidators(Client.class, "ClientName", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Client.CompanyName:", validators); LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Client.ClientName:", validators);
return validators; return validators;
} }
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_CompanyLogo(Map validatorMapping) private static List setupAttribMetaData_ClientLogo(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("attribHelper", "BLOBAttributeHelper"); metaInfo.put ("attribHelper", "BLOBAttributeHelper");
metaInfo.put ("attribHelperInstance", "BLOBAttributeHelper.INSTANCE"); metaInfo.put ("attribHelperInstance", "BLOBAttributeHelper.INSTANCE");
metaInfo.put ("binaryHandler", "loggedin"); metaInfo.put ("binaryHandler", "loggedin");
metaInfo.put ("dbcol", "company_logo"); metaInfo.put ("dbcol", "client_logo");
metaInfo.put ("mandatory", "false"); metaInfo.put ("mandatory", "false");
metaInfo.put ("name", "CompanyLogo"); metaInfo.put ("name", "ClientLogo");
metaInfo.put ("type", "BinaryContent"); metaInfo.put ("type", "BinaryContent");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Client.CompanyLogo:", metaInfo); LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Client.ClientLogo:", metaInfo);
ATTRIBUTES_METADATA_Client.put (FIELD_CompanyLogo, Collections.unmodifiableMap (metaInfo)); ATTRIBUTES_METADATA_Client.put (FIELD_ClientLogo, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Client.class, "CompanyLogo", metaInfo, validatorMapping); List validators = BaseBusinessClass.getAttribValidators(Client.class, "ClientLogo", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Client.CompanyLogo:", validators); LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Client.ClientLogo:", validators);
return validators; return validators;
} }
...@@ -367,8 +367,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -367,8 +367,8 @@ public abstract class BaseClient extends BaseBusinessClass
super._initialiseNewObjAttributes (transaction); super._initialiseNewObjAttributes (transaction);
_CompanyName = (String)(HELPER_CompanyName.initialise (_CompanyName)); _ClientName = (String)(HELPER_ClientName.initialise (_ClientName));
_CompanyLogo = (BinaryContent)(HELPER_CompanyLogo.initialise (_CompanyLogo)); _ClientLogo = (BinaryContent)(HELPER_ClientLogo.initialise (_ClientLogo));
_Email = (String)(HELPER_Email.initialise (_Email)); _Email = (String)(HELPER_Email.initialise (_Email));
_ContactName = (String)(HELPER_ContactName.initialise (_ContactName)); _ContactName = (String)(HELPER_ContactName.initialise (_ContactName));
_ContactSurname = (String)(HELPER_ContactSurname.initialise (_ContactSurname)); _ContactSurname = (String)(HELPER_ContactSurname.initialise (_ContactSurname));
...@@ -403,16 +403,16 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -403,16 +403,16 @@ public abstract class BaseClient extends BaseBusinessClass
/** /**
* Get the attribute CompanyName * Get the attribute ClientName
*/ */
public String getCompanyName () public String getClientName ()
{ {
assertValid(); assertValid();
String valToReturn = _CompanyName; String valToReturn = _ClientName;
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators) for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{ {
valToReturn = bhd.getCompanyName ((Client)this, valToReturn); valToReturn = bhd.getClientName ((Client)this, valToReturn);
} }
return valToReturn; return valToReturn;
...@@ -424,7 +424,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -424,7 +424,7 @@ public abstract class BaseClient extends BaseBusinessClass
* Called prior to the attribute changing. Subclasses need not call super. If a field exception * 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. * is thrown, the attribute change will fail. The new value is different to the old value.
*/ */
protected void preCompanyNameChange (String newCompanyName) throws FieldException protected void preClientNameChange (String newClientName) throws FieldException
{ {
} }
...@@ -434,47 +434,47 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -434,47 +434,47 @@ public abstract class BaseClient extends BaseBusinessClass
* If a field exception is thrown, the value is still changed, however it * If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back * may lead to the TX being rolled back
*/ */
protected void postCompanyNameChange () throws FieldException protected void postClientNameChange () throws FieldException
{ {
} }
public FieldWriteability getWriteability_CompanyName () public FieldWriteability getWriteability_ClientName ()
{ {
return getFieldWritabilityUtil (FieldWriteability.TRUE); return getFieldWritabilityUtil (FieldWriteability.TRUE);
} }
/** /**
* Set the attribute CompanyName. Checks to ensure a new value * Set the attribute ClientName. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute. * has been supplied. If so, marks the field as altered and sets the attribute.
*/ */
public void setCompanyName (String newCompanyName) throws FieldException public void setClientName (String newClientName) throws FieldException
{ {
boolean oldAndNewIdentical = HELPER_CompanyName.compare (_CompanyName, newCompanyName); boolean oldAndNewIdentical = HELPER_ClientName.compare (_ClientName, newClientName);
try try
{ {
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators) for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{ {
newCompanyName = bhd.setCompanyName ((Client)this, newCompanyName); newClientName = bhd.setClientName ((Client)this, newClientName);
oldAndNewIdentical = HELPER_CompanyName.compare (_CompanyName, newCompanyName); oldAndNewIdentical = HELPER_ClientName.compare (_ClientName, newClientName);
} }
BusinessObjectParser.assertFieldCondition (newCompanyName != null, this, FIELD_CompanyName, "mandatory"); BusinessObjectParser.assertFieldCondition (newClientName != null, this, FIELD_ClientName, "mandatory");
if (FIELD_CompanyName_Validators.length > 0) if (FIELD_ClientName_Validators.length > 0)
{ {
Object newCompanyNameObj = HELPER_CompanyName.toObject (newCompanyName); Object newClientNameObj = HELPER_ClientName.toObject (newClientName);
if (newCompanyNameObj != null) if (newClientNameObj != null)
{ {
int loopMax = FIELD_CompanyName_Validators.length; int loopMax = FIELD_ClientName_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Client.get (FIELD_CompanyName); Map metadata = (Map)ATTRIBUTES_METADATA_Client.get (FIELD_ClientName);
for (int v = 0 ; v < loopMax ; ++v) for (int v = 0 ; v < loopMax ; ++v)
{ {
FIELD_CompanyName_Validators[v].checkAttribute (this, FIELD_CompanyName, metadata, newCompanyNameObj); FIELD_ClientName_Validators[v].checkAttribute (this, FIELD_ClientName, metadata, newClientNameObj);
} }
} }
} }
...@@ -492,26 +492,26 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -492,26 +492,26 @@ public abstract class BaseClient extends BaseBusinessClass
if (!oldAndNewIdentical) if (!oldAndNewIdentical)
{ {
assertValid(); assertValid();
Debug.assertion (getWriteability_CompanyName () != FieldWriteability.FALSE, "Field CompanyName is not writeable"); Debug.assertion (getWriteability_ClientName () != FieldWriteability.FALSE, "Field ClientName is not writeable");
preCompanyNameChange (newCompanyName); preClientNameChange (newClientName);
markFieldChange (FIELD_CompanyName); markFieldChange (FIELD_ClientName);
_CompanyName = newCompanyName; _ClientName = newClientName;
postFieldChange (FIELD_CompanyName); postFieldChange (FIELD_ClientName);
postCompanyNameChange (); postClientNameChange ();
} }
} }
/** /**
* Get the attribute CompanyLogo * Get the attribute ClientLogo
*/ */
public BinaryContent getCompanyLogo () public BinaryContent getClientLogo ()
{ {
assertValid(); assertValid();
BinaryContent valToReturn = _CompanyLogo; BinaryContent valToReturn = _ClientLogo;
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators) for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{ {
valToReturn = bhd.getCompanyLogo ((Client)this, valToReturn); valToReturn = bhd.getClientLogo ((Client)this, valToReturn);
} }
return valToReturn; return valToReturn;
...@@ -523,7 +523,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -523,7 +523,7 @@ public abstract class BaseClient extends BaseBusinessClass
* Called prior to the attribute changing. Subclasses need not call super. If a field exception * 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. * is thrown, the attribute change will fail. The new value is different to the old value.
*/ */
protected void preCompanyLogoChange (BinaryContent newCompanyLogo) throws FieldException protected void preClientLogoChange (BinaryContent newClientLogo) throws FieldException
{ {
} }
...@@ -533,46 +533,46 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -533,46 +533,46 @@ public abstract class BaseClient extends BaseBusinessClass
* If a field exception is thrown, the value is still changed, however it * If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back * may lead to the TX being rolled back
*/ */
protected void postCompanyLogoChange () throws FieldException protected void postClientLogoChange () throws FieldException
{ {
} }
public FieldWriteability getWriteability_CompanyLogo () public FieldWriteability getWriteability_ClientLogo ()
{ {
return getFieldWritabilityUtil (FieldWriteability.TRUE); return getFieldWritabilityUtil (FieldWriteability.TRUE);
} }
/** /**
* Set the attribute CompanyLogo. Checks to ensure a new value * Set the attribute ClientLogo. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute. * has been supplied. If so, marks the field as altered and sets the attribute.
*/ */
public void setCompanyLogo (BinaryContent newCompanyLogo) throws FieldException public void setClientLogo (BinaryContent newClientLogo) throws FieldException
{ {
boolean oldAndNewIdentical = HELPER_CompanyLogo.compare (_CompanyLogo, newCompanyLogo); boolean oldAndNewIdentical = HELPER_ClientLogo.compare (_ClientLogo, newClientLogo);
try try
{ {
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators) for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{ {
newCompanyLogo = bhd.setCompanyLogo ((Client)this, newCompanyLogo); newClientLogo = bhd.setClientLogo ((Client)this, newClientLogo);
oldAndNewIdentical = HELPER_CompanyLogo.compare (_CompanyLogo, newCompanyLogo); oldAndNewIdentical = HELPER_ClientLogo.compare (_ClientLogo, newClientLogo);
} }
if (FIELD_CompanyLogo_Validators.length > 0) if (FIELD_ClientLogo_Validators.length > 0)
{ {
Object newCompanyLogoObj = HELPER_CompanyLogo.toObject (newCompanyLogo); Object newClientLogoObj = HELPER_ClientLogo.toObject (newClientLogo);
if (newCompanyLogoObj != null) if (newClientLogoObj != null)
{ {
int loopMax = FIELD_CompanyLogo_Validators.length; int loopMax = FIELD_ClientLogo_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Client.get (FIELD_CompanyLogo); Map metadata = (Map)ATTRIBUTES_METADATA_Client.get (FIELD_ClientLogo);
for (int v = 0 ; v < loopMax ; ++v) for (int v = 0 ; v < loopMax ; ++v)
{ {
FIELD_CompanyLogo_Validators[v].checkAttribute (this, FIELD_CompanyLogo, metadata, newCompanyLogoObj); FIELD_ClientLogo_Validators[v].checkAttribute (this, FIELD_ClientLogo, metadata, newClientLogoObj);
} }
} }
} }
...@@ -590,12 +590,12 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -590,12 +590,12 @@ public abstract class BaseClient extends BaseBusinessClass
if (!oldAndNewIdentical) if (!oldAndNewIdentical)
{ {
assertValid(); assertValid();
Debug.assertion (getWriteability_CompanyLogo () != FieldWriteability.FALSE, "Field CompanyLogo is not writeable"); Debug.assertion (getWriteability_ClientLogo () != FieldWriteability.FALSE, "Field ClientLogo is not writeable");
preCompanyLogoChange (newCompanyLogo); preClientLogoChange (newClientLogo);
markFieldChange (FIELD_CompanyLogo); markFieldChange (FIELD_ClientLogo);
_CompanyLogo = newCompanyLogo; _ClientLogo = newClientLogo;
postFieldChange (FIELD_CompanyLogo); postFieldChange (FIELD_ClientLogo);
postCompanyLogoChange (); postClientLogoChange ();
} }
} }
...@@ -1684,8 +1684,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1684,8 +1684,8 @@ public abstract class BaseClient extends BaseBusinessClass
PersistentSet tl_clientPSet = allSets.getPersistentSet (myID, "tl_client", myPSetStatus); PersistentSet tl_clientPSet = allSets.getPersistentSet (myID, "tl_client", myPSetStatus);
tl_clientPSet.setAttrib (FIELD_ObjectID, myID); tl_clientPSet.setAttrib (FIELD_ObjectID, myID);
tl_clientPSet.setAttrib (FIELD_CompanyName, HELPER_CompanyName.toObject (_CompanyName)); // tl_clientPSet.setAttrib (FIELD_ClientName, HELPER_ClientName.toObject (_ClientName)); //
tl_clientPSet.setAttrib (FIELD_CompanyLogo, HELPER_CompanyLogo.toObject (_CompanyLogo)); // tl_clientPSet.setAttrib (FIELD_ClientLogo, HELPER_ClientLogo.toObject (_ClientLogo)); //
tl_clientPSet.setAttrib (FIELD_Email, HELPER_Email.toObject (_Email)); // tl_clientPSet.setAttrib (FIELD_Email, HELPER_Email.toObject (_Email)); //
tl_clientPSet.setAttrib (FIELD_ContactName, HELPER_ContactName.toObject (_ContactName)); // tl_clientPSet.setAttrib (FIELD_ContactName, HELPER_ContactName.toObject (_ContactName)); //
tl_clientPSet.setAttrib (FIELD_ContactSurname, HELPER_ContactSurname.toObject (_ContactSurname)); // tl_clientPSet.setAttrib (FIELD_ContactSurname, HELPER_ContactSurname.toObject (_ContactSurname)); //
...@@ -1708,8 +1708,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1708,8 +1708,8 @@ public abstract class BaseClient extends BaseBusinessClass
PersistentSet tl_clientPSet = allSets.getPersistentSet (objectID, "tl_client"); PersistentSet tl_clientPSet = allSets.getPersistentSet (objectID, "tl_client");
_CompanyName = (String)(HELPER_CompanyName.fromObject (_CompanyName, tl_clientPSet.getAttrib (FIELD_CompanyName))); // _ClientName = (String)(HELPER_ClientName.fromObject (_ClientName, tl_clientPSet.getAttrib (FIELD_ClientName))); //
_CompanyLogo = (BinaryContent)(HELPER_CompanyLogo.fromObject (_CompanyLogo, tl_clientPSet.getAttrib (FIELD_CompanyLogo))); // _ClientLogo = (BinaryContent)(HELPER_ClientLogo.fromObject (_ClientLogo, tl_clientPSet.getAttrib (FIELD_ClientLogo))); //
_Email = (String)(HELPER_Email.fromObject (_Email, tl_clientPSet.getAttrib (FIELD_Email))); // _Email = (String)(HELPER_Email.fromObject (_Email, tl_clientPSet.getAttrib (FIELD_Email))); //
_ContactName = (String)(HELPER_ContactName.fromObject (_ContactName, tl_clientPSet.getAttrib (FIELD_ContactName))); // _ContactName = (String)(HELPER_ContactName.fromObject (_ContactName, tl_clientPSet.getAttrib (FIELD_ContactName))); //
_ContactSurname = (String)(HELPER_ContactSurname.fromObject (_ContactSurname, tl_clientPSet.getAttrib (FIELD_ContactSurname))); // _ContactSurname = (String)(HELPER_ContactSurname.fromObject (_ContactSurname, tl_clientPSet.getAttrib (FIELD_ContactSurname))); //
...@@ -1735,7 +1735,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1735,7 +1735,7 @@ public abstract class BaseClient extends BaseBusinessClass
try try
{ {
setCompanyName (otherClient.getCompanyName ()); setClientName (otherClient.getClientName ());
} }
catch (FieldException ex) catch (FieldException ex)
{ {
...@@ -1744,7 +1744,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1744,7 +1744,7 @@ public abstract class BaseClient extends BaseBusinessClass
try try
{ {
setCompanyLogo (otherClient.getCompanyLogo ()); setClientLogo (otherClient.getClientLogo ());
} }
catch (FieldException ex) catch (FieldException ex)
{ {
...@@ -1829,8 +1829,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1829,8 +1829,8 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
BaseClient sourceClient = (BaseClient)(source); BaseClient sourceClient = (BaseClient)(source);
_CompanyName = sourceClient._CompanyName; _ClientName = sourceClient._ClientName;
_CompanyLogo = sourceClient._CompanyLogo; _ClientLogo = sourceClient._ClientLogo;
_Email = sourceClient._Email; _Email = sourceClient._Email;
_ContactName = sourceClient._ContactName; _ContactName = sourceClient._ContactName;
_ContactSurname = sourceClient._ContactSurname; _ContactSurname = sourceClient._ContactSurname;
...@@ -1891,8 +1891,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1891,8 +1891,8 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
super.readExternalData(vals); super.readExternalData(vals);
_CompanyName = (String)(HELPER_CompanyName.readExternal (_CompanyName, vals.get(FIELD_CompanyName))); // _ClientName = (String)(HELPER_ClientName.readExternal (_ClientName, vals.get(FIELD_ClientName))); //
_CompanyLogo = (BinaryContent)(HELPER_CompanyLogo.readExternal (_CompanyLogo, vals.get(FIELD_CompanyLogo))); // _ClientLogo = (BinaryContent)(HELPER_ClientLogo.readExternal (_ClientLogo, vals.get(FIELD_ClientLogo))); //
_Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); // _Email = (String)(HELPER_Email.readExternal (_Email, vals.get(FIELD_Email))); //
_ContactName = (String)(HELPER_ContactName.readExternal (_ContactName, vals.get(FIELD_ContactName))); // _ContactName = (String)(HELPER_ContactName.readExternal (_ContactName, vals.get(FIELD_ContactName))); //
_ContactSurname = (String)(HELPER_ContactSurname.readExternal (_ContactSurname, vals.get(FIELD_ContactSurname))); // _ContactSurname = (String)(HELPER_ContactSurname.readExternal (_ContactSurname, vals.get(FIELD_ContactSurname))); //
...@@ -1912,8 +1912,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1912,8 +1912,8 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
super.writeExternalData(vals); super.writeExternalData(vals);
vals.put (FIELD_CompanyName, HELPER_CompanyName.writeExternal (_CompanyName)); vals.put (FIELD_ClientName, HELPER_ClientName.writeExternal (_ClientName));
vals.put (FIELD_CompanyLogo, HELPER_CompanyLogo.writeExternal (_CompanyLogo)); vals.put (FIELD_ClientLogo, HELPER_ClientLogo.writeExternal (_ClientLogo));
vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email)); vals.put (FIELD_Email, HELPER_Email.writeExternal (_Email));
vals.put (FIELD_ContactName, HELPER_ContactName.writeExternal (_ContactName)); vals.put (FIELD_ContactName, HELPER_ContactName.writeExternal (_ContactName));
vals.put (FIELD_ContactSurname, HELPER_ContactSurname.writeExternal (_ContactSurname)); vals.put (FIELD_ContactSurname, HELPER_ContactSurname.writeExternal (_ContactSurname));
...@@ -1935,13 +1935,13 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1935,13 +1935,13 @@ public abstract class BaseClient extends BaseBusinessClass
BaseClient otherClient = (BaseClient)(other); BaseClient otherClient = (BaseClient)(other);
if (!HELPER_CompanyName.compare(this._CompanyName, otherClient._CompanyName)) if (!HELPER_ClientName.compare(this._ClientName, otherClient._ClientName))
{ {
listener.notifyFieldChange(this, other, FIELD_CompanyName, HELPER_CompanyName.toObject(this._CompanyName), HELPER_CompanyName.toObject(otherClient._CompanyName)); listener.notifyFieldChange(this, other, FIELD_ClientName, HELPER_ClientName.toObject(this._ClientName), HELPER_ClientName.toObject(otherClient._ClientName));
} }
if (!HELPER_CompanyLogo.compare(this._CompanyLogo, otherClient._CompanyLogo)) if (!HELPER_ClientLogo.compare(this._ClientLogo, otherClient._ClientLogo))
{ {
listener.notifyFieldChange(this, other, FIELD_CompanyLogo, HELPER_CompanyLogo.toObject(this._CompanyLogo), HELPER_CompanyLogo.toObject(otherClient._CompanyLogo)); listener.notifyFieldChange(this, other, FIELD_ClientLogo, HELPER_ClientLogo.toObject(this._ClientLogo), HELPER_ClientLogo.toObject(otherClient._ClientLogo));
} }
if (!HELPER_Email.compare(this._Email, otherClient._Email)) if (!HELPER_Email.compare(this._Email, otherClient._Email))
{ {
...@@ -1994,8 +1994,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1994,8 +1994,8 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
super.visitAttributes (visitor); super.visitAttributes (visitor);
visitor.visitField(this, FIELD_CompanyName, HELPER_CompanyName.toObject(getCompanyName())); visitor.visitField(this, FIELD_ClientName, HELPER_ClientName.toObject(getClientName()));
visitor.visitField(this, FIELD_CompanyLogo, HELPER_CompanyLogo.toObject(getCompanyLogo())); visitor.visitField(this, FIELD_ClientLogo, HELPER_ClientLogo.toObject(getClientLogo()));
visitor.visitField(this, FIELD_Email, HELPER_Email.toObject(getEmail())); visitor.visitField(this, FIELD_Email, HELPER_Email.toObject(getEmail()));
visitor.visitField(this, FIELD_ContactName, HELPER_ContactName.toObject(getContactName())); visitor.visitField(this, FIELD_ContactName, HELPER_ContactName.toObject(getContactName()));
visitor.visitField(this, FIELD_ContactSurname, HELPER_ContactSurname.toObject(getContactSurname())); visitor.visitField(this, FIELD_ContactSurname, HELPER_ContactSurname.toObject(getContactSurname()));
...@@ -2041,13 +2041,13 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2041,13 +2041,13 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_CompanyName)) else if (attribName.equals (FIELD_ClientName))
{ {
return filter.matches (getCompanyName ()); return filter.matches (getClientName ());
} }
else if (attribName.equals (FIELD_CompanyLogo)) else if (attribName.equals (FIELD_ClientLogo))
{ {
return filter.matches (getCompanyLogo ()); return filter.matches (getClientLogo ());
} }
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
...@@ -2112,15 +2112,15 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2112,15 +2112,15 @@ public abstract class BaseClient extends BaseBusinessClass
} }
public SearchAll andCompanyName (QueryFilter<String> filter) public SearchAll andClientName (QueryFilter<String> filter)
{ {
filter.addFilter (context, "tl_client.company_name", "CompanyName"); filter.addFilter (context, "tl_client.client_name", "ClientName");
return this; return this;
} }
public SearchAll andCompanyLogo (QueryFilter<BinaryContent> filter) public SearchAll andClientLogo (QueryFilter<BinaryContent> filter)
{ {
filter.addFilter (context, "tl_client.company_logo", "CompanyLogo"); filter.addFilter (context, "tl_client.client_logo", "ClientLogo");
return this; return this;
} }
...@@ -2207,13 +2207,13 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2207,13 +2207,13 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_CompanyName)) else if (attribName.equals (FIELD_ClientName))
{ {
return HELPER_CompanyName.toObject (getCompanyName ()); return HELPER_ClientName.toObject (getClientName ());
} }
else if (attribName.equals (FIELD_CompanyLogo)) else if (attribName.equals (FIELD_ClientLogo))
{ {
return HELPER_CompanyLogo.toObject (getCompanyLogo ()); return HELPER_ClientLogo.toObject (getClientLogo ());
} }
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
...@@ -2256,13 +2256,13 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2256,13 +2256,13 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_CompanyName)) else if (attribName.equals (FIELD_ClientName))
{ {
return HELPER_CompanyName; return HELPER_ClientName;
} }
else if (attribName.equals (FIELD_CompanyLogo)) else if (attribName.equals (FIELD_ClientLogo))
{ {
return HELPER_CompanyLogo; return HELPER_ClientLogo;
} }
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
...@@ -2305,13 +2305,13 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2305,13 +2305,13 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_CompanyName)) else if (attribName.equals (FIELD_ClientName))
{ {
setCompanyName ((String)(HELPER_CompanyName.fromObject (_CompanyName, attribValue))); setClientName ((String)(HELPER_ClientName.fromObject (_ClientName, attribValue)));
} }
else if (attribName.equals (FIELD_CompanyLogo)) else if (attribName.equals (FIELD_ClientLogo))
{ {
setCompanyLogo ((BinaryContent)(HELPER_CompanyLogo.fromObject (_CompanyLogo, attribValue))); setClientLogo ((BinaryContent)(HELPER_ClientLogo.fromObject (_ClientLogo, attribValue)));
} }
else if (attribName.equals (FIELD_Email)) else if (attribName.equals (FIELD_Email))
{ {
...@@ -2361,13 +2361,13 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2361,13 +2361,13 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (fieldName.equals (FIELD_CompanyName)) else if (fieldName.equals (FIELD_ClientName))
{ {
return getWriteability_CompanyName (); return getWriteability_ClientName ();
} }
else if (fieldName.equals (FIELD_CompanyLogo)) else if (fieldName.equals (FIELD_ClientLogo))
{ {
return getWriteability_CompanyLogo (); return getWriteability_ClientLogo ();
} }
else if (fieldName.equals (FIELD_Email)) else if (fieldName.equals (FIELD_Email))
{ {
...@@ -2411,14 +2411,14 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2411,14 +2411,14 @@ public abstract class BaseClient extends BaseBusinessClass
public void putUnwriteable (Set<String> fields) public void putUnwriteable (Set<String> fields)
{ {
if (getWriteability_CompanyName () != FieldWriteability.TRUE) if (getWriteability_ClientName () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_CompanyName); fields.add (FIELD_ClientName);
} }
if (getWriteability_CompanyLogo () != FieldWriteability.TRUE) if (getWriteability_ClientLogo () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_CompanyLogo); fields.add (FIELD_ClientLogo);
} }
if (getWriteability_Email () != FieldWriteability.TRUE) if (getWriteability_Email () != FieldWriteability.TRUE)
...@@ -2465,8 +2465,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2465,8 +2465,8 @@ public abstract class BaseClient extends BaseBusinessClass
List result = super.getAttributes (); List result = super.getAttributes ();
result.add(HELPER_CompanyName.getAttribObject (getClass (), _CompanyName, true, FIELD_CompanyName)); result.add(HELPER_ClientName.getAttribObject (getClass (), _ClientName, true, FIELD_ClientName));
result.add(HELPER_CompanyLogo.getAttribObject (getClass (), _CompanyLogo, false, FIELD_CompanyLogo)); result.add(HELPER_ClientLogo.getAttribObject (getClass (), _ClientLogo, false, FIELD_ClientLogo));
result.add(HELPER_Email.getAttribObject (getClass (), _Email, false, FIELD_Email)); result.add(HELPER_Email.getAttribObject (getClass (), _Email, false, FIELD_Email));
result.add(HELPER_ContactName.getAttribObject (getClass (), _ContactName, false, FIELD_ContactName)); result.add(HELPER_ContactName.getAttribObject (getClass (), _ContactName, false, FIELD_ContactName));
result.add(HELPER_ContactSurname.getAttribObject (getClass (), _ContactSurname, false, FIELD_ContactSurname)); result.add(HELPER_ContactSurname.getAttribObject (getClass (), _ContactSurname, false, FIELD_ContactSurname));
...@@ -2516,11 +2516,11 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2516,11 +2516,11 @@ public abstract class BaseClient extends BaseBusinessClass
if(bchandler != null) if(bchandler != null)
{ {
bchandler.preCommit(willBeStored, this, "CompanyLogo"); bchandler.preCommit(willBeStored, this, "ClientLogo");
} }
else else
{ {
LogMgr.log(BUSINESS_OBJECTS, LogLevel.SYSTEMWARNING, "Unknown BinaryContentHandler loggedin on attribute CompanyLogo"); LogMgr.log(BUSINESS_OBJECTS, LogLevel.SYSTEMWARNING, "Unknown BinaryContentHandler loggedin on attribute ClientLogo");
} }
} }
...@@ -2530,7 +2530,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2530,7 +2530,7 @@ public abstract class BaseClient extends BaseBusinessClass
public oneit.servlets.objstore.binary.BinaryContentHandler getBinaryContentHandler(String attribName) public oneit.servlets.objstore.binary.BinaryContentHandler getBinaryContentHandler(String attribName)
{ {
if(CollectionUtils.equals(attribName, "CompanyLogo")) if(CollectionUtils.equals(attribName, "ClientLogo"))
{ {
return oneit.servlets.objstore.binary.BinaryContentServlet.getHandler("loggedin"); return oneit.servlets.objstore.binary.BinaryContentServlet.getHandler("loggedin");
} }
...@@ -2543,39 +2543,39 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2543,39 +2543,39 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
/** /**
* Get the attribute CompanyName * Get the attribute ClientName
*/ */
public String getCompanyName (Client obj, String original) public String getClientName (Client obj, String original)
{ {
return original; return original;
} }
/** /**
* Change the value set for attribute CompanyName. * Change the value set for attribute ClientName.
* May modify the field beforehand * May modify the field beforehand
* Occurs before validation. * Occurs before validation.
*/ */
public String setCompanyName (Client obj, String newCompanyName) throws FieldException public String setClientName (Client obj, String newClientName) throws FieldException
{ {
return newCompanyName; return newClientName;
} }
/** /**
* Get the attribute CompanyLogo * Get the attribute ClientLogo
*/ */
public BinaryContent getCompanyLogo (Client obj, BinaryContent original) public BinaryContent getClientLogo (Client obj, BinaryContent original)
{ {
return original; return original;
} }
/** /**
* Change the value set for attribute CompanyLogo. * Change the value set for attribute ClientLogo.
* May modify the field beforehand * May modify the field beforehand
* Occurs before validation. * Occurs before validation.
*/ */
public BinaryContent setCompanyLogo (Client obj, BinaryContent newCompanyLogo) throws FieldException public BinaryContent setClientLogo (Client obj, BinaryContent newClientLogo) throws FieldException
{ {
return newCompanyLogo; return newClientLogo;
} }
/** /**
...@@ -2756,13 +2756,13 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2756,13 +2756,13 @@ public abstract class BaseClient extends BaseBusinessClass
public PipeLine<From, ? extends Object> to(String name) public PipeLine<From, ? extends Object> to(String name)
{ {
if (name.equals ("CompanyName")) if (name.equals ("ClientName"))
{ {
return toCompanyName (); return toClientName ();
} }
if (name.equals ("CompanyLogo")) if (name.equals ("ClientLogo"))
{ {
return toCompanyLogo (); return toClientLogo ();
} }
if (name.equals ("Email")) if (name.equals ("Email"))
{ {
...@@ -2802,9 +2802,9 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2802,9 +2802,9 @@ public abstract class BaseClient extends BaseBusinessClass
} }
public PipeLine<From, String> toCompanyName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_CompanyName)); } public PipeLine<From, String> toClientName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_ClientName)); }
public PipeLine<From, BinaryContent> toCompanyLogo () { return pipe(new ORMAttributePipe<Me, BinaryContent>(FIELD_CompanyLogo)); } public PipeLine<From, BinaryContent> toClientLogo () { return pipe(new ORMAttributePipe<Me, BinaryContent>(FIELD_ClientLogo)); }
public PipeLine<From, String> toEmail () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Email)); } public PipeLine<From, String> toEmail () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Email)); }
......
cmsWebApp/src/performa/orm/Client.xml
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<TABLE name="tl_client" tablePrefix="object"> <TABLE name="tl_client" tablePrefix="object">
<ATTRIB name="CompanyName" type="String" dbcol="company_name" mandatory="true" length="100"/> <ATTRIB name="ClientName" type="String" dbcol="client_name" mandatory="true" length="100"/>
<ATTRIB name="CompanyLogo" type="BinaryContent" dbcol="company_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" /> <ATTRIB name="ClientLogo" type="BinaryContent" dbcol="client_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" />
<ATTRIB name="Email" type="String" dbcol="email" mandatory="false" length="100" validators="Email" /> <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="ContactName" type="String" dbcol="contact_name" mandatory="false" length="100"/>
<ATTRIB name="ContactSurname" type="String" dbcol="contact_surname" mandatory="false" length="100"/> <ATTRIB name="ContactSurname" type="String" dbcol="contact_surname" mandatory="false" length="100"/>
......
cmsWebApp/src/performa/orm/ClientPersistenceMgr.java
...@@ -28,8 +28,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -28,8 +28,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
private static final LoggingArea ClientPersistence = LoggingArea.createLoggingArea(ObjectPersistenceMgr.OBJECT_PERSISTENCE, "Client"); private static final LoggingArea ClientPersistence = LoggingArea.createLoggingArea(ObjectPersistenceMgr.OBJECT_PERSISTENCE, "Client");
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String dummyCompanyName; private String dummyClientName;
private BinaryContent dummyCompanyLogo; private BinaryContent dummyClientLogo;
private String dummyEmail; private String dummyEmail;
private String dummyContactName; private String dummyContactName;
private String dummyContactSurname; private String dummyContactSurname;
...@@ -40,8 +40,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -40,8 +40,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper HELPER_CompanyName = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_ClientName = DefaultAttributeHelper.INSTANCE;
private static final BLOBAttributeHelper HELPER_CompanyLogo = BLOBAttributeHelper.INSTANCE; private static final BLOBAttributeHelper HELPER_ClientLogo = BLOBAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_Email = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_Email = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_ContactName = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_ContactName = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_ContactSurname = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_ContactSurname = DefaultAttributeHelper.INSTANCE;
...@@ -55,8 +55,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -55,8 +55,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
public ClientPersistenceMgr () public ClientPersistenceMgr ()
{ {
dummyCompanyName = (String)(HELPER_CompanyName.initialise (dummyCompanyName)); dummyClientName = (String)(HELPER_ClientName.initialise (dummyClientName));
dummyCompanyLogo = (BinaryContent)(HELPER_CompanyLogo.initialise (dummyCompanyLogo)); dummyClientLogo = (BinaryContent)(HELPER_ClientLogo.initialise (dummyClientLogo));
dummyEmail = (String)(HELPER_Email.initialise (dummyEmail)); dummyEmail = (String)(HELPER_Email.initialise (dummyEmail));
dummyContactName = (String)(HELPER_ContactName.initialise (dummyContactName)); dummyContactName = (String)(HELPER_ContactName.initialise (dummyContactName));
dummyContactSurname = (String)(HELPER_ContactSurname.initialise (dummyContactSurname)); dummyContactSurname = (String)(HELPER_ContactSurname.initialise (dummyContactSurname));
...@@ -67,7 +67,7 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -67,7 +67,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.company_name, {PREFIX}tl_client.company_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.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.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.company_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -118,8 +118,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -118,8 +118,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !tl_clientPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_clientPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!tl_clientPSet.containsAttrib(Client.FIELD_CompanyName)|| !tl_clientPSet.containsAttrib(Client.FIELD_ClientName)||
!tl_clientPSet.containsAttrib(Client.FIELD_CompanyLogo)|| !tl_clientPSet.containsAttrib(Client.FIELD_ClientLogo)||
!tl_clientPSet.containsAttrib(Client.FIELD_Email)|| !tl_clientPSet.containsAttrib(Client.FIELD_Email)||
!tl_clientPSet.containsAttrib(Client.FIELD_ContactName)|| !tl_clientPSet.containsAttrib(Client.FIELD_ContactName)||
!tl_clientPSet.containsAttrib(Client.FIELD_ContactSurname)|| !tl_clientPSet.containsAttrib(Client.FIELD_ContactSurname)||
...@@ -207,10 +207,10 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -207,10 +207,10 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_client " + "UPDATE {PREFIX}tl_client " +
"SET company_name = ?, company_logo = ?, email = ?, contact_name = ?, contact_surname = ?, phone = ?, state = ?, country = ?, post_code = ?, company_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET client_name = ?, client_logo = ?, email = ?, contact_name = ?, contact_surname = ?, phone = ?, state = ?, country = ?, post_code = ?, company_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_client.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_client.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_CompanyName.getForSQL(dummyCompanyName, tl_clientPSet.getAttrib (Client.FIELD_CompanyName))).listEntry (HELPER_CompanyLogo.getForSQL(dummyCompanyLogo, tl_clientPSet.getAttrib (Client.FIELD_CompanyLogo))).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 (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_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 (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_Company)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -466,8 +466,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -466,8 +466,8 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
// Object Created // Object Created
tl_clientPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_clientPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
tl_clientPSet.setAttrib(Client.FIELD_CompanyName, HELPER_CompanyName.getFromRS(dummyCompanyName, r, "company_name")); tl_clientPSet.setAttrib(Client.FIELD_ClientName, HELPER_ClientName.getFromRS(dummyClientName, r, "client_name"));
tl_clientPSet.setAttrib(Client.FIELD_CompanyLogo, HELPER_CompanyLogo.getFromRS(dummyCompanyLogo, r, "company_logo")); tl_clientPSet.setAttrib(Client.FIELD_ClientLogo, HELPER_ClientLogo.getFromRS(dummyClientLogo, r, "client_logo"));
tl_clientPSet.setAttrib(Client.FIELD_Email, HELPER_Email.getFromRS(dummyEmail, r, "email")); 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_ContactName, HELPER_ContactName.getFromRS(dummyContactName, r, "contact_name"));
tl_clientPSet.setAttrib(Client.FIELD_ContactSurname, HELPER_ContactSurname.getFromRS(dummyContactSurname, r, "contact_surname")); tl_clientPSet.setAttrib(Client.FIELD_ContactSurname, HELPER_ContactSurname.getFromRS(dummyContactSurname, r, "contact_surname"));
...@@ -493,10 +493,10 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr ...@@ -493,10 +493,10 @@ public class ClientPersistenceMgr extends ObjectPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_client " + "INSERT INTO {PREFIX}tl_client " +
" (company_name, company_logo, email, contact_name, contact_surname, phone, state, country, post_code, company_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (client_name, client_logo, email, contact_name, contact_surname, phone, state, country, post_code, company_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_CompanyName.getForSQL(dummyCompanyName, tl_clientPSet.getAttrib (Client.FIELD_CompanyName))).listEntry (HELPER_CompanyLogo.getForSQL(dummyCompanyLogo, tl_clientPSet.getAttrib (Client.FIELD_CompanyLogo))).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 (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_Company)))) .listEntry (objectID.longID ()).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_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 (SQLManager.CheckNull((Long)(tl_clientPSet.getAttrib (Client.SINGLEREFERENCE_Company)))) .listEntry (objectID.longID ()).toList().toArray());
tl_clientPSet.setStatus (PersistentSetStatus.PROCESSED); tl_clientPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/webroot/extensions/performa/upgrades/20170901_Alter_Client.sql 0 → 100644
-- @AutoRun
ALTER TABLE tl_client RENAME COLUMN company_name TO client_name;
ALTER TABLE tl_client RENAME COLUMN company_logo TO client_logo;
\ 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