From 1b3f475bca72601c77b8f08052a3fccfd0f3e80e Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 6 Nov 2024 11:46:49 -0800
Subject: [PATCH 1/4] added Pen Loading

---
 .../src/components/Batch/Forms/DistrunUserForm.vue   | 11 ++++++++---
 .../Batch/Forms/FormInputs/StudentInput.vue          |  4 ++++
 .../Batch/Forms/GraduationAlgorithmForm.vue          | 12 ++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
index ea9e2d04..8ad63ce2 100644
--- a/frontend/src/components/Batch/Forms/DistrunUserForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -214,7 +214,8 @@
                   variant="flat"
                   class="text-none"
                   density="default"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   @click="submit"
                 >
                   Download
@@ -226,7 +227,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -413,6 +415,7 @@ export default {
     snackbarStore: useSnackbarStore(),
     step: 0,
     dialog: false,
+    batchLoading: false,
     groupSelected: "",
     transcriptTypes: [],
     certificateTypes: [],
@@ -569,7 +572,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "credentialTypeCode",
@@ -603,6 +606,7 @@ export default {
           this.getBatchRequestCrontime
         );
         if (response) {
+          this.batchLoading = false;
           if (this.getBatchRequestCrontime) {
             this.snackbarStore.showSnackbar(
               "User distribution batch request has been successfully scheduled",
@@ -618,6 +622,7 @@ export default {
             );
           }
         }
+        this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
         this.updateDashboards();
       } catch (error) {
diff --git a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
index c4854691..5cfe7956 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
@@ -16,6 +16,7 @@
           color="bcGovBlue"
           @click="addStudent()"
           :disabled="v$.pen.$invalid || pen == ''"
+          :loading="penLoading"
         >
           Add Student
         </v-btn>
@@ -105,6 +106,7 @@ export default {
   data() {
     return {
       pen: "",
+      penLoading: false,
       penStudentInfo: "",
       penValidating: false,
       validationMessage: "",
@@ -154,6 +156,7 @@ export default {
       this.clearPenStudentInfo();
     },
     async addStudent() {
+      this.penLoading = true;
       this.validationMessage = "";
       if (this.pen.length == 9) {
         let student = await StudentService.getStudentByPen(this.pen);
@@ -230,6 +233,7 @@ export default {
           info: this.penStudentInfo,
         });
         this.clearPen();
+        this.penLoading = false;
       }
     },
     removeStudent(pen) {
diff --git a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
index 7c881635..fa6dcbd8 100644
--- a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
+++ b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
@@ -11,15 +11,6 @@
         >
       </template>
       <v-card>
-        <v-overlay
-          v-model="batchLoading"
-          class="align-center justify-center"
-          contained
-        >
-          <v-progress-circular indeterminate color="primary" size="64">
-            Loading...
-          </v-progress-circular>
-        </v-overlay>
         <div class="d-flex justify-space-between align-center">
           <v-card-title>Graduation Algorithm</v-card-title>
           <v-btn
@@ -149,7 +140,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>

From 95a7cf0ad5f861cca72ba7f58129f9a359b88ff9 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 6 Nov 2024 13:34:36 -0800
Subject: [PATCH 2/4] tvr delete fix

---
 .../Batch/Forms/ArchiveSchoolReportsForm.vue  | 21 +++----
 .../Batch/Forms/ArchiveStudentsForm.vue       | 61 ++++++++++---------
 .../components/Batch/Forms/DistrunForm.vue    |  8 ++-
 .../Batch/Forms/DistrunFormYearEndForm.vue    |  9 +--
 .../Batch/Forms/GraduationAlgorithmForm.vue   |  3 +
 .../Batch/Forms/NongradDistrunForm.vue        |  8 ++-
 .../src/components/Batch/Forms/PSIForm.vue    |  9 +--
 .../Batch/Forms/RegenerateCertificateForm.vue |  8 ++-
 .../Forms/RegenerateSchoolReportForm.vue      | 10 +--
 .../Forms/TranscriptAlgorithmDeleteForm.vue   | 18 +++---
 .../Batch/Forms/TranscriptAlgorithmForm.vue   | 11 ++--
 11 files changed, 92 insertions(+), 74 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
index 4b32ed08..18cf3326 100644
--- a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
+++ b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -186,17 +186,9 @@
                 >
                 <v-spacer />
                 <!-- Right Action Button -->
-                <v-btn v-if="step < 3" @click="step++" color="bcGovBlue"
+                <v-btn v-if="step < 1" @click="step++" color="bcGovBlue"
                   >Next</v-btn
                 >
-                <v-btn
-                  v-else-if="getBatchRequest.localDownload == 'Y'"
-                  color="bcGovBlue"
-                  variant="text"
-                  @click="submit"
-                >
-                  Download
-                </v-btn>
                 <v-btn
                   v-else
                   color="error"
@@ -204,7 +196,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -237,7 +230,7 @@ export default {
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
       if (newValue == "All Schools") {
-        batchRequestFormStore.setActivityCode("All");
+        batchRequestFormStore.setActivityCode("ALL");
       } else {
         batchRequestFormStore.setActivityCode(null);
       }
@@ -312,6 +305,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     selectedConfirmations: [],
 
@@ -355,7 +349,7 @@ export default {
     },
 
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       const requestTemplate = [
         "districts",
         "gradDateFrom",
@@ -379,7 +373,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Archive School Reports Process has been successfully scheduled",
@@ -394,6 +388,7 @@ export default {
             5000
           );
         }
+        this.batchLoading = false;
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
         this.updateDashboards();
diff --git a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
index 7ae246ed..da2edebb 100644
--- a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
+++ b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
@@ -213,7 +213,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -245,7 +246,7 @@ export default {
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
       if (newValue == "All Students") {
-        batchRequestFormStore.setActivityCode("All");
+        batchRequestFormStore.setActivityCode("ALL");
       } else {
         batchRequestFormStore.setActivityCode(null);
       }
@@ -318,6 +319,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     selectedConfirmations: [],
   }),
@@ -380,7 +382,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       const requestTemplate = [
         "credentialTypeCode",
         "districts",
@@ -400,37 +402,38 @@ export default {
         this.getBatchRequest,
         requestTemplate
       );
-      try {
-        let response = await BatchProcessingService.runArchiveStudents(
-          requestPayload,
-          this.getBatchRequestCrontime
-        );
-
-        if (this.getBatchRequestCrontime) {
-          this.snackbarStore.showSnackbar(
-            "Archive student batch process has been successfully scheduled",
-            5000
+      if (this.group == "All Students")
+        try {
+          let response = await BatchProcessingService.runArchiveStudents(
+            requestPayload,
+            this.getBatchRequestCrontime
           );
-        } else {
+          this.batchLoading = false;
+          if (this.getBatchRequestCrontime) {
+            this.snackbarStore.showSnackbar(
+              "Archive student batch process has been successfully scheduled",
+              5000
+            );
+          } else {
+            this.snackbarStore.showSnackbar(
+              "Batch " +
+                response.data.batchId +
+                "- Archive student batch process submitted",
+              "success",
+              5000
+            );
+          }
+          this.closeDialogAndResetForm();
+          this.setActiveTab("batchRuns");
+          this.updateDashboards();
+        } catch (error) {
+          // handle the error and show the notification
           this.snackbarStore.showSnackbar(
-            "Batch " +
-              response.data.batchId +
-              "- Archive student batch process submitted",
-            "success",
+            "An error occurred: " + error.message,
+            "danger",
             5000
           );
         }
-        this.closeDialogAndResetForm();
-        this.setActiveTab("batchRuns");
-        this.updateDashboards();
-      } catch (error) {
-        // handle the error and show the notification
-        this.snackbarStore.showSnackbar(
-          "An error occurred: " + error.message,
-          "danger",
-          5000
-        );
-      }
     },
   },
 };
diff --git a/frontend/src/components/Batch/Forms/DistrunForm.vue b/frontend/src/components/Batch/Forms/DistrunForm.vue
index 95a0069f..bab668a5 100644
--- a/frontend/src/components/Batch/Forms/DistrunForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunForm.vue
@@ -58,7 +58,8 @@
               class="text-none"
               density="default"
               @click="submit"
-              :disabled="v$.$invalid"
+              :loading="batchLoading"
+              :disabled="v$.$invalid || batchLoading"
               >Submit</v-btn
             >
           </div>
@@ -166,6 +167,7 @@ export default {
   data: () => ({
     snackbarStore: useSnackbarStore(),
     step: 0,
+    batchLoading: false,
     dialog: false,
     groupSelected: "",
     transcriptTypes: [],
@@ -320,7 +322,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "pens",
@@ -346,6 +348,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
+        this.batchLoading = false;
         if (response) {
           if (this.getBatchRequestCrontime) {
             this.snackbarStore.showSnackbar(
@@ -362,6 +365,7 @@ export default {
             );
           }
         }
+        this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
         this.updateDashboards();
       } catch (error) {
diff --git a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
index 52aaa754..4de97073 100644
--- a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
@@ -113,7 +113,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -191,6 +192,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
   }),
   computed: {
@@ -254,7 +256,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       const requestTemplate = [
         "credentialTypeCode",
         "districts",
@@ -279,7 +281,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Year-End Credentials and Transcript Distribution Run has been successfully scheduled",
@@ -295,7 +297,6 @@ export default {
           );
         }
         this.closeDialogAndResetForm();
-
         this.setActiveTab("batchRuns");
         this.updateDashboards();
       } catch (error) {
diff --git a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
index fa6dcbd8..7c96b5b4 100644
--- a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
+++ b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
@@ -267,6 +267,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
     batchProcessingStore: useBatchProcessingStore(),
@@ -327,6 +328,7 @@ export default {
       this.step = step;
     },
     async submit() {
+      this.batchLoading = true;
       try {
         this.batchLoading = true;
         const requestTemplate = [
@@ -368,6 +370,7 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
+        this.updateDashboards();
       } catch (error) {
         // handle the error and show the notification
         this.snackbarStore.showSnackbar(
diff --git a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
index 3f7aa7dc..36478a7f 100644
--- a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
+++ b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
@@ -114,7 +114,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -192,6 +193,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),
@@ -256,7 +258,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       const requestTemplate = [
         "credentialTypeCode",
         "districts",
@@ -281,7 +283,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Non-Graduate Transcript Distribution Run has been successfully scheduled",
diff --git a/frontend/src/components/Batch/Forms/PSIForm.vue b/frontend/src/components/Batch/Forms/PSIForm.vue
index b7f696b5..ad1b3d09 100644
--- a/frontend/src/components/Batch/Forms/PSIForm.vue
+++ b/frontend/src/components/Batch/Forms/PSIForm.vue
@@ -110,7 +110,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -205,6 +206,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),
@@ -266,7 +268,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "credentialTypeCode",
@@ -293,7 +295,7 @@ export default {
           this.getPsiTrasmissionMode,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "PSI Run FTP / Paper has been successfully scheduled",
@@ -309,7 +311,6 @@ export default {
           );
         }
         this.closeDialogAndResetForm();
-
         this.setActiveTab("batchRuns");
         this.updateDashboards();
       } catch (error) {
diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
index 3c99b24a..a0ecf441 100644
--- a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -129,7 +129,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -240,6 +241,7 @@ export default {
   data: () => ({
     snackbarStore: useSnackbarStore(),
     step: 0,
+    batchLoading: false,
     dialog: false,
   }),
   computed: {
@@ -273,7 +275,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       const requestTemplate = [
         "districts",
         "pens",
@@ -293,7 +295,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "User Request Certificate Regeneration has been successfully scheduled",
diff --git a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
index 6dc691a8..e71d9143 100644
--- a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
@@ -145,7 +145,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -179,7 +180,7 @@ export default {
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
       if (newValue == "All Schools") {
-        batchRequestFormStore.setActivityCode("All");
+        batchRequestFormStore.setActivityCode("ALL");
       } else {
         batchRequestFormStore.setActivityCode(null);
       }
@@ -257,6 +258,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
     batchProcessingStore: useBatchProcessingStore(),
@@ -297,7 +299,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "districts",
@@ -321,7 +323,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "User Request School Report Regeneration has been successfully scheduled",
diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
index dd3762d3..b03a7919 100644
--- a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
+++ b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
@@ -138,7 +138,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -170,11 +171,6 @@ export default {
     const group = ref(batchRequestFormStore.who);
     watch(group, (newValue) => {
       batchRequestFormStore.who = newValue;
-      if (newValue == "All Students") {
-        batchRequestFormStore.setActivityCode("ALL");
-      } else {
-        batchRequestFormStore.setActivityCode(null);
-      }
     });
 
     return {
@@ -234,6 +230,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
     batchProcessingStore: useBatchProcessingStore(),
@@ -295,7 +292,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "credentialTypeCode",
@@ -307,6 +304,7 @@ export default {
           "programs",
           "psiCodes",
           "quantity",
+          "activityCode",
           "reportTypes",
           "schoolCategoryCodes",
           "schoolOfRecords",
@@ -316,11 +314,15 @@ export default {
           this.getBatchRequest,
           requestTemplate
         );
+        requestPayload.reportTypes = ["ACHV"];
+        if (this.group == "All Students") {
+          requestPayload.activityCode = "ALL";
+        }
         let response = await BatchProcessingService.runTVR_DELETE(
           requestPayload,
           this.getBatchRequestCrontime
         );
-
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Transcript verification report delete has been successfully scheduled",
diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
index a262a2c6..3e675255 100644
--- a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
+++ b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
@@ -138,7 +138,8 @@
                   class="text-none"
                   density="default"
                   @click="submit"
-                  :disabled="v$.$invalid"
+                  :loading="batchLoading"
+                  :disabled="v$.$invalid || batchLoading"
                   >Submit</v-btn
                 >
               </div>
@@ -251,6 +252,7 @@ export default {
   },
   data: () => ({
     step: 0,
+    batchLoading: false,
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),
@@ -312,7 +314,7 @@ export default {
       this.step = step;
     },
     async submit() {
-      this.dialog = false;
+      this.batchLoading = true;
       try {
         const requestTemplate = [
           "districts",
@@ -336,8 +338,7 @@ export default {
           requestPayload,
           this.getBatchRequestCrontime
         );
-
-        this.activeTab = "batchRuns";
+        this.batchLoading = false;
         if (this.getBatchRequestCrontime) {
           this.snackbarStore.showSnackbar(
             "Transcript verification report has been successfully scheduled",
@@ -350,7 +351,9 @@ export default {
             5000
           );
         }
+        this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
+        this.updateDashboards();
       } catch (error) {
         // handle the error and show the notification
         this.snackbarStore.showSnackbar(

From 378443dd1e97a91ba002528c79096333676c6488 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 6 Nov 2024 14:28:46 -0800
Subject: [PATCH 3/4] added varinat outine to batch forms

---
 .../Batch/Forms/ArchiveSchoolReportsForm.vue  | 18 +++--
 .../Batch/Forms/ArchiveStudentsForm.vue       |  3 +-
 .../Batch/Forms/DistrunFormYearEndForm.vue    |  3 +-
 .../Batch/Forms/DistrunUserForm.vue           |  2 +
 .../Batch/Forms/FormInputs/DateRangeInput.vue | 11 +--
 .../Forms/FormInputs/DistributionInput.vue    |  2 +
 .../Batch/Forms/FormInputs/DistrictInput.vue  |  3 +-
 .../Batch/Forms/FormInputs/PSIInput.vue       |  6 +-
 .../Batch/Forms/FormInputs/ProgramInput.vue   |  1 +
 .../Batch/Forms/FormInputs/SchoolInput.vue    |  1 +
 .../Batch/Forms/FormInputs/StudentInput.vue   |  3 +-
 .../Batch/Forms/GraduationAlgorithmForm.vue   |  4 +-
 .../Batch/Forms/NongradDistrunForm.vue        |  3 +-
 .../Batch/Forms/RegenerateCertificateForm.vue |  4 +-
 .../Forms/RegenerateSchoolReportForm.vue      |  8 ++-
 .../Forms/TranscriptAlgorithmDeleteForm.vue   |  4 +-
 .../Batch/Forms/TranscriptAlgorithmForm.vue   | 69 ++++++++++---------
 17 files changed, 89 insertions(+), 56 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
index 18cf3326..de6b5024 100644
--- a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
+++ b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -49,7 +49,7 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-col sm="2"> Report Type </v-col>
+                    <v-col sm="2">Report Type </v-col>
                     <v-col sm="10">
                       <v-select
                         v-model="reportType"
@@ -70,15 +70,21 @@
                         item-title="text"
                         item-value="value"
                         label="Select a report type"
+                        variant="outlined"
+                        class="mt-2"
                       ></v-select>
                     </v-col>
                   </v-row>
                   <v-row>
-                    <v-select
-                      v-model="group"
-                      :items="['School', 'All Schools']"
-                      label="Select a group"
-                    ></v-select>
+                    <v-col>
+                      <v-select
+                        class="mt-2"
+                        v-model="group"
+                        :items="['School', 'All Schools']"
+                        label="Select a group"
+                        variant="outlined"
+                      ></v-select>
+                    </v-col>
                   </v-row>
                   <v-row v-if="group == 'School'">
                     <SchoolInput>
diff --git a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
index da2edebb..99bc6862 100644
--- a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
+++ b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
@@ -52,9 +52,10 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="['School', 'All Students']"
-                      label="Select a Group"
+                      label="Select a group"
                     ></v-select>
                   </v-row>
                   <v-row v-if="group == 'School'">
diff --git a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
index 4de97073..f471800b 100644
--- a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
@@ -57,7 +57,8 @@
                     <v-select
                       v-model="getGroup"
                       :items="['School Category']"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                     ></v-select>
                   </v-row>
                   <v-row v-if="getGroup == 'School Category'">
diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
index 8ad63ce2..f29335ab 100644
--- a/frontend/src/components/Batch/Forms/DistrunUserForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -115,6 +115,8 @@
                   <v-row>
                     <v-col>
                       <v-select
+                        class="mt-2"
+                        variant="outlined"
                         v-model="group"
                         :items="groupItems"
                         label="Select group"
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
index 057610c4..ea7c9adf 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
@@ -7,6 +7,7 @@
       <v-col md="10">
         <v-select
           v-model="includeStudents"
+          variant="outlined"
           :items="['Current Students', 'Date Range']"
           label="Select which students to include"
           class=""
@@ -16,8 +17,9 @@
         <v-row v-if="includeStudents === 'Date Range'">
           <v-col sm="6">
             <v-text-field
+              variant="outlined"
               label="Graduation Date From:"
-              class="form__input"
+              class="mt-4"
               id="datepicker-birthdate-from"
               v-model="gradDateFrom"
               type="date"
@@ -46,8 +48,9 @@
           </v-col>
           <v-col sm="6">
             <v-text-field
+              variant="outlined"
               label="Graduation Date To:"
-              class="form__input"
+              class="mt-4"
               id="datepicker-birthdate-from"
               v-model="gradDateTo"
               type="date"
@@ -67,9 +70,7 @@
                 new Date(gradDateTo) < new Date(gradDateFrom)
               "
             >
-              <span class="text-red"
-                >End Date must be greater than Start Date.</span
-              >
+              <span color="red">End Date must be greater than Start Date.</span>
             </div>
             <div v-if="v$.gradDateTo.$invalid && !v$.gradDateTo.$pending">
               <span class="text-red">End Date is invalid or required.</span>
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
index d35ca370..f68f5ea4 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
@@ -8,6 +8,7 @@
           label="Copies"
           type="number"
           required
+          variant="outlined"
         ></v-text-field>
       </v-col> </v-row
     ><v-row>
@@ -23,6 +24,7 @@
           item-title="title"
           item-value="value"
           label="Where"
+          variant="outlined"
           require
           hide-details
         ></v-select>
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
index fb1076ce..26c65c81 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
@@ -17,6 +17,7 @@
               item-value="value"
               label="School Category"
               class="my-2"
+              variant="outlined"
               outlined
               hide-details
             ></v-select>
@@ -43,7 +44,7 @@
               v-if="!selectAllDistricts"
               :items="getDistrictList"
               label="Category"
-              outlined
+              variant="outlined"
               :item-title="districtTitle"
               item-value="districtNumber"
             ></v-autocomplete>
diff --git a/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue b/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue
index 4064d37c..deb58e98 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue
@@ -7,7 +7,7 @@
           v-model="transmissionMode"
           label="Select a Transmission Mode"
           :items="[{ title: 'Paper', value: 'PAPER' }, 'FTP']"
-          outlined
+          variant="outlined"
           small
           hide-details
         >
@@ -21,7 +21,7 @@
           v-model="psiYear"
           type="number"
           label="Enter PSI Year"
-          outlined
+          variant="outlined"
           small
         >
         </v-text-field>
@@ -36,7 +36,7 @@
           v-model="psi"
           maxlength="3"
           @input="validatePSI"
-          outlined
+          variant="outlined"
         />
 
         <div
diff --git a/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue b/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue
index 1c391d5c..304be752 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue
@@ -16,6 +16,7 @@
               :item-title="programTitle"
               item-value="programCode"
               :item-disabled="true"
+              variant="outlined"
             ></v-autocomplete>
           </v-col>
           <v-col sm="2" class="p-2 my-2">
diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
index 960ad26f..a85e9ff8 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -18,6 +18,7 @@
           </v-col>
           <v-col md="8">
             <v-autocomplete
+              variant="outlined"
               v-model="mincode"
               label="Select a school to include"
               :items="getSchoolsList"
diff --git a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
index 5cfe7956..60fba7e9 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
@@ -8,7 +8,8 @@
           v-model="pen"
           @input="validateStudent"
           type="number"
-          class="mr-2"
+          variant="outlined"
+          class="mr-2 mt-2"
         ></v-text-field>
       </v-col>
       <v-col md="3">
diff --git a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
index 7c96b5b4..f8b97214 100644
--- a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
+++ b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
@@ -52,6 +52,7 @@
                   <v-row>
                     <v-col>
                       <v-select
+                        class="mt-2"
                         v-model="group"
                         :items="[
                           { title: 'Student', value: 'Student' },
@@ -73,7 +74,8 @@
                             ),
                           },
                         ]"
-                        label="Select group"
+                        label="Select a group"
+                        variant="outlined"
                         hide-details
                       >
                         <template v-slot:item="{ props, item }">
diff --git a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
index 36478a7f..8855527a 100644
--- a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
+++ b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
@@ -55,7 +55,8 @@
                     <v-select
                       v-model="getGroup"
                       :items="['School Category']"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                     ></v-select>
                   </v-row>
                   <v-row v-if="getGroup == 'School Category'">
diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
index a0ecf441..fe95c223 100644
--- a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -50,6 +50,7 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="[
                         {
@@ -66,7 +67,8 @@
                           value: 'School Category',
                         },
                       ]"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                       ><template v-slot:item="{ props, item }">
                         <v-list-item
                           v-bind="props"
diff --git a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
index e71d9143..d637b906 100644
--- a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
@@ -51,7 +51,9 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-col sm="2"> Report Type </v-col>
+                    <v-col sm="2" class="mt-3"
+                      ><strong>Report Type</strong></v-col
+                    >
                     <v-col sm="10">
                       <v-select
                         v-model="reportType"
@@ -68,12 +70,15 @@
                         item-title="text"
                         item-value="value"
                         label="Select a report type"
+                        variant="outlined"
+                        class="mt-2"
                       ></v-select>
                     </v-col>
                     <v-col> </v-col>
                   </v-row>
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :item-title="title"
                       :item-value="value"
@@ -83,6 +88,7 @@
                         { title: 'All', value: 'All Schools' },
                       ]"
                       label="Select a group"
+                      variant="outlined"
                     />
                   </v-row>
                   <v-row v-if="group == 'School'">
diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
index b03a7919..7b603afd 100644
--- a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
+++ b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
@@ -51,6 +51,7 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="[
                         { title: 'Student', value: 'Student' },
@@ -68,7 +69,8 @@
                           disabled: !hasPermissions('BATCH', 'selectAllOption'),
                         },
                       ]"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                       ><template v-slot:item="{ props, item }">
                         <v-list-item
                           v-bind="props"
diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
index 3e675255..26f41e76 100644
--- a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
+++ b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
@@ -49,38 +49,41 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-select
-                      v-model="group"
-                      :items="[
-                        { title: 'Student', value: 'Student' },
-                        { title: 'School', value: 'School' },
-                        {
-                          title: 'School Category',
-                          value: 'School Category',
-                          disabled: !this.hasPermissions(
-                            'BATCH',
-                            'selectSchoolCategoryGroup'
-                          ),
-                        },
-                        {
-                          title: 'Program',
-                          value: 'Program',
-                          disabled: !this.hasPermissions(
-                            'BATCH',
-                            'selectProgramGroup'
-                          ),
-                        },
-                      ]"
-                      label="Select group"
-                      hide-details
-                    >
-                      <template v-slot:item="{ props, item }">
-                        <v-list-item
-                          v-bind="props"
-                          :subtitle="item.raw.department"
-                          :disabled="item.raw.disabled"
-                        ></v-list-item> </template
-                    ></v-select>
+                    <v-col>
+                      <v-select
+                        v-model="group"
+                        :items="[
+                          { title: 'Student', value: 'Student' },
+                          { title: 'School', value: 'School' },
+                          {
+                            title: 'School Category',
+                            value: 'School Category',
+                            disabled: !this.hasPermissions(
+                              'BATCH',
+                              'selectSchoolCategoryGroup'
+                            ),
+                          },
+                          {
+                            title: 'Program',
+                            value: 'Program',
+                            disabled: !this.hasPermissions(
+                              'BATCH',
+                              'selectProgramGroup'
+                            ),
+                          },
+                        ]"
+                        label="Select a group"
+                        variant="outlined"
+                        hide-details
+                      >
+                        <template v-slot:item="{ props, item }">
+                          <v-list-item
+                            v-bind="props"
+                            :subtitle="item.raw.department"
+                            :disabled="item.raw.disabled"
+                          ></v-list-item> </template
+                      ></v-select>
+                    </v-col>
                   </v-row>
                   <v-row v-if="group == 'Student'">
                     <StudentInput></StudentInput>
@@ -252,7 +255,7 @@ export default {
   },
   data: () => ({
     step: 0,
-    batchLoading: false,
+
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),

From 10fddb2e5955fec8767078126f48b611ee1f5216 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 6 Nov 2024 15:14:39 -0800
Subject: [PATCH 4/4] fixed change tab after batch run

---
 frontend/src/views/BatchProcessing.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 2039f098..972a999f 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -2,7 +2,10 @@
   <div class="batch-processing-view">
     <h1>Batch Processing</h1>
     <div>
-      <v-tabs v-model="activeTab" bg-color="bcGovLightGrey">
+      <v-tabs
+        v-model="batchProcessingStore.activeTab"
+        bg-color="bcGovLightGrey"
+      >
         <v-tab
           value="batchRuns"
           @click="
@@ -284,6 +287,7 @@ export default {
 
     return {
       activeTab,
+      batchProcessingStore,
     };
   },
   computed: {