Merge pull request #31 from openimis/develop

MERGING RELEASE branches
openimis · May 16, 2023 · 51819d4 · 51819d4
2 parents 3d6bbc1 + 486baad
commit 51819d4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/pages/ExtractsPage.js b/src/pages/ExtractsPage.js
@@ -43,13 +43,13 @@ const OfficerDownloadBlock = (props) => {
         </Grid>
         <Grid item xs={6}>
           <Button disabled={!officer} color="primary" variant="contained"
-                  onClick={onExtractDownload("phone_extract", {officer_id})}>
+                  onClick={onExtractDownload("feedbacks", {officer_id})}>
             {formatMessage("OfficerDownloadBlock.downloadFeedbacksBtn")}
           </Button>
         </Grid>
         <Grid item xs={6} align="right">
           <Button disabled={!officer} color="primary" variant="contained"
-                  onClick={onExtractDownload("phone_extract", {officer_id})}>
+                  onClick={onExtractDownload("renewals", {officer_id})}>
             {formatMessage("OfficerDownloadBlock.downloadRenewalsBtn")}
           </Button>
         </Grid>

diff --git a/src/pages/RegistersPage.js b/src/pages/RegistersPage.js
@@ -190,13 +190,22 @@ const RegistersPage = () => {
         method: "POST",
         credentials: "same-origin",
       });
+
+      const payload = await response.json();
+
       if (response.status >= 400) {
-        throw new Error(
-          `${response?.status}: ${response?.url} - ${response?.statusText}`
-        );
+        setDialogState({
+          open: true,
+          isLoading: false,
+          data: {
+            success: payload.success,
+          },
+          generalError:
+            payload.error && `Error ${response.status}: ${payload.error}`,
+        });
+        return;
       }
 
-      const payload = await response.json();
       setDialogState({
         open: true,
         isLoading: false,

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -64,8 +64,11 @@
   "tools.ExtractsPage.OfficerDownloadBlock.officerLabel": "Select Officer",
   "tools.ExtractsPage.OfficerDownloadBlock.downloadFeedbacksBtn": "Download Feedbacks",
   "tools.ExtractsPage.OfficerDownloadBlock.downloadRenewalsBtn": "Download Renewals",
-  "tools.ExtractsPage.EnrollmentsUploadBlock.title": "Upload Enrollments",
+  "tools.ExtractsPage.EnrollmentsUploadBlock.title": "Upload Enrolments",
   "tools.ExtractsPage.EnrollmentsUploadBlock.uploadBtn": "Upload",
+  "tools.ExtractsPage.EnrollmentsUploadBlock.ResultDialog.okBtn": "OK",
+  "tools.ExtractsPage.EnrollmentsUploadBlock.ResultDialog.success": "Success",
+  "tools.ExtractsPage.EnrollmentsUploadBlock.ResultDialog.title": "Enrolments Upload Done",
   "tools.ExtractsPage.ClaimsUploadBlock.title": "Upload Claims",
   "tools.ExtractsPage.ClaimsUploadBlock.uploadBtn": "Upload",
   "tools.ExtractsPage.ClaimsUploadBlock.ResultDialog.okBtn": "OK",