fix: fix reversed calculated values and add to formContext

bcgov · Jan 17, 2023 · 372f3d0 · 372f3d0
1 parent 6b85e99
commit 372f3d0
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/app/components/Form/ProjectMilestoneReportForm.tsx b/app/components/Form/ProjectMilestoneReportForm.tsx
@@ -8,7 +8,6 @@ import { useUpdateReportingRequirementFormChange } from "mutations/ProjectReport
 import { MutableRefObject, useMemo, useRef } from "react";
 import { graphql, useFragment } from "react-relay";
 import CollapsibleReport from "components/ReportingRequirement/CollapsibleReport";
-
 import SavingIndicator from "./SavingIndicator";
 import UndoChangesButton from "./UndoChangesButton";
 import milestoneUiSchema from "data/jsonSchemaForm/projectMilestoneUiSchema";
@@ -273,15 +272,6 @@ const ProjectMilestoneReportForm: React.FC<Props> = (props) => {
         </Button>
         {sortedMilestoneReports.map((node, index) => {
           const formData = { ...node.newFormData };
-          formData.calculatedGrossAmount = Number(
-            node.calculatedGrossAmountThisMilestone
-          );
-          formData.calculatedHoldbackAmount = Number(
-            node.calculatedNetAmountThisMilestone
-          );
-          formData.calculatedNetAmount = Number(
-            node.calculatedHoldbackAmountThisMilestone
-          );
           return (
             <div key={node.id} id={`Milestone${index + 1}`}>
               <CollapsibleReport
@@ -316,6 +306,11 @@ const ProjectMilestoneReportForm: React.FC<Props> = (props) => {
                   ObjectFieldTemplate={EmptyObjectFieldTemplate}
                   formContext={{
                     dueDate: formData?.reportDueDate,
+                    calculatedGrossAmount:
+                      node.calculatedGrossAmountThisMilestone,
+                    calculatedHoldbackAmount:
+                      node.calculatedHoldbackAmountThisMilestone,
+                    calculatedNetAmount: node.calculatedNetAmountThisMilestone,
                   }}
                 />
               </CollapsibleReport>