Merge pull request #558 from Open-Earth-Foundation/fix/manual-input-r…

…egactor Fix/manual input refactor
Open-Earth-Foundation · Jul 11, 2024 · dcbac7c · dcbac7c
2 parents cdba4a8 + be98519
commit dcbac7c
Show file tree

Hide file tree

Showing 13 changed files with 1,116 additions and 2,674 deletions.
diff --git a/app/src/app/[lng]/[inventory]/data/[step]/[subsector]/page.tsx b/app/src/app/[lng]/[inventory]/data/[step]/[subsector]/page.tsx
diff --git a/app/src/app/[lng]/[inventory]/data/[step]/page.tsx b/app/src/app/[lng]/[inventory]/data/[step]/page.tsx
@@ -811,6 +811,7 @@ export default function AddDataSteps({
                           sectorId: subSector.sectorId,
                           subsectorId: subSector.subsectorId,
                           referenceNumber: subSector.referenceNumber,
+                          subCategories: subSector.subCategories,
                         }),
                       );
                       router.push(

diff --git a/app/src/components/Cards/methodology-card.tsx b/app/src/components/Cards/methodology-card.tsx
@@ -1,34 +1,49 @@
 import { Badge, Box, Card, Radio, Text } from "@chakra-ui/react";
 import { TFunction } from "i18next";
 import React, { FC, useState } from "react";
+import { MethodologyValues } from "../Tabs/Activity/activity-tab";
 
 interface MethodologyCardProps {
-  name: string;
+  methodologyId: string;
+  methodologyName: string;
   description: string;
   inputRequired: string[];
   isSelected: boolean;
   disabled: boolean;
   t: TFunction;
-  handleCardSelect: (methodologyName: string) => void;
+  handleCardSelect: (methodologyId: MethodologyValues) => void;
 }
 
 const MethodologyCard: FC<MethodologyCardProps> = ({
-  name,
+  methodologyId,
+  methodologyName,
   description,
   inputRequired,
   disabled,
   t,
-  handleCardSelect = (_methodologyName: string) => {},
+  handleCardSelect = (_methodologyId: MethodologyValues) => {},
 }) => {
   const [isSelected, setIsSelected] = useState(false);
   const handleRadioChange = () => {
     setIsSelected(true);
-    handleCardSelect(name);
+    handleCardSelect({
+      description,
+      disabled,
+      inputRequired,
+      methodologyId,
+      methodologyName,
+    });
   };
 
   const handleCardClick = () => {
     if (!isSelected) {
-      handleCardSelect(name);
+      handleCardSelect({
+        description,
+        disabled,
+        inputRequired,
+        methodologyId,
+        methodologyName,
+      });
     }
     setIsSelected(!isSelected);
   };
@@ -74,7 +89,7 @@ const MethodologyCard: FC<MethodologyCardProps> = ({
         )}
       </Box>
       <Text fontWeight="bold" fontSize="title.md" fontFamily="heading">
-        {name}
+        {methodologyName}
       </Text>
       <Text
         letterSpacing="wide"
@@ -100,7 +115,7 @@ const MethodologyCard: FC<MethodologyCardProps> = ({
         fontWeight="normal"
         color="interactive.control"
       >
-        {inputRequired.map((item: string, i: number) => (
+        {inputRequired?.map((item: string, i: number) => (
           <li key={i}>{item}</li>
         ))}
       </Box>