Group beneficiary fetches & displays the isEligible field

also provide the UI to search by the field
openimis · Aug 27, 2024 · 7cd50f8 · 7cd50f8
1 parent 56104f7
commit 7cd50f8
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 10 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -56,6 +56,7 @@ const GROUP_BENEFICIARY_FULL_PROJECTION = () => [
   'id',
   'group {id, code, head {uuid}}',
   'status',
+  'isEligible',
 ];
 
 const WORKFLOWS_FULL_PROJECTION = () => [

diff --git a/src/components/BenefitPlanGroupBeneficiariesFilter.js b/src/components/BenefitPlanGroupBeneficiariesFilter.js
@@ -2,15 +2,17 @@ import React from 'react';
 import { injectIntl } from 'react-intl';
 import { Grid } from '@material-ui/core';
 import { withTheme, withStyles } from '@material-ui/core/styles';
-import { formatMessage, TextInput } from '@openimis/fe-core';
+import { formatMessage, TextInput, ConstantBasedPicker } from '@openimis/fe-core';
 import _debounce from 'lodash/debounce';
 import { defaultFilterStyles } from '../util/styles';
 import BeneficiaryStatusPicker from '../pickers/BeneficiaryStatusPicker';
 import { DEFAULT_DEBOUNCE_TIME, EMPTY_STRING } from '../constants';
 
-function BenefitPlanBeneficiariesFilter({
-  intl, classes, filters, onChangeFilters, readOnly,
+function BenefitPlanGroupBeneficiariesFilter({
+  intl, classes, filters, onChangeFilters, readOnly, status,
 }) {
+  const any = formatMessage(intl, 'socialProtection', 'any');
+
   const debouncedOnChangeFilters = _debounce(onChangeFilters, DEFAULT_DEBOUNCE_TIME);
 
   const filterTextFieldValue = (filterName) => filters?.[filterName]?.value ?? EMPTY_STRING;
@@ -42,8 +44,8 @@ function BenefitPlanBeneficiariesFilter({
           label="beneficiary.beneficiaryStatusPicker"
           withNull
           readOnly={readOnly}
-          nullLabel={formatMessage(intl, 'socialProtection', 'any')}
-          value={filterValue('status')}
+          nullLabel={any}
+          value={status || filterValue('status')}
           onChange={(value) => onChangeFilters([
             {
               id: 'status',
@@ -53,10 +55,29 @@ function BenefitPlanBeneficiariesFilter({
           ])}
         />
       </Grid>
+      {status && (
+        <Grid item xs={2} className={classes.item}>
+          <ConstantBasedPicker
+            module="socialProtection"
+            label="beneficiary.isEligible"
+            constants={['true', 'false']}
+            withNull
+            nullLabel={any}
+            value={filterValue('isEligible')}
+            onChange={(value) => onChangeFilters([
+              {
+                id: 'isEligible',
+                value,
+                filter: `isEligible: ${value}`,
+              },
+            ])}
+          />
+        </Grid>
+      )}
     </Grid>
   );
 }
 
 export default injectIntl(withTheme(withStyles(defaultFilterStyles)(
-  BenefitPlanBeneficiariesFilter,
+  BenefitPlanGroupBeneficiariesFilter,
 )));
diff --git a/src/components/BenefitPlanGroupBeneficiariesSearcher.js b/src/components/BenefitPlanGroupBeneficiariesSearcher.js
@@ -22,6 +22,8 @@ import {
   DialogContent,
 } from '@material-ui/core';
 import PreviewIcon from '@material-ui/icons/ListAlt';
+import ErrorIcon from '@material-ui/icons/Error';
+import CheckCircleIcon from '@material-ui/icons/CheckCircleOutline';
 import {
   fetchGroupBeneficiaries, downloadGroupBeneficiaries, clearGroupBeneficiaryExport, updateGroupBeneficiary,
 } from '../actions';
@@ -61,10 +63,20 @@ function BenefitPlanGroupBeneficiariesSearcher({
 
   const fetch = (params) => fetchGroupBeneficiaries(params);
 
-  const headers = () => [
-    'socialProtection.groupBeneficiary.code',
-    'socialProtection.groupBeneficiary.status',
-  ];
+  const headers = () => {
+    const baseHeaders = [
+      'socialProtection.groupBeneficiary.code',
+      'socialProtection.groupBeneficiary.status',
+    ];
+
+    if (status) {
+      baseHeaders.push('socialProtection.beneficiary.isEligible');
+    }
+
+    baseHeaders.push('');
+
+    return baseHeaders;
+  };
 
   const openBenefitPackage = (groupBeneficiary) => history.push(`${benefitPlan?.id}/`
   + `${modulesManager.getRef('socialProtection.route.benefitPackage')}`
@@ -112,6 +124,16 @@ function BenefitPlanGroupBeneficiariesSearcher({
       ) : groupBeneficiary.status),
     ];
 
+    if (status) {
+      const yes = formatMessage(intl, 'socialProtection', 'beneficiary.isEligible.true');
+      const no = formatMessage(intl, 'socialProtection', 'beneficiary.isEligible.false');
+      result.push((beneficiary) => (
+        beneficiary.isEligible
+          ? <Tooltip title={yes} placement="right"><CheckCircleIcon aria-label={yes} /></Tooltip>
+          : <Tooltip title={no} placement="right"><ErrorIcon aria-label={no} /></Tooltip>
+      ));
+    }
+
     if (rights.includes(RIGHT_GROUP_SEARCH)) {
       result.push((groupBeneficiary) => (
         <Tooltip title={formatMessage(intl, 'socialProtection', 'benefitPackage.overviewButtonTooltip')}>
@@ -185,6 +207,7 @@ function BenefitPlanGroupBeneficiariesSearcher({
       filters={props.filters}
       onChangeFilters={props.onChangeFilters}
       readOnly={readOnly}
+      status={status}
     />
   );