From 51767a0e248887a6d2fefc3534d109f3b59ff0b1 Mon Sep 17 00:00:00 2001
From: Wang <Bruce.Wang@gov.bc.ca>
Date: Wed, 11 Sep 2024 10:14:10 -0700
Subject: [PATCH 1/3] TH-119992: hide the WCB & CGL expiry date

---
 client/src/js/views/OwnersDetail.jsx                   | 4 ++--
 client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/js/views/OwnersDetail.jsx b/client/src/js/views/OwnersDetail.jsx
index d947155b..0b9b61f8 100644
--- a/client/src/js/views/OwnersDetail.jsx
+++ b/client/src/js/views/OwnersDetail.jsx
@@ -498,7 +498,7 @@ class OwnersDetail extends React.Component {
                           {owner.workSafeBCPolicyNumber}
                         </ColDisplay>
                       </Col>
-                      <Col lg={4} md={6} sm={12} xs={12}>
+                      <Col lg={4} md={6} sm={12} xs={12} hidden>
                         <ColDisplay labelProps={{ xs: 6 }} fieldProps={{ xs: 6 }} label="WCB Expiry Date">
                           {formatDateTime(owner.workSafeBCExpiryDate, Constant.DATE_YEAR_SHORT_MONTH_DAY)}
                         </ColDisplay>
@@ -513,7 +513,7 @@ class OwnersDetail extends React.Component {
                           {owner.cglPolicyNumber}
                         </ColDisplay>
                       </Col>
-                      <Col lg={4} md={6} sm={12} xs={12}>
+                      <Col lg={4} md={6} sm={12} xs={12} hidden>
                         <ColDisplay labelProps={{ xs: 6 }} fieldProps={{ xs: 6 }} label="CGL Policy End Date">
                           {formatDateTime(owner.cglEndDate, Constant.DATE_YEAR_SHORT_MONTH_DAY)}
                         </ColDisplay>
diff --git a/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx b/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx
index 056c43b8..b9315656 100644
--- a/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx
+++ b/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx
@@ -125,7 +125,7 @@ class OwnersPolicyEditDialog extends React.Component {
         onSubmit={this.formSubmitted}
       >
         <Row>
-          <Col xs={6}>
+          <Col xs={12}>
             <FormGroup controlId="workSafeBCPolicyNumber">
               <FormLabel>
                 WCB Number <sup>*</sup>
@@ -141,7 +141,7 @@ class OwnersPolicyEditDialog extends React.Component {
             </FormGroup>
           </Col>
           <Col xs={6}>
-            <FormGroup controlId="workSafeBCExpiryDate">
+            <FormGroup controlId="workSafeBCExpiryDate" hidden>
               <FormLabel>WCB Expiry Date</FormLabel>
               <DateControl
                 id="workSafeBCExpiryDate"
@@ -167,14 +167,14 @@ class OwnersPolicyEditDialog extends React.Component {
           </Col>
         </Row>
         <Row>
-          <Col xs={6}>
+          <Col xs={12}>
             <FormGroup controlId="cglPolicyNumber">
               <FormLabel>CGL Policy Number</FormLabel>
               <FormInputControl type="text" value={this.state.cglPolicyNumber} updateState={this.updateState} />
             </FormGroup>
           </Col>
           <Col xs={6}>
-            <FormGroup controlId="cglEndDate">
+            <FormGroup controlId="cglEndDate" hidden>
               <FormLabel>CGL Policy End Date</FormLabel>
               <DateControl
                 id="cglEndDate"

From 134590b0eb5ede9047ab9d57185d16e4da1eb99d Mon Sep 17 00:00:00 2001
From: Wang <Bruce.Wang@gov.bc.ca>
Date: Wed, 11 Sep 2024 11:47:30 -0700
Subject: [PATCH 2/3] TH-119992: fixed the issue that CGL company name can't be
 updated

---
 client/src/js/views/OwnersDetail.jsx                   |  2 +-
 client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/js/views/OwnersDetail.jsx b/client/src/js/views/OwnersDetail.jsx
index 0b9b61f8..8906b658 100644
--- a/client/src/js/views/OwnersDetail.jsx
+++ b/client/src/js/views/OwnersDetail.jsx
@@ -505,7 +505,7 @@ class OwnersDetail extends React.Component {
                       </Col>
                       <Col lg={4} md={6} sm={12} xs={12}>
                         <ColDisplay labelProps={{ xs: 6 }} fieldProps={{ xs: 6 }} label="CGL Insurance Company">
-                          {owner.cglCompanyName}
+                          {owner.cglCompany}
                         </ColDisplay>
                       </Col>
                       <Col lg={4} md={6} sm={12} xs={12}>
diff --git a/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx b/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx
index b9315656..e3d0f387 100644
--- a/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx
+++ b/client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx
@@ -29,7 +29,7 @@ class OwnersPolicyEditDialog extends React.Component {
     this.state = {
       workSafeBCPolicyNumber: owner.workSafeBCPolicyNumber || '',
       workSafeBCExpiryDate: owner.workSafeBCExpiryDate || '',
-      cglCompanyName: owner.cglCompanyName || '',
+      cglCompany: owner.cglCompany || '',
       cglPolicyNumber: owner.cglPolicyNumber || '',
       cglEndDate: owner.cglEndDate || '',
 
@@ -52,7 +52,7 @@ class OwnersPolicyEditDialog extends React.Component {
     if (this.state.workSafeBCExpiryDate !== owner.workSafeBCExpiryDate) {
       return true;
     }
-    if (this.state.cglCompanyName !== owner.cglCompanyName) {
+    if (this.state.cglCompany !== owner.cglCompany) {
       return true;
     }
     if (this.state.cglPolicyNumber !== owner.cglPolicyNumber) {
@@ -99,7 +99,7 @@ class OwnersPolicyEditDialog extends React.Component {
           ...this.props.owner,
           workSafeBCPolicyNumber: this.state.workSafeBCPolicyNumber,
           workSafeBCExpiryDate: toZuluTime(this.state.workSafeBCExpiryDate),
-          cglCompanyName: this.state.cglCompanyName,
+          cglCompany: this.state.cglCompany,
           cglPolicyNumber: this.state.cglPolicyNumber,
           cglEndDate: toZuluTime(this.state.cglEndDate),
         };
@@ -155,11 +155,11 @@ class OwnersPolicyEditDialog extends React.Component {
         </Row>
         <Row>
           <Col xs={12}>
-            <FormGroup controlId="cglCompanyName">
+            <FormGroup controlId="cglCompany">
               <FormLabel>CGL Insurance Company</FormLabel>
               <FormInputControl
                 type="text"
-                value={this.state.cglCompanyName}
+                value={this.state.cglCompany}
                 updateState={this.updateState}
                 maxLength={Constant.MAX_LENGTH_CGL_COMPANY_NAME}
               />

From 825ee752942cc52ac8b4d3d518cd980768a17121 Mon Sep 17 00:00:00 2001
From: Wang <Bruce.Wang@gov.bc.ca>
Date: Fri, 13 Sep 2024 10:36:25 -0700
Subject: [PATCH 3/3] TH-119992: removed other fields per business request

---
 client/src/js/views/WcbCglCoverage.jsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/src/js/views/WcbCglCoverage.jsx b/client/src/js/views/WcbCglCoverage.jsx
index 6074d6fc..3583b7df 100644
--- a/client/src/js/views/WcbCglCoverage.jsx
+++ b/client/src/js/views/WcbCglCoverage.jsx
@@ -12,15 +12,15 @@ import * as Constant from '../constants';
 
 import PageHeader from '../components/ui/PageHeader.jsx';
 import SearchBar from '../components/ui/SearchBar.jsx';
-import DateControl from '../components/DateControl.jsx';
+// import DateControl from '../components/DateControl.jsx';
 import Favourites from '../components/Favourites.jsx';
 import Form from '../components/Form.jsx';
 import MultiDropdown from '../components/MultiDropdown.jsx';
 import SortTable from '../components/SortTable.jsx';
 import Spinner from '../components/Spinner.jsx';
 import PrintButton from '../components/PrintButton.jsx';
-
-import { formatDateTime, toZuluTime } from '../utils/date';
+// import { formatDateTime, toZuluTime } from '../utils/date';
+import { toZuluTime } from '../utils/date';
 
 class WcbCglCoverage extends React.Component {
   static propTypes = {
@@ -170,9 +170,9 @@ class WcbCglCoverage extends React.Component {
           { field: 'primaryContactNumber', title: 'Phone' },
           { field: 'primaryContactCell', title: 'Cell' },
           { field: 'wcbNumber', title: 'WCB Number' },
-          { field: 'wcbExpiryDate', title: 'WCB Expires' },
+          // { field: 'wcbExpiryDate', title: 'WCB Expires' },
           { field: 'cglNumber', title: 'CGL Policy' },
-          { field: 'cglExpiryDate', title: 'CGL Expires' },
+          // { field: 'cglExpiryDate', title: 'CGL Expires' },
         ]}
       >
         {_.map(ownersCoverage, (entry) => {
@@ -186,9 +186,9 @@ class WcbCglCoverage extends React.Component {
               <td>{entry.primaryContactNumber}</td>
               <td>{entry.primaryContactCell}</td>
               <td>{entry.wcbNumber}</td>
-              <td>{formatDateTime(entry.wcbExpiryDate, 'YYYY-MMM-DD')}</td>
+              {/* <td>{formatDateTime(entry.wcbExpiryDate, 'YYYY-MMM-DD')}</td> */}
               <td>{entry.cglNumber}</td>
-              <td>{formatDateTime(entry.cglExpiryDate, 'YYYY-MMM-DD')}</td>
+              {/* <td>{formatDateTime(entry.cglExpiryDate, 'YYYY-MMM-DD')}</td> */}
             </tr>
           );
         })}
@@ -261,7 +261,7 @@ class WcbCglCoverage extends React.Component {
                     updateState={this.updateSearchState}
                     showMaxItems={2}
                   />
-                  <DateControl
+                  {/* <DateControl
                     id="wcbExpiry"
                     date={this.state.search.wcbExpiry}
                     updateState={this.updateSearchState}
@@ -274,7 +274,7 @@ class WcbCglCoverage extends React.Component {
                     updateState={this.updateSearchState}
                     label="CGL Exp Before:"
                     title="CGL Expiry Before"
-                  />
+                  /> */}
                   <Button id="search-button" variant="primary" type="submit">
                     Search
                   </Button>