Merge pull request #593 from bcgov/GRAD2-2821

Grad2 2821
bcgov · Sep 12, 2024 · eecc43e · eecc43e
2 parents dedca75 + 45b2380
commit eecc43e
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 25 deletions.
diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
@@ -1,8 +1,6 @@
 <template>
   <div>
-    <b-alert :show="batchTypeDesc != ''" variant="info">
-      {{ batchTypeDesc }}
-    </b-alert>
+    <b-alert :show="batchTypeDesc != ''" variant="info"> </b-alert>
     <b-overlay :show="processingBatch">
       <div class="row">
         <div class="col-12 col-md-3 border-right">
@@ -20,20 +18,29 @@
             >
             </b-form-select>
           </div>
-
-          <div class="mt-2" v-if="batch.details['what'] == 'ARC_SCH_REPORTS'">
+          <div class="mt-2" v-if="batch.details['what'] == 'SCHL_RPT_REGEN'">
             <label class="font-weight-bold">Report Type</label>
             <b-form-select
               id="inline-form-select-audience"
               class="mb-2 mr-sm-2 mb-sm-0 col-12"
-              :options="reportTypes"
+              :options="SCHL_RPT_REGEN_reportTypes"
+              value-field="code"
+              text-field="label"
+              :value="batch.details['reportType']"
+              @change="editBatchJob('reportType', $event)"
+            ></b-form-select>
+          </div>
+          <div class="mt-2" v-if="batch.details['what'] == 'ARC_SCH_REPORTS'">
+            <b-form-select
+              id="inline-form-select-audience"
+              class="mb-2 mr-sm-2 mb-sm-0 col-12"
+              :options="ARC_SCH_REPORTS_reportTypes"
               value-field="code"
               text-field="label"
               :value="batch.details['reportType']"
               @change="editBatchJob('reportType', $event)"
             ></b-form-select>
           </div>
-
           <div class="mt-2" v-if="batch.details['what'] == 'DISTRUNUSER'">
             <label class="font-weight-bold">Credential Type</label>
             <b-form-select
@@ -224,6 +231,7 @@
                 batch.details['what'] != 'DISTRUN_YE' &&
                 batch.details['what'] != 'DISTRUN_SUPP' &&
                 batch.details['what'] != 'ARC_STUDENTS' &&
+                batch.details['what'] != 'SCHL_RPT_REGEN' &&
                 batch.details['what'] != 'TVR_DELETE' &&
                 batch.details['what'] != 'ARC_SCH_REPORTS' &&
                 batch.details['what'] != 'CERT_REGEN'
@@ -1265,7 +1273,8 @@ export default {
       ARC_STUDENTS_confirm: [],
       ARC_SCHOOL_REPORTS_confirm: [],
       runType: "",
-      reportTypes: [],
+      ARC_SCH_REPORTS_reportTypes: [],
+      SCHL_RPT_REGEN_reportTypes: [],
       reportType: "",
       batchIsValid: false,
       batchTypes: [],
@@ -1384,27 +1393,36 @@ export default {
               value: "All Schools",
             },
           ],
-
-          copies: true,
-          where: true,
         },
-        TVR_DELETE: {
+        SCHL_RPT_REGEN: {
           group: [
             {
               text: "School",
               value: "School",
             },
+            { text: "School Category", value: "District" },
+            {
+              text: "All",
+              value: "All Schools",
+            },
+          ],
+        },
+        TVR_DELETE: {
+          group: [
             {
               text: "Student",
               value: "Student",
             },
+            {
+              text: "School",
+              value: "School",
+            },
+
             {
               text: "All Students",
               value: "All Students",
             },
           ],
-          copies: true,
-          where: true,
         },
       },
     };
@@ -1417,7 +1435,8 @@ export default {
     this.transcriptTypes = this.getTranscriptTypes();
     this.certificateTypes = this.getCertificateTypes();
     this.batchTypes = this.getBatchJobTypes();
-    this.reportTypes = [
+
+    this.ARC_SCH_REPORTS_reportTypes = [
       {
         code: "NONGRADPRJ",
         label:
@@ -1439,6 +1458,21 @@ export default {
           "A daily, cumulative list of student in the current cycle who have not-yet graduated, based on the latest information submitted by the school. Produced as part of the Batch Graduation Algorithm Run.",
       },
     ];
+    this.SCHL_RPT_REGEN_reportTypes = [
+      {
+        code: "NONGRADPRJ",
+        label: "Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)",
+        description:
+          "A list of all current students reported on a graduation program, in grade 12 or AD, who are not projected to graduate based on missing course registrations or assessment registrations. Produced as part of TVR Batch Run.",
+      },
+      {
+        code: "GRADREG and NONGRADREG",
+        label:
+          "Graduated Students (MM YYYY to MM YYYY) Report and Not-Yet Graduated Students (MM YYYY to MM YYYY) Report",
+        description:
+          "A daily, cumulative list of student in the current cycle who have graduated, based on the latest information submitted by the school. Produced as part of the Batch Graduation Algorithm Run.",
+      },
+    ];
   },
 
   methods: {
@@ -1513,7 +1547,8 @@ export default {
         }
       }
       if (
-        this.batch.details["what"] == "ARC_SCH_REPORTS" &&
+        (this.batch.details["what"] == "ARC_SCH_REPORTS" ||
+          this.batch.details["what"] == "SCHL_RPT_REGEN") &&
         this.batch.details["reportType"] == ""
       ) {
         this.batchIsValid = false;
@@ -1589,10 +1624,7 @@ export default {
             );
           }
           this.batchTypes = this.batchTypes.map((type) => {
-            if (
-              type.code === "SCHL_RPT_REGEN" ||
-              type.code === "EDW_SNAPSHOT"
-            ) {
+            if (type.code === "EDW_SNAPSHOT") {
               type.disabled = true;
             }
             return type;

diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -37,6 +37,7 @@
             details.who != 'PSI' &&
             details.who != 'Student' &&
             details.who != 'District' &&
+            details.what != 'SCHL_RPT_REGEN' &&
             details.what == 'ARC_STUDENTS'
           "
         >
@@ -107,7 +108,7 @@
             <strong>Grad End Date: </strong>{{ details.gradDateTo }}
           </li>
         </ul>
-        <li v-if="details.categoryCode">
+        <li v-if="details.categoryCode && details.what != 'SCHL_RPT_REGEN'">
           <strong>School Category: </strong>{{ details.categoryCode }}
         </li>
         <li v-if="details.psiTransmissionMode">
@@ -123,6 +124,7 @@
           details.what != 'REGALG' &&
           details.what != 'TVRRUN' &&
           details.what != 'CERT_REGEN' &&
+          details.what != 'SCHL_RPT_REGEN' &&
           details.what != 'ARC_STUDENTS' &&
           details.what != 'TVR_DELETE' &&
           details.what != 'ARC_SCH_REPORTS'

diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
@@ -62,6 +62,9 @@ export default {
   runDISTRUN_MONTHLY() {
     return ApiService.apiAxios.get("/api/v1/batch/executedisrunbatchjob");
   },
+  runSCHL_RPT_REGEN(request, cronTime=""){
+    return ApiService.apiAxios.post(`/api/v1/batch/regenerate/school-report`,request);
+  },  
   runDISTRUN_SUPP() {
     return ApiService.apiAxios.get("/api/v1/batch/executesuppdisrunbatchjob");
   },

diff --git a/frontend/src/store/modules/batchprocessing.js b/frontend/src/store/modules/batchprocessing.js
@@ -178,7 +178,6 @@ export const useBatchProcessingStore = defineStore("batchProcessing", {
     getBatchDetailsTypeById: (state) =>{
       return function(args){
         return state.batchDetails[args].details['what']
-
       }
     },
     getbatchDetailsGroupById: (state) =>{

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
@@ -128,7 +128,9 @@
                                         v-if="
                                           row.item.jobType != 'TVR_DELETE' &&
                                           row.item.jobType != 'ARC_STUDENTS' &&
-                                          row.item.jobType != 'ARC_SCH_REPORTS'
+                                          row.item.jobType !=
+                                            'ARC_SCH_REPORTS' &&
+                                          row.item.jobType != 'SCHL_RPT_REGEN'
                                         "
                                       >
                                         <div class="col-12">
@@ -163,6 +165,8 @@
                                           row.item.jobType != 'ARC_STUDENTS' &&
                                           row.item.jobType !=
                                             'ARC_SCH_REPORTS' &&
+                                          row.item.jobType !=
+                                            'SCHL_RPT_REGEN' &&
                                           row.item.jobType != 'PSIRUN'
                                         "
                                       >
@@ -220,6 +224,8 @@
                                           row.item.jobType != 'ARC_STUDENTS' &&
                                           row.item.jobType !=
                                             'ARC_SCH_REPORTS' &&
+                                          row.item.jobType !=
+                                            'SCHL_RPT_REGEN' &&
                                           row.item.failedStudentsProcessed != 0
                                         "
                                       >
@@ -275,7 +281,8 @@
                                           row.item.jobType != 'TVR_DELETE' &&
                                           row.item.jobType !=
                                             'ARC_SCH_REPORTS' &&
-                                          row.item.jobType != 'ARC_STUDENTS'
+                                          row.item.jobType != 'ARC_STUDENTS' &&
+                                          row.item.jobType != 'SCHL_RPT_REGEN'
                                         "
                                       >
                                         <div class="col-9 p-2">
@@ -1136,6 +1143,44 @@ export default {
           }
         });
     },
+    runSCHL_RPT_REGEN(request, id) {
+      let requestId = id.replace("job-", "");
+      this.$set(this.spinners, id, true);
+      let index = id.replace("job-", "") - 1;
+      let value = true;
+      this.setTabLoading({ index, value });
+      BatchProcessingService.runSCHL_RPT_REGEN(request)
+        .then((response) => {
+          this.getAdminDashboardData();
+          this.cancelBatchJob(id);
+          this.selectedTab = 0;
+          if (response.data) {
+            this.$bvToast.toast(
+              "Batch run " +
+                response.data.batchId +
+                " has started for request " +
+                requestId,
+              {
+                title: "BATCH PROCESSING STARTED",
+                variant: "success",
+                noAutoHide: true,
+              }
+            );
+          }
+        })
+        .catch((error) => {
+          if (error) {
+            this.getAdminDashboardData();
+            this.cancelBatchJob(id);
+            this.selectedTab = 0;
+            this.$bvToast.toast("This request is running in the background", {
+              title: "BATCH PROCESSING UPDATE",
+              variant: "success",
+              noAutoHide: true,
+            });
+          }
+        });
+    },
     runCERTREGEN(request, id) {
       let requestId = id.replace("job-", "");
       this.$set(this.spinners, id, true);
@@ -1846,7 +1891,7 @@ export default {
         delete request.gradDateTo;
         delete request.quantity;
         delete request.localDownload;
-        delete request.reportType;
+        delete request.activityCode;
 
         if (cronTime) {
           let scheduledRequest = {};
@@ -1862,6 +1907,33 @@ export default {
             this.runCERTREGEN(request, id);
           }
         }
+      } else if (this.tabContent[id].details["what"] == "SCHL_RPT_REGEN") {
+        delete request.credentialTypeCode;
+        request.reportTypes = [this.tabContent[id].details["reportType"]];
+        if (this.tabContent[id].details["who"] == "All Schools") {
+          request.activityCode = "ALL";
+        }
+        if (cronTime) {
+          let scheduledRequest = {};
+          scheduledRequest.cronExpression = cronTime;
+          scheduledRequest.jobName = "??";
+          scheduledRequest.blankPayLoad = null;
+          scheduledRequest.payload = request;
+          this.addScheduledJob(scheduledRequest, id);
+        } else {
+          this.runSCHL_RPT_REGEN(request, id);
+        }
+      } else if (this.tabContent[id].details["what"] == "ARC_STUDENTS") {
+        if (cronTime) {
+          let scheduledRequest = {};
+          scheduledRequest.cronExpression = cronTime;
+          scheduledRequest.jobName = "ARCS";
+          scheduledRequest.blankPayLoad = null;
+          scheduledRequest.payload = request;
+          this.addScheduledJob(scheduledRequest, id);
+        } else {
+          this.runArchiveStudents(request, id);
+        }
       } else if (this.tabContent[id].details["what"] == "ARC_STUDENTS") {
         delete request.credentialTypeCode;