updated rr export files

palladiumkenya · Apr 17, 2024 · bd25091 · bd25091
1 parent f030ca7
commit bd25091
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/src/views/RR/RROverview.js b/src/views/RR/RROverview.js
@@ -50,7 +50,7 @@ const RROverview = () => {
             partner: filters.partners,
             agency: filters.agencies,
             project: filters.projects,
-            fromDate: filters.fromDate ? filters.fromDate : moment().format("MMM YYYY")
+            fromDate: filters.fromDate || moment().format("MMM YYYY")
         };
         params.period = filters.fromDate ?
             moment(params.fromDate, "MMM YYYY").startOf('month').subtract(1, 'month').format('YYYY,M') :
@@ -147,11 +147,9 @@ const RROverview = () => {
             partner: filters.partners,
             agency: filters.agencies,
             project: filters.projects,
-            fromDate: filters.fromDate
-                ? filters.fromDate
-                : moment()
-                      .subtract(16, 'days')
-                      .format('MMM YYYY'),
+            fromDate: filters.fromDate || moment()
+                .subtract(16, 'days')
+                .format('MMM YYYY'),
         };
         params.period = filters.fromDate
             ? moment(params.fromDate, 'MMM YYYY')
@@ -296,14 +294,10 @@ const RROverview = () => {
                                     sub_county: l.subCounty,
                                     agency: l.Agency,
                                     partner: l.Partner,
-                                    reporting_date: filters.fromDate
-                                        ? filters.fromDate
-                                        : moment()
-                                              .startOf('month')
-                                              .subtract(2, 'month')
-                                              .add(16, 'days')
-
-                                              .format('MMM YYYY'),
+                                    reporting_date: filters.fromDate || moment()
+                                        .subtract(2, 'month')
+                                        .add(16, 'days')
+                                        .format('MMM YYYY'),
                                 })
                             )}
                             text="Download facilities not reporting"
@@ -351,12 +345,10 @@ const RROverview = () => {
                                     sub_county: l.Subcounty,
                                     agency: l.Agency,
                                     partner: l.Partner,
-                                    reporting_date: filters.fromDate
-                                        ? filters.fromDate
-                                        : moment()
-                                              .startOf('month')
-                                              .subtract(1, 'month')
-                                              .format('MMM YYYY'),
+                                    reporting_date: filters.fromDate || moment()
+                                        .startOf('month')
+                                        .subtract(1, 'month')
+                                        .format('MMM YYYY'),
                                     number_of_uploads: l.NumberOfUploads,
                                 })
                             )}