Merge pull request #697 from bcgov/release/v1.26.7

fixed GRADA2-3167 and GRAD2-3168
bcgov · Dec 11, 2024 · 768bd5f · 768bd5f
2 parents 8205504 + 26aded3
commit 768bd5f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 14 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/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -203,8 +203,8 @@
                   :disabled="
                     step == 0 ||
                     (step == 1 &&
-                      (getCredential !== 'Blank certificate print' ||
-                        getCredential !== 'Blank transcript print'))
+                      getCredential !== 'Blank certificate print' &&
+                      getCredential !== 'Blank transcript print')
                   "
                   variant="outlined"
                   >Back</v-btn
@@ -310,8 +310,7 @@ export default {
       batchRequestFormStore.who = newValue;
       if (newValue == "Ministry of Advanced Education") {
         batchRequestFormStore.distribution = "User";
-      } else {
-        batchRequestFormStore.distribution = "BC Mail";
+        batchRequestFormStore.schools = [];
       }
     });
 
@@ -458,6 +457,7 @@ export default {
       "getCredential",
       "getDistribution",
       "getCopies",
+      "gwtWhere",
     ]),
     requestPayload() {
       const requestTemplate = [
@@ -608,10 +608,11 @@ export default {
           this.getBatchRequest,
           requestTemplate
         );
-        //set schoolOfRecords to "000000"
+        // set payload.user and payload.address for the request
         if (
-          this.group == "Ministry of Advanced Education" &&
-          this.getCredential == "Blank certificate print"
+          (this.group == "Ministry of Advanced Education" &&
+            this.getCredential == "Blank certificate print") ||
+          this.getDistribution == "User"
         ) {
           requestPayload.user = this.userFullName;
           requestPayload.address = {
@@ -622,9 +623,15 @@ export default {
             country: "CANADA",
             code: "V8W9T6",
           };
-          requestPayload.schoolOfRecords = ["00000000"];
         }
 
+        //set schoolOfRecords to "000000" for Ministry of Advanced Education
+        if (
+          this.group == "Ministry of Advanced Education" &&
+          this.getCredential == "Blank certificate print"
+        ) {
+          requestPayload.schoolOfRecords = ["00000000"];
+        }
         BatchProcessingService.runDISTRUNUSER(
           requestPayload,
           this.getCredential,

diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
@@ -12,14 +12,23 @@
         ></v-text-field>
       </v-col>
     </v-row>
-    <v-row v-if="getDistribution !== 'User'">
+    <v-row>
       <v-col sm="2"><strong>Where</strong></v-col>
       <v-col sm="10" md="4">
         <v-select
+          v-if="getGroup != 'Ministry of Advanced Education'"
           v-model="distribution"
-          :items="['BC Mail', 'Download']"
+          :items="[
+            'BC Mail',
+            'Download',
+            {
+              title: 'User - ' + userFullName,
+              value: 'User',
+            },
+          ]"
           item-title="title"
           item-value="value"
+          :key="value"
           label="Where"
           variant="outlined"
           require
@@ -32,7 +41,7 @@
       </v-col>
     </v-row>
     <v-card
-      v-if="getDistribution === 'User'"
+      v-if="getDistribution == 'User'"
       class="mt-4"
       title="Mailing Address"
     >

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