diff --git a/app/gqlFragments.ts b/app/gqlFragments.ts index 8f412cb418..405fea5ae8 100644 --- 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 index 793b991863..8661312768 100644 --- 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 index 82555a6a11..14f3f18ac1 100644 --- 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 index d6da963651..c25a1555b7 100644 --- 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 index 46eaad1199..cf8dd03eb9 100644 --- a/app/views/AryDashboard/index.tsx +++ b/app/views/AryDashboard/index.tsx @@ -398,6 +398,7 @@ function AryDashboard(props: Props) { > How was it assessed? + {/* What are the main findings? + */} +
diff --git a/app/views/EditAry/AssessmentRegistryForm/formSchema.ts b/app/views/EditAry/AssessmentRegistryForm/formSchema.ts index fe6dd0dec8..1bb0061991 100644 --- 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 index 1bfc2b7c66..8b97c8e375 100644 --- 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 } = {