Skip to content

P
PERFORMA_REPLICA
Commit 247c76d3 by Nilu
Options

client related changes

parent 95e9f7d6
Showing with 89 additions and 12 deletions
cmsWebApp/sql/Client.xml
......@@ -19,9 +19,12 @@
<column name="post_code" type="String" nullable="true" length="10"/>
<column name="city" type="String" nullable="true" length="100"/>
<column name="time_zone" type="String" nullable="true" length="200"/>
<column name="company_id" type="Long" length="11" nullable="false"/>
<column name="hiring_team_id" type="Long" length="11" nullable="false"/>
<column name="company_id" type="Long" length="11" nullable="true"/>
</NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_client" indexName="idx_tl_client_hiring_team_id" isUnique="false"><column name="hiring_team_id"/></NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_client" indexName="idx_tl_client_company_id" isUnique="false"><column name="company_id"/></NODE>
</NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/ms/Client.sql
......@@ -19,7 +19,8 @@ CREATE TABLE tl_client (
post_code varchar(10) NULL,
city varchar(100) NULL,
time_zone varchar(200) NULL,
company_id numeric(12) NOT NULL
hiring_team_id numeric(12) NOT NULL,
company_id numeric(12) NULL
);
......@@ -32,5 +33,8 @@ ALTER TABLE tl_client ADD
CREATE INDEX idx_tl_client_hiring_team_id
ON tl_client (hiring_team_id);
CREATE INDEX idx_tl_client_company_id
ON tl_client (company_id);
cmsWebApp/sql/oracle/Client.sql
......@@ -20,7 +20,8 @@ CREATE TABLE tl_client (
post_code varchar2(10) NULL,
city varchar2(100) NULL,
time_zone varchar2(200) NULL,
company_id number(12) NOT NULL
hiring_team_id number(12) NOT NULL,
company_id number(12) NULL
);
......@@ -33,5 +34,8 @@ ALTER TABLE tl_client ADD
CREATE INDEX idx_tl_client_hiring_team_id
ON tl_client (hiring_team_id);
CREATE INDEX idx_tl_client_company_id
ON tl_client (company_id);
cmsWebApp/sql/postgres/Client.sql
......@@ -20,7 +20,8 @@ CREATE TABLE tl_client (
post_code varchar(10) NULL,
city varchar(100) NULL,
time_zone varchar(200) NULL,
company_id numeric(12) NOT NULL
hiring_team_id numeric(12) NOT NULL,
company_id numeric(12) NULL
);
......@@ -33,5 +34,8 @@ ALTER TABLE tl_client ADD
CREATE INDEX idx_tl_client_hiring_team_id
ON tl_client (hiring_team_id);
CREATE INDEX idx_tl_client_company_id
ON tl_client (company_id);
cmsWebApp/src/performa/orm/Client.xml
......@@ -26,7 +26,8 @@
<ATTRIB name="City" type="String" dbcol="city" mandatory="false" length="100"/>
<ATTRIB name="TimeZone" type="TimeZone" dbcol="time_zone" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<SINGLEREFERENCE name="Company" type="Company" dbcol="company_id" backreferenceName="Clients" mandatory="true"/>
<SINGLEREFERENCE name="HiringTeam" type="HiringTeam" dbcol="hiring_team_id" backreferenceName="Clients" mandatory="true"/>
<SINGLEREFERENCE name="Company" type="Company" dbcol="company_id" backreferenceName="Clients" mandatory="false"/>
</TABLE>
......
cmsWebApp/src/performa/orm/HiringTeam.xml
......@@ -9,7 +9,7 @@
<IMPORT value="oneit.business.shopping.orm.*"/>
<MULTIPLEREFERENCE name="Users" type="CompanyUserHiringTeamLink" backreferenceName="HiringTeam" />
<!--<MULTIPLEREFERENCE name="Clients" type="Client" backreferenceName="HiringTeam" />-->
<MULTIPLEREFERENCE name="Clients" type="Client" backreferenceName="HiringTeam" />
<TRANSIENT name="IsLogoDeleted" type="Boolean" defaultValue="Boolean.FALSE"/>
......
cmsWebApp/src/performa/orm/types/ClientSortOption.java
......@@ -20,9 +20,9 @@ public class ClientSortOption extends AbstractEnumerated
public static final EnumeratedFactory FACTORY_ClientSortOption = new ClientSortOptionFactory();
public static final ClientSortOption ALPHA_A_Z = new ClientSortOption ("ALPHA_A_Z", "ALPHA_A_Z", "A-Z", false);
public static final ClientSortOption ALPHA_A_Z = new ClientSortOption ("ALPHA_A_Z", "ALPHA_A_Z", "Alphabetical (A-Z)", false);
public static final ClientSortOption ALPHA_Z_A = new ClientSortOption ("ALPHA_Z_A", "ALPHA_Z_A", "Z-A", false);
public static final ClientSortOption ALPHA_Z_A = new ClientSortOption ("ALPHA_Z_A", "ALPHA_Z_A", "Alphabetical (Z-A)", false);
public static final ClientSortOption OPEN_JOBS = new ClientSortOption ("OPEN_JOBS", "OPEN_JOBS", "Open Jobs", false);
......
cmsWebApp/src/performa/orm/types/ClientSortOption.xml
......@@ -3,8 +3,8 @@
<ROOT>
<CONSTANT package="performa.orm.types" name="ClientSortOption">
<VALUE name="ALPHA_A_Z" value="ALPHA_A_Z" description="A-Z"/>
<VALUE name="ALPHA_Z_A" value="ALPHA_Z_A" description="Z-A"/>
<VALUE name="ALPHA_A_Z" value="ALPHA_A_Z" description="Alphabetical (A-Z)"/>
<VALUE name="ALPHA_Z_A" value="ALPHA_Z_A" description="Alphabetical (Z-A)"/>
<VALUE name="OPEN_JOBS" value="OPEN_JOBS" description="Open Jobs"/>
<VALUE name="FILLED_JOBS" value="FILLED_JOBS" description="Filled Jobs"/>
......
cmsWebApp/src/performa/utils/Utils.java
......@@ -334,7 +334,7 @@ public class Utils
SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
return companyUser.getCompany().getClientsSet().toArray(new Client[0]);
return companyUser.getSelectedTeam().getClientsSet().toArray(new Client[0]);
}
......
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
......@@ -14,7 +14,7 @@
SecUser loggedInUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
client.setCompany(companyUser.getCompany());
client.setHiringTeam(companyUser.getSelectedTeam());
%><%@include file="/saferedirect.jsp"%><%
}
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20181009_Alter_Client.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_client</tableName>
<column name="hiring_team_id" type="Long" length="11" nullable="true"/>
</NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_client" indexName="idx_tl_client_hiring_team_id" isUnique="false">
<column name="hiring_team_id"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20181009_Insert_Default_HiringTeam.xml 0 → 100644
<?xml version="1.0"?>
<!-- @AutoRun -->
<OBJECTS name="">
<NODE name="Script" factory="Vector">
<NODE name="insertOp" factory="Participant" class="oneit.sql.transfer.InsertOperation"
query="select distinct(tl_company.*) from tl_company, tl_hiring_team where tl_hiring_team.company_id != tl_company.object_id">
<tableName factory="String">tl_hiring_team</tableName>
<value name='object_id' factory='Participant' class="oneit.sql.transfer.DBTransferer$ObjectID"/>
<value name='object_last_updated_date' class="oneit.sql.transfer.DBTransferer$Timestamp"/>
<value name='object_created_date' class="oneit.sql.transfer.DBTransferer$Timestamp"/>
<value name='hiring_team_name' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="company_name" />
<value name='hiring_team_logo' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="company_logo" />
<value name='hiring_team_type' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="hiring_team_type" />
<value name='industry' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="industry" />
<value name='time_zone' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="time_zone" />
<value name='state' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="state" />
<value name='country' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="country" />
<value name='post_code' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="post_code" />
<value name='city' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="city" />
<value name='has_client_support' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="has_client_support" />
<value name='manage_own_billing' factory='Boolean'>true</value>
<value name='stripe_reference' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="stripe_reference" />
<value name='stripe_subscription' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="stripe_subscription" />
<value name='name_on_card' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="name_on_card" />
<value name='card_post_code' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="card_post_code" />
<value name='card_id' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="card_id" />
<value name='plan_renewed_on' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="plan_renewed_on" />
<value name='used_credits' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="used_credits" />
<value name='company_id' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="object_id" />
<value name='added_by_user_id' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="added_by_user_id" />
<value name='payment_plan_id' factory='Participant' class="oneit.sql.transfer.InsertOperation$QueryColumn" column="payment_plan_id" />
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20181010_Client_To_HiringTeam.sql 0 → 100644
UPDATE tl_client
SET hiring_team_id = tl_hiring_team.object_id
FROM tl_hiring_team
WHERE tl_hiring_team.company_id = tl_client.company_id AND tl_client.hiring_team_id IS NULL;
\ 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