more

unicef · Dec 12, 2024 · fc2f569 · fc2f569
1 parent f425928
commit fc2f569
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 37 deletions.
diff --git a/...rontend/src/components/targeting/TargetingCriteriaDisplay/VulnerabilityScoreComponent.tsx b/...rontend/src/components/targeting/TargetingCriteriaDisplay/VulnerabilityScoreComponent.tsx
@@ -14,6 +14,7 @@ import { TARGET_POPULATION_QUERY } from '../../../apollo/queries/targeting/Targe
 import { useSnackbar } from '@hooks/useSnackBar';
 import {
   PaymentPlanQuery,
+  PaymentPlanStatus,
   useAllSteficonRulesQuery,
   useSetSteficonRuleOnTargetPopulationMutation,
   useUpdateTpMutation,
@@ -143,16 +144,16 @@ export function VulnerabilityScoreComponent({
     return null;
   }
   const disabled =
-    targetPopulation.status === TargetPopulationStatus.ReadyForCashAssist;
+    targetPopulation.status === PaymentPlanStatus.ReadyForCashAssist;
   if (
     ![
-      TargetPopulationStatus.Locked,
-      TargetPopulationStatus.Processing,
-      TargetPopulationStatus.SteficonWait,
-      TargetPopulationStatus.SteficonRun,
-      TargetPopulationStatus.SteficonCompleted,
-      TargetPopulationStatus.SteficonError,
-      TargetPopulationStatus.ReadyForCashAssist,
+      PaymentPlanStatus.Locked,
+      PaymentPlanStatus.Processing,
+      PaymentPlanStatus.SteficonWait,
+      PaymentPlanStatus.SteficonRun,
+      PaymentPlanStatus.SteficonCompleted,
+      PaymentPlanStatus.SteficonError,
+      PaymentPlanStatus.ReadyForCashAssist,
     ].includes(targetPopulation?.status)
   ) {
     return null;
@@ -230,7 +231,7 @@ export function VulnerabilityScoreComponent({
                 await updateTargetPopulation({
                   variables: {
                     input: {
-                      id: targetPopulation.id,
+                      paymentPlanId: targetPopulation.id,
                       vulnerabilityScoreMin: vulnerabilityScoreMinValue,
                       vulnerabilityScoreMax: vulnerabilityScoreMaxValue,
                     },

diff --git a/src/frontend/src/containers/dialogs/targetPopulation/FinalizeTargetPopulation.tsx b/src/frontend/src/containers/dialogs/targetPopulation/FinalizeTargetPopulation.tsx
@@ -2,7 +2,7 @@ import { Button, DialogContent, DialogTitle } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { LoadingButton } from '@components/core/LoadingButton';
 import { useSnackbar } from '@hooks/useSnackBar';
-import { Action, useFinalizeTpMutation } from '@generated/graphql';
+import { Action } from '@generated/graphql';
 import { Dialog } from '../Dialog';
 import { DialogActions } from '../DialogActions';
 import { DialogDescription } from '../DialogDescription';

diff --git a/src/frontend/src/containers/pages/accountability/communication/CreateCommunicationPage.tsx b/src/frontend/src/containers/pages/accountability/communication/CreateCommunicationPage.tsx
@@ -87,7 +87,7 @@ function prepareVariables(
   return {
     input: {
       households: values.households,
-      targetPopulation: values.targetPopulation,
+      paymentPlan: values.targetPopulation,
       registrationDataImport: values.registrationDataImport,
       samplingType:
         selectedSampleSizeType === 0
@@ -265,7 +265,7 @@ export const CreateCommunicationPage = (): ReactElement => {
   ): CreateAccountabilityCommunicationMessageMutationVariables => ({
     input: {
       households: values.households,
-      targetPopulation: values.targetPopulation,
+      paymentPlan: values.targetPopulation,
       registrationDataImport: values.registrationDataImport,
       samplingType:
         selectedSampleSizeType === 0
@@ -550,8 +550,14 @@ export const CreateCommunicationPage = (): ReactElement => {
                                       { value: 'FEMALE', name: t('Female') },
                                       { value: 'MALE', name: t('Male') },
                                       { value: 'OTHER', name: t('Other') },
-                                      { value: 'NOT_COLLECTED', name: t('Not Collected') },
-                                      { value: 'NOT_ANSWERED', name: t('Not Answered') },
+                                      {
+                                        value: 'NOT_COLLECTED',
+                                        name: t('Not Collected'),
+                                      },
+                                      {
+                                        value: 'NOT_ANSWERED',
+                                        name: t('Not Answered'),
+                                      },
                                     ]}
                                     component={FormikSelectField}
                                   />

diff --git a/src/frontend/src/containers/pages/accountability/surveys/CreateSurveyPage.tsx b/src/frontend/src/containers/pages/accountability/surveys/CreateSurveyPage.tsx
@@ -69,7 +69,7 @@ function prepareVariables(
 ): AccountabilitySampleSizeQueryVariables {
   return {
     input: {
-      targetPopulation: values.targetPopulation,
+      paymentPlan: values.targetPopulation,
       program: values.program,
       samplingType: selectedSampleSizeType === 0 ? 'FULL_LIST' : 'RANDOM',
       fullListArguments:
@@ -294,7 +294,7 @@ export const CreateSurveyPage = (): ReactElement => {
       title: matchTitle(values),
       body: values.body,
       category: values.category,
-      targetPopulation: values.targetPopulation,
+      paymentPlan: values.targetPopulation,
       program: values.program,
       samplingType:
         selectedSampleSizeType === 0
@@ -576,8 +576,14 @@ export const CreateSurveyPage = (): ReactElement => {
                                     { value: 'FEMALE', name: t('Female') },
                                     { value: 'MALE', name: t('Male') },
                                     { value: 'OTHER', name: t('Other') },
-                                    { value: 'NOT_COLLECTED', name: t('Not Collected') },
-                                    { value: 'NOT_ANSWERED', name: t('Not Answered') },
+                                    {
+                                      value: 'NOT_COLLECTED',
+                                      name: t('Not Collected'),
+                                    },
+                                    {
+                                      value: 'NOT_ANSWERED',
+                                      name: t('Not Answered'),
+                                    },
                                   ]}
                                   component={FormikSelectField}
                                 />

diff --git a/src/frontend/src/containers/pages/headers/FinalizedTargetPopulationHeaderButtons.tsx b/src/frontend/src/containers/pages/headers/FinalizedTargetPopulationHeaderButtons.tsx
@@ -5,7 +5,7 @@ import { ReactElement, useState } from 'react';
 import styled from 'styled-components';
 import {
   BusinessAreaDataQuery,
-  TargetPopulationQuery,
+  PaymentPlanQuery,
   useCashAssistUrlPrefixQuery,
 } from '@generated/graphql';
 import { LoadingComponent } from '@components/core/LoadingComponent';

diff --git a/src/frontend/src/containers/pages/headers/LockedTargetPopulationHeaderButtons.tsx b/src/frontend/src/containers/pages/headers/LockedTargetPopulationHeaderButtons.tsx
@@ -7,12 +7,10 @@ import { LoadingButton } from '@components/core/LoadingButton';
 import { useSnackbar } from '@hooks/useSnackBar';
 import {
   BusinessAreaDataQuery,
+  PaymentPlanQuery,
   ProgramStatus,
-  TargetPopulationQuery,
-  useUnlockTpMutation,
 } from '@generated/graphql';
 import { DuplicateTargetPopulation } from '../../dialogs/targetPopulation/DuplicateTargetPopulation';
-import { FinalizeTargetPopulation } from '../../dialogs/targetPopulation/FinalizeTargetPopulation';
 import { FinalizeTargetPopulationPaymentPlan } from '../../dialogs/targetPopulation/FinalizeTargetPopulationPaymentPlan';
 import { useProgramContext } from '../../../programContext';
 
@@ -138,21 +136,12 @@ export function LockedTargetPopulationHeaderButtons({
         setOpen={setOpenDuplicate}
         targetPopulationId={targetPopulation.id}
       />
-      {isPaymentPlanApplicable ? (
-        <FinalizeTargetPopulationPaymentPlan
-          open={openFinalizePaymentPlan}
-          setOpen={setOpenFinalizePaymentPlan}
-          targetPopulationId={targetPopulation.id}
-          totalHouseholds={targetPopulation.totalHouseholdsCount}
-        />
-      ) : (
-        <FinalizeTargetPopulation
-          open={openFinalize}
-          setOpen={setOpenFinalize}
-          targetPopulationId={targetPopulation.id}
-          totalHouseholds={targetPopulation.totalHouseholdsCount}
-        />
-      )}
+      <FinalizeTargetPopulationPaymentPlan
+        open={openFinalizePaymentPlan}
+        setOpen={setOpenFinalizePaymentPlan}
+        targetPopulationId={targetPopulation.id}
+        totalHouseholds={targetPopulation.totalHouseholdsCount}
+      />
     </Box>
   );
 }