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

S35301241 # Client - Incoming Issues (raised by Client) #Ask whether Client details to appear in Job landing page

cmsWebApp/sql/Client.xml

@@ -10,6 +10,7 @@
 			<column name="object_created_date" type="Date" nullable="false" length="22"/>
 			<column name="client_name" type="String" nullable="false" length="30"/>
 			<column name="client_logo" type="BLOB" nullable="true"/>
+			<column name="use_client_details" type="Boolean" nullable="true"/>
 			<column name="email" type="String" nullable="true" length="100"/>
 			<column name="contact_name" type="String" nullable="true" length="100"/>
 			<column name="contact_surname" type="String" nullable="true" length="100"/>

cmsWebApp/sql/ms/Client.sql

@@ -10,6 +10,7 @@ CREATE TABLE tl_client (
     ,
     client_name varchar(30) NOT NULL,
     client_logo image NULL,
+    use_client_details char(1) NULL,
     email varchar(100) NULL,
     contact_name varchar(100) NULL,
     contact_surname varchar(100) NULL,

cmsWebApp/sql/oracle/Client.sql

@@ -11,6 +11,7 @@ CREATE TABLE tl_client (
     ,
     client_name varchar2(30) NOT NULL,
     client_logo blob NULL,
+    use_client_details char(1) NULL,
     email varchar2(100) NULL,
     contact_name varchar2(100) NULL,
     contact_surname varchar2(100) NULL,

cmsWebApp/sql/postgres/Client.sql

@@ -11,6 +11,7 @@ CREATE TABLE tl_client (
     ,
     client_name varchar(30) NOT NULL,
     client_logo bytea NULL,
+    use_client_details char(1) NULL,
     email varchar(100) NULL,
     contact_name varchar(100) NULL,
     contact_surname varchar(100) NULL,

cmsWebApp/src/performa/orm/Client.java

@@ -32,4 +32,9 @@ public class Client extends BaseClient
     {
         return StringUtils.subNulls(getClientName(), super.getToString());
     }
+    
+    public boolean showUseClientDetails()
+    {
+        return isTrue(getUseClientDetails());
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Client.xml

@@ -15,6 +15,7 @@
             
             <ATTRIB name="ClientName"       type="String"           dbcol="client_name"         mandatory="true"    length="30"/>
             <ATTRIB name="ClientLogo"       type="BinaryContent"    dbcol="client_logo"         mandatory="false"   binaryHandler="loggedin"    attribHelper="BLOBAttributeHelper"  attribHelperInstance="BLOBAttributeHelper.INSTANCE" />
+            <ATTRIB name="UseClientDetails" type="Boolean"          dbcol="use_client_details"  mandatory="false"   defaultValue="Boolean.TRUE" />
             <ATTRIB name="Email"            type="String"           dbcol="email"               mandatory="false"   length="100"                validators="Email"  />
             <ATTRIB name="ContactName"      type="String"           dbcol="contact_name"        mandatory="false"   length="100"/>
             <ATTRIB name="ContactSurname"   type="String"           dbcol="contact_surname"     mandatory="false"   length="100"/>

cmsWebApp/src/performa/orm/Job.java

@@ -472,7 +472,7 @@ public class Job extends BaseJob
         
         title.append("Matchd - ");
 
-        if(isClientAvailable())
+        if(isClientAvailable() && getClient().showUseClientDetails())
         {
             title.append(getClient()).append(" - ");
         }
@@ -559,30 +559,23 @@ public class Job extends BaseJob
     
     public BinaryContent getLogo()
     {
-        if(isClientAvailable() && getClient().getClientLogo() != null)
+        if(isClientAvailable() && getClient().showUseClientDetails())
         {
             return getClient().getClientLogo();
         }
-        else if(getHiringTeam() != null)
-        {
-            return getHiringTeam().getHiringTeamLogo();
-        }
         
-        return null;
+        return getHiringTeam() != null ? getHiringTeam().getHiringTeamLogo() : null;
     }
     
+    
     public String getTeamName()
     {
-        if(isClientAvailable())
+        if(isClientAvailable() && getClient().showUseClientDetails())
         {
             return getClient().getClientName();
         }
-        else if(getHiringTeam() != null)
-        {
-            return getHiringTeam().getHiringTeamName();
-        }
         
-        return "";
+        return getHiringTeam() != null ? getHiringTeam().getHiringTeamName() : "";
     }
     
     

cmsWebApp/webroot/extensions/adminportal/edit_client.jsp

@@ -72,7 +72,18 @@
                                 </span>
                             </div>
                         </div>
-
+                        <div class="form-group">
+                            <div class="styled_checkboxes">
+                                <div class="checkbox checkbox-primary">
+                                    <oneit:ormInput obj="<%= client %>"  id="use-client-details"    attributeName="UseClientDetails" type="checkbox"/>
+                                    <oneit:recalcClass  htmlTag="span"  classScript="client.showUseClientDetails() ? 'checked': 'unchecked'"    client="<%= client %>">
+                                        <label for="use-client-details">
+                                            <oneit:ormlabel  obj="<%= client %>"    field="UseClientDetails" />
+                                        </label>
+                                    </oneit:recalcClass>
+                                </div>
+                            </div>
+                        </div>  
                         <div class="form-brack-line-sub"></div>
 
                         <div class="form-group">

cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt

@@ -33,6 +33,7 @@ Client.ContactName          =   Contact First Name
 Client.ContactSurname       =   Contact Last Name
 Client.ClientLogo           =   Client Logo
 Client.State                =   State or Province
+Client.UseClientDetails     =   Display client name and logo for job applicants (if No, then use Hiring Team details)
 
 Company.TimeZone            =   Time zone
 Company.HasClientSupport    =   We help clients with hiring

cmsWebApp/webroot/extensions/adminportal/upgrades/20190514_Alter_Client.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- @AutoRun -->
+
+<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
+    <NODE name="Script" factory="Vector">
+
+        <NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
+            <tableName factory="String">tl_client</tableName>
+            <column name="use_client_details" type="Boolean" nullable="true"/>
+        </NODE>
+
+    </NODE>
+</OBJECTS>
\ No newline at end of file