CM-838: allow to fetch by payment cycle (#45)

Co-authored-by: Jan <[email protected]>
openimis · Mar 25, 2024 · d6f3447 · d6f3447
1 parent e08f8a6
commit d6f3447
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 14 deletions.
diff --git a/src/components/payroll/BenefitConsumptionPayrollFilter.js b/src/components/payroll/BenefitConsumptionPayrollFilter.js
@@ -84,22 +84,33 @@ function BenefitConsumptionPayrollFilter({ filters, onChangeFilters, benefitPlan
         />
       </Grid>
       <Grid item xs={2} className={classes.item}>
-        <NumberInput
+        <PublishedComponent
+          pubRef="core.DatePicker"
           module="payroll"
           label={formatMessage('benefitConsumption.payroll.startDate')}
-          min={0}
-          max={12}
           value={filterValue('payroll_PaymentCycle_StartDate')}
-          onChange={onChangeFilter('payroll_PaymentCycle_StartDate')}
+          onChange={(v) => onChangeFilters([
+            {
+              id: 'payroll_PaymentCycle_StartDate',
+              value: v,
+              filter: `payroll_PaymentCycle_StartDate: "${v}"`,
+            },
+          ])}
         />
       </Grid>
       <Grid item xs={2} className={classes.item}>
-        <NumberInput
+        <PublishedComponent
+          pubRef="core.DatePicker"
           module="payroll"
           label={formatMessage('benefitConsumption.payroll.endDate')}
-          min={0}
           value={filterValue('payroll_PaymentCycle_EndDate')}
-          onChange={onChangeFilter('payroll_PaymentCycle_EndDate')}
+          onChange={(v) => onChangeFilters([
+            {
+              id: 'payroll_PaymentCycle_EndDate',
+              value: v,
+              filter: `payroll_PaymentCycle_EndDate: "${v}"`,
+            },
+          ])}
         />
       </Grid>
       <Grid item xs={2} className={classes.item}>

diff --git a/src/components/payroll/BenefitConsumptionPayrollSearcher.js b/src/components/payroll/BenefitConsumptionPayrollSearcher.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
@@ -29,9 +29,11 @@ function BenefitConsumptionPayrollSearcher({
   individualUuid,
   benefitPlan,
   groupBeneficiaries,
+  paymentCycleUuid,
 }) {
   const modulesManager = useModulesManager();
   const { formatMessage, formatMessageWithValues } = useTranslations('payroll', modulesManager);
+  const [totalNumberOfBenefits, setTotalNumberOfBenefits] = useState(0);
 
   const fetch = (params) => fetchPayrollBenefitConsumptions(modulesManager, params);
 
@@ -113,27 +115,47 @@ function BenefitConsumptionPayrollSearcher({
         filter: `benefit_Individual_Id: "${individualUuid}"`,
       };
     }
-    if (benefitPlan !== null && benefitPlan !== undefined) {
+    if (benefitPlan?.id) {
       filters.benefitPlanUuid = {
         value: benefitPlan.id,
         filter: `benefitPlanUuid: "${benefitPlan.id}"`,
       };
     }
+    if (paymentCycleUuid) {
+      filters.paymentCycleUuid = {
+        value: paymentCycleUuid,
+        filter: `paymentCycleUuid: "${paymentCycleUuid}"`,
+      };
+    }
     return filters;
   };
 
   useEffect(() => {
-    const params = [
-      `individualId: "${individualUuid}"`,
-    ];
-    if (benefitPlan !== null && benefitPlan !== undefined) {
+    const params = [];
+    if (individualUuid) {
+      params.push(
+        `individualId: "${individualUuid}"`,
+      );
+    }
+    if (benefitPlan?.id) {
       params.push(
         `benefitPlanUuid: "${benefitPlan.id}"`,
       );
     }
+    if (paymentCycleUuid) {
+      params.push(
+        `paymentCycleUuid: "${paymentCycleUuid}"`,
+      );
+    }
     fetchBenefitsSummary(params);
   }, []);
 
+  useEffect(() => {
+    if (payrollBenefitConsumptionsTotalCount > totalNumberOfBenefits) {
+      setTotalNumberOfBenefits(payrollBenefitConsumptionsTotalCount);
+    }
+  }, [benefitsSummary]);
+
   const benefitConsumptionPayrollFilter = ({ filters, onChangeFilters }) => (
     <BenefitConsumptionPayrollFilter
       filters={filters}
@@ -152,7 +174,7 @@ function BenefitConsumptionPayrollSearcher({
               {formatMessage('payroll.summary.totalNumberOfBenefits')}
             </Typography>
             <Typography variant="body1">
-              {payrollBenefitConsumptionsTotalCount}
+              {totalNumberOfBenefits}
             </Typography>
           </Paper>
         </Grid>