diff --git a/migrations/sql/V2024.08.27.14.14__update_discharge_factor_description_in_project_summary_document_type.sql b/migrations/sql/V2024.08.27.14.14__update_discharge_factor_description_in_project_summary_document_type.sql new file mode 100644 index 0000000000..936e0cadee --- /dev/null +++ b/migrations/sql/V2024.08.27.14.14__update_discharge_factor_description_in_project_summary_document_type.sql @@ -0,0 +1,3 @@ +UPDATE project_summary_document_type +SET description = 'Discharge Factor' +WHERE project_summary_document_type_code = 'DFA'; \ No newline at end of file diff --git a/services/common/src/components/projectSummary/AuthorizationSupportDocumentUpload.tsx b/services/common/src/components/projectSummary/AuthorizationSupportDocumentUpload.tsx index 30b9369052..1888a0e112 100644 --- a/services/common/src/components/projectSummary/AuthorizationSupportDocumentUpload.tsx +++ b/services/common/src/components/projectSummary/AuthorizationSupportDocumentUpload.tsx @@ -4,7 +4,11 @@ import { DOCUMENT, EXCEL, IMAGE, SPATIAL } from "@mds/common/constants/fileTypes import { PROJECT_SUMMARY_DOCUMENTS } from "@mds/common/constants/API"; import RenderFileUpload from "@mds/common/components/forms/RenderFileUpload"; import { IProjectSummaryDocument } from "../.."; -import { PROJECT_SUMMARY_DOCUMENT_TYPE_CODE } from "../.."; +import { + PROJECT_SUMMARY_DOCUMENT_TYPE_CODE, + DISCHARGE_FACTOR_FORM_AMENDMENT, + DISCHARGE_FACTOR_FORM_NEW, +} from "../.."; import { requiredList } from "@mds/common/redux/utils/Validate"; interface AuthorizationSupportDocumentUploadProps { @@ -75,7 +79,7 @@ export const AuthorizationSupportDocumentUpload: FC valuesToCheckFor.includes(val)); @@ -110,14 +114,12 @@ export const AuthorizationSupportDocumentUpload: FC {(!isAmendment || (isAmendment && - isDocumentTypeRequired( - PROJECT_SUMMARY_DOCUMENT_TYPE_CODE.DISCHARGE_FACTOR_AMENDMENT - ))) && ( + isDocumentTypeRequired(PROJECT_SUMMARY_DOCUMENT_TYPE_CODE.DISCHARGE_FACTOR))) && ( { const RenderEMANewPermitSection = ({ code }) => { return ( -
+
{ required validate={[requiredRadioButton]} /> +
@@ -278,7 +285,7 @@ const RenderEMAAmendFieldArray = ({ fields, code }) => { return ( <> {fields.map((amendment: string, index) => ( - + { }; return ( - <> +
{ }} onChange={handleChangeAuthType} props={{ - label: "What type of authorization is involved in your application?", + label: ( + + What type of authorization is involved in your application? + + ), options: [ { disabled: hasAmendments, @@ -406,7 +417,7 @@ const RenderEMAAuthCodeFormSection = ({ code }) => { @@ -424,7 +435,7 @@ const RenderEMAAuthCodeFormSection = ({ code }) => { }} /> {hasNew && } - +
); }; @@ -484,7 +495,7 @@ const RenderAuthCodeFormSection = ({ authorizationType, code }) => { // other authorizations, have single record so index with [0] return ( - + { {transformedProjectSummaryAuthorizationTypes.map((authorization) => { return ( -
+
{authorization.description} {authorization.children.map((child) => { const checked = formValues.authorizationTypes?.includes(child.code); @@ -584,39 +595,42 @@ export const AuthorizationsInvolved = () => { <> {child.code === "MINES_ACT_PERMIT" && ( -
  • - For intent to depart from a Mines Act authorized mine plan - and reclamation program, as per HSRC code 10.1.18, submit - a{" "} - {isCore ? ( - "Notice of Departure" - ) : ( - - Notice of Departure - - )}{" "} - through MineSpace -
    • -
  • - For exploration work outside the permit mine area without - expanding the production area, submit a Notice of Work - application via FrontCounter BC to amend your MX or CX - permit. -
    • -
  • - For induced polarization surveys or exploration drilling - within the permit mine area, submit a Notification of - Deemed Authorization application via FrontCounter BC. -
    • - +
    +
      +
    • + For intent to depart from a Mines Act authorized mine + plan and reclamation program, as per HSRC code 10.2.9, + submit a{" "} + {isCore ? ( + "Notice of Departure" + ) : ( + + Notice of Departure + + )}{" "} + through MineSpace +
      • +
    • + For exploration work outside the permit mine area + without expanding the production area, submit a Notice + of Work application via FrontCounter BC to amend your MX + or CX permit. +
      • +
    • + For induced polarization surveys or exploration drilling + within the permit mine area, submit a Notification of + Deemed Authorization application via FrontCounter BC. +
      • +
    +
    } type="info" showIcon diff --git a/services/common/src/components/projectSummary/__snapshots__/AuthorizationsInvolved.spec.tsx.snap b/services/common/src/components/projectSummary/__snapshots__/AuthorizationsInvolved.spec.tsx.snap index 2d05c13fda..3643d57ec2 100644 --- a/services/common/src/components/projectSummary/__snapshots__/AuthorizationsInvolved.spec.tsx.snap +++ b/services/common/src/components/projectSummary/__snapshots__/AuthorizationsInvolved.spec.tsx.snap @@ -100,7 +100,9 @@ exports[`AuthorizationsInvolved renders properly 1`] = ` />
    -
    +
    @@ -141,7 +143,9 @@ exports[`AuthorizationsInvolved renders properly 1`] = `
    -
    +
    @@ -284,7 +288,9 @@ exports[`AuthorizationsInvolved renders properly 1`] = `
    -
    +
    @@ -393,7 +399,9 @@ exports[`AuthorizationsInvolved renders properly 1`] = `
    -
    +
    @@ -434,7 +442,9 @@ exports[`AuthorizationsInvolved renders properly 1`] = `
    -
    +
    diff --git a/services/common/src/constants/strings.tsx b/services/common/src/constants/strings.tsx index 7d6e911195..208c6dbec9 100755 --- a/services/common/src/constants/strings.tsx +++ b/services/common/src/constants/strings.tsx @@ -220,7 +220,7 @@ export const PROJECT_SUMMARY_DOCUMENT_TYPE = { export const PROJECT_SUMMARY_DOCUMENT_TYPE_CODE = { GENERAL: "GEN", LOCATION_MAP: "MAP", - DISCHARGE_FACTOR_AMENDMENT: "DFA", + DISCHARGE_FACTOR: "DFA", SUPPORTING: "SPR", SPATIAL: "SPT", CONSENT_LETTER: "CSL", @@ -244,7 +244,7 @@ export const PROJECT_SUMMARY_DOCUMENT_TYPE_CODE_STATE = { export const PROJECT_SUMMARY_DOCUMENT_TYPE_CODE_LOCATION = { GEN: "General", MAP: "Location Map", - DFA: "Discharge Factor Amendment", + DFA: "Discharge Factor", SPR: "Supporting Documents", }; @@ -456,3 +456,8 @@ export const AMS_STATUS_CODE_FAIL = "fail"; export const AMS_STATUS_CODE_ERROR = "error"; export const ENVIRONMENTAL_MANAGMENT_ACT = "ENVIRONMENTAL_MANAGMENT_ACT"; + +export const DISCHARGE_FACTOR_FORM_NEW = + "https://www2.gov.bc.ca/assets/gov/environment/waste-management/waste-discharge-authorization/guides/forms/epd-ema-03_new_auth_discharge_factors_application_form.pdf"; +export const DISCHARGE_FACTOR_FORM_AMENDMENT = + "https://www2.gov.bc.ca/assets/gov/environment/waste-management/waste-discharge-authorization/guides/forms/epd-ema-06_amend_discharge_factor_amendment_form.pdf"; diff --git a/services/common/src/tests/mocks/dataMocks.tsx b/services/common/src/tests/mocks/dataMocks.tsx index 66d77fef39..e3095ba2b8 100644 --- a/services/common/src/tests/mocks/dataMocks.tsx +++ b/services/common/src/tests/mocks/dataMocks.tsx @@ -7789,7 +7789,7 @@ export const AUTHORIZATION_INVOLVED = { SPR: "Supporting Documents", MAP: "Location Map", GEN: "General", - DFA: "Discharge Factor Amendment", + DFA: "Discharge Factor", }, formValues: { authorizations: { diff --git a/services/core-api/app/api/projects/project_summary/models/project_summary_authorization.py b/services/core-api/app/api/projects/project_summary/models/project_summary_authorization.py index 46e3c61e3c..b6cacf254c 100644 --- a/services/core-api/app/api/projects/project_summary/models/project_summary_authorization.py +++ b/services/core-api/app/api/projects/project_summary/models/project_summary_authorization.py @@ -188,7 +188,12 @@ def validate_authorization(cls, authorization, is_ams): 'required': True, 'type': 'list', 'empty': False, - } + }, + 'support_documents': { + 'required': True, + 'type': 'list', + 'empty': False, + }, } if not permit_type or not isinstance(permit_type, list) or not permit_type[0]: diff --git a/services/core-web/src/styles/generic/layout.scss b/services/core-web/src/styles/generic/layout.scss index ac9443faa6..f47ec51b99 100644 --- a/services/core-web/src/styles/generic/layout.scss +++ b/services/core-web/src/styles/generic/layout.scss @@ -482,6 +482,11 @@ html { } margin: $default-margin-lg !important; + + &--y { + margin-top: $default-margin-lg !important; + margin-bottom: $default-margin-lg !important; + } } .margin-xlarge { @@ -707,4 +712,14 @@ img.lessOpacity { .grey-box { width: 100%; + border: 1px solid #f2f2f2; + padding: 16px 24px; +} + +.list-position-outside { + padding-inline-start: 15px; + + li { + list-style-position: outside; + } } \ No newline at end of file diff --git a/services/minespace-web/src/styles/generic/layout.scss b/services/minespace-web/src/styles/generic/layout.scss index a2e5b5f115..68f45f309f 100644 --- a/services/minespace-web/src/styles/generic/layout.scss +++ b/services/minespace-web/src/styles/generic/layout.scss @@ -501,4 +501,12 @@ color: $white !important; } } +} + +.list-position-outside { + padding-inline-start: 15px; + + li { + list-style-position: outside; + } } \ No newline at end of file