fix pp queries

unicef · Dec 20, 2024 · 82d3015 · 82d3015
1 parent d75f30f
commit 82d3015
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 39 deletions.
diff --git a/src/frontend/src/__generated__/graphql.tsx b/src/frontend/src/__generated__/graphql.tsx
diff --git a/src/frontend/src/apollo/queries/paymentmodule/AllPaymentPlansForTable.ts b/src/frontend/src/apollo/queries/paymentmodule/AllPaymentPlansForTable.ts
@@ -21,6 +21,8 @@ export const AllPaymentPlansForTable = gql`
     $totalHouseholdsCountWithValidPhoneNoMax: Int
     $createdAtRange: String
     $statusNot: String
+    $isPaymentPlan: Boolean
+    $isTargetPopulation: Boolean
   ) {
     allPaymentPlans(
       after: $after
@@ -42,6 +44,8 @@ export const AllPaymentPlansForTable = gql`
       totalHouseholdsCountWithValidPhoneNoMax: $totalHouseholdsCountWithValidPhoneNoMax
       createdAtRange: $createdAtRange
       statusNot: $statusNot
+      isPaymentPlan: $isPaymentPlan
+      isTargetPopulation: $isTargetPopulation
     ) {
       pageInfo {
         hasNextPage

diff --git a/src/frontend/src/components/targeting/TargetPopulationDetails.tsx b/src/frontend/src/components/targeting/TargetPopulationDetails.tsx
@@ -21,20 +21,6 @@ export function TargetPopulationDetails({
   const { createdBy, program, programCycle } = targetPopulation;
   const { t } = useTranslation();
 
-  //TODO: ?? replace it with some other?
-  // const closeDate = changeDate ? (
-  //   <UniversalMoment>{changeDate}</UniversalMoment>
-  // ) : (
-  //   '-'
-  // );
-  // const sendBy = sentForFinanceReleaseBy
-  //   ? `${sentForFinanceReleaseBy.firstName} ${sentForFinanceReleaseBy.lastName}`
-  //   : '-';
-  // const sendDate = sentForFinanceReleaseDate ? (
-  //   <UniversalMoment>{sentForFinanceReleaseDate}</UniversalMoment>
-  // ) : (
-  //   '-'
-  // );
   const programName = program?.name ? program.name : '-';
   return (
     <ContainerColumnWithBorder data-cy="target-population-details-container">
@@ -60,13 +46,6 @@ export function TargetPopulationDetails({
               value={`${createdBy.firstName} ${createdBy.lastName}`}
             />
           </Grid>
-          {/* <Grid item xs={4}>
-            <LabelizedField
-              dataCy="close-date"
-              label={t('Programme population close date')}
-              value={closeDate}
-            />
-          </Grid> */}
           <Grid item xs={4}>
             <LabelizedField
               dataCy="program-name"
@@ -81,20 +60,6 @@ export function TargetPopulationDetails({
               value={programCycle?.title ?? '-'}
             />
           </Grid>
-          {/* <Grid item xs={4}>
-            <LabelizedField
-              dataCy="send-by"
-              label={t('Send by')}
-              value={sendBy}
-            />
-          </Grid>
-          <Grid item xs={4}>
-            <LabelizedField
-              dataCy="send-date"
-              label={t('Send date')}
-              value={sendDate}
-            />
-          </Grid> */}
         </Grid>
       </OverviewContainer>
     </ContainerColumnWithBorder>

diff --git a/...ion/LookUpTargetPopulationTableCommunication/LookUpTargetPopulationTableCommunication.tsx b/...ion/LookUpTargetPopulationTableCommunication/LookUpTargetPopulationTableCommunication.tsx
@@ -53,6 +53,7 @@ export const LookUpTargetPopulationTableCommunication = ({
       max: filter.createdAtRangeMax || null,
     }),
     statusNot: PaymentPlanStatus.Open,
+    isTargetPopulation: true,
   };
 
   const handleRadioChange = (id: string): void => {

diff --git a/.../tables/Surveys/LookUpTargetPopulationTableSurveys/LookUpTargetPopulationTableSurveys.tsx b/.../tables/Surveys/LookUpTargetPopulationTableSurveys/LookUpTargetPopulationTableSurveys.tsx
@@ -54,6 +54,7 @@ export function LookUpTargetPopulationTableSurveys({
       max: filter.createdAtRangeMax || null,
     }),
     statusNot: PaymentPlanStatus.Open,
+    isTargetPopulation: true,
   };
 
   const handleRadioChange = (id: string): void => {

diff --git a/src/frontend/src/containers/tables/paymentmodule/PaymentPlansTable/PaymentPlansTable.tsx b/src/frontend/src/containers/tables/paymentmodule/PaymentPlansTable/PaymentPlansTable.tsx
@@ -36,6 +36,7 @@ export function PaymentPlansTable({
     dispersionEndDate: filter.dispersionEndDate || null,
     isFollowUp: filter.isFollowUp ? true : null,
     program: programId,
+    isPaymentPlan: true,
   };
   const replacements = {
     totalHouseholdsCount: (_beneficiaryGroup) =>

diff --git a/...containers/tables/paymentmodulePeople/PeoplePaymentPlansTable/PeoplePaymentPlansTable.tsx b/...containers/tables/paymentmodulePeople/PeoplePaymentPlansTable/PeoplePaymentPlansTable.tsx
@@ -31,6 +31,7 @@ export const PeoplePaymentPlansTable = ({
     dispersionEndDate: filter.dispersionEndDate || null,
     isFollowUp: filter.isFollowUp ? true : null,
     program: programId,
+    isPaymentPlan: true,
   };
 
   return (

diff --git a/...ainers/tables/targeting/TargetPopulationHouseholdTable/TargetPopulationHouseholdTable.tsx b/...ainers/tables/targeting/TargetPopulationHouseholdTable/TargetPopulationHouseholdTable.tsx
@@ -43,8 +43,6 @@ export function TargetPopulationHouseholdTable({
     replacements,
   );
 
-  //TODO: adjust headcells and renderRow
-
   return (
     <TableWrapper>
       <UniversalTable

diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts
@@ -299,7 +299,6 @@ export function paymentPlanStatusToColor(
   return theme.palette.error.main;
 }
 
-//TODO: check if some statuses need to be moved to PP
 export function paymentPlanBuildStatusToColor(
   theme: typeof themeObj,
   status: string,