Skip to content

P
PERFORMA_REPLICA
Commit 5056d324 by Nilu
Options

company logo and client logo. Add, remove, replace functionalities

parent 1b6efacd
Showing with 769 additions and 45 deletions
cmsWebApp/sql/Company.xml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="company_name" type="String" nullable="false" length="100"/> <column name="company_name" type="String" nullable="false" length="100"/>
<column name="company_logo" type="BLOB" nullable="true"/>
<column name="hiring_team_type" type="String" nullable="true" length="200"/> <column name="hiring_team_type" type="String" nullable="true" length="200"/>
<column name="industry" type="String" nullable="true" length="200"/> <column name="industry" type="String" nullable="true" length="200"/>
<column name="time_zone" type="String" nullable="true" length="200"/> <column name="time_zone" type="String" nullable="true" length="200"/>
......
cmsWebApp/sql/ms/Company.sql
...@@ -9,6 +9,7 @@ CREATE TABLE tl_company ( ...@@ -9,6 +9,7 @@ CREATE TABLE tl_company (
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
, ,
company_name varchar(100) NOT NULL, company_name varchar(100) NOT NULL,
company_logo image NULL,
hiring_team_type varchar(200) NULL, hiring_team_type varchar(200) NULL,
industry varchar(200) NULL, industry varchar(200) NULL,
time_zone varchar(200) NULL, time_zone varchar(200) NULL,
......
cmsWebApp/sql/oracle/Company.sql
...@@ -10,6 +10,7 @@ CREATE TABLE tl_company ( ...@@ -10,6 +10,7 @@ CREATE TABLE tl_company (
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
, ,
company_name varchar2(100) NOT NULL, company_name varchar2(100) NOT NULL,
company_logo blob NULL,
hiring_team_type varchar2(200) NULL, hiring_team_type varchar2(200) NULL,
industry varchar2(200) NULL, industry varchar2(200) NULL,
time_zone varchar2(200) NULL, time_zone varchar2(200) NULL,
......
cmsWebApp/sql/postgres/Company.sql
...@@ -10,6 +10,7 @@ CREATE TABLE tl_company ( ...@@ -10,6 +10,7 @@ CREATE TABLE tl_company (
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
, ,
company_name varchar(100) NOT NULL, company_name varchar(100) NOT NULL,
company_logo bytea NULL,
hiring_team_type varchar(200) NULL, hiring_team_type varchar(200) NULL,
industry varchar(200) NULL, industry varchar(200) NULL,
time_zone varchar(200) NULL, time_zone varchar(200) NULL,
......
cmsWebApp/src/performa/form/SaveClientFP.java 0 → 100644
package performa.form;
import java.util.Map;
import oneit.logging.LogLevel;
import oneit.logging.LogMgr;
import oneit.objstore.StorageException;
import oneit.servlets.forms.SubmissionDetails;
import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessState;
import oneit.servlets.process.SaveFP;
import oneit.utils.BusinessException;
import oneit.utils.CollectionUtils;
import performa.orm.Client;
public class SaveClientFP extends SaveFP
{
@Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
Client client = (Client) process.getAttribute("Client");
LogMgr.log(Client.LOG, LogLevel.PROCESSING1,"In SaveClientFP saving client : ", client );
if(CollectionUtils.equals(client.getIsLogoDeleted(), Boolean.TRUE))
{
client.setClientLogo(null);
LogMgr.log(Client.LOG, LogLevel.PROCESSING1,"In SaveClientFP setting client logo to null of client : ", client );
}
return super.processForm(process, submission, params);
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/SaveCompanyFP.java 0 → 100644
package performa.form;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel;
import oneit.logging.LogMgr;
import oneit.objstore.StorageException;
import oneit.servlets.forms.SubmissionDetails;
import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessState;
import oneit.servlets.process.SaveFP;
import oneit.utils.BusinessException;
import oneit.utils.CollectionUtils;
import performa.orm.Company;
public class SaveCompanyFP extends SaveFP
{
@Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
HttpServletRequest request = submission.getRequest();
Company company = process.getAttribute("Company") != null ? (Company) process.getAttribute("Company") : (Company) request.getAttribute("Company");
LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP saving company : ", company );
if(CollectionUtils.equals(company.getIsLogoDeleted(), Boolean.TRUE))
{
company.setCompanyLogo(null);
LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP setting comany logo to null of company : ", company );
}
return super.processForm(process, submission, params);
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/BaseClient.java
...@@ -55,6 +55,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -55,6 +55,7 @@ public abstract class BaseClient extends BaseBusinessClass
public static final String FIELD_PostCode = "PostCode"; public static final String FIELD_PostCode = "PostCode";
public static final String FIELD_City = "City"; public static final String FIELD_City = "City";
public static final String FIELD_TimeZone = "TimeZone"; public static final String FIELD_TimeZone = "TimeZone";
public static final String FIELD_IsLogoDeleted = "IsLogoDeleted";
public static final String SINGLEREFERENCE_Company = "Company"; public static final String SINGLEREFERENCE_Company = "Company";
public static final String BACKREF_Company = ""; public static final String BACKREF_Company = "";
public static final String MULTIPLEREFERENCE_Jobs = "Jobs"; public static final String MULTIPLEREFERENCE_Jobs = "Jobs";
...@@ -76,6 +77,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -76,6 +77,7 @@ public abstract class BaseClient extends BaseBusinessClass
private static final DefaultAttributeHelper<Client> HELPER_PostCode = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Client> HELPER_PostCode = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Client> HELPER_City = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Client> HELPER_City = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper<Client, TimeZone> HELPER_TimeZone = new EnumeratedAttributeHelper<Client, TimeZone> (TimeZone.FACTORY_TimeZone); private static final EnumeratedAttributeHelper<Client, TimeZone> HELPER_TimeZone = new EnumeratedAttributeHelper<Client, TimeZone> (TimeZone.FACTORY_TimeZone);
private static final DefaultAttributeHelper<Client> HELPER_IsLogoDeleted = DefaultAttributeHelper.INSTANCE;
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
...@@ -90,6 +92,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -90,6 +92,7 @@ public abstract class BaseClient extends BaseBusinessClass
private String _PostCode; private String _PostCode;
private String _City; private String _City;
private TimeZone _TimeZone; private TimeZone _TimeZone;
private Boolean _IsLogoDeleted;
// Private attributes corresponding to single references // Private attributes corresponding to single references
...@@ -104,6 +107,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -104,6 +107,7 @@ 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_IsLogoDeleted_Validators;
private static final AttributeValidator[] FIELD_ClientName_Validators; private static final AttributeValidator[] FIELD_ClientName_Validators;
private static final AttributeValidator[] FIELD_ClientLogo_Validators; private static final AttributeValidator[] FIELD_ClientLogo_Validators;
private static final AttributeValidator[] FIELD_Email_Validators; private static final AttributeValidator[] FIELD_Email_Validators;
...@@ -132,6 +136,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -132,6 +136,7 @@ public abstract class BaseClient extends BaseBusinessClass
setupAssocMetaData_Jobs(); setupAssocMetaData_Jobs();
setupAssocMetaData_Company(); setupAssocMetaData_Company();
FIELD_IsLogoDeleted_Validators = (AttributeValidator[])setupAttribMetaData_IsLogoDeleted(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_ClientName_Validators = (AttributeValidator[])setupAttribMetaData_ClientName(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_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]);
...@@ -187,6 +192,24 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -187,6 +192,24 @@ public abstract class BaseClient extends BaseBusinessClass
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_IsLogoDeleted(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("defaultValue", "Boolean.FALSE");
metaInfo.put ("name", "IsLogoDeleted");
metaInfo.put ("type", "Boolean");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Client.IsLogoDeleted:", metaInfo);
ATTRIBUTES_METADATA_Client.put (FIELD_IsLogoDeleted, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Client.class, "IsLogoDeleted", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Client.IsLogoDeleted:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_ClientName(Map validatorMapping) private static List setupAttribMetaData_ClientName(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -449,6 +472,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -449,6 +472,7 @@ public abstract class BaseClient extends BaseBusinessClass
_PostCode = (String)(HELPER_PostCode.initialise (_PostCode)); _PostCode = (String)(HELPER_PostCode.initialise (_PostCode));
_City = (String)(HELPER_City.initialise (_City)); _City = (String)(HELPER_City.initialise (_City));
_TimeZone = (TimeZone)(HELPER_TimeZone.initialise (_TimeZone)); _TimeZone = (TimeZone)(HELPER_TimeZone.initialise (_TimeZone));
_IsLogoDeleted = (Boolean)(Boolean.FALSE);
} }
...@@ -1556,6 +1580,104 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -1556,6 +1580,104 @@ public abstract class BaseClient extends BaseBusinessClass
} }
} }
/**
* Get the attribute IsLogoDeleted
*/
public Boolean getIsLogoDeleted ()
{
assertValid();
Boolean valToReturn = _IsLogoDeleted;
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{
valToReturn = bhd.getIsLogoDeleted ((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 preIsLogoDeletedChange (Boolean newIsLogoDeleted) 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 postIsLogoDeletedChange () throws FieldException
{
}
public FieldWriteability getWriteability_IsLogoDeleted ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute IsLogoDeleted. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setIsLogoDeleted (Boolean newIsLogoDeleted) throws FieldException
{
boolean oldAndNewIdentical = HELPER_IsLogoDeleted.compare (_IsLogoDeleted, newIsLogoDeleted);
try
{
for (ClientBehaviourDecorator bhd : Client_BehaviourDecorators)
{
newIsLogoDeleted = bhd.setIsLogoDeleted ((Client)this, newIsLogoDeleted);
oldAndNewIdentical = HELPER_IsLogoDeleted.compare (_IsLogoDeleted, newIsLogoDeleted);
}
if (FIELD_IsLogoDeleted_Validators.length > 0)
{
Object newIsLogoDeletedObj = HELPER_IsLogoDeleted.toObject (newIsLogoDeleted);
if (newIsLogoDeletedObj != null)
{
int loopMax = FIELD_IsLogoDeleted_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Client.get (FIELD_IsLogoDeleted);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_IsLogoDeleted_Validators[v].checkAttribute (this, FIELD_IsLogoDeleted, metadata, newIsLogoDeletedObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_IsLogoDeleted () != FieldWriteability.FALSE, "Field IsLogoDeleted is not writeable");
preIsLogoDeletedChange (newIsLogoDeleted);
markFieldChange (FIELD_IsLogoDeleted);
_IsLogoDeleted = newIsLogoDeleted;
postFieldChange (FIELD_IsLogoDeleted);
postIsLogoDeletedChange ();
}
}
/** /**
...@@ -2255,6 +2377,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2255,6 +2377,7 @@ public abstract class BaseClient extends BaseBusinessClass
_PostCode = sourceClient._PostCode; _PostCode = sourceClient._PostCode;
_City = sourceClient._City; _City = sourceClient._City;
_TimeZone = sourceClient._TimeZone; _TimeZone = sourceClient._TimeZone;
_IsLogoDeleted = sourceClient._IsLogoDeleted;
} }
} }
...@@ -2320,6 +2443,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2320,6 +2443,7 @@ public abstract class BaseClient extends BaseBusinessClass
_PostCode = (String)(HELPER_PostCode.readExternal (_PostCode, vals.get(FIELD_PostCode))); // _PostCode = (String)(HELPER_PostCode.readExternal (_PostCode, vals.get(FIELD_PostCode))); //
_City = (String)(HELPER_City.readExternal (_City, vals.get(FIELD_City))); // _City = (String)(HELPER_City.readExternal (_City, vals.get(FIELD_City))); //
_TimeZone = (TimeZone)(HELPER_TimeZone.readExternal (_TimeZone, vals.get(FIELD_TimeZone))); // _TimeZone = (TimeZone)(HELPER_TimeZone.readExternal (_TimeZone, vals.get(FIELD_TimeZone))); //
_IsLogoDeleted = (Boolean)(HELPER_IsLogoDeleted.readExternal (_IsLogoDeleted, vals.get(FIELD_IsLogoDeleted))); //
_Company.readExternalData(vals.get(SINGLEREFERENCE_Company)); _Company.readExternalData(vals.get(SINGLEREFERENCE_Company));
_Jobs.readExternalData(vals.get(MULTIPLEREFERENCE_Jobs)); _Jobs.readExternalData(vals.get(MULTIPLEREFERENCE_Jobs));
...@@ -2344,6 +2468,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2344,6 +2468,7 @@ public abstract class BaseClient extends BaseBusinessClass
vals.put (FIELD_PostCode, HELPER_PostCode.writeExternal (_PostCode)); vals.put (FIELD_PostCode, HELPER_PostCode.writeExternal (_PostCode));
vals.put (FIELD_City, HELPER_City.writeExternal (_City)); vals.put (FIELD_City, HELPER_City.writeExternal (_City));
vals.put (FIELD_TimeZone, HELPER_TimeZone.writeExternal (_TimeZone)); vals.put (FIELD_TimeZone, HELPER_TimeZone.writeExternal (_TimeZone));
vals.put (FIELD_IsLogoDeleted, HELPER_IsLogoDeleted.writeExternal (_IsLogoDeleted));
vals.put (SINGLEREFERENCE_Company, _Company.writeExternalData()); vals.put (SINGLEREFERENCE_Company, _Company.writeExternalData());
vals.put (MULTIPLEREFERENCE_Jobs, _Jobs.writeExternalData()); vals.put (MULTIPLEREFERENCE_Jobs, _Jobs.writeExternalData());
...@@ -2419,6 +2544,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2419,6 +2544,7 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
super.visitAttributes (visitor); super.visitAttributes (visitor);
visitor.visitField(this, FIELD_IsLogoDeleted, HELPER_IsLogoDeleted.toObject(getIsLogoDeleted()));
} }
...@@ -2711,6 +2837,10 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2711,6 +2837,10 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
return HELPER_TimeZone.toObject (getTimeZone ()); return HELPER_TimeZone.toObject (getTimeZone ());
} }
else if (attribName.equals (FIELD_IsLogoDeleted))
{
return HELPER_IsLogoDeleted.toObject (getIsLogoDeleted ());
}
else else
{ {
return super.getAttribute (attribName); return super.getAttribute (attribName);
...@@ -2768,6 +2898,10 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2768,6 +2898,10 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
return HELPER_TimeZone; return HELPER_TimeZone;
} }
else if (attribName.equals (FIELD_IsLogoDeleted))
{
return HELPER_IsLogoDeleted;
}
else else
{ {
return super.getAttributeHelper (attribName); return super.getAttributeHelper (attribName);
...@@ -2825,6 +2959,10 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2825,6 +2959,10 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
setTimeZone ((TimeZone)(HELPER_TimeZone.fromObject (_TimeZone, attribValue))); setTimeZone ((TimeZone)(HELPER_TimeZone.fromObject (_TimeZone, attribValue)));
} }
else if (attribName.equals (FIELD_IsLogoDeleted))
{
setIsLogoDeleted ((Boolean)(HELPER_IsLogoDeleted.fromObject (_IsLogoDeleted, attribValue)));
}
else else
{ {
super.setAttribute (attribName, attribValue); super.setAttribute (attribName, attribValue);
...@@ -2897,6 +3035,10 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2897,6 +3035,10 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
return getWriteability_Company (); return getWriteability_Company ();
} }
else if (fieldName.equals (FIELD_IsLogoDeleted))
{
return getWriteability_IsLogoDeleted ();
}
else else
{ {
return super.getWriteable (fieldName); return super.getWriteable (fieldName);
...@@ -2962,6 +3104,11 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2962,6 +3104,11 @@ public abstract class BaseClient extends BaseBusinessClass
fields.add (FIELD_TimeZone); fields.add (FIELD_TimeZone);
} }
if (getWriteability_IsLogoDeleted () != FieldWriteability.TRUE)
{
fields.add (FIELD_IsLogoDeleted);
}
super.putUnwriteable (fields); super.putUnwriteable (fields);
} }
...@@ -2982,6 +3129,7 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -2982,6 +3129,7 @@ public abstract class BaseClient extends BaseBusinessClass
result.add(HELPER_PostCode.getAttribObject (getClass (), _PostCode, false, FIELD_PostCode)); result.add(HELPER_PostCode.getAttribObject (getClass (), _PostCode, false, FIELD_PostCode));
result.add(HELPER_City.getAttribObject (getClass (), _City, false, FIELD_City)); result.add(HELPER_City.getAttribObject (getClass (), _City, false, FIELD_City));
result.add(HELPER_TimeZone.getAttribObject (getClass (), _TimeZone, false, FIELD_TimeZone)); result.add(HELPER_TimeZone.getAttribObject (getClass (), _TimeZone, false, FIELD_TimeZone));
result.add(HELPER_IsLogoDeleted.getAttribObject (getClass (), _IsLogoDeleted, false, FIELD_IsLogoDeleted));
return result; return result;
} }
...@@ -3248,6 +3396,24 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -3248,6 +3396,24 @@ public abstract class BaseClient extends BaseBusinessClass
return newTimeZone; return newTimeZone;
} }
/**
* Get the attribute IsLogoDeleted
*/
public Boolean getIsLogoDeleted (Client obj, Boolean original)
{
return original;
}
/**
* Change the value set for attribute IsLogoDeleted.
* May modify the field beforehand
* Occurs before validation.
*/
public Boolean setIsLogoDeleted (Client obj, Boolean newIsLogoDeleted) throws FieldException
{
return newIsLogoDeleted;
}
} }
...@@ -3304,6 +3470,10 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -3304,6 +3470,10 @@ public abstract class BaseClient extends BaseBusinessClass
{ {
return toJobs (); return toJobs ();
} }
if (name.equals ("IsLogoDeleted"))
{
return toIsLogoDeleted ();
}
if (name.equals ("ClientName")) if (name.equals ("ClientName"))
{ {
return toClientName (); return toClientName ();
...@@ -3358,6 +3528,8 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -3358,6 +3528,8 @@ public abstract class BaseClient extends BaseBusinessClass
} }
public PipeLine<From, Boolean> toIsLogoDeleted () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsLogoDeleted)); }
public PipeLine<From, String> toClientName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_ClientName)); } public PipeLine<From, String> toClientName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_ClientName)); }
public PipeLine<From, BinaryContent> toClientLogo () { return pipe(new ORMAttributePipe<Me, BinaryContent>(FIELD_ClientLogo)); } public PipeLine<From, BinaryContent> toClientLogo () { return pipe(new ORMAttributePipe<Me, BinaryContent>(FIELD_ClientLogo)); }
...@@ -3397,6 +3569,11 @@ public abstract class BaseClient extends BaseBusinessClass ...@@ -3397,6 +3569,11 @@ public abstract class BaseClient extends BaseBusinessClass
public boolean isTransientAttrib(String attribName) public boolean isTransientAttrib(String attribName)
{ {
if(CollectionUtils.equals(attribName, "IsLogoDeleted"))
{
return true;
}
return super.isTransientAttrib(attribName); return super.isTransientAttrib(attribName);
} }
......
cmsWebApp/src/performa/orm/BaseCompany.java
...@@ -45,6 +45,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -45,6 +45,7 @@ public abstract class BaseCompany 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_CompanyName = "CompanyName";
public static final String FIELD_CompanyLogo = "CompanyLogo";
public static final String FIELD_HiringTeamType = "HiringTeamType"; public static final String FIELD_HiringTeamType = "HiringTeamType";
public static final String FIELD_Industry = "Industry"; public static final String FIELD_Industry = "Industry";
public static final String FIELD_TimeZone = "TimeZone"; public static final String FIELD_TimeZone = "TimeZone";
...@@ -58,6 +59,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -58,6 +59,7 @@ public abstract class BaseCompany extends BaseBusinessClass
public static final String FIELD_FirstName = "FirstName"; public static final String FIELD_FirstName = "FirstName";
public static final String FIELD_LastName = "LastName"; public static final String FIELD_LastName = "LastName";
public static final String FIELD_RoleType = "RoleType"; public static final String FIELD_RoleType = "RoleType";
public static final String FIELD_IsLogoDeleted = "IsLogoDeleted";
public static final String SINGLEREFERENCE_AddedByUser = "AddedByUser"; public static final String SINGLEREFERENCE_AddedByUser = "AddedByUser";
public static final String MULTIPLEREFERENCE_Users = "Users"; public static final String MULTIPLEREFERENCE_Users = "Users";
public static final String BACKREF_Users = ""; public static final String BACKREF_Users = "";
...@@ -70,6 +72,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -70,6 +72,7 @@ public abstract class BaseCompany extends BaseBusinessClass
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper<Company> HELPER_CompanyName = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Company> HELPER_CompanyName = DefaultAttributeHelper.INSTANCE;
private static final BLOBAttributeHelper HELPER_CompanyLogo = BLOBAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper<Company, HiringTeamType> HELPER_HiringTeamType = new EnumeratedAttributeHelper<Company, HiringTeamType> (HiringTeamType.FACTORY_HiringTeamType); private static final EnumeratedAttributeHelper<Company, HiringTeamType> HELPER_HiringTeamType = new EnumeratedAttributeHelper<Company, HiringTeamType> (HiringTeamType.FACTORY_HiringTeamType);
private static final EnumeratedAttributeHelper<Company, Industry> HELPER_Industry = new EnumeratedAttributeHelper<Company, Industry> (Industry.FACTORY_Industry); private static final EnumeratedAttributeHelper<Company, Industry> HELPER_Industry = new EnumeratedAttributeHelper<Company, Industry> (Industry.FACTORY_Industry);
private static final EnumeratedAttributeHelper<Company, TimeZone> HELPER_TimeZone = new EnumeratedAttributeHelper<Company, TimeZone> (TimeZone.FACTORY_TimeZone); private static final EnumeratedAttributeHelper<Company, TimeZone> HELPER_TimeZone = new EnumeratedAttributeHelper<Company, TimeZone> (TimeZone.FACTORY_TimeZone);
...@@ -83,10 +86,12 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -83,10 +86,12 @@ public abstract class BaseCompany extends BaseBusinessClass
private static final DefaultAttributeHelper<Company> HELPER_FirstName = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Company> HELPER_FirstName = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<Company> HELPER_LastName = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<Company> HELPER_LastName = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper<Company, RoleType> HELPER_RoleType = new EnumeratedAttributeHelper<Company, RoleType> (RoleType.FACTORY_RoleType); private static final EnumeratedAttributeHelper<Company, RoleType> HELPER_RoleType = new EnumeratedAttributeHelper<Company, RoleType> (RoleType.FACTORY_RoleType);
private static final DefaultAttributeHelper<Company> HELPER_IsLogoDeleted = DefaultAttributeHelper.INSTANCE;
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String _CompanyName; private String _CompanyName;
private BinaryContent _CompanyLogo;
private HiringTeamType _HiringTeamType; private HiringTeamType _HiringTeamType;
private Industry _Industry; private Industry _Industry;
private TimeZone _TimeZone; private TimeZone _TimeZone;
...@@ -100,6 +105,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -100,6 +105,7 @@ public abstract class BaseCompany extends BaseBusinessClass
private String _FirstName; private String _FirstName;
private String _LastName; private String _LastName;
private RoleType _RoleType; private RoleType _RoleType;
private Boolean _IsLogoDeleted;
// Private attributes corresponding to single references // Private attributes corresponding to single references
...@@ -119,7 +125,9 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -119,7 +125,9 @@ public abstract class BaseCompany extends BaseBusinessClass
private static final AttributeValidator[] FIELD_FirstName_Validators; private static final AttributeValidator[] FIELD_FirstName_Validators;
private static final AttributeValidator[] FIELD_LastName_Validators; private static final AttributeValidator[] FIELD_LastName_Validators;
private static final AttributeValidator[] FIELD_RoleType_Validators; private static final AttributeValidator[] FIELD_RoleType_Validators;
private static final AttributeValidator[] FIELD_IsLogoDeleted_Validators;
private static final AttributeValidator[] FIELD_CompanyName_Validators; private static final AttributeValidator[] FIELD_CompanyName_Validators;
private static final AttributeValidator[] FIELD_CompanyLogo_Validators;
private static final AttributeValidator[] FIELD_HiringTeamType_Validators; private static final AttributeValidator[] FIELD_HiringTeamType_Validators;
private static final AttributeValidator[] FIELD_Industry_Validators; private static final AttributeValidator[] FIELD_Industry_Validators;
private static final AttributeValidator[] FIELD_TimeZone_Validators; private static final AttributeValidator[] FIELD_TimeZone_Validators;
...@@ -151,7 +159,9 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -151,7 +159,9 @@ public abstract class BaseCompany extends BaseBusinessClass
FIELD_FirstName_Validators = (AttributeValidator[])setupAttribMetaData_FirstName(validatorMapping).toArray (new AttributeValidator[0]); FIELD_FirstName_Validators = (AttributeValidator[])setupAttribMetaData_FirstName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_LastName_Validators = (AttributeValidator[])setupAttribMetaData_LastName(validatorMapping).toArray (new AttributeValidator[0]); FIELD_LastName_Validators = (AttributeValidator[])setupAttribMetaData_LastName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_RoleType_Validators = (AttributeValidator[])setupAttribMetaData_RoleType(validatorMapping).toArray (new AttributeValidator[0]); FIELD_RoleType_Validators = (AttributeValidator[])setupAttribMetaData_RoleType(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_IsLogoDeleted_Validators = (AttributeValidator[])setupAttribMetaData_IsLogoDeleted(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyName_Validators = (AttributeValidator[])setupAttribMetaData_CompanyName(validatorMapping).toArray (new AttributeValidator[0]); FIELD_CompanyName_Validators = (AttributeValidator[])setupAttribMetaData_CompanyName(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_CompanyLogo_Validators = (AttributeValidator[])setupAttribMetaData_CompanyLogo(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_HiringTeamType_Validators = (AttributeValidator[])setupAttribMetaData_HiringTeamType(validatorMapping).toArray (new AttributeValidator[0]); FIELD_HiringTeamType_Validators = (AttributeValidator[])setupAttribMetaData_HiringTeamType(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_Industry_Validators = (AttributeValidator[])setupAttribMetaData_Industry(validatorMapping).toArray (new AttributeValidator[0]); FIELD_Industry_Validators = (AttributeValidator[])setupAttribMetaData_Industry(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_TimeZone_Validators = (AttributeValidator[])setupAttribMetaData_TimeZone(validatorMapping).toArray (new AttributeValidator[0]); FIELD_TimeZone_Validators = (AttributeValidator[])setupAttribMetaData_TimeZone(validatorMapping).toArray (new AttributeValidator[0]);
...@@ -290,6 +300,24 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -290,6 +300,24 @@ public abstract class BaseCompany extends BaseBusinessClass
} }
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_IsLogoDeleted(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("defaultValue", "Boolean.FALSE");
metaInfo.put ("name", "IsLogoDeleted");
metaInfo.put ("type", "Boolean");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Company.IsLogoDeleted:", metaInfo);
ATTRIBUTES_METADATA_Company.put (FIELD_IsLogoDeleted, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Company.class, "IsLogoDeleted", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Company.IsLogoDeleted:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_CompanyName(Map validatorMapping) private static List setupAttribMetaData_CompanyName(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -310,6 +338,28 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -310,6 +338,28 @@ public abstract class BaseCompany extends BaseBusinessClass
} }
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_CompanyLogo(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("attribHelper", "BLOBAttributeHelper");
metaInfo.put ("attribHelperInstance", "BLOBAttributeHelper.INSTANCE");
metaInfo.put ("binaryHandler", "loggedin");
metaInfo.put ("dbcol", "company_logo");
metaInfo.put ("mandatory", "false");
metaInfo.put ("name", "CompanyLogo");
metaInfo.put ("type", "BinaryContent");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for Company.CompanyLogo:", metaInfo);
ATTRIBUTES_METADATA_Company.put (FIELD_CompanyLogo, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(Company.class, "CompanyLogo", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for Company.CompanyLogo:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_HiringTeamType(Map validatorMapping) private static List setupAttribMetaData_HiringTeamType(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -518,6 +568,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -518,6 +568,7 @@ public abstract class BaseCompany extends BaseBusinessClass
_CompanyName = (String)(HELPER_CompanyName.initialise (_CompanyName)); _CompanyName = (String)(HELPER_CompanyName.initialise (_CompanyName));
_CompanyLogo = (BinaryContent)(HELPER_CompanyLogo.initialise (_CompanyLogo));
_HiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.initialise (_HiringTeamType)); _HiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.initialise (_HiringTeamType));
_Industry = (Industry)(HELPER_Industry.initialise (_Industry)); _Industry = (Industry)(HELPER_Industry.initialise (_Industry));
_TimeZone = (TimeZone)(HELPER_TimeZone.initialise (_TimeZone)); _TimeZone = (TimeZone)(HELPER_TimeZone.initialise (_TimeZone));
...@@ -531,6 +582,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -531,6 +582,7 @@ public abstract class BaseCompany extends BaseBusinessClass
_FirstName = (String)(HELPER_FirstName.initialise (_FirstName)); _FirstName = (String)(HELPER_FirstName.initialise (_FirstName));
_LastName = (String)(HELPER_LastName.initialise (_LastName)); _LastName = (String)(HELPER_LastName.initialise (_LastName));
_RoleType = (RoleType)(RoleType.STANDARD); _RoleType = (RoleType)(RoleType.STANDARD);
_IsLogoDeleted = (Boolean)(Boolean.FALSE);
} }
...@@ -661,6 +713,104 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -661,6 +713,104 @@ public abstract class BaseCompany extends BaseBusinessClass
} }
/** /**
* Get the attribute CompanyLogo
*/
public BinaryContent getCompanyLogo ()
{
assertValid();
BinaryContent valToReturn = _CompanyLogo;
for (CompanyBehaviourDecorator bhd : Company_BehaviourDecorators)
{
valToReturn = bhd.getCompanyLogo ((Company)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 preCompanyLogoChange (BinaryContent newCompanyLogo) 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 postCompanyLogoChange () throws FieldException
{
}
public FieldWriteability getWriteability_CompanyLogo ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute CompanyLogo. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setCompanyLogo (BinaryContent newCompanyLogo) throws FieldException
{
boolean oldAndNewIdentical = HELPER_CompanyLogo.compare (_CompanyLogo, newCompanyLogo);
try
{
for (CompanyBehaviourDecorator bhd : Company_BehaviourDecorators)
{
newCompanyLogo = bhd.setCompanyLogo ((Company)this, newCompanyLogo);
oldAndNewIdentical = HELPER_CompanyLogo.compare (_CompanyLogo, newCompanyLogo);
}
if (FIELD_CompanyLogo_Validators.length > 0)
{
Object newCompanyLogoObj = HELPER_CompanyLogo.toObject (newCompanyLogo);
if (newCompanyLogoObj != null)
{
int loopMax = FIELD_CompanyLogo_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Company.get (FIELD_CompanyLogo);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_CompanyLogo_Validators[v].checkAttribute (this, FIELD_CompanyLogo, metadata, newCompanyLogoObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_CompanyLogo () != FieldWriteability.FALSE, "Field CompanyLogo is not writeable");
preCompanyLogoChange (newCompanyLogo);
markFieldChange (FIELD_CompanyLogo);
_CompanyLogo = newCompanyLogo;
postFieldChange (FIELD_CompanyLogo);
postCompanyLogoChange ();
}
}
/**
* Get the attribute HiringTeamType * Get the attribute HiringTeamType
*/ */
public HiringTeamType getHiringTeamType () public HiringTeamType getHiringTeamType ()
...@@ -1934,6 +2084,104 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -1934,6 +2084,104 @@ public abstract class BaseCompany extends BaseBusinessClass
} }
} }
/**
* Get the attribute IsLogoDeleted
*/
public Boolean getIsLogoDeleted ()
{
assertValid();
Boolean valToReturn = _IsLogoDeleted;
for (CompanyBehaviourDecorator bhd : Company_BehaviourDecorators)
{
valToReturn = bhd.getIsLogoDeleted ((Company)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 preIsLogoDeletedChange (Boolean newIsLogoDeleted) 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 postIsLogoDeletedChange () throws FieldException
{
}
public FieldWriteability getWriteability_IsLogoDeleted ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute IsLogoDeleted. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setIsLogoDeleted (Boolean newIsLogoDeleted) throws FieldException
{
boolean oldAndNewIdentical = HELPER_IsLogoDeleted.compare (_IsLogoDeleted, newIsLogoDeleted);
try
{
for (CompanyBehaviourDecorator bhd : Company_BehaviourDecorators)
{
newIsLogoDeleted = bhd.setIsLogoDeleted ((Company)this, newIsLogoDeleted);
oldAndNewIdentical = HELPER_IsLogoDeleted.compare (_IsLogoDeleted, newIsLogoDeleted);
}
if (FIELD_IsLogoDeleted_Validators.length > 0)
{
Object newIsLogoDeletedObj = HELPER_IsLogoDeleted.toObject (newIsLogoDeleted);
if (newIsLogoDeletedObj != null)
{
int loopMax = FIELD_IsLogoDeleted_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_Company.get (FIELD_IsLogoDeleted);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_IsLogoDeleted_Validators[v].checkAttribute (this, FIELD_IsLogoDeleted, metadata, newIsLogoDeletedObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_IsLogoDeleted () != FieldWriteability.FALSE, "Field IsLogoDeleted is not writeable");
preIsLogoDeletedChange (newIsLogoDeleted);
markFieldChange (FIELD_IsLogoDeleted);
_IsLogoDeleted = newIsLogoDeleted;
postFieldChange (FIELD_IsLogoDeleted);
postIsLogoDeletedChange ();
}
}
/** /**
...@@ -2552,6 +2800,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2552,6 +2800,7 @@ public abstract class BaseCompany extends BaseBusinessClass
tl_companyPSet.setAttrib (FIELD_ObjectID, myID); tl_companyPSet.setAttrib (FIELD_ObjectID, myID);
tl_companyPSet.setAttrib (FIELD_CompanyName, HELPER_CompanyName.toObject (_CompanyName)); // tl_companyPSet.setAttrib (FIELD_CompanyName, HELPER_CompanyName.toObject (_CompanyName)); //
tl_companyPSet.setAttrib (FIELD_CompanyLogo, HELPER_CompanyLogo.toObject (_CompanyLogo)); //
tl_companyPSet.setAttrib (FIELD_HiringTeamType, HELPER_HiringTeamType.toObject (_HiringTeamType)); // tl_companyPSet.setAttrib (FIELD_HiringTeamType, HELPER_HiringTeamType.toObject (_HiringTeamType)); //
tl_companyPSet.setAttrib (FIELD_Industry, HELPER_Industry.toObject (_Industry)); // tl_companyPSet.setAttrib (FIELD_Industry, HELPER_Industry.toObject (_Industry)); //
tl_companyPSet.setAttrib (FIELD_TimeZone, HELPER_TimeZone.toObject (_TimeZone)); // tl_companyPSet.setAttrib (FIELD_TimeZone, HELPER_TimeZone.toObject (_TimeZone)); //
...@@ -2577,6 +2826,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2577,6 +2826,7 @@ public abstract class BaseCompany extends BaseBusinessClass
PersistentSet tl_companyPSet = allSets.getPersistentSet (objectID, "tl_company"); PersistentSet tl_companyPSet = allSets.getPersistentSet (objectID, "tl_company");
_CompanyName = (String)(HELPER_CompanyName.fromObject (_CompanyName, tl_companyPSet.getAttrib (FIELD_CompanyName))); // _CompanyName = (String)(HELPER_CompanyName.fromObject (_CompanyName, tl_companyPSet.getAttrib (FIELD_CompanyName))); //
_CompanyLogo = (BinaryContent)(HELPER_CompanyLogo.fromObject (_CompanyLogo, tl_companyPSet.getAttrib (FIELD_CompanyLogo))); //
_HiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.fromObject (_HiringTeamType, tl_companyPSet.getAttrib (FIELD_HiringTeamType))); // _HiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.fromObject (_HiringTeamType, tl_companyPSet.getAttrib (FIELD_HiringTeamType))); //
_Industry = (Industry)(HELPER_Industry.fromObject (_Industry, tl_companyPSet.getAttrib (FIELD_Industry))); // _Industry = (Industry)(HELPER_Industry.fromObject (_Industry, tl_companyPSet.getAttrib (FIELD_Industry))); //
_TimeZone = (TimeZone)(HELPER_TimeZone.fromObject (_TimeZone, tl_companyPSet.getAttrib (FIELD_TimeZone))); // _TimeZone = (TimeZone)(HELPER_TimeZone.fromObject (_TimeZone, tl_companyPSet.getAttrib (FIELD_TimeZone))); //
...@@ -2613,6 +2863,15 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2613,6 +2863,15 @@ public abstract class BaseCompany extends BaseBusinessClass
try try
{ {
setCompanyLogo (otherCompany.getCompanyLogo ());
}
catch (FieldException ex)
{
e.addException (ex);
}
try
{
setHiringTeamType (otherCompany.getHiringTeamType ()); setHiringTeamType (otherCompany.getHiringTeamType ());
} }
catch (FieldException ex) catch (FieldException ex)
...@@ -2708,6 +2967,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2708,6 +2967,7 @@ public abstract class BaseCompany extends BaseBusinessClass
BaseCompany sourceCompany = (BaseCompany)(source); BaseCompany sourceCompany = (BaseCompany)(source);
_CompanyName = sourceCompany._CompanyName; _CompanyName = sourceCompany._CompanyName;
_CompanyLogo = sourceCompany._CompanyLogo;
_HiringTeamType = sourceCompany._HiringTeamType; _HiringTeamType = sourceCompany._HiringTeamType;
_Industry = sourceCompany._Industry; _Industry = sourceCompany._Industry;
_TimeZone = sourceCompany._TimeZone; _TimeZone = sourceCompany._TimeZone;
...@@ -2721,6 +2981,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2721,6 +2981,7 @@ public abstract class BaseCompany extends BaseBusinessClass
_FirstName = sourceCompany._FirstName; _FirstName = sourceCompany._FirstName;
_LastName = sourceCompany._LastName; _LastName = sourceCompany._LastName;
_RoleType = sourceCompany._RoleType; _RoleType = sourceCompany._RoleType;
_IsLogoDeleted = sourceCompany._IsLogoDeleted;
} }
} }
...@@ -2779,6 +3040,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2779,6 +3040,7 @@ public abstract class BaseCompany extends BaseBusinessClass
super.readExternalData(vals); super.readExternalData(vals);
_CompanyName = (String)(HELPER_CompanyName.readExternal (_CompanyName, vals.get(FIELD_CompanyName))); // _CompanyName = (String)(HELPER_CompanyName.readExternal (_CompanyName, vals.get(FIELD_CompanyName))); //
_CompanyLogo = (BinaryContent)(HELPER_CompanyLogo.readExternal (_CompanyLogo, vals.get(FIELD_CompanyLogo))); //
_HiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.readExternal (_HiringTeamType, vals.get(FIELD_HiringTeamType))); // _HiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.readExternal (_HiringTeamType, vals.get(FIELD_HiringTeamType))); //
_Industry = (Industry)(HELPER_Industry.readExternal (_Industry, vals.get(FIELD_Industry))); // _Industry = (Industry)(HELPER_Industry.readExternal (_Industry, vals.get(FIELD_Industry))); //
_TimeZone = (TimeZone)(HELPER_TimeZone.readExternal (_TimeZone, vals.get(FIELD_TimeZone))); // _TimeZone = (TimeZone)(HELPER_TimeZone.readExternal (_TimeZone, vals.get(FIELD_TimeZone))); //
...@@ -2792,6 +3054,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2792,6 +3054,7 @@ public abstract class BaseCompany extends BaseBusinessClass
_FirstName = (String)(HELPER_FirstName.readExternal (_FirstName, vals.get(FIELD_FirstName))); // _FirstName = (String)(HELPER_FirstName.readExternal (_FirstName, vals.get(FIELD_FirstName))); //
_LastName = (String)(HELPER_LastName.readExternal (_LastName, vals.get(FIELD_LastName))); // _LastName = (String)(HELPER_LastName.readExternal (_LastName, vals.get(FIELD_LastName))); //
_RoleType = (RoleType)(HELPER_RoleType.readExternal (_RoleType, vals.get(FIELD_RoleType))); // _RoleType = (RoleType)(HELPER_RoleType.readExternal (_RoleType, vals.get(FIELD_RoleType))); //
_IsLogoDeleted = (Boolean)(HELPER_IsLogoDeleted.readExternal (_IsLogoDeleted, vals.get(FIELD_IsLogoDeleted))); //
_AddedByUser.readExternalData(vals.get(SINGLEREFERENCE_AddedByUser)); _AddedByUser.readExternalData(vals.get(SINGLEREFERENCE_AddedByUser));
_Users.readExternalData(vals.get(MULTIPLEREFERENCE_Users)); _Users.readExternalData(vals.get(MULTIPLEREFERENCE_Users));
_Clients.readExternalData(vals.get(MULTIPLEREFERENCE_Clients)); _Clients.readExternalData(vals.get(MULTIPLEREFERENCE_Clients));
...@@ -2807,6 +3070,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2807,6 +3070,7 @@ public abstract class BaseCompany extends BaseBusinessClass
super.writeExternalData(vals); super.writeExternalData(vals);
vals.put (FIELD_CompanyName, HELPER_CompanyName.writeExternal (_CompanyName)); vals.put (FIELD_CompanyName, HELPER_CompanyName.writeExternal (_CompanyName));
vals.put (FIELD_CompanyLogo, HELPER_CompanyLogo.writeExternal (_CompanyLogo));
vals.put (FIELD_HiringTeamType, HELPER_HiringTeamType.writeExternal (_HiringTeamType)); vals.put (FIELD_HiringTeamType, HELPER_HiringTeamType.writeExternal (_HiringTeamType));
vals.put (FIELD_Industry, HELPER_Industry.writeExternal (_Industry)); vals.put (FIELD_Industry, HELPER_Industry.writeExternal (_Industry));
vals.put (FIELD_TimeZone, HELPER_TimeZone.writeExternal (_TimeZone)); vals.put (FIELD_TimeZone, HELPER_TimeZone.writeExternal (_TimeZone));
...@@ -2820,6 +3084,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2820,6 +3084,7 @@ public abstract class BaseCompany extends BaseBusinessClass
vals.put (FIELD_FirstName, HELPER_FirstName.writeExternal (_FirstName)); vals.put (FIELD_FirstName, HELPER_FirstName.writeExternal (_FirstName));
vals.put (FIELD_LastName, HELPER_LastName.writeExternal (_LastName)); vals.put (FIELD_LastName, HELPER_LastName.writeExternal (_LastName));
vals.put (FIELD_RoleType, HELPER_RoleType.writeExternal (_RoleType)); vals.put (FIELD_RoleType, HELPER_RoleType.writeExternal (_RoleType));
vals.put (FIELD_IsLogoDeleted, HELPER_IsLogoDeleted.writeExternal (_IsLogoDeleted));
vals.put (SINGLEREFERENCE_AddedByUser, _AddedByUser.writeExternalData()); vals.put (SINGLEREFERENCE_AddedByUser, _AddedByUser.writeExternalData());
vals.put (MULTIPLEREFERENCE_Users, _Users.writeExternalData()); vals.put (MULTIPLEREFERENCE_Users, _Users.writeExternalData());
vals.put (MULTIPLEREFERENCE_Clients, _Clients.writeExternalData()); vals.put (MULTIPLEREFERENCE_Clients, _Clients.writeExternalData());
...@@ -2840,6 +3105,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2840,6 +3105,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
listener.notifyFieldChange(this, other, FIELD_CompanyName, HELPER_CompanyName.toObject(this._CompanyName), HELPER_CompanyName.toObject(otherCompany._CompanyName)); listener.notifyFieldChange(this, other, FIELD_CompanyName, HELPER_CompanyName.toObject(this._CompanyName), HELPER_CompanyName.toObject(otherCompany._CompanyName));
} }
if (!HELPER_CompanyLogo.compare(this._CompanyLogo, otherCompany._CompanyLogo))
{
listener.notifyFieldChange(this, other, FIELD_CompanyLogo, HELPER_CompanyLogo.toObject(this._CompanyLogo), HELPER_CompanyLogo.toObject(otherCompany._CompanyLogo));
}
if (!HELPER_HiringTeamType.compare(this._HiringTeamType, otherCompany._HiringTeamType)) if (!HELPER_HiringTeamType.compare(this._HiringTeamType, otherCompany._HiringTeamType))
{ {
listener.notifyFieldChange(this, other, FIELD_HiringTeamType, HELPER_HiringTeamType.toObject(this._HiringTeamType), HELPER_HiringTeamType.toObject(otherCompany._HiringTeamType)); listener.notifyFieldChange(this, other, FIELD_HiringTeamType, HELPER_HiringTeamType.toObject(this._HiringTeamType), HELPER_HiringTeamType.toObject(otherCompany._HiringTeamType));
...@@ -2897,6 +3166,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2897,6 +3166,7 @@ public abstract class BaseCompany extends BaseBusinessClass
visitor.visitField(this, FIELD_FirstName, HELPER_FirstName.toObject(getFirstName())); visitor.visitField(this, FIELD_FirstName, HELPER_FirstName.toObject(getFirstName()));
visitor.visitField(this, FIELD_LastName, HELPER_LastName.toObject(getLastName())); visitor.visitField(this, FIELD_LastName, HELPER_LastName.toObject(getLastName()));
visitor.visitField(this, FIELD_RoleType, HELPER_RoleType.toObject(getRoleType())); visitor.visitField(this, FIELD_RoleType, HELPER_RoleType.toObject(getRoleType()));
visitor.visitField(this, FIELD_IsLogoDeleted, HELPER_IsLogoDeleted.toObject(getIsLogoDeleted()));
} }
...@@ -2906,6 +3176,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2906,6 +3176,7 @@ public abstract class BaseCompany extends BaseBusinessClass
super.visitAttributes (visitor); super.visitAttributes (visitor);
visitor.visitField(this, FIELD_CompanyName, HELPER_CompanyName.toObject(getCompanyName())); visitor.visitField(this, FIELD_CompanyName, HELPER_CompanyName.toObject(getCompanyName()));
visitor.visitField(this, FIELD_CompanyLogo, HELPER_CompanyLogo.toObject(getCompanyLogo()));
visitor.visitField(this, FIELD_HiringTeamType, HELPER_HiringTeamType.toObject(getHiringTeamType())); visitor.visitField(this, FIELD_HiringTeamType, HELPER_HiringTeamType.toObject(getHiringTeamType()));
visitor.visitField(this, FIELD_Industry, HELPER_Industry.toObject(getIndustry())); visitor.visitField(this, FIELD_Industry, HELPER_Industry.toObject(getIndustry()));
visitor.visitField(this, FIELD_TimeZone, HELPER_TimeZone.toObject(getTimeZone())); visitor.visitField(this, FIELD_TimeZone, HELPER_TimeZone.toObject(getTimeZone()));
...@@ -2967,6 +3238,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -2967,6 +3238,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return filter.matches (getCompanyName ()); return filter.matches (getCompanyName ());
} }
else if (attribName.equals (FIELD_CompanyLogo))
{
return filter.matches (getCompanyLogo ());
}
else if (attribName.equals (FIELD_HiringTeamType)) else if (attribName.equals (FIELD_HiringTeamType))
{ {
return filter.matches (getHiringTeamType ()); return filter.matches (getHiringTeamType ());
...@@ -3044,6 +3319,12 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3044,6 +3319,12 @@ public abstract class BaseCompany extends BaseBusinessClass
return this; return this;
} }
public SearchAll andCompanyLogo (QueryFilter<BinaryContent> filter)
{
filter.addFilter (context, "tl_company.company_logo", "CompanyLogo");
return this;
}
public SearchAll andHiringTeamType (QueryFilter<HiringTeamType> filter) public SearchAll andHiringTeamType (QueryFilter<HiringTeamType> filter)
{ {
filter.addFilter (context, "tl_company.hiring_team_type", "HiringTeamType"); filter.addFilter (context, "tl_company.hiring_team_type", "HiringTeamType");
...@@ -3143,6 +3424,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3143,6 +3424,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return HELPER_CompanyName.toObject (getCompanyName ()); return HELPER_CompanyName.toObject (getCompanyName ());
} }
else if (attribName.equals (FIELD_CompanyLogo))
{
return HELPER_CompanyLogo.toObject (getCompanyLogo ());
}
else if (attribName.equals (FIELD_HiringTeamType)) else if (attribName.equals (FIELD_HiringTeamType))
{ {
return HELPER_HiringTeamType.toObject (getHiringTeamType ()); return HELPER_HiringTeamType.toObject (getHiringTeamType ());
...@@ -3195,6 +3480,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3195,6 +3480,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return HELPER_RoleType.toObject (getRoleType ()); return HELPER_RoleType.toObject (getRoleType ());
} }
else if (attribName.equals (FIELD_IsLogoDeleted))
{
return HELPER_IsLogoDeleted.toObject (getIsLogoDeleted ());
}
else else
{ {
return super.getAttribute (attribName); return super.getAttribute (attribName);
...@@ -3212,6 +3501,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3212,6 +3501,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return HELPER_CompanyName; return HELPER_CompanyName;
} }
else if (attribName.equals (FIELD_CompanyLogo))
{
return HELPER_CompanyLogo;
}
else if (attribName.equals (FIELD_HiringTeamType)) else if (attribName.equals (FIELD_HiringTeamType))
{ {
return HELPER_HiringTeamType; return HELPER_HiringTeamType;
...@@ -3264,6 +3557,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3264,6 +3557,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return HELPER_RoleType; return HELPER_RoleType;
} }
else if (attribName.equals (FIELD_IsLogoDeleted))
{
return HELPER_IsLogoDeleted;
}
else else
{ {
return super.getAttributeHelper (attribName); return super.getAttributeHelper (attribName);
...@@ -3281,6 +3578,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3281,6 +3578,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
setCompanyName ((String)(HELPER_CompanyName.fromObject (_CompanyName, attribValue))); setCompanyName ((String)(HELPER_CompanyName.fromObject (_CompanyName, attribValue)));
} }
else if (attribName.equals (FIELD_CompanyLogo))
{
setCompanyLogo ((BinaryContent)(HELPER_CompanyLogo.fromObject (_CompanyLogo, attribValue)));
}
else if (attribName.equals (FIELD_HiringTeamType)) else if (attribName.equals (FIELD_HiringTeamType))
{ {
setHiringTeamType ((HiringTeamType)(HELPER_HiringTeamType.fromObject (_HiringTeamType, attribValue))); setHiringTeamType ((HiringTeamType)(HELPER_HiringTeamType.fromObject (_HiringTeamType, attribValue)));
...@@ -3333,6 +3634,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3333,6 +3634,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
setRoleType ((RoleType)(HELPER_RoleType.fromObject (_RoleType, attribValue))); setRoleType ((RoleType)(HELPER_RoleType.fromObject (_RoleType, attribValue)));
} }
else if (attribName.equals (FIELD_IsLogoDeleted))
{
setIsLogoDeleted ((Boolean)(HELPER_IsLogoDeleted.fromObject (_IsLogoDeleted, attribValue)));
}
else else
{ {
super.setAttribute (attribName, attribValue); super.setAttribute (attribName, attribValue);
...@@ -3357,6 +3662,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3357,6 +3662,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return getWriteability_CompanyName (); return getWriteability_CompanyName ();
} }
else if (fieldName.equals (FIELD_CompanyLogo))
{
return getWriteability_CompanyLogo ();
}
else if (fieldName.equals (FIELD_HiringTeamType)) else if (fieldName.equals (FIELD_HiringTeamType))
{ {
return getWriteability_HiringTeamType (); return getWriteability_HiringTeamType ();
...@@ -3421,6 +3730,10 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3421,6 +3730,10 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return getWriteability_RoleType (); return getWriteability_RoleType ();
} }
else if (fieldName.equals (FIELD_IsLogoDeleted))
{
return getWriteability_IsLogoDeleted ();
}
else else
{ {
return super.getWriteable (fieldName); return super.getWriteable (fieldName);
...@@ -3436,6 +3749,11 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3436,6 +3749,11 @@ public abstract class BaseCompany extends BaseBusinessClass
fields.add (FIELD_CompanyName); fields.add (FIELD_CompanyName);
} }
if (getWriteability_CompanyLogo () != FieldWriteability.TRUE)
{
fields.add (FIELD_CompanyLogo);
}
if (getWriteability_HiringTeamType () != FieldWriteability.TRUE) if (getWriteability_HiringTeamType () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_HiringTeamType); fields.add (FIELD_HiringTeamType);
...@@ -3501,6 +3819,11 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3501,6 +3819,11 @@ public abstract class BaseCompany extends BaseBusinessClass
fields.add (FIELD_RoleType); fields.add (FIELD_RoleType);
} }
if (getWriteability_IsLogoDeleted () != FieldWriteability.TRUE)
{
fields.add (FIELD_IsLogoDeleted);
}
super.putUnwriteable (fields); super.putUnwriteable (fields);
} }
...@@ -3511,6 +3834,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3511,6 +3834,7 @@ public abstract class BaseCompany extends BaseBusinessClass
result.add(HELPER_CompanyName.getAttribObject (getClass (), _CompanyName, true, FIELD_CompanyName)); result.add(HELPER_CompanyName.getAttribObject (getClass (), _CompanyName, true, FIELD_CompanyName));
result.add(HELPER_CompanyLogo.getAttribObject (getClass (), _CompanyLogo, false, FIELD_CompanyLogo));
result.add(HELPER_HiringTeamType.getAttribObject (getClass (), _HiringTeamType, false, FIELD_HiringTeamType)); result.add(HELPER_HiringTeamType.getAttribObject (getClass (), _HiringTeamType, false, FIELD_HiringTeamType));
result.add(HELPER_Industry.getAttribObject (getClass (), _Industry, false, FIELD_Industry)); result.add(HELPER_Industry.getAttribObject (getClass (), _Industry, false, FIELD_Industry));
result.add(HELPER_TimeZone.getAttribObject (getClass (), _TimeZone, false, FIELD_TimeZone)); result.add(HELPER_TimeZone.getAttribObject (getClass (), _TimeZone, false, FIELD_TimeZone));
...@@ -3524,6 +3848,7 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3524,6 +3848,7 @@ public abstract class BaseCompany extends BaseBusinessClass
result.add(HELPER_FirstName.getAttribObject (getClass (), _FirstName, false, FIELD_FirstName)); result.add(HELPER_FirstName.getAttribObject (getClass (), _FirstName, false, FIELD_FirstName));
result.add(HELPER_LastName.getAttribObject (getClass (), _LastName, false, FIELD_LastName)); result.add(HELPER_LastName.getAttribObject (getClass (), _LastName, false, FIELD_LastName));
result.add(HELPER_RoleType.getAttribObject (getClass (), _RoleType, false, FIELD_RoleType)); result.add(HELPER_RoleType.getAttribObject (getClass (), _RoleType, false, FIELD_RoleType));
result.add(HELPER_IsLogoDeleted.getAttribObject (getClass (), _IsLogoDeleted, false, FIELD_IsLogoDeleted));
return result; return result;
} }
...@@ -3561,12 +3886,30 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3561,12 +3886,30 @@ public abstract class BaseCompany extends BaseBusinessClass
if(willBeStored) if(willBeStored)
{ {
{
oneit.servlets.objstore.binary.BinaryContentHandler bchandler = oneit.servlets.objstore.binary.BinaryContentServlet.getHandler("loggedin");
if(bchandler != null)
{
bchandler.preCommit(willBeStored, this, "CompanyLogo");
}
else
{
LogMgr.log(BUSINESS_OBJECTS, LogLevel.SYSTEMWARNING, "Unknown BinaryContentHandler loggedin on attribute CompanyLogo");
}
}
} }
} }
public oneit.servlets.objstore.binary.BinaryContentHandler getBinaryContentHandler(String attribName) public oneit.servlets.objstore.binary.BinaryContentHandler getBinaryContentHandler(String attribName)
{ {
if(CollectionUtils.equals(attribName, "CompanyLogo"))
{
return oneit.servlets.objstore.binary.BinaryContentServlet.getHandler("loggedin");
}
return super.getBinaryContentHandler(attribName); return super.getBinaryContentHandler(attribName);
} }
...@@ -3593,6 +3936,24 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3593,6 +3936,24 @@ public abstract class BaseCompany extends BaseBusinessClass
} }
/** /**
* Get the attribute CompanyLogo
*/
public BinaryContent getCompanyLogo (Company obj, BinaryContent original)
{
return original;
}
/**
* Change the value set for attribute CompanyLogo.
* May modify the field beforehand
* Occurs before validation.
*/
public BinaryContent setCompanyLogo (Company obj, BinaryContent newCompanyLogo) throws FieldException
{
return newCompanyLogo;
}
/**
* Get the attribute HiringTeamType * Get the attribute HiringTeamType
*/ */
public HiringTeamType getHiringTeamType (Company obj, HiringTeamType original) public HiringTeamType getHiringTeamType (Company obj, HiringTeamType original)
...@@ -3826,6 +4187,24 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3826,6 +4187,24 @@ public abstract class BaseCompany extends BaseBusinessClass
return newRoleType; return newRoleType;
} }
/**
* Get the attribute IsLogoDeleted
*/
public Boolean getIsLogoDeleted (Company obj, Boolean original)
{
return original;
}
/**
* Change the value set for attribute IsLogoDeleted.
* May modify the field beforehand
* Occurs before validation.
*/
public Boolean setIsLogoDeleted (Company obj, Boolean newIsLogoDeleted) throws FieldException
{
return newIsLogoDeleted;
}
} }
...@@ -3902,10 +4281,18 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3902,10 +4281,18 @@ public abstract class BaseCompany extends BaseBusinessClass
{ {
return toRoleType (); return toRoleType ();
} }
if (name.equals ("IsLogoDeleted"))
{
return toIsLogoDeleted ();
}
if (name.equals ("CompanyName")) if (name.equals ("CompanyName"))
{ {
return toCompanyName (); return toCompanyName ();
} }
if (name.equals ("CompanyLogo"))
{
return toCompanyLogo ();
}
if (name.equals ("HiringTeamType")) if (name.equals ("HiringTeamType"))
{ {
return toHiringTeamType (); return toHiringTeamType ();
...@@ -3960,8 +4347,12 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -3960,8 +4347,12 @@ public abstract class BaseCompany extends BaseBusinessClass
public PipeLine<From, RoleType> toRoleType () { return pipe(new ORMAttributePipe<Me, RoleType>(FIELD_RoleType)); } public PipeLine<From, RoleType> toRoleType () { return pipe(new ORMAttributePipe<Me, RoleType>(FIELD_RoleType)); }
public PipeLine<From, Boolean> toIsLogoDeleted () { return pipe(new ORMAttributePipe<Me, Boolean>(FIELD_IsLogoDeleted)); }
public PipeLine<From, String> toCompanyName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_CompanyName)); } public PipeLine<From, String> toCompanyName () { return pipe(new ORMAttributePipe<Me, String>(FIELD_CompanyName)); }
public PipeLine<From, BinaryContent> toCompanyLogo () { return pipe(new ORMAttributePipe<Me, BinaryContent>(FIELD_CompanyLogo)); }
public PipeLine<From, HiringTeamType> toHiringTeamType () { return pipe(new ORMAttributePipe<Me, HiringTeamType>(FIELD_HiringTeamType)); } public PipeLine<From, HiringTeamType> toHiringTeamType () { return pipe(new ORMAttributePipe<Me, HiringTeamType>(FIELD_HiringTeamType)); }
public PipeLine<From, Industry> toIndustry () { return pipe(new ORMAttributePipe<Me, Industry>(FIELD_Industry)); } public PipeLine<From, Industry> toIndustry () { return pipe(new ORMAttributePipe<Me, Industry>(FIELD_Industry)); }
...@@ -4023,6 +4414,11 @@ public abstract class BaseCompany extends BaseBusinessClass ...@@ -4023,6 +4414,11 @@ public abstract class BaseCompany extends BaseBusinessClass
return true; return true;
} }
if(CollectionUtils.equals(attribName, "IsLogoDeleted"))
{
return true;
}
return super.isTransientAttrib(attribName); return super.isTransientAttrib(attribName);
} }
......
cmsWebApp/src/performa/orm/Client.java
package performa.orm; package performa.orm;
import oneit.logging.LoggingArea;
import oneit.objstore.rdbms.filters.EqualsFilter; import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.utils.filter.Filter; import oneit.utils.filter.Filter;
import performa.orm.types.JobStatus; import performa.orm.types.JobStatus;
...@@ -9,6 +10,8 @@ public class Client extends BaseClient ...@@ -9,6 +10,8 @@ public class Client extends BaseClient
{ {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
public static LoggingArea LOG = LoggingArea.createLoggingArea("Client");
// This constructor should not be called // This constructor should not be called
public Client () public Client ()
{ {
......
cmsWebApp/src/performa/orm/Client.xml
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<MULTIPLEREFERENCE name="Jobs" type="Job" backreferenceName="Client" /> <MULTIPLEREFERENCE name="Jobs" type="Job" backreferenceName="Client" />
<TRANSIENT name="IsLogoDeleted" type="Boolean" defaultValue="Boolean.FALSE"/>
<TABLE name="tl_client" tablePrefix="object"> <TABLE name="tl_client" tablePrefix="object">
<ATTRIB name="ClientName" type="String" dbcol="client_name" mandatory="true" length="100"/> <ATTRIB name="ClientName" type="String" dbcol="client_name" mandatory="true" length="100"/>
......
cmsWebApp/src/performa/orm/Company.java
package performa.orm; package performa.orm;
import oneit.logging.LoggingArea;
public class Company extends BaseCompany public class Company extends BaseCompany
{ {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
public static LoggingArea LOG = LoggingArea.createLoggingArea("Company");
// This constructor should not be called // This constructor should not be called
public Company () public Company ()
{ {
......
cmsWebApp/src/performa/orm/Company.xml
...@@ -15,10 +15,12 @@ ...@@ -15,10 +15,12 @@
<TRANSIENT name="FirstName" type="String"/> <TRANSIENT name="FirstName" type="String"/>
<TRANSIENT name="LastName" type="String"/> <TRANSIENT name="LastName" type="String"/>
<TRANSIENT name="RoleType" type="RoleType" defaultValue="RoleType.STANDARD" attribHelper="EnumeratedAttributeHelper"/> <TRANSIENT name="RoleType" type="RoleType" defaultValue="RoleType.STANDARD" attribHelper="EnumeratedAttributeHelper"/>
<TRANSIENT name="IsLogoDeleted" type="Boolean" defaultValue="Boolean.FALSE"/>
<TABLE name="tl_company" tablePrefix="object"> <TABLE name="tl_company" tablePrefix="object">
<ATTRIB name="CompanyName" type="String" dbcol="company_name" mandatory="true" length="100" /> <ATTRIB name="CompanyName" type="String" dbcol="company_name" mandatory="true" length="100" />
<ATTRIB name="CompanyLogo" type="BinaryContent" dbcol="company_logo" mandatory="false" binaryHandler="loggedin" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE" />
<ATTRIB name="HiringTeamType" type="HiringTeamType" dbcol="hiring_team_type" mandatory="false" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="HiringTeamType" type="HiringTeamType" dbcol="hiring_team_type" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" mandatory="false" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="Industry" type="Industry" dbcol="industry" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="TimeZone" type="TimeZone" dbcol="time_zone" mandatory="false" attribHelper="EnumeratedAttributeHelper"/> <ATTRIB name="TimeZone" type="TimeZone" dbcol="time_zone" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
......
cmsWebApp/src/performa/orm/CompanyPersistenceMgr.java
...@@ -30,6 +30,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -30,6 +30,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String dummyCompanyName; private String dummyCompanyName;
private BinaryContent dummyCompanyLogo;
private HiringTeamType dummyHiringTeamType; private HiringTeamType dummyHiringTeamType;
private Industry dummyIndustry; private Industry dummyIndustry;
private TimeZone dummyTimeZone; private TimeZone dummyTimeZone;
...@@ -43,6 +44,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -43,6 +44,7 @@ public class CompanyPersistenceMgr 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_CompanyName = DefaultAttributeHelper.INSTANCE;
private static final BLOBAttributeHelper HELPER_CompanyLogo = BLOBAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper HELPER_HiringTeamType = new EnumeratedAttributeHelper (HiringTeamType.FACTORY_HiringTeamType); private static final EnumeratedAttributeHelper HELPER_HiringTeamType = new EnumeratedAttributeHelper (HiringTeamType.FACTORY_HiringTeamType);
private static final EnumeratedAttributeHelper HELPER_Industry = new EnumeratedAttributeHelper (Industry.FACTORY_Industry); private static final EnumeratedAttributeHelper HELPER_Industry = new EnumeratedAttributeHelper (Industry.FACTORY_Industry);
private static final EnumeratedAttributeHelper HELPER_TimeZone = new EnumeratedAttributeHelper (TimeZone.FACTORY_TimeZone); private static final EnumeratedAttributeHelper HELPER_TimeZone = new EnumeratedAttributeHelper (TimeZone.FACTORY_TimeZone);
...@@ -59,6 +61,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -59,6 +61,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr
public CompanyPersistenceMgr () public CompanyPersistenceMgr ()
{ {
dummyCompanyName = (String)(HELPER_CompanyName.initialise (dummyCompanyName)); dummyCompanyName = (String)(HELPER_CompanyName.initialise (dummyCompanyName));
dummyCompanyLogo = (BinaryContent)(HELPER_CompanyLogo.initialise (dummyCompanyLogo));
dummyHiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.initialise (dummyHiringTeamType)); dummyHiringTeamType = (HiringTeamType)(HELPER_HiringTeamType.initialise (dummyHiringTeamType));
dummyIndustry = (Industry)(HELPER_Industry.initialise (dummyIndustry)); dummyIndustry = (Industry)(HELPER_Industry.initialise (dummyIndustry));
dummyTimeZone = (TimeZone)(HELPER_TimeZone.initialise (dummyTimeZone)); dummyTimeZone = (TimeZone)(HELPER_TimeZone.initialise (dummyTimeZone));
...@@ -71,7 +74,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -71,7 +74,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}tl_company.object_id as id, {PREFIX}tl_company.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_company.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_company.company_name, {PREFIX}tl_company.hiring_team_type, {PREFIX}tl_company.industry, {PREFIX}tl_company.time_zone, {PREFIX}tl_company.is_verified, {PREFIX}tl_company.state, {PREFIX}tl_company.country, {PREFIX}tl_company.post_code, {PREFIX}tl_company.city, {PREFIX}tl_company.has_client_support, {PREFIX}tl_company.added_by_user_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_company.object_id as id, {PREFIX}tl_company.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_company.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_company.company_name, {PREFIX}tl_company.company_logo, {PREFIX}tl_company.hiring_team_type, {PREFIX}tl_company.industry, {PREFIX}tl_company.time_zone, {PREFIX}tl_company.is_verified, {PREFIX}tl_company.state, {PREFIX}tl_company.country, {PREFIX}tl_company.post_code, {PREFIX}tl_company.city, {PREFIX}tl_company.has_client_support, {PREFIX}tl_company.added_by_user_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
...@@ -123,6 +126,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -123,6 +126,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !tl_companyPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !tl_companyPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!tl_companyPSet.containsAttrib(Company.FIELD_CompanyName)|| !tl_companyPSet.containsAttrib(Company.FIELD_CompanyName)||
!tl_companyPSet.containsAttrib(Company.FIELD_CompanyLogo)||
!tl_companyPSet.containsAttrib(Company.FIELD_HiringTeamType)|| !tl_companyPSet.containsAttrib(Company.FIELD_HiringTeamType)||
!tl_companyPSet.containsAttrib(Company.FIELD_Industry)|| !tl_companyPSet.containsAttrib(Company.FIELD_Industry)||
!tl_companyPSet.containsAttrib(Company.FIELD_TimeZone)|| !tl_companyPSet.containsAttrib(Company.FIELD_TimeZone)||
...@@ -202,10 +206,10 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -202,10 +206,10 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_company " + "UPDATE {PREFIX}tl_company " +
"SET company_name = ?, hiring_team_type = ?, industry = ?, time_zone = ?, is_verified = ?, state = ?, country = ?, post_code = ?, city = ?, has_client_support = ?, added_by_user_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET company_name = ?, company_logo = ?, hiring_team_type = ?, industry = ?, time_zone = ?, is_verified = ?, state = ?, country = ?, post_code = ?, city = ?, has_client_support = ?, added_by_user_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_company.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_company.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_CompanyName.getForSQL(dummyCompanyName, tl_companyPSet.getAttrib (Company.FIELD_CompanyName))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_companyPSet.getAttrib (Company.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_companyPSet.getAttrib (Company.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_companyPSet.getAttrib (Company.FIELD_TimeZone))).listEntry (HELPER_IsVerified.getForSQL(dummyIsVerified, tl_companyPSet.getAttrib (Company.FIELD_IsVerified))).listEntry (HELPER_State.getForSQL(dummyState, tl_companyPSet.getAttrib (Company.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_companyPSet.getAttrib (Company.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_companyPSet.getAttrib (Company.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_companyPSet.getAttrib (Company.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_companyPSet.getAttrib (Company.FIELD_HasClientSupport))).listEntry (SQLManager.CheckNull((Long)(tl_companyPSet.getAttrib (Company.SINGLEREFERENCE_AddedByUser)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_CompanyName.getForSQL(dummyCompanyName, tl_companyPSet.getAttrib (Company.FIELD_CompanyName))).listEntry (HELPER_CompanyLogo.getForSQL(dummyCompanyLogo, tl_companyPSet.getAttrib (Company.FIELD_CompanyLogo))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_companyPSet.getAttrib (Company.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_companyPSet.getAttrib (Company.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_companyPSet.getAttrib (Company.FIELD_TimeZone))).listEntry (HELPER_IsVerified.getForSQL(dummyIsVerified, tl_companyPSet.getAttrib (Company.FIELD_IsVerified))).listEntry (HELPER_State.getForSQL(dummyState, tl_companyPSet.getAttrib (Company.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_companyPSet.getAttrib (Company.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_companyPSet.getAttrib (Company.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_companyPSet.getAttrib (Company.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_companyPSet.getAttrib (Company.FIELD_HasClientSupport))).listEntry (SQLManager.CheckNull((Long)(tl_companyPSet.getAttrib (Company.SINGLEREFERENCE_AddedByUser)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -462,6 +466,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -462,6 +466,7 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr
tl_companyPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); tl_companyPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
tl_companyPSet.setAttrib(Company.FIELD_CompanyName, HELPER_CompanyName.getFromRS(dummyCompanyName, r, "company_name")); tl_companyPSet.setAttrib(Company.FIELD_CompanyName, HELPER_CompanyName.getFromRS(dummyCompanyName, r, "company_name"));
tl_companyPSet.setAttrib(Company.FIELD_CompanyLogo, HELPER_CompanyLogo.getFromRS(dummyCompanyLogo, r, "company_logo"));
tl_companyPSet.setAttrib(Company.FIELD_HiringTeamType, HELPER_HiringTeamType.getFromRS(dummyHiringTeamType, r, "hiring_team_type")); tl_companyPSet.setAttrib(Company.FIELD_HiringTeamType, HELPER_HiringTeamType.getFromRS(dummyHiringTeamType, r, "hiring_team_type"));
tl_companyPSet.setAttrib(Company.FIELD_Industry, HELPER_Industry.getFromRS(dummyIndustry, r, "industry")); tl_companyPSet.setAttrib(Company.FIELD_Industry, HELPER_Industry.getFromRS(dummyIndustry, r, "industry"));
tl_companyPSet.setAttrib(Company.FIELD_TimeZone, HELPER_TimeZone.getFromRS(dummyTimeZone, r, "time_zone")); tl_companyPSet.setAttrib(Company.FIELD_TimeZone, HELPER_TimeZone.getFromRS(dummyTimeZone, r, "time_zone"));
...@@ -489,10 +494,10 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr ...@@ -489,10 +494,10 @@ public class CompanyPersistenceMgr extends ObjectPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_company " + "INSERT INTO {PREFIX}tl_company " +
" (company_name, hiring_team_type, industry, time_zone, is_verified, state, country, post_code, city, has_client_support, added_by_user_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (company_name, company_logo, hiring_team_type, industry, time_zone, is_verified, state, country, post_code, city, has_client_support, added_by_user_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_companyPSet.getAttrib (Company.FIELD_CompanyName))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_companyPSet.getAttrib (Company.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_companyPSet.getAttrib (Company.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_companyPSet.getAttrib (Company.FIELD_TimeZone))).listEntry (HELPER_IsVerified.getForSQL(dummyIsVerified, tl_companyPSet.getAttrib (Company.FIELD_IsVerified))).listEntry (HELPER_State.getForSQL(dummyState, tl_companyPSet.getAttrib (Company.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_companyPSet.getAttrib (Company.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_companyPSet.getAttrib (Company.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_companyPSet.getAttrib (Company.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_companyPSet.getAttrib (Company.FIELD_HasClientSupport))) .listEntry (SQLManager.CheckNull((Long)(tl_companyPSet.getAttrib (Company.SINGLEREFERENCE_AddedByUser)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_CompanyName.getForSQL(dummyCompanyName, tl_companyPSet.getAttrib (Company.FIELD_CompanyName))).listEntry (HELPER_CompanyLogo.getForSQL(dummyCompanyLogo, tl_companyPSet.getAttrib (Company.FIELD_CompanyLogo))).listEntry (HELPER_HiringTeamType.getForSQL(dummyHiringTeamType, tl_companyPSet.getAttrib (Company.FIELD_HiringTeamType))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_companyPSet.getAttrib (Company.FIELD_Industry))).listEntry (HELPER_TimeZone.getForSQL(dummyTimeZone, tl_companyPSet.getAttrib (Company.FIELD_TimeZone))).listEntry (HELPER_IsVerified.getForSQL(dummyIsVerified, tl_companyPSet.getAttrib (Company.FIELD_IsVerified))).listEntry (HELPER_State.getForSQL(dummyState, tl_companyPSet.getAttrib (Company.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_companyPSet.getAttrib (Company.FIELD_Country))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_companyPSet.getAttrib (Company.FIELD_PostCode))).listEntry (HELPER_City.getForSQL(dummyCity, tl_companyPSet.getAttrib (Company.FIELD_City))).listEntry (HELPER_HasClientSupport.getForSQL(dummyHasClientSupport, tl_companyPSet.getAttrib (Company.FIELD_HasClientSupport))) .listEntry (SQLManager.CheckNull((Long)(tl_companyPSet.getAttrib (Company.SINGLEREFERENCE_AddedByUser)))) .listEntry (objectID.longID ()).toList().toArray());
tl_companyPSet.setStatus (PersistentSetStatus.PROCESSED); tl_companyPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
<InvitationEmailer factory="Participant" class="oneit.email.ConfigurableArticleTemplateEmailer" templateShortcut="InvitationMail"/> <InvitationEmailer factory="Participant" class="oneit.email.ConfigurableArticleTemplateEmailer" templateShortcut="InvitationMail"/>
</FORM> </FORM>
<FORM name="*.saveUserDetails" factory="Participant" class="performa.form.SaveUserDetailsFP"/> <FORM name="*.saveUserDetails" factory="Participant" class="performa.form.SaveUserDetailsFP"/>
<FORM name="*.saveClient" factory="Participant" class="performa.form.SaveClientFP"/>
<FORM name="*.saveCompany" factory="Participant" class="performa.form.SaveCompanyFP"/>
</NODE> </NODE>
<NODE name="job_assessment_criteria_add_jsp" factory="Participant"> <NODE name="job_assessment_criteria_add_jsp" factory="Participant">
......
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
...@@ -24,36 +24,20 @@ ...@@ -24,36 +24,20 @@
String nextPage = WebUtils.getSamePageInRenderMode(request, "Page"); String nextPage = WebUtils.getSamePageInRenderMode(request, "Page");
%> %>
<script> <script>
$(document).ready(function() $(document).ready(function()
{
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$("#upload").change(function(){
readURL(this);
});
$("#remove-logo").click(function(){
$('#client-logo').attr('src', '');
var input = $("#upload");
input.replaceWith(input.val('').clone(true));
});
});
function readURL(input) {
if (input.files && input.files[0])
{ {
var reader = new FileReader(); recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
reader.onload = function (e) { $("#upload").change(function(){
$('#client-logo').attr('src', e.target.result); readURL(this);
} });
reader.readAsDataURL(input.files[0]); $("#remove-logo").click(function(){
} removeLogo();
} });
</script> });
</script>
<div class="container-fluid"> <div class="container-fluid">
<div class="row content"> <div class="row content">
<div class="main-content-area"> <div class="main-content-area">
...@@ -70,23 +54,23 @@ ...@@ -70,23 +54,23 @@
<div class="form-group"> <div class="form-group">
<label><oneit:ormlabel obj="<%= client %>" field="ClientLogo" /></label> <label><oneit:ormlabel obj="<%= client %>" field="ClientLogo" /></label>
<div class="main-upload-logo"> <div class="main-upload-logo">
<span class="u-img-tag"> <span class="u-img-tag" style="<%= client.getClientLogo() != null ? "" : "display: none" %>">
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(client.getClientLogo()), "KEEP", new ScaleWithin (0,0)) %>" <tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(client.getClientLogo()), "KEEP", new ScaleWithin (0,90)) %>"
class="upload-img-w-h" id="client-logo"/> class="upload-img-w-h" id="client-logo"/>
<span class="remove-logo-btn"> <span class="remove-logo-btn">
<img src="images/logo-remove-btn.png" id="remove-logo"> <img src="images/logo-remove-btn.png" id="remove-logo">
<oneit:ormInput obj="<%= client %>" type="text" attributeName="IsLogoDeleted" style="display:none;" />
</span> </span>
</span> </span>
<span class="up-rep-btn"> <span class="up-rep-btn">
<oneit:ormInput obj="<%= client %>" type="file" attributeName="ClientLogo" accept="image/*" id="upload" <oneit:ormInput obj="<%= client %>" type="file" attributeName="ClientLogo" accept="image/*" id="upload"
style="visibility: hidden; width: 1px; height: 1px"/> style="visibility: hidden; width: 1px; height: 1px"/>
<a href="javascript:void(0)" onclick="document.getElementById('upload').click(); return false"> <a href="javascript:void(0)" onclick="document.getElementById('upload').click(); return false" id="replace-btn">
Replace <%= client.getClientLogo() != null ? "Replace" : "Upload" %>
</a> </a>
</span> </span>
</div> </div>
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
...@@ -137,7 +121,7 @@ ...@@ -137,7 +121,7 @@
</div> </div>
</div> </div>
<div class="text-center form-group"> <div class="text-center form-group">
<oneit:button value="Save Updates" name="save" cssClass="btn btn-primary largeBtn" <oneit:button value="Save Updates" name="saveClient" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" /> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" />
</div> </div>
</oneit:form> </oneit:form>
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
...@@ -31,3 +31,4 @@ Company.UserEmail = Email Address ...@@ -31,3 +31,4 @@ Company.UserEmail = Email Address
Company.FirstName = First Name Company.FirstName = First Name
Company.LastName = Last Name Company.LastName = Last Name
Company.RoleType = Role Company.RoleType = Role
Company.CompanyLogo = Company Logo
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
...@@ -15,11 +15,20 @@ ...@@ -15,11 +15,20 @@
String nextPage = WebUtils.getSamePageInRenderMode(request, "Page"); String nextPage = WebUtils.getSamePageInRenderMode(request, "Page");
%> %>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function()
{
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$("#upload").change(function(){
readURL(this);
});
$("#remove-logo").click(function(){
removeLogo();
});
}); });
</script> </script>
<div class="container-fluid"> <div class="container-fluid">
<div class="row content"> <div class="row content">
<div class="main-content-area"> <div class="main-content-area">
...@@ -38,6 +47,27 @@ ...@@ -38,6 +47,27 @@
<label><oneit:label GUIName="Company Name" /></label> <label><oneit:label GUIName="Company Name" /></label>
<oneit:ormInput obj="<%= company %>" type="text" attributeName="CompanyName" cssClass="form-control" /> <oneit:ormInput obj="<%= company %>" type="text" attributeName="CompanyName" cssClass="form-control" />
</div> </div>
<div class="form-group">
<label><oneit:ormlabel obj="<%= company %>" field="CompanyLogo" /></label>
<div class="main-upload-logo">
<span class="u-img-tag" style="<%= company.getCompanyLogo() != null ? "" : "display: none" %>">
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(company.getCompanyLogo()), "KEEP", new ScaleWithin (0,90)) %>"
class="upload-img-w-h" id="client-logo"/>
<span class="remove-logo-btn">
<img src="images/logo-remove-btn.png" id="remove-logo">
<oneit:ormInput obj="<%= company %>" type="text" attributeName="IsLogoDeleted" style="display:none;" />
</span>
</span>
<span class="up-rep-btn">
<oneit:ormInput obj="<%= company %>" type="file" attributeName="CompanyLogo" accept="image/*" id="upload"
style="visibility: hidden; width: 1px; height: 1px"/>
<a href="javascript:void(0)" onclick="document.getElementById('upload').click(); return false" id="replace-btn">
<%= company.getCompanyLogo() != null ? "Replace" : "Upload" %>
</a>
</span>
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<div class="col-md-6"> <div class="col-md-6">
<label><oneit:label GUIName="Industry" /></label> <label><oneit:label GUIName="Industry" /></label>
...@@ -83,8 +113,10 @@ ...@@ -83,8 +113,10 @@
</div> </div>
</div> </div>
<div class="text-center form-group"> <div class="text-center form-group">
<oneit:button value="Save Updates" name="save" cssClass="btn btn-primary largeBtn" <oneit:button value="Save Updates" name="saveCompany" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" /> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Company", company)
.toMap() %>" />
</div> </div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/performa/GeneralConfig_performa.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<MAP code="Candidate" class="performa.orm.Candidate"/> <MAP code="Candidate" class="performa.orm.Candidate"/>
<MAP code="CompanyUser" class="performa.orm.CompanyUser"/> <MAP code="CompanyUser" class="performa.orm.CompanyUser"/>
<MAP code="Client" class="performa.orm.Client"/> <MAP code="Client" class="performa.orm.Client"/>
<MAP code="Company" class="performa.orm.Company"/>
</NODE> </NODE>
<NODE name="CONFIG.GLOBAL::Performa"> <NODE name="CONFIG.GLOBAL::Performa">
......
cmsWebApp/webroot/extensions/performa/upgrades/20170914_Alter_Company.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_company</tableName>
<column name="company_logo" type="BLOB" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/scripts/common.js
...@@ -83,3 +83,27 @@ $(window).resize(function () { ...@@ -83,3 +83,27 @@ $(window).resize(function () {
equalheight('.eq-height'); equalheight('.eq-height');
equalheight('.eq-second-height'); equalheight('.eq-second-height');
}); });
function readURL(input) {
if (input.files && input.files[0])
{
var reader = new FileReader();
reader.onload = function (e) {
$('#client-logo').attr('src', e.target.result);
$('#client-logo').removeAttr("width");
$('#client-logo').attr("height", "90");
$('input[name$=IsLogoDeleted]').val('false').change();
$('.u-img-tag').show();
$('#replace-btn').text('Replace');
}
reader.readAsDataURL(input.files[0]);
}
}
function removeLogo() {
$('#client-logo').removeAttr("src");
$('input[name$=IsLogoDeleted]').val('true').change();
$('.u-img-tag').hide();
$('#replace-btn').text('Upload');
}
\ 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