Add missing field costInUsd and remove last 3 tabs

the-deep · Jan 25, 2024 · b7f8253 · b7f8253
1 parent 57165cd
commit b7f8253
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/app/gqlFragments.ts b/app/gqlFragments.ts
@@ -341,6 +341,7 @@ export const ASSESSMENT_REGISTRY_FRAGMENT = gql`
         bgPreparedness
         clientId
         confidentiality
+        costEstimatesUsd
         coordinatedJoint
         dataCollectionEndDate
         dataCollectionStartDate

diff --git a/app/views/AryDashboard/HowAssessed/GeographicalAreaMethodology/index.tsx b/app/views/AryDashboard/HowAssessed/GeographicalAreaMethodology/index.tsx
@@ -102,10 +102,10 @@ interface MethodologyType {
         description?: string | null;
     }[] | null;
     value: {
-        adminLevelId: number
-        geoArea: number;
+        adminLevelId: string;
+        geoArea: string;
         count: number;
-        region: number;
+        region: string;
         dataCollectionTechnique?: AssessmentRegistryDataCollectionTechniqueTypeEnum;
         samplingApproach?: AssessmentRegistrySamplingApproachTypeEnum;
         unitOfAnanlysis?: AssessmentRegistryUnitOfAnalysisTypeEnum;
@@ -238,7 +238,7 @@ function GeographicalAreaMethodology(props: Props) {
             const attributeValue = methodologyDataMap[category].value?.filter(
                 (technique) => technique.dataCollectionTechnique === subCategory,
             )?.map((selection) => ({
-                id: selection.geoArea,
+                id: Number(selection.geoArea),
                 value: selection.count,
             }));
 
@@ -248,7 +248,7 @@ function GeographicalAreaMethodology(props: Props) {
             const attributeValue = methodologyDataMap[category].value?.filter(
                 (technique) => technique.samplingApproach === subCategory,
             )?.map((selection) => ({
-                id: selection.geoArea,
+                id: Number(selection.geoArea),
                 value: selection.count,
             }));
             return attributeValue;
@@ -257,7 +257,7 @@ function GeographicalAreaMethodology(props: Props) {
             const attributeValue = methodologyDataMap[category].value?.filter(
                 (technique) => technique.unitOfAnanlysis === subCategory,
             )?.map((selection) => ({
-                id: selection.geoArea,
+                id: Number(selection.geoArea),
                 value: selection.count,
             }));
             return attributeValue;
@@ -266,7 +266,7 @@ function GeographicalAreaMethodology(props: Props) {
             const attributeValue = methodologyDataMap[category].value?.filter(
                 (technique) => technique.unitOfReporting === subCategory,
             )?.map((selection) => ({
-                id: selection.geoArea,
+                id: Number(selection.geoArea),
                 value: selection.count,
             }));
             return attributeValue;

diff --git a/app/views/AryDashboard/QualityAssessment/GeographicalAreaQualityScore/index.tsx b/app/views/AryDashboard/QualityAssessment/GeographicalAreaQualityScore/index.tsx
@@ -159,7 +159,7 @@ function GeographicalAreaQualityScore(props: Props) {
     const assessmentCountAttribute = useMemo(() => (
         data?.medianQualityScoreByGeoArea?.map(
             (selection) => ({
-                id: selection.geoArea,
+                id: Number(selection.geoArea),
                 value: selection.finalScore,
             }),
         ) ?? []

diff --git a/app/views/AryDashboard/WhatAssessed/GeographicalAreaAssessments/index.tsx b/app/views/AryDashboard/WhatAssessed/GeographicalAreaAssessments/index.tsx
@@ -152,7 +152,7 @@ function GeographicalAreaAssessments(props: Props) {
     const assessmentCountAttribute = useMemo(() => (
         data?.assessmentGeographicAreas?.map(
             (selection) => ({
-                id: selection.geoArea,
+                id: Number(selection.geoArea),
                 value: selection.count,
             }),
         ) ?? []

diff --git a/app/views/AryDashboard/index.tsx b/app/views/AryDashboard/index.tsx
@@ -398,6 +398,7 @@ function AryDashboard(props: Props) {
                         >
                             How was it assessed?
                         </Tab>
+                        {/*
                         <Tab
                             name="quality"
                             transparentBorder
@@ -416,6 +417,7 @@ function AryDashboard(props: Props) {
                         >
                             What are the main findings?
                         </Tab>
+                        */}
                     </TabList>
                     <TabPanel
                         name="what"

diff --git a/app/views/EditAry/AssessmentRegistryForm/MetadataForm/index.tsx b/app/views/EditAry/AssessmentRegistryForm/MetadataForm/index.tsx
@@ -227,6 +227,13 @@ function MetadataForm(props: Props) {
                         labelSelector={enumLabelSelector}
                         options={coordinationJointOptions}
                     />
+                    <NumberInput
+                        label="Cost Estimates in USD"
+                        name="costEstimatesUsd"
+                        value={value.costEstimatesUsd}
+                        onChange={setFieldValue}
+                        error={error?.costEstimatesUsd}
+                    />
                 </div>
             </div>
             <div className={styles.formElement}>

diff --git a/app/views/EditAry/AssessmentRegistryForm/formSchema.ts b/app/views/EditAry/AssessmentRegistryForm/formSchema.ts
@@ -115,6 +115,7 @@ export const schema: FormSchema = {
             confidentiality: [requiredCondition],
             language: [requiredCondition],
             noOfPages: [],
+            costEstimatesUsd: [],
             dataCollectionStartDate: [],
             dataCollectionEndDate: [],
             publicationDate: [],

diff --git a/app/views/EditAry/AssessmentRegistryForm/index.tsx b/app/views/EditAry/AssessmentRegistryForm/index.tsx
@@ -44,6 +44,7 @@ const fieldsInMetadata: { [key in keyof PartialFormType]?: true } = {
     dataCollectionEndDate: true,
     publicationDate: true,
     stakeholders: true,
+    costEstimatesUsd: true,
 };
 
 const fieldsInAdditionalDocuments: { [key in keyof PartialFormType]?: true } = {