chore: additional reporting data form

bcgov · Jan 16, 2025 · b50e25b · b50e25b
1 parent e85e0b0
commit b50e25b
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/.../components/additionalInformation/additionalReportingData/AdditionalReportingDataPage.tsx b/.../components/additionalInformation/additionalReportingData/AdditionalReportingDataPage.tsx
@@ -6,7 +6,7 @@ import { HasReportVersion } from "@reporting/src/app/utils/defaultPageFactoryTyp
 const REGULATED_OPERATION = "OBPS Regulated Operation";
 const NEW_ENTRANT = "New Entrant Operation";
 
-function transformReportAdditionalData(reportAdditionalData: any) {
+export function transformReportAdditionalData(reportAdditionalData: any) {
   const captureType = [];
   if (reportAdditionalData.emissions_on_site_use !== null) {
     captureType.push("On-site use");

diff --git a/bciers/apps/reporting/src/app/components/finalReview/FinalReviewForm.tsx b/bciers/apps/reporting/src/app/components/finalReview/FinalReviewForm.tsx
@@ -13,6 +13,7 @@ import { ReviewData } from "./reviewDataFactory/factory";
 import { withTheme } from "@rjsf/core";
 import { customizeValidator } from "@rjsf/validator-ajv8";
 import finalReviewTheme from "./formCustomization/finalReviewTheme";
+import { additionalReportingDataUiSchema } from "@reporting/src/data/jsonSchema/additionalReportingData/additionalReportingData";
 
 interface Props extends HasReportVersion {
   taskListElements: TaskListElement[];
@@ -25,6 +26,7 @@ const finalReviewSchemaMap: { [key: string]: any } = {
   nonAttributableEmissions: nonAttributableEmissionUiSchema,
   productionData: productionDataUiSchema,
   emissionAllocation: emissionAllocationUiSchema,
+  additionalReportingData: additionalReportingDataUiSchema,
 };
 
 const resolveUiSchema = (uiSchema: any) => {

diff --git a/...pps/reporting/src/app/components/finalReview/reviewDataFactory/additionalReportingData.ts b/...pps/reporting/src/app/components/finalReview/reviewDataFactory/additionalReportingData.ts
@@ -0,0 +1,31 @@
+import { ReviewDataFactoryItem } from "./factory";
+import { getReportAdditionalData } from "@reporting/src/app/utils/getReportAdditionalData";
+import { transformReportAdditionalData } from "../../additionalInformation/additionalReportingData/AdditionalReportingDataPage";
+import {
+  additionalReportingDataSchema,
+  additionalReportingDataWithElectricityGeneratedSchema,
+} from "@reporting/src/data/jsonSchema/additionalReportingData/additionalReportingData";
+import { getRegistrationPurpose } from "@reporting/src/app/utils/getRegistrationPurpose";
+
+const additionalReportingDataFactoryItem: ReviewDataFactoryItem = async (
+  versionId,
+) => {
+  const isRegulatedOperation =
+    (await getRegistrationPurpose(versionId))?.registration_purpose ===
+    "OBPS Regulated Operation";
+
+  const reportAdditionalData = await getReportAdditionalData(versionId);
+  const transformedData = transformReportAdditionalData(reportAdditionalData);
+
+  return [
+    {
+      schema: isRegulatedOperation
+        ? additionalReportingDataWithElectricityGeneratedSchema
+        : additionalReportingDataSchema,
+      data: transformedData,
+      uiSchema: "additionalReportingData",
+    },
+  ];
+};
+
+export default additionalReportingDataFactoryItem;
diff --git a/bciers/apps/reporting/src/app/components/finalReview/reviewDataFactory/factory.ts b/bciers/apps/reporting/src/app/components/finalReview/reviewDataFactory/factory.ts
@@ -7,6 +7,7 @@ import emissionsSummaryFactoryItem from "./emissionsSummaryFactoryItem";
 import productionDataFactoryItem from "./productionDataFactoryItem";
 import allocationOfEmissionsFactoryItem from "./allocationOfEmissions";
 import { RJSFSchema } from "@rjsf/utils";
+import additionalReportingDataFactoryItem from "./additionalReportingData";
 
 export type ReviewData = {
   schema: RJSFSchema;
@@ -32,5 +33,6 @@ export default async function reviewDataFactory(
     ...(await emissionsSummaryFactoryItem(versionId, facilityId)),
     ...(await productionDataFactoryItem(versionId, facilityId)),
     ...(await allocationOfEmissionsFactoryItem(versionId, facilityId)),
+    ...(await additionalReportingDataFactoryItem(versionId, facilityId)),
   ];
 }
diff --git a/bciers/apps/reporting/src/data/jsonSchema/additionalReportingData/additionalReportingData.ts b/bciers/apps/reporting/src/data/jsonSchema/additionalReportingData/additionalReportingData.ts
@@ -3,8 +3,8 @@ import FieldTemplate from "@bciers/components/form/fields/FieldTemplate";
 import { TitleOnlyFieldTemplate } from "@bciers/components/form/fields";
 import SectionFieldTemplate from "@bciers/components/form/fields/SectionFieldTemplate";
 import { CapturedEmmissionsInfo } from "@reporting/src/data/jsonSchema/additionalReportingData/additionalMessage";
-import { RadioWidget } from "@bciers/components/form/widgets";
-import multiSelectWidget from "@bciers/components/form/widgets/MultiSelectWidget";
+import RadioWidget from "@bciers/components/form/widgets/RadioWidget";
+import MultiSelectWidget from "@bciers/components/form/widgets/MultiSelectWidget";
 
 export const additionalReportingDataSchema: RJSFSchema = {
   type: "object",
@@ -132,7 +132,7 @@ export const additionalReportingDataUiSchema = {
       "ui:widget": RadioWidget,
     },
     capture_type: {
-      "ui:widget": multiSelectWidget,
+      "ui:widget": MultiSelectWidget,
       "ui:options": { style: { width: "100%", textAlign: "justify" } },
       "ui:placeholder": "Capture type",
     },