Merge pull request #695 from bcgov/release/v1.26.5

Release/v1.26.5
bcgov · Dec 4, 2024 · 98cdeff · 98cdeff
2 parents 6bc1541 + 9315cb4
commit 98cdeff
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 27 deletions.
diff --git a/backend/src/routes/auth.js b/backend/src/routes/auth.js
@@ -40,7 +40,7 @@ router.get("/error", (_req, res) => {
 router.get(
   "/login",
   passport.authenticate("oidc", {
-    failureRedirect: "error",
+    failureRedirect: "error"
   })
 );
 

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -46,7 +46,6 @@
     <!-- <div class="container"> -->
     <v-main>
       <router-view />
-
       <div class="overlay-dialog">
         <v-dialog v-model="tokenExpiring" max-width="600px">
           <v-card>

diff --git a/frontend/src/components/Batch/Forms/DistrunForm.vue b/frontend/src/components/Batch/Forms/DistrunForm.vue
@@ -237,9 +237,11 @@ export default {
           return ["School"];
         }
       } else if (this.getCredential === "Blank transcript print") {
-        return this.blankTranscriptDetails
-          ? ["School", "Ministry of Advanced Education"]
-          : ["Select a credential type"];
+        let groupOptions = [
+          { title: "Student", value: "Student" },
+          { title: "School", value: "School" },
+        ];
+        return groupOptions;
       } else {
         let groupOptions = [
           { title: "Student", value: "Student" },

diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -496,9 +496,8 @@ export default {
           return ["School"];
         }
       } else if (this.getCredential === "Blank transcript print") {
-        return this.blankTranscriptDetails
-          ? ["School", "Ministry of Advanced Education"]
-          : ["Select a credential type"];
+        let groupOptions = [{ title: "School", value: "School" }];
+        return groupOptions;
       } else {
         let groupOptions = [
           { title: "Student", value: "Student" },
@@ -575,6 +574,7 @@ export default {
     },
     closeDialogAndResetForm() {
       this.blankCertificateDetails = [];
+      this.blankTranscriptDetails = [];
       this.group = null;
       this.dialog = false;
       this.clearBatchDetails();

diff --git a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
@@ -209,28 +209,17 @@ export default {
           ) {
             let certificate =
               await GraduationReportService.getStudentCertificates(studentID);
-            if (certificate?.data.length) {
-              //check that certificate has does not have a null distribution date
 
-              if (
-                !certificate.data.distributionDate &&
-                this.credentialType == "RC"
-              ) {
-                this.validationMessage =
-                  "Cannot reprint certificate for this student. Distribution date is null";
-                this.penLoading = false;
-                return;
-              }
-            } else {
+            if (!certificate?.data.length) {
               if (this.credentialType == "RC") {
                 this.validationMessage =
-                  "Cannot reprint certificate for this student.";
+                  "Cannot reprint certificate for this student. This student does not have a certificate.";
                 this.penLoading = false;
                 return;
               }
               if (this.credentialType == "OC") {
                 this.validationMessage =
-                  "Cannot print certificate for this student,this student does not have a certificate.";
+                  "Cannot print certificate for this student. This student does not have a certificate.";
                 this.penLoading = false;
                 return;
               }

diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -294,10 +294,15 @@ export default {
         requestTemplate
       );
       try {
-        let response = await BatchProcessingService.runCERTREGEN(
-          requestPayload,
-          this.getBatchRequestCrontime
-        );
+        if (this.getGroup == "all") {
+          let response = await BatchProcessingService.runCERTREGEN_ALL();
+        } else {
+          let response = await BatchProcessingService.runCERTREGEN(
+            requestPayload,
+            this.getBatchRequestCrontime
+          );
+        }
+
         this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(

diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
@@ -144,6 +144,13 @@ export default {
 
     return ApiService.apiAxios.get("/api/v1/batch/executesuppdisrunbatchjob");
   },
+  runCERTREGEN_ALL() {
+    //To run regenerate all Certificates, you must run a get
+
+      return ApiService.apiAxios.get(
+        "/api/v1/batch/executecertregenbatchjob"
+      );
+  },
   runCERTREGEN(request, cronTime = "") {
     if (
       Array.isArray(request.districts) &&

diff --git a/frontend/src/store/modules/batchRequestFormStore.js b/frontend/src/store/modules/batchRequestFormStore.js
@@ -219,7 +219,10 @@ export const useBatchRequestFormStore = defineStore("batchRequestFormStore", {
         gradDateFrom: state.getFormattedGradDateFrom,
         gradDateTo: state.getFormattedGradDateTo,
 
-        credentialTypeCode: [...state.blankCertificateDetails],
+        credentialTypeCode: [
+          ...state.blankCertificateDetails,
+          ...state.blankTranscriptDetails
+        ],
 
         quantity: state.copies,
         localDownload: state.getLocalDownload,