Skip to content

Commit

Permalink
Merge pull request #2238 from bcgov/1.10.12
Browse files Browse the repository at this point in the history 
1.10.12 - TH-119992: Remove the WCB & CGL expiry date
  • Loading branch information
@bcgov-brwang
bcgov-brwang authored Oct 9, 2024
2 parents 207264e + 825ee75 commit cb6bd08
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions client/src/js/views/OwnersDetail.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,22 +498,22 @@ 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>
</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}>
<ColDisplay labelProps={{ xs: 6 }} fieldProps={{ xs: 6 }} label="CGL Policy Number">
{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>
Expand Down
18 changes: 9 additions & 9 deletions client/src/js/views/WcbCglCoverage.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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) => {
Expand All @@ -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>
);
})}
Expand Down Expand Up @@ -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}
Expand All @@ -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>
Expand Down
18 changes: 9 additions & 9 deletions client/src/js/views/dialogs/OwnersPolicyEditDialog.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 || '',

Expand All @@ -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) {
Expand Down Expand Up @@ -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),
};
Expand All @@ -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>
Expand All @@ -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"
Expand All @@ -155,26 +155,26 @@ 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}
/>
</FormGroup>
</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"
Expand Down

0 comments on commit cb6bd08

Please sign in to comment.