Merge pull request #58 from openimis/feature/CM-987

CM-987: added short summary of records uploaded
openimis · Aug 7, 2024 · 516ff9d · 516ff9d
2 parents e850387 + faf7de0
commit 516ff9d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -92,6 +92,7 @@ const CSV_RECONCILIATION_PROJECTION = () => [
   'fileName',
   'status',
   'error',
+  'jsonExt',
 ];
 
 const PAYMENT_METHOD_PROJECTION = () => [

diff --git a/src/components/payroll/BenefitConsumptionSearcher.js b/src/components/payroll/BenefitConsumptionSearcher.js
@@ -79,6 +79,8 @@ function BenefitConsumptionSearcher({
     (benefitConsumption) => (
       <AdditionalFieldsDialog
         jsonExt={benefitConsumption?.jsonExt}
+        buttonLabel="payroll.additonalFields.showAdditionalFields"
+        title="payroll.additonalFields.label"
       />
     ),
   ];

diff --git a/src/components/payroll/BenefitConsumptionSearcherModal.js b/src/components/payroll/BenefitConsumptionSearcherModal.js
@@ -137,6 +137,8 @@ function BenefitConsumptionSearcherModal({
     (benefitAttachment) => (
       <AdditionalFieldsDialog
         jsonExt={benefitAttachment?.benefit?.jsonExt}
+        buttonLabel="payroll.additonalFields.showAdditionalFields"
+        title="payroll.additonalFields.label"
       />
     ),
     (benefitAttachment) => (

diff --git a/src/components/payroll/PayrollPaymentFilesSearcher.js b/src/components/payroll/PayrollPaymentFilesSearcher.js
@@ -16,6 +16,7 @@ import {
 } from '../../constants';
 import { fetchPayrollPaymentFiles } from '../../actions';
 import downloadPayroll from '../../utils/export';
+import AdditionalFieldsDialog from './dialogs/AdditionalFieldsDialog';
 
 function PayrollPaymentFilesSearcher({
   fetchingPayrollFiles,
@@ -35,6 +36,7 @@ function PayrollPaymentFilesSearcher({
     'payrollPaymentFile.status',
     'payrollPaymentFile.error',
     'payrollPaymentFile.download',
+    '',
   ];
 
   const defaultFilters = () => {
@@ -76,6 +78,13 @@ function PayrollPaymentFilesSearcher({
         </IconButton>
       </Tooltip>
     ),
+    (file) => (
+      <AdditionalFieldsDialog
+        jsonExt={file?.jsonExt}
+        buttonLabel="payroll.summaryUpload"
+        title="payroll.summaryUpload"
+      />
+    ),
   ];
 
   return (

diff --git a/src/components/payroll/dialogs/AdditionalFieldsDialog.js b/src/components/payroll/dialogs/AdditionalFieldsDialog.js
@@ -24,6 +24,8 @@ function AdditionalFieldsDialog({
   intl,
   classes,
   jsonExt,
+  buttonLabel,
+  title,
 }) {
   // eslint-disable-next-line no-param-reassign
   if (!jsonExt) jsonExt = '{}';
@@ -50,7 +52,7 @@ function AdditionalFieldsDialog({
           marginTop: '6px',
         }}
       >
-        {formatMessage(intl, 'payroll', 'payroll.additonalFields.showAdditionalFields')}
+        {formatMessage(intl, 'payroll', buttonLabel)}
       </Button>
       <Dialog
         open={isOpen}
@@ -69,7 +71,7 @@ function AdditionalFieldsDialog({
               marginTop: '10px',
             }}
           >
-            {formatMessage(intl, 'payroll', 'payroll.additonalFields.label')}
+            {formatMessage(intl, 'payroll', title)}
           </DialogTitle>
           <DialogContent>
             <div

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -151,5 +151,6 @@
 
     "payroll.additonalFields.label": "Additional Fields",
     "payroll.additonalFields.showAdditionalFields": "Show Additional Fields",
-    "payroll.additonalFields.close": "Close"
+    "payroll.additonalFields.close": "Close",
+    "payroll.summaryUpload": "Summary Upload"
 }