Merge pull request #681 from bcgov/shaun-dev

fixed the update after batch submission
bcgov · Nov 7, 2024 · f95a571 · f95a571
2 parents 698eb1c + 2b148fb
commit f95a571
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 15 deletions.
diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -397,7 +397,10 @@ export default {
         this.batchLoading = false;
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,

diff --git a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
@@ -426,7 +426,10 @@ export default {
           }
           this.closeDialogAndResetForm();
           this.setActiveTab("batchRuns");
-          this.updateDashboards();
+          //add a wait before updating dashboard
+          setTimeout(() => {
+            this.updateDashboards();
+          }, 2000);
         } catch (error) {
           // handle the error and show the notification
           this.snackbarStore.showSnackbar(

diff --git a/frontend/src/components/Batch/Forms/DistrunForm.vue b/frontend/src/components/Batch/Forms/DistrunForm.vue
@@ -367,7 +367,10 @@ export default {
         }
         this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         console.error("Error:", error);

diff --git a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
@@ -299,7 +299,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,

diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -126,7 +126,10 @@
                   </v-row>
 
                   <v-row v-if="group == 'Student'">
-                    <StudentInput></StudentInput>
+                    <StudentInput
+                      runType="DISTRUNUSER"
+                      :credentialType="credentialSelected"
+                    ></StudentInput>
                   </v-row>
                   <v-row v-if="group == 'School Category'">
                     <DistrictInput></DistrictInput>
@@ -626,7 +629,10 @@ export default {
         }
         this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         console.error("Error:", error);

diff --git a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
@@ -145,6 +145,7 @@ export default {
       this.clearPenStudentInfo();
       const result = await this.v$.$validate();
       if (!result) {
+        this.penLoading = false;
         return;
       }
       this.penValidating = false;
@@ -163,8 +164,10 @@ export default {
         let student = await StudentService.getStudentByPen(this.pen);
         if (student.data && student.data.length === 0) {
           this.validationMessage = "Student not found";
+          this.penLoading = false;
           return false;
         }
+        let studentID = student.data[0].studentID;
 
         let studentGRADStatus = await StudentService.getGraduationStatus(
           student.data[0].studentID
@@ -186,13 +189,15 @@ export default {
           if (studentGRADStatus.data.studentStatusName == "Merged") {
             this.validationMessage =
               this.pen + " is a merged student and not permitted";
+            this.penLoading = false;
             return;
           }
           if (this.runType == "CERT_REGEN") {
             //when User is entereing PENs for the REGEN process, error if the student has a null PROGRAM COMPLETION DATE
             if (!studentGRADStatus.data.programCompletionDate) {
               this.validationMessage =
                 "Error: Cannot regenerate a certificate for this student - this student has not completed their program";
+              this.penLoading = false;
               return;
             }
           }
@@ -204,7 +209,7 @@ export default {
           ) {
             let certificate =
               await GraduationReportService.getStudentCertificates(studentID);
-            if (certificate.data.length) {
+            if (certificate?.data.length) {
               //check that certificate has does not have a null distribution date
 
               if (
@@ -213,17 +218,20 @@ export default {
               ) {
                 this.validationMessage =
                   "Cannot reprint certificate for this student. Distribution date is null";
+                this.penLoading = false;
                 return;
               }
             } else {
               if (this.credentialType == "RC") {
                 this.validationMessage =
                   "Cannot reprint certificate for this student.";
+                this.penLoading = false;
                 return;
               }
               if (this.credentialType == "OC") {
                 this.validationMessage =
                   "Cannot print certificate for this student,this student does not have a certificate.";
+                this.penLoading = false;
                 return;
               }
             }
@@ -246,15 +254,16 @@ export default {
     },
   },
   props: {
-    credentialType: String,
     runType: String,
+    credentialType: String,
   },
 
   computed: {
     computed: {
       ...mapState(useBatchRequestFormStore, [
         "getBatchRequest",
         "getBatchRunTime",
+        "getCredential",
       ]),
     },
     isEmpty() {

diff --git a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
@@ -370,9 +370,13 @@ export default {
             5000
           );
         }
+
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } 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
@@ -301,7 +301,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,

diff --git a/frontend/src/components/Batch/Forms/PSIForm.vue b/frontend/src/components/Batch/Forms/PSIForm.vue
@@ -312,7 +312,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,

diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -314,7 +314,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,

diff --git a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
@@ -346,7 +346,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         this.snackbarStore.showSnackbar(
           "An error occurred: " + error.message,

diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
@@ -339,7 +339,10 @@ export default {
         }
         this.closeDialogAndResetForm();
         this.setActiveTab("batchRuns");
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         this.snackbarStore.showSnackbar(

diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
@@ -356,7 +356,10 @@ export default {
         }
         this.setActiveTab("batchRuns");
         this.closeDialogAndResetForm();
-        this.updateDashboards();
+        //add a wait before updating dashboard
+        setTimeout(() => {
+          this.updateDashboards();
+        }, 2000);
       } catch (error) {
         // handle the error and show the notification
         this.snackbarStore.showSnackbar(