From 161e23cd7380d01f8447fba37fc7f0cb11abb2c9 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 2 Oct 2024 11:44:47 -0700
Subject: [PATCH 1/2] fixed date input

---
 .../Batch/Forms/FormInputs/DateRangeInput.vue | 187 ++++++++++--------
 .../src/services/BatchProcessingService.js    |  66 +++++--
 2 files changed, 151 insertions(+), 102 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
index 3d2f0996..3485af26 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
@@ -19,7 +19,7 @@
               v-model="gradDateFrom"
               label="Graduation Date From:"
               placeholder="yyyy-mm-dd"
-              @blur="validateAndFormatDate(gradDateFrom, 'gradDateFrom')"
+              @blur="validateAndFormatDate('gradDateFrom')"
               @input="debouncedCheckAndConvertDate('from')"
             ></v-text-field>
             <div v-if="v$.gradDateFrom.$invalid && !v$.gradDateFrom.$pending">
@@ -31,7 +31,7 @@
               v-model="gradDateTo"
               label="Graduation Date To:"
               placeholder="yyyy-mm-dd"
-              @blur="validateAndFormatDate(gradDateTo, 'gradDateTo')"
+              @blur="validateAndFormatDate('gradDateTo')"
               @input="debouncedCheckAndConvertDate('to')"
             ></v-text-field>
             <div
@@ -56,117 +56,130 @@
 </template>
 
 <script>
-import { ref, watch, defineComponent } from "vue";
 import { required, helpers } from "@vuelidate/validators";
 import useVuelidate from "@vuelidate/core";
 import { useBatchRequestFormStore } from "../../../../store/modules/batchRequestFormStore";
 import { debounce } from "lodash";
 
-const formatDateString = (dateString) => {
-  const dateParts = dateString.split("-");
-  if (dateParts.length === 3) {
-    const [year, month, day] = dateParts.map(Number);
-    const date = new Date(year, month - 1, day);
-    return !isNaN(date.getTime()) ? date.toISOString().slice(0, 10) : "";
-  }
-  return "";
-};
-
-export default defineComponent({
-  setup() {
-    const batchRequestFormStore = useBatchRequestFormStore();
-
-    // Reactive references from the store
-    const gradDateFrom = ref(batchRequestFormStore.gradDateFrom);
-    const gradDateTo = ref(batchRequestFormStore.gradDateTo);
-
-    const rules = {
+export default {
+  data() {
+    return {
+      gradDateFrom: "",
+      gradDateTo: "",
+      includeStudents: "Current Students",
+    };
+  },
+  computed: {
+    batchRequestFormStore() {
+      return useBatchRequestFormStore();
+    },
+  },
+  validations() {
+    return {
       gradDateFrom: {
-        required: helpers.withMessage("Start Date is required", required),
-        dateFormat: (value) =>
-          /^\d{4}-\d{2}-\d{2}$/.test(value) ||
-          "Invalid date format (yyyy-mm-dd)",
+        required:
+          this.includeStudents === "Date Range"
+            ? helpers.withMessage("Start Date is required", required)
+            : false,
+        dateFormat:
+          this.includeStudents === "Date Range"
+            ? (value) =>
+                /^\d{4}-\d{2}-\d{2}$/.test(value) ||
+                "Invalid date format (yyyy-mm-dd)"
+            : false,
       },
       gradDateTo: {
-        required: helpers.withMessage("End Date is required", required),
-        dateFormat: (value) =>
-          /^\d{4}-\d{2}-\d{2}$/.test(value) ||
-          "Invalid date format (yyyy-mm-dd)",
+        required:
+          this.includeStudents === "Date Range"
+            ? helpers.withMessage("End Date is required", required)
+            : false,
+        dateFormat:
+          this.includeStudents === "Date Range"
+            ? (value) =>
+                /^\d{4}-\d{2}-\d{2}$/.test(value) ||
+                "Invalid date format (yyyy-mm-dd)"
+            : false,
       },
     };
+  },
+  created() {
+    this.gradDateFrom = this.batchRequestFormStore.gradDateFrom;
+    this.gradDateTo = this.batchRequestFormStore.gradDateTo;
 
-    const v$ = useVuelidate(rules, { gradDateFrom, gradDateTo });
-
-    const validateAndFormatDate = (dateRef, emitKey) => {
-      if (dateRef.value) {
-        const formatted = formatDateString(dateRef.value);
-        dateRef.value = formatted;
+    // Initialize Vuelidate
+    this.v$ = useVuelidate();
+  },
+  watch: {
+    "batchRequestFormStore.gradDateFrom"(newValue) {
+      this.gradDateFrom = newValue;
+    },
+    "batchRequestFormStore.gradDateTo"(newValue) {
+      this.gradDateTo = newValue;
+    },
+    includeStudents(newValue) {
+      if (newValue === "Current Students") {
+        this.clearDateFields();
+      }
+      // Re-evaluate validations when the selection changes
+      this.v$.$reset();
+    },
+  },
+  methods: {
+    clearDateFields() {
+      this.gradDateFrom = "";
+      this.gradDateTo = "";
+      this.batchRequestFormStore.gradDateFrom = "";
+      this.batchRequestFormStore.gradDateTo = "";
+    },
+    validateAndFormatDate(dateRef) {
+      if (this[dateRef]) {
+        const formatted = this.formatDateString(this[dateRef]);
+        this[dateRef] = formatted;
         // Emit updates to the store
-        batchRequestFormStore[emitKey] = formatted;
+        this.batchRequestFormStore[dateRef] = formatted;
       }
-    };
-
-    const checkAndConvertDate = (type) => {
-      const targetDate = type === "from" ? gradDateFrom : gradDateTo;
+    },
+    checkAndConvertDate(type) {
+      const targetDate = type === "from" ? this.gradDateFrom : this.gradDateTo;
 
       // Check if the input length is 8
-      if (targetDate.value.length === 8) {
-        const year = targetDate.value.substring(0, 4);
-        const month = targetDate.value.substring(4, 6);
-        const day = targetDate.value.substring(6, 8);
-        targetDate.value = `${year}-${month}-${day}`;
+      if (targetDate.length === 8) {
+        const year = targetDate.substring(0, 4);
+        const month = targetDate.substring(4, 6);
+        const day = targetDate.substring(6, 8);
+        this[
+          type === "from" ? "gradDateFrom" : "gradDateTo"
+        ] = `${year}-${month}-${day}`;
         // Emit the change to the store
         if (type === "from") {
-          batchRequestFormStore.gradDateFrom = targetDate.value;
+          this.batchRequestFormStore.gradDateFrom = this.gradDateFrom;
         } else {
-          batchRequestFormStore.gradDateTo = targetDate.value;
+          this.batchRequestFormStore.gradDateTo = this.gradDateTo;
         }
       }
-    };
-
-    // Create a debounced version of checkAndConvertDate
-    const debouncedCheckAndConvertDate = debounce(checkAndConvertDate, 300); // 300 ms delay
-    const handleStudentSelectionChange = (newValue) => {
+    },
+    formatDateString(dateString) {
+      const dateParts = dateString.split("-");
+      if (dateParts.length === 3) {
+        const [year, month, day] = dateParts.map(Number);
+        const date = new Date(year, month - 1, day);
+        return !isNaN(date.getTime()) ? date.toISOString().slice(0, 10) : "";
+      }
+      return "";
+    },
+    handleStudentSelectionChange(newValue) {
       console.log("Student selection changed:", newValue);
       if (newValue === "Current Students") {
         console.log("Clearing gradDateFrom and gradDateTo");
-        gradDateFrom.value = ""; // Clear local ref
-        gradDateTo.value = ""; // Clear local ref
-        // Update the store
-        batchRequestFormStore.gradDateFrom = "";
-        batchRequestFormStore.gradDateTo = "";
-      }
-    };
-    // Watch for store updates to keep component state in sync
-    watch(
-      () => batchRequestFormStore.gradDateFrom,
-      (newValue) => {
-        gradDateFrom.value = newValue;
-      }
-    );
-
-    watch(
-      () => batchRequestFormStore.gradDateTo,
-      (newValue) => {
-        gradDateTo.value = newValue;
+        this.clearDateFields();
       }
-    );
-
-    return {
-      gradDateFrom,
-      gradDateTo,
-      v$,
-      validateAndFormatDate,
-      debouncedCheckAndConvertDate,
-      handleStudentSelectionChange,
-    };
+    },
   },
-  data() {
-    return {
-      includeStudents: "Current Students",
-    };
+  mounted() {
+    // Debounced version of checkAndConvertDate
+    this.debouncedCheckAndConvertDate = debounce(this.checkAndConvertDate, 300); // 300 ms delay
   },
-});
+};
 </script>
 
 <style scoped>
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index 8b2f95ba..83c1570b 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -59,32 +59,56 @@ export default {
       return
     }else{
       if(credentialType == "OT"){
-        return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OT', request);
+        console.log("/api/v1/batch/userrequestdisrun/OT");
+        console.log(request)
+        return;
+        //return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OT', request);
       }else if(credentialType == "OC"){
-        return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OC', request);
+        console.log("/api/v1/batch/userrequestdisrun/OC");
+        console.log(request);
+        return;
+        //return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OC', request);
       }else if(credentialType == "RC"){
-        return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/RC', request);
+        console.log("/api/v1/batch/userrequestdisrun/RC");
+        console.log(request);
+        return;
+        //return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/RC', request);
       }else if(credentialType == "Blank transcript print"){
-        return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OT', request); 
+        console.log("/api/v1/batch/userrequestblankdisrun/OT");
+        console.log(request);
+        return;
+        //return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OT', request); 
       }else if(credentialType == "Blank certificate print"){
-        return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OC', request);
+        console.log("userrequestblankdisrun/OC");
+        console.log(request);
+        return;
+        //return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OC', request);
       }
     }
 
     
   },     
   runDISTRUN_MONTHLY(){
-    return ApiService.apiAxios.get('/api/v1/batch/executedisrunbatchjob');
+    console.log("/api/v1/batch/executedisrunbatchjob");
+    console.log(request);
+    return;
+    //return ApiService.apiAxios.get('/api/v1/batch/executedisrunbatchjob');
   },
   runDISTRUN_SUPP(){
-    return ApiService.apiAxios.get('/api/v1/batch/executesuppdisrunbatchjob');
+    console.log("/api/v1/batch/executesuppdisrunbatchjob");
+    console.log(request);
+    return;
+    //return ApiService.apiAxios.get('/api/v1/batch/executesuppdisrunbatchjob');
   },
   runNONGRADRUN(request, cronTime=""){
     if (Array.isArray(request.districts) && request.districts.length === 1 && request.districts[0].toLowerCase() === "all") {
       // If the condition is true, set districts to an empty array
       request.districts = [];
     }
-    return ApiService.apiAxios.post('/api/v1/batch/executenongraddisrunbatchjob',request);
+    console.log("/api/v1/batch/executenongraddisrunbatchjob");
+    console.log(request);
+    return;    
+    //return ApiService.apiAxios.post('/api/v1/batch/executenongraddisrunbatchjob',request);
   },  
   runDISTRUN_YE(request, cronTime=""){
     if (Array.isArray(request.districts) && request.districts.length === 1 && request.districts[0].toLowerCase() === "all") {
@@ -100,14 +124,23 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
+      console.log("/api/v1/batch/executeyearlydisrunbatchjob");
+      console.log(request);
+      return;    
+      //return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
     }
   },
   runSCHL_RPT_REGEN(request, cronTime=""){
-    return ApiService.apiAxios.post(`/api/v1/batch/regenerate/school-report`,request);
+    console.log("/api/v1/batch/regenerate/school-report");
+    console.log(request);
+    return;    
+    //return ApiService.apiAxios.post(`/api/v1/batch/regenerate/school-report`,request);
   },  
   runDISTRUN_SUPP() {
-    return ApiService.apiAxios.get("/api/v1/batch/executesuppdisrunbatchjob");
+    console.log("/api/v1/batch/executesuppdisrunbatchjob");
+    console.log(request);
+    return;    
+    //return ApiService.apiAxios.get("/api/v1/batch/executesuppdisrunbatchjob");
   },
   runCERTREGEN(request, cronTime = "") {
     if (
@@ -127,10 +160,13 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return;
     } else {
-      return ApiService.apiAxios.post(
-        "/api/v1/batch/executecertregenbatchjob",
-        request
-      );
+      console.log("/api/v1/batch/executecertregenbatchjob");
+      console.log(request);
+      return;    
+      // return ApiService.apiAxios.post(
+      //   "/api/v1/batch/executecertregenbatchjob",
+      //   request
+      // );
     }
   },
   runTVR_DELETE(request, cronTime="" ) {

From fdea175610bfca91b4f98142c3e648c74c851162 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 4 Oct 2024 11:03:36 -0700
Subject: [PATCH 2/2] updated batch inputs to confirm port

---
 .../components/Batch/Forms/DistrunForm.vue    |   7 +-
 .../Batch/Forms/FormInputs/DateRangeInput.vue |  31 ++--
 .../Batch/Forms/FormInputs/DistrictInput.vue  | 107 ++------------
 .../Batch/Forms/FormInputs/SchoolInput.vue    |  11 +-
 .../Batch/Forms/RegenerateCertificateForm.vue |   5 +-
 .../Forms/RegenerateSchoolReportForm.vue      |  40 +++--
 .../src/services/BatchProcessingService.js    | 139 +++++++++++-------
 .../store/modules/batchRequestFormStore.js    |  11 +-
 frontend/vite.config.js                       |   2 +-
 9 files changed, 173 insertions(+), 180 deletions(-)

diff --git a/frontend/src/components/Batch/Forms/DistrunForm.vue b/frontend/src/components/Batch/Forms/DistrunForm.vue
index f7a2f850..f85cf75f 100644
--- a/frontend/src/components/Batch/Forms/DistrunForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunForm.vue
@@ -121,7 +121,12 @@
                       <ProgramInput></ProgramInput>
                     </v-row>
                     <v-row v-if="group == 'School'">
-                      <SchoolInput></SchoolInput>
+                      <SchoolInput
+                        :disableSelectStudents="
+                          getCredential == 'Blank certificate print' ||
+                          getCredential == 'Blank transcript print'
+                        "
+                      ></SchoolInput>
                     </v-row>
                   </v-stepper-window-item>
                   <v-stepper-window-item value="3">
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
index 3485af26..6be181d2 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
@@ -57,6 +57,7 @@
 
 <script>
 import { required, helpers } from "@vuelidate/validators";
+import { ref, watch } from "vue";
 import useVuelidate from "@vuelidate/core";
 import { useBatchRequestFormStore } from "../../../../store/modules/batchRequestFormStore";
 import { debounce } from "lodash";
@@ -102,26 +103,30 @@ export default {
       },
     };
   },
-  created() {
-    this.gradDateFrom = this.batchRequestFormStore.gradDateFrom;
-    this.gradDateTo = this.batchRequestFormStore.gradDateTo;
 
-    // Initialize Vuelidate
-    this.v$ = useVuelidate();
+  setup() {
+    const batchRequestFormStore = useBatchRequestFormStore();
+    const gradDateFrom = ref(batchRequestFormStore.gradDateFrom);
+    const gradDateTo = ref(batchRequestFormStore.gradDateTo);
+
+    watch(gradDateFrom, (newValue) => {
+      batchRequestFormStore.gradDateFrom = newValue;
+    });
+    watch(gradDateTo, (newValue) => {
+      batchRequestFormStore.gradDateTo = newValue;
+    });
+    return {
+      gradDateFrom,
+      gradDateTo,
+      v$: useVuelidate(),
+    };
   },
+
   watch: {
-    "batchRequestFormStore.gradDateFrom"(newValue) {
-      this.gradDateFrom = newValue;
-    },
-    "batchRequestFormStore.gradDateTo"(newValue) {
-      this.gradDateTo = newValue;
-    },
     includeStudents(newValue) {
       if (newValue === "Current Students") {
         this.clearDateFields();
       }
-      // Re-evaluate validations when the selection changes
-      this.v$.$reset();
     },
   },
   methods: {
diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
index 00815ac8..0976a250 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
@@ -22,7 +22,7 @@
             ></v-select>
           </v-col>
         </v-row>
-        <v-row>
+        <v-row v-if="!disableSelectStudents">
           <v-col md="12">
             <DateRangeInput></DateRangeInput>
           </v-col>
@@ -104,93 +104,6 @@
             <div><strong>Active Flag:</strong> {{ item.info.activeFlag }}</div>
           </template>
         </v-data-table>
-
-        <!-- <v-data-table :items="districts" :headers="districtInputFields" striped>
-          <template v-slot:top>
-            <v-row>
-              <v-col sm="9"></v-col>
-              <v-col sm="3">
-                <v-btn @click="addMode = true" :disabled="addMode"
-                  ><v-icon>mdi-plus</v-icon> Add
-                </v-btn>
-              </v-col>
-            </v-row></template
-          >
-          <template v-slot:item.remove="{ item }">
-            <v-btn
-              v-if="schoolCategory != '09' && schoolCategory != '04'"
-              @click="removeDistrict(item.district)"
-              color="primary"
-            >
-              Remove
-            </v-btn>
-          </template>
-
-   
-          <template v-slot:item.info="{ item }">
-            <div>
-              <strong>District Name:</strong> {{ item.info.districtName }}
-            </div>
-            <div><strong>Active Flag:</strong> {{ item.info.activeFlag }}</div>
-          </template>
-
-          <template v-slot:body.prepend>
-            <tr v-if="addMode">
-              <td>Include</td>
-              <td>
-                <v-row
-                  v-if="schoolCategory !== '04' && schoolCategory !== '09'"
-                >
-                  <v-col sm="12" lg="12">
-                    <v-autocomplete
-                      v-model="district"
-                      :items="getDistrictList"
-                      label="Include District"
-                      outlined
-                      :item-title="districtTitle"
-                      item-value="districtNumber"
-                      hide-details
-                    ></v-autocomplete>
-                  </v-col>
-                </v-row>
-                <v-row>
-                  <v-col>
-                    <v-row v-if="districtInfo" class="float-left col-10">
-                      <v-card>
-                        <v-card-text>
-                          <v-alert
-                            v-if="validationMessage"
-                            dismissible
-                            type="danger"
-                            >{{ validationMessage }}</v-alert
-                          >
-                          <v-overlay :value="districtValidating">
-                            <div v-if="!districtInfo">NOT VALID</div>
-                            <div v-else>
-                              <strong>District:</strong>
-                              {{ districtInfo.districtName }}<br />
-                              <strong>Active Flag:</strong>
-                              {{ districtInfo.activeFlag }}<br />
-                            </div>
-                          </v-overlay>
-                        </v-card-text>
-                      </v-card>
-                    </v-row>
-                  </v-col>
-                </v-row>
-              </td>
-              <td>
-                <v-btn
-                  :disabled="!district"
-                  @click="addDistrict()"
-                  class="float-left bg-primary"
-                >
-                  Add
-                </v-btn>
-              </td>
-            </tr>
-          </template>
-        </v-data-table> -->
       </v-card-text>
     </v-card>
   </v-container>
@@ -211,7 +124,10 @@ export default {
     const gradDateFrom = ref(batchRequestFormStore.gradDateFrom);
     const gradDateTo = ref(batchRequestFormStore.gradDateTo);
     const districts = ref(batchRequestFormStore.districts);
-
+    const schoolCategory = ref(batchRequestFormStore.categoryCode);
+    watch(schoolCategory, (newValue) => {
+      batchRequestFormStore.categoryCode = newValue;
+    });
     watch(gradDateFrom, (newValue) => {
       batchRequestFormStore.gradDateFrom = newValue;
     });
@@ -220,6 +136,7 @@ export default {
     });
 
     return {
+      schoolCategory,
       gradDateTo,
       gradDateFrom,
       districts,
@@ -283,7 +200,6 @@ export default {
       districtInfo: "",
       districtValidating: false,
       validationMessage: "",
-      schoolCategory: "",
       districtInputFields: [
         {
           key: "district",
@@ -363,11 +279,20 @@ export default {
   props: {
     credentialType: String,
     runType: String,
+    disableSelectStudents: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
 
   computed: {
     ...mapState(useAppStore, ["getDistrictList"]),
-    ...mapState(useBatchRequestFormStore, ["getDistricts", "getBatchRequest"]),
+    ...mapState(useBatchRequestFormStore, [
+      "getDistricts",
+      "getBatchRequest",
+      "getSchoolCategory",
+    ]),
 
     isEmpty() {
       return this.districts.length > 0;
diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
index 503de151..4bf81fad 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -8,7 +8,7 @@
               <slot name="inputWarning"></slot>
             </v-alert>
 
-            <v-row>
+            <v-row v-if="!disableSelectStudents">
               <v-col sm="12">
                 <DateRangeInput></DateRangeInput>
               </v-col>
@@ -270,7 +270,14 @@ export default {
       }
     },
   },
-  props: {},
+
+  props: {
+    disableSelectStudents: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
 
   computed: {
     ...mapState(useAppStore, ["getSchoolsList"]),
diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
index 41408012..d2c32d5e 100644
--- a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -56,7 +56,10 @@
                       <StudentInput runType="CERT_REGEN"></StudentInput>
                     </v-row>
                     <v-row v-if="group == 'School Category'">
-                      <DistrictInput runType="CERT_REGEN"></DistrictInput>
+                      <DistrictInput
+                        runType="CERT_REGEN"
+                        disableSelectStudents
+                      ></DistrictInput>
                     </v-row>
                   </v-stepper-window-item>
 
diff --git a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
index 8c88bf60..659253b3 100644
--- a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
+++ b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
@@ -16,7 +16,8 @@
                   <v-stepper-item
                     :rules="[
                       () =>
-                        !v$.getBatchRequest.hasAtLeastOneGroupValue.$invalid,
+                        !v$.getBatchRequest.hasAtLeastOneGroupValue.$invalid &&
+                        !v$.getBatchRequest.reportTypeRequired.$invalid,
                     ]"
                     complete
                     editable
@@ -75,17 +76,10 @@
                       />
                     </v-row>
                     <v-row v-if="group == 'School'">
-                      <SchoolInput>
-                        <template #inputWarning>
-                          <p>
-                            This will archive current school reports, which will
-                            become static and no longer be updated. School
-                            reports must be archived before the new data
-                            collection cycle begins so they are not overwritten
-                            entirely.
-                          </p>
-                        </template>
-                      </SchoolInput>
+                      <SchoolInput> </SchoolInput>
+                    </v-row>
+                    <v-row v-if="group == 'School Category'">
+                      <DistrictInput> </DistrictInput>
                     </v-row>
                     <v-row v-if="group == 'All Schools'">
                       <v-alert type="info" class="pb-2">
@@ -183,6 +177,7 @@
 import { ref, watch } from "vue";
 import BatchProcessingService from "@/services/BatchProcessingService.js";
 import SchoolInput from "@/components/Batch/Forms/FormInputs/SchoolInput.vue";
+import DistrictInput from "@/components/Batch/Forms/FormInputs/DistrictInput.vue";
 import ScheduleInput from "@/components/Batch/Forms/FormInputs/ScheduleInput.vue";
 import { useVuelidate } from "@vuelidate/core";
 import { required, helpers } from "@vuelidate/validators";
@@ -228,6 +223,16 @@ export default {
         ),
       },
       getBatchRequest: {
+        reportTypeRequired: helpers.withMessage(
+          "Select a Report Type",
+          (value) => {
+            if (this.getReportType.length > 0) {
+              return true;
+            } else {
+              return false;
+            }
+          }
+        ),
         batchRunTimeSet: helpers.withMessage("Runtime not set", (value) => {
           if (this.getBatchRunTime) {
             if (this.getBatchRunTime == "Run Now") {
@@ -246,16 +251,20 @@ export default {
               let isValid = false;
               if (
                 this.group &&
-                ["All Schools", "School"].includes(this.group)
+                ["All Schools", "School", "School Category"].includes(
+                  this.group
+                )
               ) {
                 if (this.group === "School") {
                   isValid =
                     this.getBatchRequest.schoolOfRecords &&
                     this.getBatchRequest.schoolOfRecords.length > 0;
+                } else if (this.group === "School Category") {
+                  isValid =
+                    this.getBatchRequest.districts &&
+                    this.getBatchRequest.districts.length > 0;
                 } else if (this.group === "All Schools") {
                   isValid = true;
-                } else {
-                  isValid = true; // Return true if none of the above conditions matched
                 }
                 return isValid;
               }
@@ -270,6 +279,7 @@ export default {
   components: {
     ScheduleInput: ScheduleInput,
     SchoolInput: SchoolInput,
+    DistrictInput: DistrictInput,
   },
   data: () => ({
     step: 0,
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index 83c1570b..35125435 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -59,56 +59,62 @@ export default {
       return
     }else{
       if(credentialType == "OT"){
-        console.log("/api/v1/batch/userrequestdisrun/OT");
-        console.log(request)
-        return;
-        //return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OT', request);
+        // console.log("/api/v1/batch/userrequestdisrun/OT");
+        // console.log(request)
+        // return;
+        return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OT', request);
       }else if(credentialType == "OC"){
-        console.log("/api/v1/batch/userrequestdisrun/OC");
-        console.log(request);
-        return;
-        //return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OC', request);
+        // console.log("/api/v1/batch/userrequestdisrun/OC");
+        // console.log(request);
+        // return;
+        return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OC', request);
       }else if(credentialType == "RC"){
-        console.log("/api/v1/batch/userrequestdisrun/RC");
-        console.log(request);
-        return;
-        //return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/RC', request);
+        // console.log("/api/v1/batch/userrequestdisrun/RC");
+        // console.log(request);
+        // return;
+        return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/RC', request);
       }else if(credentialType == "Blank transcript print"){
-        console.log("/api/v1/batch/userrequestblankdisrun/OT");
-        console.log(request);
-        return;
-        //return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OT', request); 
+        // console.log("/api/v1/batch/userrequestblankdisrun/OT");
+        // console.log(request);
+        // return;
+        return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OT', request); 
       }else if(credentialType == "Blank certificate print"){
-        console.log("userrequestblankdisrun/OC");
-        console.log(request);
-        return;
-        //return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OC', request);
+        // console.log("userrequestblankdisrun/OC");
+        // console.log(request);
+        // return;
+        return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OC', request);
       }
     }
 
     
   },     
   runDISTRUN_MONTHLY(){
-    console.log("/api/v1/batch/executedisrunbatchjob");
-    console.log(request);
-    return;
-    //return ApiService.apiAxios.get('/api/v1/batch/executedisrunbatchjob');
+    // console.log("/api/v1/batch/executedisrunbatchjob");
+    // console.log(request);
+    // return;
+    return ApiService.apiAxios.get('/api/v1/batch/executedisrunbatchjob');
   },
+  runSCHL_RPT_REGEN(request, cronTime=""){
+    // console.log(`/api/v1/batch/regenerate/school-report`)
+    //   console.log(request)
+    //   return;
+    return ApiService.apiAxios.post(`/api/v1/batch/regenerate/school-report`,request);
+  },  
   runDISTRUN_SUPP(){
-    console.log("/api/v1/batch/executesuppdisrunbatchjob");
-    console.log(request);
-    return;
-    //return ApiService.apiAxios.get('/api/v1/batch/executesuppdisrunbatchjob');
+    // console.log("/api/v1/batch/executesuppdisrunbatchjob");
+    // console.log(request);
+    // return;
+    return ApiService.apiAxios.get('/api/v1/batch/executesuppdisrunbatchjob');
   },
   runNONGRADRUN(request, cronTime=""){
     if (Array.isArray(request.districts) && request.districts.length === 1 && request.districts[0].toLowerCase() === "all") {
       // If the condition is true, set districts to an empty array
       request.districts = [];
     }
-    console.log("/api/v1/batch/executenongraddisrunbatchjob");
-    console.log(request);
-    return;    
-    //return ApiService.apiAxios.post('/api/v1/batch/executenongraddisrunbatchjob',request);
+    // console.log("/api/v1/batch/executenongraddisrunbatchjob");
+    // console.log(request);
+    // return;    
+    return ApiService.apiAxios.post('/api/v1/batch/executenongraddisrunbatchjob',request);
   },  
   runDISTRUN_YE(request, cronTime=""){
     if (Array.isArray(request.districts) && request.districts.length === 1 && request.districts[0].toLowerCase() === "all") {
@@ -124,23 +130,42 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      console.log("/api/v1/batch/executeyearlydisrunbatchjob");
-      console.log(request);
-      return;    
-      //return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
+      // console.log("/api/v1/batch/executeyearlydisrunbatchjob");
+      // console.log(request);
+      // return;    
+      return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
     }
   },
+  runBlankDISTRUNUSERUserRequest(request, credentialType) {
+    // console.log("/api/v1/batch/userrequestblankdisrun/" + credentialType)
+    //   console.log(request)
+    //   return;
+    return ApiService.apiAxios.post(
+      "/api/v1/batch/userrequestblankdisrun/" + credentialType,
+      request
+    );
+  },
   runSCHL_RPT_REGEN(request, cronTime=""){
-    console.log("/api/v1/batch/regenerate/school-report");
-    console.log(request);
-    return;    
-    //return ApiService.apiAxios.post(`/api/v1/batch/regenerate/school-report`,request);
+    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);
+    }
+    // console.log("/api/v1/batch/regenerate/school-report");
+    // console.log(request);
+    // return;    
+    return ApiService.apiAxios.post(`/api/v1/batch/regenerate/school-report`,request);
   },  
   runDISTRUN_SUPP() {
-    console.log("/api/v1/batch/executesuppdisrunbatchjob");
-    console.log(request);
-    return;    
-    //return ApiService.apiAxios.get("/api/v1/batch/executesuppdisrunbatchjob");
+    // console.log("/api/v1/batch/executesuppdisrunbatchjob");
+    // console.log(request);
+    // return;    
+    return ApiService.apiAxios.get("/api/v1/batch/executesuppdisrunbatchjob");
   },
   runCERTREGEN(request, cronTime = "") {
     if (
@@ -160,13 +185,13 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return;
     } else {
-      console.log("/api/v1/batch/executecertregenbatchjob");
-      console.log(request);
-      return;    
-      // return ApiService.apiAxios.post(
-      //   "/api/v1/batch/executecertregenbatchjob",
-      //   request
-      // );
+      // console.log("/api/v1/batch/executecertregenbatchjob");
+      // console.log(request);
+      // return;    
+      return ApiService.apiAxios.post(
+        "/api/v1/batch/executecertregenbatchjob",
+        request
+      );
     }
   },
   runTVR_DELETE(request, cronTime="" ) {
@@ -180,6 +205,9 @@ export default {
       scheduledRequest.psiPayload = null;
       this.addScheduledJob(scheduledRequest);
     }else{
+      // console.log("/api/v1/batch/report/student/delete");
+      // console.log(request);
+      // return;  
       return ApiService.apiAxios.post(
         "/api/v1/batch/report/student/delete",
         request
@@ -196,6 +224,9 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return;
     } else {
+      // console.log("/api/v1/batch/student/archive");
+      // console.log(request);
+      // return;  
       return ApiService.apiAxios.post("/api/v1/batch/student/archive", request);
     }
   },
@@ -209,6 +240,9 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return;
     } else {
+      // console.log("/api/v1/batch/report/school/archive");
+      // console.log(request);
+      // return;  
       return ApiService.apiAxios.post(
         "/api/v1/batch/report/school/archive",
         request
@@ -225,6 +259,9 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return;
     } else {
+      // console.log('/api/v1/batch/executepsireportbatchjob/' + transmissionType);
+      // console.log(request);
+      // return;  
       return ApiService.apiAxios.post('/api/v1/batch/executepsireportbatchjob/' + transmissionType, request);
       
     }
diff --git a/frontend/src/store/modules/batchRequestFormStore.js b/frontend/src/store/modules/batchRequestFormStore.js
index 8ff48a57..5c3f61f3 100644
--- a/frontend/src/store/modules/batchRequestFormStore.js
+++ b/frontend/src/store/modules/batchRequestFormStore.js
@@ -22,7 +22,7 @@ export const useBatchRequestFormStore = defineStore("batchRequestFormStore", {
     blankCertificateDetails:[],
     blankTranscriptDetails:[],
     credential:null,
-    categoryCode:[],
+    categoryCode:"",
     copies:"1",
     allPsi:false,
     allDistricts:false,
@@ -121,6 +121,7 @@ export const useBatchRequestFormStore = defineStore("batchRequestFormStore", {
     getCopies: (state) => state.copies,
     getBatchRunTime: (state) => state.batchRunTime,
     getActivityCode:(state) => state.activityCode,
+    getSchoolCategory: (state) => state.categoryCode,
     getLocalDownload: (state) => state.distribution == "Download"?"Y":"N", 
     getBatchRequestCrontime: (state) => {   
         if (state.batchRunSchedule == "N") {
@@ -207,8 +208,8 @@ export const useBatchRequestFormStore = defineStore("batchRequestFormStore", {
         districts: state.who === "School Category" ? state.districts.map(district => district.district) : [],
         programs: state.who === "Program" ? state.programs.map(program => program.program) : [],
         psiCodes: state.who === "Psi" ? state.psi.map(postSecondaryInstitution => postSecondaryInstitution.psi) : [],
-        schoolCategoryCodes: state.categoryCode,
-        validateInputs: false,
+        schoolCategoryCodes: state.categoryCode ? [state.categoryCode] : [],
+        validateInputs: true,
         activityCode: state.activityCode,
         reportTypes: [state.reportType],
         // gradDateFrom and gradDateTo are empty if "Current Students" is selected
@@ -216,8 +217,8 @@ export const useBatchRequestFormStore = defineStore("batchRequestFormStore", {
         gradDateTo: state.getFormattedGradDateTo,
 
         // Include credentialTypeCode based on the credential selected
-        ...(state.credential === "Blank certificate print" ? { credentialTypeCode: state.blankCertificateDetails } : {}),
-        ...(state.credential === "Blank transcript print" ? { credentialTypeCode: state.blankTranscriptDetails } : {}),
+        ...(state.credential === "Blank certificate print" ? { credentialTypeCode: [...state.blankCertificateDetails] } : {}),
+        ...(state.credential === "Blank transcript print" ? { credentialTypeCode: [...state.blankTranscriptDetails] } : {}),
 
         // User distribution run with specific conditions
         quantity: state.copies,
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 1c35168f..ccb914e2 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -12,7 +12,7 @@ export default defineConfig({
     }
   },
   server: {
-    port: 8081,
+    port: 8082,
     proxy: {
       // with options: http://localhost:5173/api/bar-> http://jsonplaceholder.typicode.com/bar
       '/api': {