Merge pull request #691 from bcgov/release/v1.26.3

Release/v1.26.3
bcgov · Nov 28, 2024 · afcef1b · afcef1b
2 parents 88eedc1 + 0d5519e
commit afcef1b
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 9 deletions.
diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -18,6 +18,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
@@ -19,6 +19,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/DistrunForm.vue b/frontend/src/components/Batch/Forms/DistrunForm.vue
@@ -27,6 +27,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
@@ -22,6 +22,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -261,6 +261,7 @@ import DistributionInput from "@/components/Batch/Forms/FormInputs/DistributionI
 import { mapActions, mapState } from "pinia";
 import BatchProcessingService from "@/services/BatchProcessingService.js";
 import { useAccessStore } from "../../../store/modules/access";
+import { useAuthStore } from "../../../store/modules/auth";
 import { useSnackbarStore } from "../../../store/modules/snackbar";
 import { useBatchProcessingStore } from "../../../store/modules/batchprocessing";
 import { useBatchRequestFormStore } from "../../../store/modules/batchRequestFormStore";
@@ -307,6 +308,11 @@ export default {
 
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
+      if (newValue == "Ministry of Advanced Education") {
+        batchRequestFormStore.distribution = "User";
+      } else {
+        batchRequestFormStore.distribution = "BC Mail";
+      }
     });
 
     return {
@@ -441,6 +447,7 @@ export default {
     ],
   }),
   computed: {
+    ...mapState(useAuthStore, ["userFullName"]),
     ...mapState(useAccessStore, ["hasPermissions"]),
     ...mapState(useBatchRequestFormStore, [
       "getBatchRequest",
@@ -606,6 +613,15 @@ export default {
           this.group == "Ministry of Advanced Education" &&
           this.getCredential == "Blank certificate print"
         ) {
+          requestPayload.user = this.userFullName;
+          requestPayload.address = {
+            streetLine1: "4TH FLOOR 620 SUPERIOR",
+            streetLine2: "PO BOX 9886 STN PROV GOVT",
+            city: "VICTORIA",
+            region: "BRITISH COLUMBIA",
+            country: "CANADA",
+            code: "V8W9T6",
+          };
           requestPayload.schoolOfRecords = ["00000000"];
         }
 

diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
@@ -10,17 +10,14 @@
           required
           variant="outlined"
         ></v-text-field>
-      </v-col> </v-row
-    ><v-row>
+      </v-col>
+    </v-row>
+    <v-row v-if="getDistribution !== 'User'">
       <v-col sm="2"><strong>Where</strong></v-col>
       <v-col sm="10" md="4">
         <v-select
-          v-model="distribution"
-          :items="[
-            'BC Mail',
-            'Download',
-            { title: 'User: ' + userFullName, value: 'User' },
-          ]"
+          v-model="getDistribution"
+          :items="['BC Mail', 'Download']"
           item-title="title"
           item-value="value"
           label="Where"
@@ -34,7 +31,11 @@
         <template #bottom></template>
       </v-col>
     </v-row>
-    <v-card v-if="distribution === 'User'" class="mt-4" title="Mailing Address">
+    <v-card
+      v-if="getDistribution === 'User'"
+      class="mt-4"
+      title="Mailing Address"
+    >
       <v-card-text>
         <strong>{{ userFullName }}</strong
         ><br />
@@ -125,6 +126,7 @@ export default {
       "getBatchRunTime",
       "getBatchRunCustomDate",
       "getbatchRunCustomTime",
+      "getDistribution",
       "getGroup",
       "getUserDistributionAddress",
     ]),

diff --git a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
@@ -18,6 +18,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>
@@ -352,6 +353,7 @@ export default {
           this.getBatchRequest,
           requestTemplate
         );
+        requestPayload.user = "Shaun Lum";
         let response = await BatchProcessingService.runREGALG(
           requestPayload,
           this.getBatchRequestCrontime

diff --git a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
@@ -20,6 +20,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/PSIForm.vue b/frontend/src/components/Batch/Forms/PSIForm.vue
@@ -20,6 +20,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -18,6 +18,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
@@ -18,6 +18,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
@@ -19,6 +19,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>

diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
@@ -18,6 +18,7 @@
             color="error"
             variant="outlined"
             class="m-4"
+            :loading="batchLoading"
             >Cancel</v-btn
           >
         </div>