diff --git a/frontend/src/compliance/components/ComplianceReportAlert.js b/frontend/src/compliance/components/ComplianceReportAlert.js
index 80d48d8e0..9a20f5857 100644
--- a/frontend/src/compliance/components/ComplianceReportAlert.js
+++ b/frontend/src/compliance/components/ComplianceReportAlert.js
@@ -27,7 +27,7 @@ const ComplianceReportAlert = (props) => {
switch (status) {
case 'DRAFT':
title = 'Draft';
- message = `${type} confirmed ${date} by ${userName}. Compliance report awaiting submission to Government of B.C.`;
+ message = `${type} confirmed ${date} by ${userName}. Model Year Report pending submission to Government of B.C.`;
classname = 'alert-warning';
break;
diff --git a/frontend/src/compliance/components/ComplianceReportListPage.js b/frontend/src/compliance/components/ComplianceReportListPage.js
index e13b852b8..df6e10b25 100644
--- a/frontend/src/compliance/components/ComplianceReportListPage.js
+++ b/frontend/src/compliance/components/ComplianceReportListPage.js
@@ -18,7 +18,7 @@ const ComplianceReportListPage = (props) => {
-
Model Year Compliance Reports
+
Model Year Reports
{displayBtn && (
)}
+
+ Under section 17 (5) of the ZEV Act a model year report must include for
+ the adjustment period ending September 30:
+
+
+ the number of credits issued or transferred or added to your balance
+
+
+ the number of credits offset or transferred away from your balance
+
+
+ Consumer sales of zero-emission vehicles made prior to October 1 must be
+ included in a submitted credit application prior to completing your
+ model year report. Model year reports must be submitted on or before
+ October 20.
+
diff --git a/frontend/src/compliance/components/ComplianceReportTabs.js b/frontend/src/compliance/components/ComplianceReportTabs.js
index c2baa44d3..944ed823f 100644
--- a/frontend/src/compliance/components/ComplianceReportTabs.js
+++ b/frontend/src/compliance/components/ComplianceReportTabs.js
@@ -1,11 +1,13 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Link } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
import ROUTES_COMPLIANCE from '../../app/routes/Compliance';
const ComplianceReportTabs = (props) => {
const { active, reportStatuses } = props;
+ const { id } = useParams();
return (
{
className={`nav-item ${(active === 'supplier-information') ? 'active' : ''} ${reportStatuses.supplierInformation}`}
role="presentation"
>
- Supplier Information
+ Supplier Information
- Enter the total light duty vehicle sales for{' '}
- {details.organization.name} in British Columbia for the 2020
- model year (ICE & ZEV)
+ Enter the 2020 model year light duty vehicle sales and lease
+ total (ICE & ZEV) in British Columbia for{' '}
+ {details.organization.name}.
- Confirm the previous 3 model year total light duty vehicle sales
- for {details.organization.name} in British Columbia (ICE & ZEV).
- Changes to these totals will require supplemental report(s) for
- previous model year compliance reports.
+ Confirm the previous 3 model year light duty vehicle sales and
+ lease total (ICE & ZEV) in British Columbia for{' '}
+ {details.organization.name}.
-
-
-
-
-
-
-
-
-
-
-
-
+ {previousSales.map((yearSale) => (
+
+
+
+
+ ))}
-
- If there are ZEV models missing below that contribute to your
- 2020 model year compliance report use the{' '}
- {' '}
- to add them, they will require government validation.
-
+
-
+
-
- 1,474 - total LDV ZEV models sold during the 2020 compliance
- period ending September 30,2021.
+
+ Pending Sales are VIN applied for in credit applications
+ awaiting government review. Sales Issued are those VIN already
+ verified by government as being eligible to earn credits
@@ -174,10 +175,10 @@ SupplierInformationDetailsPage.propTypes = {
handleChangeMake: PropTypes.func.isRequired,
handleDeleteMake: PropTypes.func.isRequired,
handleSubmitMake: PropTypes.func.isRequired,
+ handleSubmit: PropTypes.func.isRequired,
loading: PropTypes.bool.isRequired,
make: PropTypes.string.isRequired,
makes: PropTypes.arrayOf(PropTypes.string).isRequired,
- orgMakes: PropTypes.arrayOf(PropTypes.string).isRequired,
user: CustomPropTypes.user.isRequired,
};
export default SupplierInformationDetailsPage;
diff --git a/frontend/src/credits/CreditTransfersDetailsContainer.js b/frontend/src/credits/CreditTransfersDetailsContainer.js
index b08f0aee7..5497fbe36 100644
--- a/frontend/src/credits/CreditTransfersDetailsContainer.js
+++ b/frontend/src/credits/CreditTransfersDetailsContainer.js
@@ -66,7 +66,15 @@ const CreditTransfersDetailsContainer = (props) => {
submissionContent.signingConfirmation = checkboxes;
}
axios.patch(ROUTES_CREDIT_TRANSFERS.DETAILS.replace(':id', id), submissionContent)
- .then(() => history.push(ROUTES_CREDIT_TRANSFERS.LIST))
+ .then(() => {
+ history.push(ROUTES_CREDIT_TRANSFERS.EDIT.replace(':id', id));
+ if (status === "RESCINDED" || status === "DRAFT") {
+ history.replace(ROUTES_CREDIT_TRANSFERS.EDIT.replace(':id', id))
+ }
+ else {
+ history.replace(ROUTES_CREDIT_TRANSFERS.DETAILS.replace(':id', id));
+ }
+ })
.catch((error) => {
const { response } = error;
if (response.status === 400) {
diff --git a/frontend/src/credits/CreditTransfersEditContainer.js b/frontend/src/credits/CreditTransfersEditContainer.js
index 9d23a726d..ee12aa7ef 100644
--- a/frontend/src/credits/CreditTransfersEditContainer.js
+++ b/frontend/src/credits/CreditTransfersEditContainer.js
@@ -125,7 +125,14 @@ const CreditTransfersEditContainer = (props) => {
debitFrom,
signingConfirmation: checkboxes,
})
- .then(() => history.push(ROUTES_CREDIT_TRANSFERS.LIST))
+ .then((response) => {
+ if (status === "DRAFT") {
+ history.push(ROUTES_CREDIT_TRANSFERS.EDIT.replace(/:id/gi, response.data.id))
+ }
+ else {
+ history.push(ROUTES_CREDIT_TRANSFERS.DETAILS.replace(/:id/gi, response.data.id))
+ }
+ })
.catch((error) => {
const { response } = error;
if (response.status === 400) {
@@ -140,7 +147,12 @@ const CreditTransfersEditContainer = (props) => {
debitFrom,
signingConfirmation: checkboxes,
})
- .then(() => history.push(ROUTES_CREDIT_TRANSFERS.LIST))
+ .then(() => {
+ history.push(ROUTES_CREDIT_TRANSFERS.DETAILS.replace(/:id/g, id));
+ if (status === 'DRAFT') {
+ history.replace(ROUTES_CREDIT_TRANSFERS.EDIT.replace(/:id/g, id));
+ }
+ })
.catch((error) => {
const { response } = error;
if (response.status === 400) {
diff --git a/frontend/src/credits/UploadCreditRequestContainer.js b/frontend/src/credits/UploadCreditRequestContainer.js
index 49f645c89..6f59400f9 100644
--- a/frontend/src/credits/UploadCreditRequestContainer.js
+++ b/frontend/src/credits/UploadCreditRequestContainer.js
@@ -37,6 +37,7 @@ const UploadCreditRequestsContainer = (props) => {
axios.get(ROUTES_CREDIT_REQUESTS.DETAILS.replace(':id', id))
.then((response) => {
setSubmission(response.data);
+ setUploadNewExcel(true);
if (response.data.evidence.length > 0) {
setEvidenceCheckbox(true);
}
@@ -113,7 +114,7 @@ const UploadCreditRequestsContainer = (props) => {
id,
};
}
- if (uploadNewExcel) {
+ if (uploadNewExcel && files.length > 0) {
data.upload_new = true;
}
upload(ROUTES_CREDIT_REQUESTS.UPLOAD, files, data).then((response) => {
diff --git a/frontend/src/credits/components/CreditRequestAlert.js b/frontend/src/credits/components/CreditRequestAlert.js
index 77da7ee03..f36328ab1 100644
--- a/frontend/src/credits/components/CreditRequestAlert.js
+++ b/frontend/src/credits/components/CreditRequestAlert.js
@@ -11,7 +11,7 @@ const CreditRequestAlert = (props) => {
invalidSubmission,
} = props;
const {
- content, validationStatus, history, filename,
+ content, validationStatus, history, filename, id,
} = submission;
let message = '';
@@ -50,11 +50,11 @@ const CreditRequestAlert = (props) => {
break;
}
title = 'Draft';
- message = `${excelUploadMessage}, awaiting submission to Government of B.C. `;
+ message = `CA-${id} ${excelUploadMessage}, awaiting submission to Government of B.C. `;
classname = 'alert-warning';
break;
case 'SUBMITTED':
- message = `Application submitted to Government of B.C. ${moment(statusFilter('SUBMITTED').createTimestamp).format('MMM D, YYYY')}, by ${statusFilter('SUBMITTED').createUser.displayName}. Awaiting review by Government of B.C.`;
+ message = `CA-${id} submitted to Government of B.C. ${moment(statusFilter('SUBMITTED').createTimestamp).format('MMM D, YYYY')}, by ${statusFilter('SUBMITTED').createUser.displayName}. Awaiting review by Government of B.C.`;
title = 'Submitted';
if (isGovernment || excelUploadMessage === '') {
classname = 'alert-warning';
@@ -68,22 +68,22 @@ const CreditRequestAlert = (props) => {
classname = 'alert-success';
icon = 'check-circle';
if (isGovernment || excelUploadMessage === '') {
- message = `Credits issued ${moment(statusFilter('VALIDATED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('VALIDATED').createUser.displayName}.`;
+ message = `CA-${id} Credits issued ${moment(statusFilter('VALIDATED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('VALIDATED').createUser.displayName}.`;
} else {
- message = `Credits issued ${moment(statusFilter('VALIDATED').createTimestamp).format('MMM D, YYYY')} by Government of B.C.`;
+ message = `CA-${id} Credits issued ${moment(statusFilter('VALIDATED').createTimestamp).format('MMM D, YYYY')} by Government of B.C.`;
historyMessage = `${excelUploadMessage}. Application submitted to Government of B.C. ${moment(statusFilter('SUBMITTED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('SUBMITTED').createUser.displayName}`;
}
break;
case 'RECOMMEND_APPROVAL':
if (isGovernment || excelUploadMessage === '') {
title = 'Recommended';
- message = `Application reviewed and recommended to Director ${moment(statusFilter('RECOMMEND_APPROVAL').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('RECOMMEND_APPROVAL').createUser.displayName}. ICBC data used was current to ${icbcDate}.`;
+ message = `CA-${id} Application reviewed and recommended to Director ${moment(statusFilter('RECOMMEND_APPROVAL').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('RECOMMEND_APPROVAL').createUser.displayName}. ICBC data used was current to ${icbcDate}.`;
classname = 'alert-warning';
}
break;
case 'CHECKED':
title = 'Validated';
- message = `Sales checked against ICBC registration data ${moment(statusFilter('CHECKED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('CHECKED').createUser.displayName}. ICBC data used was current to: ${icbcDate}`;
+ message = `CA-${id} Sales checked against ICBC registration data ${moment(statusFilter('CHECKED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('CHECKED').createUser.displayName}. ICBC data used was current to: ${icbcDate}`;
classname = 'alert-warning';
break;
default:
diff --git a/frontend/src/credits/components/CreditRequestDetailsPage.js b/frontend/src/credits/components/CreditRequestDetailsPage.js
index 5b683cfe4..286950d1f 100644
--- a/frontend/src/credits/components/CreditRequestDetailsPage.js
+++ b/frontend/src/credits/components/CreditRequestDetailsPage.js
@@ -364,7 +364,7 @@ const CreditRequestDetailsPage = (props) => {
}}
type="button"
>
- Re-upload excel file
+ Re-upload files
)}
{submission.validationStatus === 'DRAFT'
diff --git a/frontend/src/credits/components/CreditRequestListTable.js b/frontend/src/credits/components/CreditRequestListTable.js
index df70c0629..5897ca8a1 100644
--- a/frontend/src/credits/components/CreditRequestListTable.js
+++ b/frontend/src/credits/components/CreditRequestListTable.js
@@ -17,7 +17,8 @@ const CreditRequestListTable = (props) => {
} = props;
const columns = [{
- accessor: 'id',
+ id: 'id',
+ accessor: (item) => (`CA-${item.id}`),
className: 'text-right',
Header: 'ID',
maxWidth: 75,
diff --git a/frontend/src/credits/components/CreditRequestsUploadPage.js b/frontend/src/credits/components/CreditRequestsUploadPage.js
index b4c34cc4d..7b6f52e8b 100644
--- a/frontend/src/credits/components/CreditRequestsUploadPage.js
+++ b/frontend/src/credits/components/CreditRequestsUploadPage.js
@@ -78,6 +78,7 @@ const CreditRequestsUploadPage = (props) => {
{
submission,
} = props;
const {
- history, status, debitFrom, creditTo, sufficientCredits,
+ history, status, debitFrom, creditTo, sufficientCredits, id,
} = submission;
let message = '';
let title;
@@ -26,23 +26,23 @@ const CreditTransfersAlert = (props) => {
switch (status) {
case 'DRAFT':
title = 'Draft';
- message = `saved ${date} by ${userName}, awaiting submission to ${creditTo.name} by your signing authority.`;
+ message = `CT-${id} saved ${date} by ${userName}, awaiting submission to ${creditTo.name} by your signing authority.`;
classname = 'alert-warning';
break;
case 'RESCINDED':
title = 'Rescinded';
- message = `rescinded ${date} by ${statusOrg}`;
+ message = `CT-${id} rescinded ${date} by ${statusOrg}`;
classname = 'alert-danger';
break;
case 'RESCIND_PRE_APPROVAL':
title = 'Rescinded';
- message = `rescinded ${date} by ${statusOrg}`;
+ message = `CT-${id} rescinded ${date} by ${statusOrg}`;
classname = 'alert-danger';
break;
case 'SUBMITTED':
if (user.organization.id === debitFrom.id) { // bceid initiator
title = 'Submitted to Transfer Partner';
- message = `submitted ${date} by ${userName}, awaiting ${creditTo.name} acceptance.`;
+ message = `CT-${id} submitted ${date} by ${userName}, awaiting ${creditTo.name} acceptance.`;
classname = 'alert-warning';
} else { // bceid receiver
title = 'Submitted by Transfer Partner';
@@ -55,39 +55,39 @@ const CreditTransfersAlert = (props) => {
title = 'Submitted to Government';
if (user.isGovernment) {
classname = 'alert-warning';
- message = `submitted to the Government of B.C. ${date}, awaiting government analyst review and recommendation to the Director.`;
+ message = `CT-${id} submitted to the Government of B.C. ${date}, awaiting government analyst review and recommendation to the Director.`;
} else {
- message = `submitted to the Government of B.C. ${date}, awaiting government review.`;
+ message = `CT-${id} submitted to the Government of B.C. ${date}, awaiting government review.`;
classname = 'alert-primary';
}
break;
case 'DISAPPROVED':
title = 'Rejected';
- message = ` rejected ${date} by ${statusOrg}.`;
+ message = `CT-${id} rejected ${date} by ${statusOrg}.`;
classname = 'alert-danger';
break;
case 'REJECTED':
title = 'Rejected';
classname = 'alert-danger';
if (user.isGovernment) {
- message = `rejected ${date} by the Director.`;
+ message = `CT-${id} rejected ${date} by the Director.`;
} else {
- message = `rejected ${date} by the Government of B.C.`;
+ message = `CT-${id} rejected ${date} by the Government of B.C.`;
}
break;
case 'RECOMMEND_APPROVAL':
if (user.isGovernment) {
title = 'Recommend Transfer';
- message = `recommended recording of transfer ${date} by ${userName}, awaiting Director action.`;
+ message = `CT-${id} recommended recording of transfer ${date} by ${userName}, awaiting Director action.`;
classname = 'alert-primary';
}
break;
case 'RECOMMEND_REJECTION':
if (user.isGovernment) {
title = 'Recommend Rejection';
- message = `recommended rejection of transfer ${date} by ${userName}, awaiting Director action.`;
+ message = `CT-${id} recommended rejection of transfer ${date} by ${userName}, awaiting Director action.`;
classname = 'alert-danger';
}
break;
@@ -95,9 +95,9 @@ const CreditTransfersAlert = (props) => {
icon = 'check-circle';
classname = 'alert-success';
if (user.isGovernment) {
- message = `recorded ${date} by the Director, credit balances have been adjusted.`;
+ message = `CT-${id} recorded ${date} by the Director, credit balances have been adjusted.`;
} else {
- message = `recorded ${date} by the Government of B.C, credit balances have been adjusted.`;
+ message = `CT-${id} recorded ${date} by the Government of B.C, credit balances have been adjusted.`;
}
break;
diff --git a/frontend/src/credits/components/CreditTransfersDetailsPage.js b/frontend/src/credits/components/CreditTransfersDetailsPage.js
index 7047fdce0..8e0cddace 100644
--- a/frontend/src/credits/components/CreditTransfersDetailsPage.js
+++ b/frontend/src/credits/components/CreditTransfersDetailsPage.js
@@ -206,11 +206,13 @@ const CreditTransfersDetailsPage = (props) => {
{showSubmissionConfirmation
&& (
<>
+ {latestSubmit && (
Signed and submitted by {latestSubmit.createUser.displayName} of
{latestSubmit.createUser.organization.name}
{moment(latestSubmit.createTimestamp).tz('America/Vancouver').format('YYYY-MM-DD hh:mm:ss z')}
+ )}
{showApproveConfirmation && (
Signed and submitted by {latestApprove.createUser.displayName} of
diff --git a/frontend/src/credits/components/CreditTransfersListTable.js b/frontend/src/credits/components/CreditTransfersListTable.js
index 8e1843f57..60eec663c 100644
--- a/frontend/src/credits/components/CreditTransfersListTable.js
+++ b/frontend/src/credits/components/CreditTransfersListTable.js
@@ -44,7 +44,7 @@ const CreditTransfersListTable = (props) => {
});
const columns = [{
- accessor: 'id',
+ accessor: (item) => (`CT-${item.id}`),
className: 'text-right',
Header: 'ID',
id: 'id',
diff --git a/frontend/src/credits/components/__tests__/CreditTransfersDetailsPage.test.js b/frontend/src/credits/components/__tests__/CreditTransfersDetailsPage.test.js
index 0c859d628..4a9c713e7 100644
--- a/frontend/src/credits/components/__tests__/CreditTransfersDetailsPage.test.js
+++ b/frontend/src/credits/components/__tests__/CreditTransfersDetailsPage.test.js
@@ -111,10 +111,12 @@ const govUser = {
it('renders without crashing', () => {
render( { console.log('submit!'); }} />);
});
+
it('shows an action bar with just a back button if the user is government', () => {
const { container } = render( { console.log('submit!'); }} />);
expect(findByTestId(container, 'action-bar-basic')).toBeInTheDocument;
});
+
it('shows the comment box and reject button (but not rescind button) if the user is from the receiving supplier', () => {
const { container } = render( { console.log('submit!'); }} />);
const commentbox = findByTestId(container, 'transfer-comment');
@@ -143,6 +145,7 @@ it('if its a draft, initiating company can submit to partner or press back', ()
fireEvent.click(getByTestId(container, 'submit-to-partner'));
expect(queryByText(container, 'Submit credit transfer notice to trade partner?')).toBeInTheDocument;
});
+
it('shows the submit modal if the user selects the submit button', () => {
submission.status = 'DRAFT';
submission.history = [{
@@ -152,6 +155,13 @@ it('shows the submit modal if the user selects the submit button', () => {
organization: { name: 'Toyota Canada Inc.' },
},
createTimestamp: '2020-12-01T09:27:21.098202-07:00',
+ }, {
+ status: 'SUBMITTED',
+ createUser: {
+ displayName: 'emily',
+ organization: { name: 'Toyota Canada Inc.' },
+ },
+ createTimestamp: '2020-12-01T09:27:21.098202-07:00',
}];
const { container } = render( { console.log('submit!'); }} />);
fireEvent.click(getByTestId(container, 'submit-to-partner'));
diff --git a/frontend/src/credits/components/__tests__/SalesListTable.test.js b/frontend/src/credits/components/__tests__/SalesListTable.test.js
index 1e76aa111..ec4b36233 100644
--- a/frontend/src/credits/components/__tests__/SalesListTable.test.js
+++ b/frontend/src/credits/components/__tests__/SalesListTable.test.js
@@ -91,6 +91,9 @@ it('renders without crashing', () => {
render( {}}
+ setLoading={() => {}}
+ setReactTable={() => {}}
user={baseProps.user}
validatedList={baseProps.validatedList}
/>);
@@ -101,6 +104,9 @@ it('gives an error code of 21 if vin has already been validated', () => {
handleCheckboxClick={baseProps.handleCheckboxClick}
items={baseProps.items}
loading={false}
+ refreshContent={() => {}}
+ setLoading={() => {}}
+ setReactTable={() => {}}
user={baseProps.user}
validatedList={baseProps.validatedList}
/>);
@@ -111,7 +117,11 @@ it('gives an error code of 11 if there is no matching icbc vin', () => {
const { getByText } = render( {}}
+ setLoading={() => {}}
+ setReactTable={() => {}}
user={baseProps.user}
validatedList={basePropsNoMatch.validatedList}
/>);
@@ -121,8 +131,12 @@ it('gives an error code of 11 if there is no matching icbc vin', () => {
it('gives no error code if everything matches with icbcdata', () => {
const { queryByText } = render( {}}
+ setLoading={() => {}}
+ setReactTable={() => {}}
user={baseProps.user}
validatedList={baseProps.validatedList}
/>);
diff --git a/frontend/src/notifications/components/NotificationListPage.js b/frontend/src/notifications/components/NotificationListPage.js
index 9c6d77ee8..a3f77ae19 100644
--- a/frontend/src/notifications/components/NotificationListPage.js
+++ b/frontend/src/notifications/components/NotificationListPage.js
@@ -1,8 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import ReactTooltip from 'react-tooltip';
-import CustomPropTypes from '../../app/utilities/props';
-import Loading from '../../app/components/Loading';
const NotificationListPage = (props) => {
const {
@@ -13,26 +11,19 @@ const NotificationListPage = (props) => {
displayList,
subscribe,
unsubscribe,
- loading,
- user,
} = props;
-
- if (loading) {
- return ;
- }
-
return (