tvr delete fix

bcgov · Nov 6, 2024 · 95a7cf0 · 95a7cf0
1 parent 1b3f475
commit 95a7cf0
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 74 deletions.
diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -186,25 +186,18 @@
                 >
                 <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"
                   variant="flat"
                   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",