From f7a196fd4d6f8bc97dafb1edbf2c6b2f9d381f7d Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 26 Jan 2024 11:03:36 -0800
Subject: [PATCH 001/168] GRAD2-1869-fix

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

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 8a16bc49..799783e5 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1499,6 +1499,10 @@ export default {
           this.validationMessage = "Please select a program.";
           return;
         }
+      } else if (
+        this.tabContent[id].details["who"] == "Ministry of Advanced Education"
+      ) {
+        schools = ["00000000"];
       }
       let gradDateFrom = this.tabContent[id].details["gradDateFrom"];
       let gradDateTo = this.tabContent[id].details["gradDateTo"];

From abbdaa35275ac0c04a4b4e83f135e95974f4e301 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 1 Feb 2024 10:33:24 -0800
Subject: [PATCH 002/168] Created DIsplayModal and added to Optional Program
 Rules view

---
 frontend/src/components/DisplayModal.vue      | 51 +++++++++++++++
 .../GraduationOptionalProgramRules.vue        | 65 ++++++++++---------
 frontend/src/services/CourseService.js        | 53 +++++++++------
 3 files changed, 118 insertions(+), 51 deletions(-)
 create mode 100644 frontend/src/components/DisplayModal.vue

diff --git a/frontend/src/components/DisplayModal.vue b/frontend/src/components/DisplayModal.vue
new file mode 100644
index 00000000..47c2297d
--- /dev/null
+++ b/frontend/src/components/DisplayModal.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="display-modal" v-if="showModal">
+    <b-card :header="header" class="modal-body">
+      <slot name="body"> Hello World </slot>
+      <template #footer>
+        <slot name="footer"></slot>
+        <!-- <b-btn
+          variant="danger"
+          size="xs"
+          class="float-right"
+          @click="show = false"
+          >Close</b-btn
+        > -->
+      </template>
+    </b-card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "DisplayModal",
+  props: ["header", "showModal"],
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style>
+.card-header {
+  font-weight: 700;
+}
+
+.modal-body {
+  height: fit-content;
+  width: fit-content;
+  margin: 5rem auto;
+}
+
+.display-modal {
+  position: fixed;
+  z-index: 1000;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgb(0, 0, 0);
+  background-color: rgba(0, 0, 0, 0.4);
+}
+</style>
diff --git a/frontend/src/components/Programs/GraduationOptionalProgramRules.vue b/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
index 11a278fa..b307db9e 100644
--- a/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
+++ b/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
@@ -1,5 +1,33 @@
 <template>
   <div id="optional-graduation-program-rules">
+    <DisplayModal
+      :header="ruleMatchType + ' Matching Rule # ' + ruleNumMatch"
+      :showModal="showModal"
+    >
+      <template v-slot:body>
+        <b-spinner v-if="loadingRuleMatch" class="px-1 my-2"></b-spinner>
+        <div v-else-if="!ruleMatchList.length">Not applicable</div>
+        <DisplayTable
+          v-else
+          v-bind:items="ruleMatchList"
+          title="OptionalProgramRuleMatch"
+          v-bind:fields="ruleMatchFields"
+          id="optionalProgramRuleMatch"
+          :showFilter="false"
+          :pagination="true"
+        >
+        </DisplayTable>
+      </template>
+      <template v-slot:footer>
+        <b-btn
+          variant="danger"
+          size="xs"
+          class="float-right"
+          @click="showModal = false"
+          >Close</b-btn
+        >
+      </template>
+    </DisplayModal>
     <DisplayTable
       v-bind:items="optionalProgramRules"
       v-bind:fields="optionalOptionalProgramRulesFields"
@@ -8,37 +36,6 @@
       showFilter="true"
     >
       <template #cell(ruleCode)="row">
-        <b-modal
-          :id="'modal-' + row.item.optionalProgramRequirementID"
-          :title="
-            (row.item.optionalProgramRequirementCode.requirementCategory == 'C'
-              ? 'Courses'
-              : 'Assessments') +
-            ' that match rule #' +
-            row.item.optionalProgramRequirementCode.optProReqCode
-          "
-          size="xl"
-        >
-          <b-spinner v-if="loadingRuleMatch" class="px-1 my-2"></b-spinner>
-          <div v-else-if="!ruleMatchList.length">Not applicable</div>
-          <div v-else>
-            <DisplayTable
-              v-bind:items="ruleMatchList"
-              title="OptionalProgramRuleMatch"
-              v-bind:fields="ruleMatchFields"
-              id="optionalProgramRuleMatch"
-              :showFilter="false"
-              :pagination="false"
-            >
-            </DisplayTable>
-          </div>
-          <template #modal-footer="{ cancel }">
-            <!-- Emulate built in modal footer ok and cancel button actions -->
-            <b-button size="sm" variant="outline-secondary" v-on:click="cancel">
-              Close
-            </b-button>
-          </template>
-        </b-modal>
         <b-btn
           variant="link"
           size="xs"
@@ -60,6 +57,7 @@
 <script>
 import ProgramManagementService from "@/services/ProgramManagementService.js";
 import DisplayTable from "../DisplayTable.vue";
+import DisplayModal from "../DisplayModal.vue";
 import CourseService from "@/services/CourseService.js";
 import AssessmentService from "@/services/AssessmentService.js";
 import { mapGetters } from "vuex";
@@ -69,6 +67,7 @@ export default {
   computed: { ...mapGetters({}) },
   components: {
     DisplayTable: DisplayTable,
+    DisplayModal: DisplayModal,
   },
   data: function () {
     return {
@@ -212,7 +211,9 @@ export default {
       ruleMatchList: [],
       ruleMatchFields: [],
       ruleMatchType: "",
+      ruleNumMatch: "",
       loadingRuleMatch: false,
+      showModal: false,
     };
   },
   created() {
@@ -227,6 +228,8 @@ export default {
   },
   methods: {
     ruleNumberClicked(categoryCode, ruleNum) {
+      this.showModal = true;
+      this.ruleNumMatch = ruleNum;
       switch (categoryCode) {
         case "A":
           this.ruleMatchFields = this.assessmentFields;
diff --git a/frontend/src/services/CourseService.js b/frontend/src/services/CourseService.js
index e007f374..497a03a6 100644
--- a/frontend/src/services/CourseService.js
+++ b/frontend/src/services/CourseService.js
@@ -1,34 +1,47 @@
-import ApiService from '../common/apiService';
+import ApiService from "../common/apiService";
 
 export default {
   getCoursesByAdvanceSearch(params) {
-    return ApiService.apiAxios.get('/api/v1/course/coursesearch?' + params);
+    return ApiService.apiAxios.get("/api/v1/course/coursesearch?" + params);
   },
-  getCourses(courseCode){
-    return ApiService.apiAxios.get('/api/v1/course/' + courseCode);
+  getCourses(courseCode) {
+    return ApiService.apiAxios.get("/api/v1/course/" + courseCode);
   },
-  getAllCourses(){
-    return ApiService.apiAxios.get('/api/v1/course/');
+  getAllCourses() {
+    return ApiService.apiAxios.get("/api/v1/course/");
   },
-  getAllCourseRequirements(){
-    return ApiService.apiAxios.get('/api/v1/course/requirement');
+  getAllCourseRequirements() {
+    return ApiService.apiAxios.get("/api/v1/course/requirement");
   },
-  getCourseRestrictions(){
-    return ApiService.apiAxios.get('/api/v1/course/restriction');
+  getCourseRestrictions() {
+    return ApiService.apiAxios.get("/api/v1/course/restriction");
   },
-  getCourseRestriction(mainCourseLevel,mainCourseCode){
-    return ApiService.apiAxios.get('/api/v1/course/courserestrictionsearch?mainCourseLevel=' + mainCourseLevel + '&mainCourseCode=' + mainCourseCode);
+  getCourseRestriction(mainCourseLevel, mainCourseCode) {
+    return ApiService.apiAxios.get(
+      "/api/v1/course/courserestrictionsearch?mainCourseLevel=" +
+        mainCourseLevel +
+        "&mainCourseCode=" +
+        mainCourseCode
+    );
   },
-  getRuleCourseRequirements(rule){
-    return ApiService.apiAxios.get('/api/v1/course/requirement/rule?rule=' + rule);
+  getRuleCourseRequirements(rule) {
+    return ApiService.apiAxios.get(
+      "/api/v1/course/requirement/rule?rule=" + rule + "&pageNo=0&pageSize=600"
+    );
   },
-  getCourseRequirements(params){
-    return ApiService.apiAxios.get('/api/v1/course/courserequirementsearch?' + params);
+  getCourseRequirements(params) {
+    return ApiService.apiAxios.get(
+      "/api/v1/course/courserequirementsearch?" + params
+    );
   },
   getStudentCourseAchievements(pen) {
-    return ApiService.apiAxios.get('/api/v1/course/studentcourse/pen/' + pen + '?sortForUI=true');
+    return ApiService.apiAxios.get(
+      "/api/v1/course/studentcourse/pen/" + pen + "?sortForUI=true"
+    );
   },
   getStudentExamDetails(pen) {
-    return ApiService.apiAxios.get('/api/v1/course/studentexam/pen/' + pen + '?sortForUI=true');
-  }
-}
+    return ApiService.apiAxios.get(
+      "/api/v1/course/studentexam/pen/" + pen + "?sortForUI=true"
+    );
+  },
+};

From 646dfe255b2018b7f5bdb152045ee00a20d80b4d Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 1 Feb 2024 10:54:21 -0800
Subject: [PATCH 003/168] Added modal to program rules table

---
 .../Programs/GraduationProgramRules.vue       | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Programs/GraduationProgramRules.vue b/frontend/src/components/Programs/GraduationProgramRules.vue
index 5b0bd58c..09b2461f 100644
--- a/frontend/src/components/Programs/GraduationProgramRules.vue
+++ b/frontend/src/components/Programs/GraduationProgramRules.vue
@@ -1,5 +1,34 @@
 <template>
   <div id="graduation-program-rules">
+    <DisplayModal
+      :header="ruleMatchType + ' Matching Rule # ' + ruleNumMatch"
+      :showModal="showModal"
+    >
+      <template v-slot:body>
+        <b-spinner v-if="loadingRuleMatch" class="px-1 my-2"></b-spinner>
+        <div v-else-if="!ruleMatchList.length">Not applicable</div>
+        <DisplayTable
+          v-else
+          v-bind:items="ruleMatchList"
+          title="GradProgramRuleMatch"
+          v-bind:fields="ruleMatchFields"
+          id="gradProgramRuleMatch"
+          :showFilter="false"
+          :pagination="false"
+        >
+        </DisplayTable>
+      </template>
+
+      <template v-slot:footer>
+        <b-btn
+          variant="danger"
+          size="xs"
+          class="float-right"
+          @click="showModal = false"
+          >Close</b-btn
+        >
+      </template>
+    </DisplayModal>
     <div v-if="!selectedProgramCode">
       <DisplayTable
         v-bind:items="graduationProgramRules"
@@ -12,7 +41,7 @@
         pagination="true"
       >
         <template #cell(ruleCode)="row">
-          <b-modal
+          <!-- <b-modal
             :id="
               'modal-' +
               row.item.graduationProgramCode +
@@ -40,7 +69,6 @@
               </DisplayTable>
             </div>
             <template #modal-footer="{ cancel }">
-              <!-- Emulate built in modal footer ok and cancel button actions -->
               <b-button
                 size="sm"
                 variant="outline-secondary"
@@ -49,7 +77,7 @@
                 Close
               </b-button>
             </template>
-          </b-modal>
+          </b-modal> -->
           <b-btn
             variant="link"
             size="xs"
@@ -89,6 +117,7 @@
 <script>
 import ProgramManagementService from "@/services/ProgramManagementService.js";
 import DisplayTable from "../DisplayTable.vue";
+import DisplayModal from "../DisplayModal.vue";
 import CourseService from "@/services/CourseService.js";
 import AssessmentService from "@/services/AssessmentService.js";
 import { mapGetters } from "vuex";
@@ -96,6 +125,7 @@ export default {
   name: "GraduationProgramRules",
   components: {
     DisplayTable: DisplayTable,
+    DisplayModal: DisplayModal,
   },
   props: {},
 
@@ -256,9 +286,11 @@ export default {
       ruleMatchList: [],
       ruleMatchFields: [],
       ruleMatchType: "",
+      ruleNumMatch: "",
       loadingRuleMatch: false,
       selectedProgramCode: "",
       selectedProgramId: "",
+      showModal: false,
     };
   },
   created() {
@@ -273,6 +305,9 @@ export default {
   },
   methods: {
     ruleNumberClicked(categoryCode, ruleNum) {
+      this.showModal = true;
+      this.ruleNumMatch = ruleNum;
+
       switch (categoryCode) {
         case "A":
           this.ruleMatchFields = this.assessmentFields;

From 28c8dfe6ec1d033a6a884dbc14715e22f185571d Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 1 Feb 2024 10:54:40 -0800
Subject: [PATCH 004/168] override grey background in header and footer

---
 frontend/src/components/DisplayModal.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/DisplayModal.vue b/frontend/src/components/DisplayModal.vue
index 47c2297d..cdba8a5e 100644
--- a/frontend/src/components/DisplayModal.vue
+++ b/frontend/src/components/DisplayModal.vue
@@ -37,6 +37,12 @@ export default {
   margin: 5rem auto;
 }
 
+.modal-body .card-footer,
+.modal-body .card-header {
+  background-color: rgb(255, 255, 255);
+  background-color: rgba(255, 255, 255, 0);
+}
+
 .display-modal {
   position: fixed;
   z-index: 1000;

From 93829405e970d42d5c1d4f135d007299a4704067 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 1 Feb 2024 11:29:40 -0800
Subject: [PATCH 005/168] fixed card heading bold being applied everywhere

---
 frontend/src/components/DisplayModal.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/DisplayModal.vue b/frontend/src/components/DisplayModal.vue
index cdba8a5e..c1acc39f 100644
--- a/frontend/src/components/DisplayModal.vue
+++ b/frontend/src/components/DisplayModal.vue
@@ -27,10 +27,6 @@ export default {
 </script>
 
 <style>
-.card-header {
-  font-weight: 700;
-}
-
 .modal-body {
   height: fit-content;
   width: fit-content;
@@ -55,3 +51,9 @@ export default {
   background-color: rgba(0, 0, 0, 0.4);
 }
 </style>
+
+<style scoped>
+:deep(.card-header) {
+  font-weight: 700;
+}
+</style>

From b2e28b33c0087d2a9a24c7f57e358638cd970743 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 1 Feb 2024 12:09:55 -0800
Subject: [PATCH 006/168] added sort on course/assessment code by default

---
 .../GraduationOptionalProgramRules.vue        |  3 ++
 .../Programs/GraduationProgramRules.vue       | 42 ++-----------------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/frontend/src/components/Programs/GraduationOptionalProgramRules.vue b/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
index b307db9e..b2bb47be 100644
--- a/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
+++ b/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
@@ -15,6 +15,9 @@
           id="optionalProgramRuleMatch"
           :showFilter="false"
           :pagination="true"
+          :sort-by="
+            (ruleMatchType = 'Courses' ? 'courseCode' : 'assessmentCode')
+          "
         >
         </DisplayTable>
       </template>
diff --git a/frontend/src/components/Programs/GraduationProgramRules.vue b/frontend/src/components/Programs/GraduationProgramRules.vue
index 09b2461f..ef496048 100644
--- a/frontend/src/components/Programs/GraduationProgramRules.vue
+++ b/frontend/src/components/Programs/GraduationProgramRules.vue
@@ -14,7 +14,10 @@
           v-bind:fields="ruleMatchFields"
           id="gradProgramRuleMatch"
           :showFilter="false"
-          :pagination="false"
+          :pagination="true"
+          :sort-by="
+            (ruleMatchType = 'Courses' ? 'courseCode' : 'assessmentCode')
+          "
         >
         </DisplayTable>
       </template>
@@ -41,43 +44,6 @@
         pagination="true"
       >
         <template #cell(ruleCode)="row">
-          <!-- <b-modal
-            :id="
-              'modal-' +
-              row.item.graduationProgramCode +
-              row.item.programRequirementCode.proReqCode
-            "
-            :title="
-              'Rule # ' +
-              row.item.programRequirementCode.proReqCode +
-              ' - ' +
-              ruleMatchType
-            "
-            size="xl"
-          >
-            <b-spinner v-if="loadingRuleMatch" class="px-1 my-2"></b-spinner>
-            <div v-else-if="!ruleMatchList.length">Not applicable</div>
-            <div v-else>
-              <DisplayTable
-                v-bind:items="ruleMatchList"
-                title="GradProgramRuleMatch"
-                v-bind:fields="ruleMatchFields"
-                id="gradProgramRuleMatch"
-                :showFilter="false"
-                :pagination="false"
-              >
-              </DisplayTable>
-            </div>
-            <template #modal-footer="{ cancel }">
-              <b-button
-                size="sm"
-                variant="outline-secondary"
-                v-on:click="cancel"
-              >
-                Close
-              </b-button>
-            </template>
-          </b-modal> -->
           <b-btn
             variant="link"
             size="xs"

From c1cc5ca54ed63750a1aa203d309acc0cbda44b03 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 1 Feb 2024 12:19:26 -0800
Subject: [PATCH 007/168] fix oopsie

---
 .../src/components/Programs/GraduationOptionalProgramRules.vue  | 2 +-
 frontend/src/components/Programs/GraduationProgramRules.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Programs/GraduationOptionalProgramRules.vue b/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
index b2bb47be..d6c14ecd 100644
--- a/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
+++ b/frontend/src/components/Programs/GraduationOptionalProgramRules.vue
@@ -16,7 +16,7 @@
           :showFilter="false"
           :pagination="true"
           :sort-by="
-            (ruleMatchType = 'Courses' ? 'courseCode' : 'assessmentCode')
+            ruleMatchType == 'Courses' ? 'courseCode' : 'assessmentCode'
           "
         >
         </DisplayTable>
diff --git a/frontend/src/components/Programs/GraduationProgramRules.vue b/frontend/src/components/Programs/GraduationProgramRules.vue
index ef496048..821f031d 100644
--- a/frontend/src/components/Programs/GraduationProgramRules.vue
+++ b/frontend/src/components/Programs/GraduationProgramRules.vue
@@ -16,7 +16,7 @@
           :showFilter="false"
           :pagination="true"
           :sort-by="
-            (ruleMatchType = 'Courses' ? 'courseCode' : 'assessmentCode')
+            ruleMatchType == 'Courses' ? 'courseCode' : 'assessmentCode'
           "
         >
         </DisplayTable>

From f8938b46a5b95a3b84839607f2e2b4f73c54be98 Mon Sep 17 00:00:00 2001
From: Kamal Mohammed <kamal.mohammed@outlook.com>
Date: Thu, 1 Feb 2024 16:06:32 -0700
Subject: [PATCH 008/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 162a6d17..aacc7fa6 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.13.0",
-    "test": "1.13.0",
+    "dev": "1.13.1",
+    "test": "1.13.1",
     "prod": "1.12.0"
   }
 }

From 0474c4617a7e4154d96ed0ec5d9141dfb9c5d221 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 5 Feb 2024 11:39:20 -0800
Subject: [PATCH 009/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index aacc7fa6..53203d76 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.13.1",
     "test": "1.13.1",
-    "prod": "1.12.0"
+    "prod": "1.13.1"
   }
 }

From a23261591f46e69f522b9c61ed2e8b0b4f3b8894 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 5 Feb 2024 13:54:02 -0800
Subject: [PATCH 010/168] fix env banner showing in PROD by removing base case
 tag

---
 frontend/src/components/Header/EnvironmentBanner.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/Header/EnvironmentBanner.vue b/frontend/src/components/Header/EnvironmentBanner.vue
index 0afabf91..d179f20c 100644
--- a/frontend/src/components/Header/EnvironmentBanner.vue
+++ b/frontend/src/components/Header/EnvironmentBanner.vue
@@ -9,7 +9,6 @@
     <div v-else-if="environment == 'test'" class="test-env">
       Vue 3 - <strong>TEST</strong> environment
     </div>
-    <div v-else>Vue 3 - <strong>Environment not recognized</strong></div>
   </div>
 </template>
 

From 2df0249c3b048f3684f862362280ed716863e92d Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 6 Feb 2024 11:05:35 -0800
Subject: [PATCH 011/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 53203d76..6c99aea7 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.13.1",
-    "test": "1.13.1",
+    "dev": "1.14.0",
+    "test": "1.14.0",
     "prod": "1.13.1"
   }
 }

From bce39baae517ae5e77f2473700e47a89c2b63ef9 Mon Sep 17 00:00:00 2001
From: Tang <Michael.Tang@gov.bc.ca>
Date: Tue, 6 Feb 2024 13:38:20 -0800
Subject: [PATCH 012/168] changes for grad2 2499

---
 .../src/components/Codes/CareerPrograms.vue    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Codes/CareerPrograms.vue b/frontend/src/components/Codes/CareerPrograms.vue
index e357dd28..b60b4bd2 100644
--- a/frontend/src/components/Codes/CareerPrograms.vue
+++ b/frontend/src/components/Codes/CareerPrograms.vue
@@ -8,7 +8,7 @@
     </p>
     <DisplayTable
       title="Career Programs"
-      v-bind:items="careerPrograms"
+      v-bind:items="sortedCareerPrograms"
       v-bind:fields="careerProgramFields"
       id="code"
       showFilter="true"
@@ -36,6 +36,9 @@ export default {
     ProgramManagementService.getCareerPrograms()
       .then((response) => {
         this.careerPrograms = response.data;
+        this.sortedCareerPrograms = this.careerPrograms.sort(
+          (a, b) => a.displayOrder - b.displayOrder
+        );
       })
       // eslint-disable-next-line
       .catch((error) => {
@@ -49,7 +52,16 @@ export default {
   data: function () {
     return {
       careerPrograms: [],
+      sortedCareerPrograms: [],
       careerProgramFields: [
+        {
+          key: "displayOrder",
+          label: "Display Order",
+          sortable: true,
+          sortDirection: "asc",
+          thClass: "d-none",
+          tdClass: "d-none",
+        },
         {
           key: "code",
           label: "Code",
@@ -64,12 +76,12 @@ export default {
         },
         {
           key: "startDate",
-          label: "Start Date",
+          label: "Effective Date",
           sortable: true,
         },
         {
           key: "endDate",
-          label: "End Date",
+          label: "Expiry Date",
           sortable: true,
         },
       ],

From 6e1a8680036abd603fcba12c4b42678120810347 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 7 Feb 2024 11:21:05 -0800
Subject: [PATCH 013/168] Increased pageSize to 2000 for course requirement
 rules

---
 frontend/src/services/CourseService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/services/CourseService.js b/frontend/src/services/CourseService.js
index 497a03a6..43aeccf8 100644
--- a/frontend/src/services/CourseService.js
+++ b/frontend/src/services/CourseService.js
@@ -26,7 +26,7 @@ export default {
   },
   getRuleCourseRequirements(rule) {
     return ApiService.apiAxios.get(
-      "/api/v1/course/requirement/rule?rule=" + rule + "&pageNo=0&pageSize=600"
+      "/api/v1/course/requirement/rule?rule=" + rule + "&pageNo=0&pageSize=2000"
     );
   },
   getCourseRequirements(params) {

From cb78754ef2cb09139c750962539cc605dd7b31bc Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 12 Feb 2024 15:22:11 -0800
Subject: [PATCH 014/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 6c99aea7..7c8f9831 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.14.0",
-    "test": "1.14.0",
+    "dev": "1.14.1",
+    "test": "1.14.1",
     "prod": "1.13.1"
   }
 }

From 289d76acb9d9c2c49291109f5457e44ade6e0c95 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 15 Feb 2024 10:45:44 -0800
Subject: [PATCH 015/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 7c8f9831..5576b98d 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.14.1",
     "test": "1.14.1",
-    "prod": "1.13.1"
+    "prod": "1.14.1"
   }
 }

From 54309a1995af6b669238fecadcb1a46f10327219 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 20 Feb 2024 10:28:55 -0800
Subject: [PATCH 016/168] Added new columns to optional programs table

---
 .../components/StudentProfile/StudentOptionalPrograms.vue   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 8e9b42a2..748f693f 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -234,9 +234,15 @@ export default {
       ],
       optionalProgramsfields: [
         { key: "more", label: "" },
+        { key: "programCode", label: "Graduation Program" },
         { key: "optionalProgramName", label: "Optional Program" },
         { key: "optionalReqMet", label: "Requirements Met" },
         { key: "optionalNonGradReasons", label: "Requirements Not Met" },
+        {
+          key: "optionalProgramCompletionDate",
+          label: "Optional Program Completion Date",
+        },
+        { key: "delete", label: "Delete" },
       ],
       careerProgramsFields: [
         { key: "careerProgramCode", label: "" },

From c23667797018e0782badae0309c94c3264ce930b Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 21 Feb 2024 09:19:50 -0800
Subject: [PATCH 017/168] Added wroteFlag to student assessment table

---
 .../src/components/StudentProfile/StudentAssessments.vue    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/StudentProfile/StudentAssessments.vue b/frontend/src/components/StudentProfile/StudentAssessments.vue
index 2c5eade1..ce9617cb 100644
--- a/frontend/src/components/StudentProfile/StudentAssessments.vue
+++ b/frontend/src/components/StudentProfile/StudentAssessments.vue
@@ -136,6 +136,12 @@ export default {
           sortable: true,
           sortDirection: "desc",
         },
+        {
+          key: "wroteFlag",
+          label: "Wrote Flag",
+          sortable: true,
+          sortDirection: "desc",
+        },
         {
           key: "exceededWriteFlag",
           label: "Exceeded Writes",

From 32317b8dad162479367797dca067e5a2562fca6d Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 21 Feb 2024 16:41:09 -0800
Subject: [PATCH 018/168] fixed pagination

---
 frontend/src/components/DisplayTable.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index e7b14adf..43317a84 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -6,6 +6,7 @@
       aria-label="Toolbar with button groups"
       class="float-left"
     >
+      {{ filter }} {{ totalRows }}
       <b-button-group class="mx-1">
         <b-button
           v-if="allowUpdateGradStatus && updateAllowed"
@@ -197,6 +198,7 @@
     </b-table>
 
     <b-pagination
+      v-if="totalRows"
       v-model="currentPage"
       :total-rows="totalRows"
       :per-page="perPage"
@@ -245,7 +247,8 @@ export default {
   ],
   onMounted() {
     // Set the initial number of items
-    this.totalRows = this.items.length;
+    // this.totalRows = this.items.length;
+    // this.rows = this.items.length;
   },
   data() {
     return {
@@ -302,11 +305,11 @@ export default {
     editableFields() {
       return this.fields.filter((field) => field.editable);
     },
-    // totalRows: function () {
-    //   if (this.items?.length) {
-    //     return this.items.length;
-    //   } else return this.totalRows;
-    // },
+    totalRows: function () {
+      if (this.items?.length && !this.filter) {
+        return this.items.length;
+      } else return this.totalRows;
+    },
     sortOptions() {
       return this.fields
         .filter((f) => f.sortable)
@@ -344,8 +347,11 @@ export default {
     },
     onFiltered(filteredItems) {
       // Trigger pagination to update the number of buttons/pages due to filtering
-      this.totalRows = filteredItems.length;
-      this.currentPage = 1;
+      if (this.filter) {
+        this.totalRows = filteredItems.length;
+      }
+
+      this.currentPage = 0;
     },
   },
 };

From 57c3f3888dd270a6947ed495ce8edf4b142f8a0a Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 21 Feb 2024 16:45:31 -0800
Subject: [PATCH 019/168] removed output

---
 frontend/src/components/DisplayTable.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 43317a84..ca64d81c 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -6,7 +6,6 @@
       aria-label="Toolbar with button groups"
       class="float-left"
     >
-      {{ filter }} {{ totalRows }}
       <b-button-group class="mx-1">
         <b-button
           v-if="allowUpdateGradStatus && updateAllowed"

From 0f96b3765382cf771e240f5fd9b88d27ab7fd3bb Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Fri, 23 Feb 2024 09:16:11 -0800
Subject: [PATCH 020/168] Updates to table and placeholder for optional
 programs form

---
 frontend/src/components/DisplayModal.vue      |  2 +-
 frontend/src/components/DisplayTable.vue      |  3 +-
 .../components/Forms/OptionalProgramsForm.vue | 79 +++++++++++++++++++
 .../StudentOptionalPrograms.vue               | 34 +++++++-
 4 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/components/Forms/OptionalProgramsForm.vue

diff --git a/frontend/src/components/DisplayModal.vue b/frontend/src/components/DisplayModal.vue
index c1acc39f..e0481f50 100644
--- a/frontend/src/components/DisplayModal.vue
+++ b/frontend/src/components/DisplayModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="display-modal" v-if="showModal">
     <b-card :header="header" class="modal-body">
-      <slot name="body"> Hello World </slot>
+      <slot name="body"> No body specified </slot>
       <template #footer>
         <slot name="footer"></slot>
         <!-- <b-btn
diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index ca64d81c..3408c22f 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -111,6 +111,8 @@
         </b-card-text>
       </b-card>
     </b-row>
+    <slot name="create"></slot>
+
     <b-table
       v-if="items && items.length"
       :responsive="responsive"
@@ -229,7 +231,6 @@ export default {
     "title",
     "fields",
     "id",
-    "create",
     "update",
     "delete",
     "store",
diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
new file mode 100644
index 00000000..6522559b
--- /dev/null
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <!-- btn to open optional program edit form-->
+    <b-btn
+      >Add Optional Program
+      <i
+        class="fas fa-plus"
+        aria-hidden="true"
+        @click="editStudentOptionalPrograms = true"
+      ></i
+    ></b-btn>
+
+    <DisplayModal
+      header="Add Optional Program"
+      :showModal="editStudentOptionalPrograms"
+    >
+      <template v-slot:body> I'm the optional programs form </template>
+
+      <template v-slot:footer>
+        <b-btn
+          variant="danger"
+          size="xs"
+          class="float-right"
+          @click="editStudentOptionalPrograms = false"
+          >Close</b-btn
+        >
+      </template>
+    </DisplayModal>
+  </div>
+</template>
+
+<script>
+import DisplayModal from "../DisplayModal.vue";
+
+export default {
+  name: "HelloWorld",
+  props: ["header", "showModal"],
+  components: {
+    DisplayModal: DisplayModal,
+  },
+  data() {
+    return {
+      editStudentOptionalPrograms: false,
+    };
+  },
+};
+</script>
+
+<style>
+.modal-body {
+  height: fit-content;
+  width: fit-content;
+  margin: 5rem auto;
+}
+
+.modal-body .card-footer,
+.modal-body .card-header {
+  background-color: rgb(255, 255, 255);
+  background-color: rgba(255, 255, 255, 0);
+}
+
+.display-modal {
+  position: fixed;
+  z-index: 1000;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgb(0, 0, 0);
+  background-color: rgba(0, 0, 0, 0.4);
+}
+</style>
+
+<style scoped>
+:deep(.card-header) {
+  font-weight: 700;
+}
+</style>
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 748f693f..30bf3c22 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -1,5 +1,10 @@
 <template>
   <div>
+    <b-alert variant="primary" show
+      ><i class="fa-solid fa-circle-info"></i> This student is on the
+      <strong>{{ studentGradStatus.program }}</strong> Graduation
+      Program</b-alert
+    >
     <div class="table-responsive">
       <div v-if="!optionalPrograms" class="container">
         This student does not have any optional programs.
@@ -12,6 +17,10 @@
         showFilter="true"
         title="Optional Programs"
       >
+        <template v-slot:create>
+          <OptionalProgramsForm></OptionalProgramsForm>
+        </template>
+
         <template #cell(optionalNonGradReasons)="row">
           <div v-if="row.item.studentOptionalProgramData">
             <div
@@ -192,7 +201,7 @@
           </b-btn>
         </template>
         <template #row-details="">
-          <b-card class="px-0">
+          <!-- <b-card class="px-0">
             <strong>Career Programs</strong>
             <hr />
             <ul id="student-career-programs">
@@ -200,6 +209,22 @@
                 {{ item.careerProgramName }} ({{ item.careerProgramCode }})
               </li>
             </ul>
+          </b-card> -->
+          <b-card class="col-6">
+            <DisplayTable
+              v-if="careerPrograms"
+              :items="careerPrograms"
+              :striped="false"
+              :fields="careerProgramsFields"
+              :showFilter="false"
+              :pagination="false"
+              title="Career Programs"
+            >
+              <template #cell(careerProgramName)="row3">
+                {{ row3.item.careerProgramName }}
+                ({{ row3.item.careerProgramCode }})
+              </template>
+            </DisplayTable>
           </b-card>
         </template>
       </DisplayTable>
@@ -211,16 +236,19 @@
 import { useStudentStore } from "../../store/modules/student";
 import { mapState } from "pinia";
 import DisplayTable from "@/components/DisplayTable.vue";
+import OptionalProgramsForm from "@/components/Forms/OptionalProgramsForm.vue";
 export default {
   name: "StudentOptionalPrograms",
   components: {
     DisplayTable: DisplayTable,
+    OptionalProgramsForm: OptionalProgramsForm,
   },
 
   computed: {
     ...mapState(useStudentStore, {
       optionalPrograms: "getStudentOptionalPrograms",
       careerPrograms: "getStudentCareerPrograms",
+      studentGradStatus: "getStudentGradStatus",
     }),
   },
   data: function () {
@@ -245,8 +273,8 @@ export default {
         { key: "delete", label: "Delete" },
       ],
       careerProgramsFields: [
-        { key: "careerProgramCode", label: "" },
-        { key: "careerProgramName", label: "" },
+        { key: "careerProgramName", label: "Career Program" },
+        { key: "delete", label: "Delete" },
       ],
     };
   },

From 512b9a528e8e38ce0976626d7bfa171a628c20d5 Mon Sep 17 00:00:00 2001
From: Tang <Michael.Tang@gov.bc.ca>
Date: Fri, 23 Feb 2024 13:15:13 -0800
Subject: [PATCH 021/168] delete

---
 frontend/src/components/DisplayTable.vue      |   4 +-
 .../StudentOptionalPrograms.vue               |   6 +
 frontend/src/services/StudentService.js       | 173 ++++++++++--------
 frontend/src/store/modules/student.js         |   3 +
 4 files changed, 112 insertions(+), 74 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index ca64d81c..ed5ed70f 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -337,9 +337,9 @@ export default {
     deleteItem(item) {
       const itemRaw = toRaw(item);
       const store = this.stores[this.store];
-      const id = toRaw(item).id;
+      const itemId = itemRaw[this.id];
       if (store) {
-        store[this.delete](id);
+        store[this.delete](itemId);
       } else {
         console.error("Store not found.");
       }
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 748f693f..345b61c5 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -6,11 +6,17 @@
       </div>
       <DisplayTable
         v-if="optionalPrograms"
+        id="optionalProgramID"
         :items="optionalPrograms"
         :striped="false"
         :fields="optionalProgramsfields"
         showFilter="true"
         title="Optional Programs"
+        disableDeletefield="optionalProgramCode"
+        disableDeleteIfValue="CP"
+        deleteLabel="Delete"
+        store="student"
+        delete="removeOptionalProgram"
       >
         <template #cell(optionalNonGradReasons)="row">
           <div v-if="row.item.studentOptionalProgramData">
diff --git a/frontend/src/services/StudentService.js b/frontend/src/services/StudentService.js
index 41d36014..d06fdb52 100644
--- a/frontend/src/services/StudentService.js
+++ b/frontend/src/services/StudentService.js
@@ -1,75 +1,104 @@
-import ApiService from '../common/apiService';
+import ApiService from "../common/apiService";
 
 export default {
-    getStudentByPen(pen) {
-        return ApiService.apiAxios.get('/api/v1/student/pen/' + pen)
-    },
-    getStudentByID(studentID) {
-        return ApiService.apiAxios.get('/api/v1/student/stdid/' + studentID)
-    },
-    getStudentsByAdvancedSearch(advancedSearchInput){
-        let queryString = ""
-        for (const key in advancedSearchInput) {
-            if (advancedSearchInput.hasOwnProperty(key)) {
-                if(advancedSearchInput[key].value){
-                    let contains = (advancedSearchInput[key].contains) ? "*":"";
-                    queryString 
-                        += key 
-                        + "=" 
-                        + advancedSearchInput[key].value
-                        + contains
-                        + "&";
-                }
-            }
+  getStudentByPen(pen) {
+    return ApiService.apiAxios.get("/api/v1/student/pen/" + pen);
+  },
+  getStudentByID(studentID) {
+    return ApiService.apiAxios.get("/api/v1/student/stdid/" + studentID);
+  },
+  getStudentsByAdvancedSearch(advancedSearchInput) {
+    let queryString = "";
+    for (const key in advancedSearchInput) {
+      if (advancedSearchInput.hasOwnProperty(key)) {
+        if (advancedSearchInput[key].value) {
+          let contains = advancedSearchInput[key].contains ? "*" : "";
+          queryString +=
+            key + "=" + advancedSearchInput[key].value + contains + "&";
         }
-        return ApiService.apiAxios.get('/api/v1/student/gradstudentsearch?' + queryString)
-    },  
-    getGraduationStatus(id) {
-        return ApiService.apiAxios.get('/api/v1/student/studentid/' + id)
-    },
-    getGraduationStatusOptionalPrograms(id){
-        return ApiService.apiAxios.get('/api/v1/student/optionalprogram/studentid/' + id)
-    },
-    editGraduationStatus(id, json) {
-        return ApiService.apiAxios.post('/api/v1/student/gradstudent/studentid/' + id, json)
-    },
-    ungradStudent(id,reasonCode, reasonDesc, json){
-        return ApiService.apiAxios.post('/api/v1/student/undocompletionstudent/studentid/' + id + '?ungradReasonCode=' + reasonCode + '&ungradReasonDesc=' + reasonDesc, json)
-    },
-    getStudentCareerPrograms(id){
-        return ApiService.apiAxios.get('/api/v1/student/studentcareerprogram/studentid/' + id)
-    },  
-    getStudentStatusCodes() {
-        return ApiService.apiAxios.get('/api/v1/student/studentstatus')
-    },
-    getStudentNotes(id) {
-        return ApiService.apiAxios.get('/api/v1/student/studentnotes/studentid/' + id)
-    },
-    addStudentNotes(json) {
-        return ApiService.apiAxios.post('/api/v1/student/studentnotes',json)
-    },
-    deleteStudentNotes(noteID) {
-        return ApiService.apiAxios.delete('/api/v1/student/studentnotes/' + noteID)
-    },
-    getStudentUngradReasons(id) {
-        return ApiService.apiAxios.get('/api/v1/studentgraduation/undocompletion/studentundocompletionreason/studentid/' + id)
-    },  
-    getUngradReasons() {
-        return ApiService.apiAxios.get('/api/v1/studentgraduation/undocompletion/undocompletionreason')
-    },
-    getStudentHistory(id) {
-        return ApiService.apiAxios.get('/api/v1/student/studentHistory/' + id)
-    },
-    getBatchHistory(id, page) {
-        return ApiService.apiAxios.get('/api/v1/student/studentHistory/batchid/' + id + '?pageNumber=' + page)
-    },
-    getStudentOptionalProgramHistory(id) {
-        return ApiService.apiAxios.get('/api/v1/student/studentOptionalProgramHistory/' + id)
-    },  
-    getStudentHistoryActivityCode() {
-        return ApiService.apiAxios.get('/api/v1/student/historyactivity')
-    },
-    getStudentPen(id) {
-        return ApiService.apiAxios.get('/api/v1/student/stdid/' + id)
-    }  
-}
+      }
+    }
+    return ApiService.apiAxios.get(
+      "/api/v1/student/gradstudentsearch?" + queryString
+    );
+  },
+  getGraduationStatus(id) {
+    return ApiService.apiAxios.get("/api/v1/student/studentid/" + id);
+  },
+  getGraduationStatusOptionalPrograms(id) {
+    return ApiService.apiAxios.get(
+      "/api/v1/student/optionalprogram/studentid/" + id
+    );
+  },
+  deleteGraduationStatusOptionalPrograms(id) {
+    return ApiService.apiAxios.delete(
+      "/api/v1/student/optionalprogram/studentid/" + id
+    );
+  },
+  editGraduationStatus(id, json) {
+    return ApiService.apiAxios.post(
+      "/api/v1/student/gradstudent/studentid/" + id,
+      json
+    );
+  },
+  ungradStudent(id, reasonCode, reasonDesc, json) {
+    return ApiService.apiAxios.post(
+      "/api/v1/student/undocompletionstudent/studentid/" +
+        id +
+        "?ungradReasonCode=" +
+        reasonCode +
+        "&ungradReasonDesc=" +
+        reasonDesc,
+      json
+    );
+  },
+  getStudentCareerPrograms(id) {
+    return ApiService.apiAxios.get(
+      "/api/v1/student/studentcareerprogram/studentid/" + id
+    );
+  },
+  getStudentStatusCodes() {
+    return ApiService.apiAxios.get("/api/v1/student/studentstatus");
+  },
+  getStudentNotes(id) {
+    return ApiService.apiAxios.get(
+      "/api/v1/student/studentnotes/studentid/" + id
+    );
+  },
+  addStudentNotes(json) {
+    return ApiService.apiAxios.post("/api/v1/student/studentnotes", json);
+  },
+  deleteStudentNotes(noteID) {
+    return ApiService.apiAxios.delete("/api/v1/student/studentnotes/" + noteID);
+  },
+  getStudentUngradReasons(id) {
+    return ApiService.apiAxios.get(
+      "/api/v1/studentgraduation/undocompletion/studentundocompletionreason/studentid/" +
+        id
+    );
+  },
+  getUngradReasons() {
+    return ApiService.apiAxios.get(
+      "/api/v1/studentgraduation/undocompletion/undocompletionreason"
+    );
+  },
+  getStudentHistory(id) {
+    return ApiService.apiAxios.get("/api/v1/student/studentHistory/" + id);
+  },
+  getBatchHistory(id, page) {
+    return ApiService.apiAxios.get(
+      "/api/v1/student/studentHistory/batchid/" + id + "?pageNumber=" + page
+    );
+  },
+  getStudentOptionalProgramHistory(id) {
+    return ApiService.apiAxios.get(
+      "/api/v1/student/studentOptionalProgramHistory/" + id
+    );
+  },
+  getStudentHistoryActivityCode() {
+    return ApiService.apiAxios.get("/api/v1/student/historyactivity");
+  },
+  getStudentPen(id) {
+    return ApiService.apiAxios.get("/api/v1/student/stdid/" + id);
+  },
+};
diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index a2b17cbe..fb18f83b 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -43,6 +43,9 @@ export const useStudentStore = defineStore("student", {
     },
   }),
   actions: {
+    removeOptionalProgram(id) {
+      console.log(id);
+    },
     loadStudentReportsAndCertificates() {
       this.loadStudentXmlReport(this.pen);
       this.loadStudentTranscripts(this.id);

From 993c745a94a201f46513165f59a8321ce922de7a Mon Sep 17 00:00:00 2001
From: Tang <Michael.Tang@gov.bc.ca>
Date: Fri, 23 Feb 2024 15:13:55 -0800
Subject: [PATCH 022/168] added delete

---
 .../components/StudentProfile/StudentOptionalPrograms.vue   | 6 ++++++
 frontend/src/store/modules/student.js                       | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 4b288ed3..ce893496 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -219,12 +219,18 @@
           <b-card class="col-6">
             <DisplayTable
               v-if="careerPrograms"
+              id="id"
               :items="careerPrograms"
               :striped="false"
               :fields="careerProgramsFields"
               :showFilter="false"
               :pagination="false"
               title="Career Programs"
+              disableDeletefield=""
+              disableDeleteIfValue=""
+              deleteLabel="Delete"
+              store="student"
+              delete="removeCareerProgram"
             >
               <template #cell(careerProgramName)="row3">
                 {{ row3.item.careerProgramName }}
diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index fb18f83b..66f65d29 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -43,6 +43,9 @@ export const useStudentStore = defineStore("student", {
     },
   }),
   actions: {
+    removeCareerProgram(id) {
+      console.log(id);
+    },
     removeOptionalProgram(id) {
       console.log(id);
     },

From bdc8ee16cab922eba10283804cce41ae9a8f780b Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 27 Feb 2024 15:44:01 -0800
Subject: [PATCH 023/168] added base UI functionality for adding optional
 programs to a student

---
 frontend/src/components/DisplayTable.vue      |   1 +
 .../components/Forms/OptionalProgramsForm.vue | 300 ++++++++++++++++--
 .../StudentOptionalPrograms.vue               |   4 +-
 3 files changed, 269 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 3408c22f..dd6cdc53 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -231,6 +231,7 @@ export default {
     "title",
     "fields",
     "id",
+    "create",
     "update",
     "delete",
     "store",
diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 6522559b..e5d81006 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -2,27 +2,149 @@
   <div>
     <!-- btn to open optional program edit form-->
     <b-btn
-      >Add Optional Program
-      <i
-        class="fas fa-plus"
-        aria-hidden="true"
-        @click="editStudentOptionalPrograms = true"
-      ></i
+      variant="primary"
+      class="float-right mb-2 mr-2"
+      @click="editOptionalPrograms()"
+      >Add Optional Program <i class="fas fa-plus" aria-hidden="true"></i
     ></b-btn>
 
     <DisplayModal
       header="Add Optional Program"
       :showModal="editStudentOptionalPrograms"
     >
-      <template v-slot:body> I'm the optional programs form </template>
+      <template v-slot:body>
+        <!-- Prevent users from editing status of MER students & display error -->
+        <div
+          v-if="studentGradStatus.studentStatus === 'MER'"
+          class="opt-program-form-body"
+        >
+          <b-alert variant="danger" show
+            ><i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
+            <p>
+              This student is showing as merged. Student GRAD Optional Program
+              data cannot be updated for students with a status of "MER" merged.
+            </p>
+          </b-alert>
+        </div>
+        <div v-else class="opt-program-form-body">
+          <!-- Student status warnings that inform user without blocking action -->
+          <b-alert
+            show
+            variant="warning"
+            v-if="studentGradStatus.studentStatus === 'TER'"
+          >
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>
+              This student has been terminated. Re-activate by setting their
+              status to "CUR" if they are currently attending school.
+            </p>
+          </b-alert>
+          <b-alert
+            show
+            variant="warning"
+            v-else-if="studentGradStatus.studentStatus === 'ARC'"
+          >
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>
+              This student is not active. Re-activate by setting their status to
+              "CUR" if they are currently attending school.
+            </p>
+          </b-alert>
+          <b-alert
+            show
+            variant="warning"
+            v-else-if="studentGradStatus.studentStatus === 'DEC'"
+          >
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>This student is showing as deceased.</p>
+          </b-alert>
+          <!-- END student status warnings -->
+
+          <p class="form-label required">Optional Program</p>
+          <b-form-select
+            v-model="selectedOptionalProgram"
+            :options="activeOptionalPrograms"
+            value-field="optionalProgramID"
+            text-field="optionalProgramName"
+          ></b-form-select>
+
+          <b-alert
+            variant="primary"
+            :show="!!selectedOptionalProgram"
+            class="my-4"
+            ><i class="fa-solid fa-circle-info"></i>&nbsp;<strong>
+              {{
+                getOptionalProgramByID(selectedOptionalProgram)
+                  .optionalProgramName
+              }}
+              ({{
+                getOptionalProgramByID(selectedOptionalProgram).optProgramCode
+              }})
+            </strong>
+            <p>
+              {{ getOptionalProgramByID(selectedOptionalProgram).description }}
+            </p>
+            <p>
+              <strong>Effective Date: </strong
+              >{{
+                $filters.formatSimpleDate(
+                  getOptionalProgramByID(selectedOptionalProgram).effectiveDate
+                )
+              }}
+              <strong class="ml-4">Expiry Date: </strong
+              >{{
+                $filters.formatSimpleDate(
+                  getOptionalProgramByID(selectedOptionalProgram).expiryDate
+                )
+              }}
+            </p>
+          </b-alert>
+
+          <div v-if="isCareerProgram()">
+            <p class="form-label required">Career Program</p>
+            <b-form-select
+              v-model="selectedCareerProgram"
+              :options="careerProgramList"
+              value-field="code"
+              text-field="name"
+            ></b-form-select>
+            <div v-if="careerProgramsToAdd.length > 0" class="mx-4 my-2">
+              <div
+                v-for="item in careerProgramsToAdd"
+                :key="item.code"
+                class="my-1"
+              >
+                {{ item.code }} - {{ item.name }}
+                <b-btn
+                  variant="outline-danger"
+                  size="sm"
+                  class="px-1 py-0"
+                  @click="removeCareerProgram(item.code)"
+                >
+                  <i class="fa-solid fa-xmark"></i>
+                </b-btn>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
 
       <template v-slot:footer>
         <b-btn
-          variant="danger"
+          variant="outline-danger"
+          class="float-left"
           size="xs"
-          class="float-right"
           @click="editStudentOptionalPrograms = false"
-          >Close</b-btn
+          >Cancel</b-btn
+        >
+        <b-btn
+          variant="primary"
+          class="float-right"
+          :disabled="studentGradStatus.studentStatus === 'MER'"
+          >Next</b-btn
         >
       </template>
     </DisplayModal>
@@ -30,50 +152,158 @@
 </template>
 
 <script>
+//import components
 import DisplayModal from "../DisplayModal.vue";
 
+//import services
+import ProgramManagementService from "@/services/ProgramManagementService.js";
+
+//import stores & pinia utilities
+//import { useAppStore } from "@/store/modules/app";
+import { useStudentStore } from "@/store/modules/student";
+import { mapState } from "pinia";
+
 export default {
-  name: "HelloWorld",
-  props: ["header", "showModal"],
+  name: "StudentOptionalProgramsForm",
+  props: {
+    studentProgramId: {
+      type: String,
+      default: "",
+    },
+  },
   components: {
     DisplayModal: DisplayModal,
   },
+  mounted() {
+    this.fetchPrograms();
+  },
   data() {
     return {
+      formSteps: "",
       editStudentOptionalPrograms: false,
+      selectedOptionalProgram: null,
+      selectedCareerProgram: null,
+      careerProgramsToAdd: [],
+      optionalProgramList: null,
+      careerProgramList: null,
     };
   },
+  computed: {
+    ...mapState(useStudentStore, {
+      optionalPrograms: "getStudentOptionalPrograms",
+      studentGradStatus: "getStudentGradStatus",
+    }),
+    // ...mapState(useAppStore, {
+    //   optionalPrograms
+    // })
+    careerProgramChange() {
+      return this.selectedCareerProgram;
+    },
+    activeOptionalPrograms() {
+      const studentProgramId = this.studentProgramId;
+
+      const currentDate = new Date().toISOString().split("T")[0];
+      return this.optionalProgramList.filter((item) => {
+        let effectiveDateUTC = null;
+        let expiryDateUTC = null;
+        if (item.effectiveDate) {
+          effectiveDateUTC = new Date(item.effectiveDate)
+            .toISOString()
+            .split("T")[0];
+        }
+        if (item.expiryDate) {
+          expiryDateUTC = new Date(item.expiryDate).toISOString().split("T")[0];
+        }
+        return (
+          item.graduationProgramCode === studentProgramId &&
+          effectiveDateUTC <= currentDate &&
+          (expiryDateUTC == null || currentDate <= expiryDateUTC)
+        );
+      }); //TODO - map to filter out existing opt programs
+    },
+  },
+  methods: {
+    editOptionalPrograms() {
+      this.editStudentOptionalPrograms = true;
+    },
+    isCareerProgram() {
+      //determines if optional program selected is a career program
+      return (
+        !!this.selectedOptionalProgram &&
+        this.getOptionalProgramByID(this.selectedOptionalProgram)
+          .optProgramCode === "CP"
+      );
+    },
+    async fetchPrograms() {
+      try {
+        const response = await ProgramManagementService.getOptionalPrograms();
+        this.optionalProgramList = response.data;
+      } catch (error) {
+        console.error("Error fetching optional programs:", error);
+      }
+      try {
+        const response = await ProgramManagementService.getCareerPrograms();
+        this.careerProgramList = response.data;
+      } catch (error) {
+        console.error("Error fetching optional programs:", error);
+      }
+    },
+    // getters
+    getOptionalProgramByID(selectedID) {
+      return this.optionalProgramList.find(
+        (optProgram) => optProgram.optionalProgramID === selectedID
+      );
+    },
+    getCareerProgramByCode(selectedCode) {
+      return this.careerProgramList.find(
+        (careerProgram) => careerProgram.code === selectedCode
+      );
+    },
+    addCareerProgram() {
+      this.careerProgramsToAdd.push(
+        this.getCareerProgramByCode(this.selectedCareerProgram)
+      );
+    },
+    removeCareerProgram(selectedCode) {
+      // The following using array.splice DOES NOT WORK due to multiple versions of Vue running on this branch
+      // let index = this.careerProgramsToAdd.indexOf(selectedCode);
+      // console.log(index);
+      // if (index !== -1) {
+      //   this.careerProgramsToAdd.splice(index, 1);
+      // }
+      this.careerProgramsToAdd = this.careerProgramsToAdd.filter(
+        (item) => item.code !== selectedCode
+      );
+    },
+    // Do we need these for bootstrap vue? Modal struct is different
+    //openCreateOptionalProgramDialog()
+    //closeCreateOptionalProgramDialog()
+    //clearForm()
+    //submitForm()
+  },
+  watch: {
+    careerProgramChange: function () {
+      this.careerProgramsToAdd.push(
+        this.getCareerProgramByCode(this.selectedCareerProgram)
+      );
+    },
+  },
 };
 </script>
 
 <style>
-.modal-body {
-  height: fit-content;
-  width: fit-content;
-  margin: 5rem auto;
+.opt-program-form-body {
+  max-width: 50vw;
 }
 
-.modal-body .card-footer,
-.modal-body .card-header {
-  background-color: rgb(255, 255, 255);
-  background-color: rgba(255, 255, 255, 0);
+.form-label {
+  font-weight: bold;
 }
 
-.display-modal {
-  position: fixed;
-  z-index: 1000;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  overflow: auto;
-  background-color: rgb(0, 0, 0);
-  background-color: rgba(0, 0, 0, 0.4);
+.form-label.required:after {
+  content: " *";
+  color: red;
 }
 </style>
 
-<style scoped>
-:deep(.card-header) {
-  font-weight: 700;
-}
-</style>
+<style scoped></style>
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 30bf3c22..7dc747ac 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -18,7 +18,9 @@
         title="Optional Programs"
       >
         <template v-slot:create>
-          <OptionalProgramsForm></OptionalProgramsForm>
+          <OptionalProgramsForm
+            :studentProgramId="studentGradStatus.program"
+          ></OptionalProgramsForm>
         </template>
 
         <template #cell(optionalNonGradReasons)="row">

From 6ff917b6988d723a4945e0c123b444134723f755 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 27 Feb 2024 16:31:25 -0800
Subject: [PATCH 024/168] cleanup state regarding career programs and
 open/close

---
 .../components/Forms/OptionalProgramsForm.vue | 327 ++++++++++++------
 1 file changed, 214 insertions(+), 113 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index e5d81006..3e34dcf1 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -4,7 +4,7 @@
     <b-btn
       variant="primary"
       class="float-right mb-2 mr-2"
-      @click="editOptionalPrograms()"
+      @click="openCreateOptionalProgramDialog()"
       >Add Optional Program <i class="fas fa-plus" aria-hidden="true"></i
     ></b-btn>
 
@@ -14,138 +14,206 @@
     >
       <template v-slot:body>
         <!-- Prevent users from editing status of MER students & display error -->
-        <div
-          v-if="studentGradStatus.studentStatus === 'MER'"
-          class="opt-program-form-body"
-        >
-          <b-alert variant="danger" show
-            ><i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
-            <p>
-              This student is showing as merged. Student GRAD Optional Program
-              data cannot be updated for students with a status of "MER" merged.
-            </p>
-          </b-alert>
-        </div>
-        <div v-else class="opt-program-form-body">
-          <!-- Student status warnings that inform user without blocking action -->
-          <b-alert
-            show
-            variant="warning"
-            v-if="studentGradStatus.studentStatus === 'TER'"
-          >
-            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
-            <strong>Warning</strong>
-            <p>
-              This student has been terminated. Re-activate by setting their
-              status to "CUR" if they are currently attending school.
-            </p>
-          </b-alert>
-          <b-alert
-            show
-            variant="warning"
-            v-else-if="studentGradStatus.studentStatus === 'ARC'"
+        <div v-if="currentStep === formSteps[0]">
+          <div
+            v-if="studentGradStatus.studentStatus === 'MER'"
+            class="opt-program-form-body"
           >
+            <b-alert variant="danger" show
+              ><i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
+              <p>
+                This student is showing as merged. Student GRAD Optional Program
+                data cannot be updated for students with a status of "MER"
+                merged.
+              </p>
+            </b-alert>
+          </div>
+          <!-- Display form if student status is NOT MER -->
+          <div v-else class="opt-program-form-body">
+            <!-- Student status warnings that inform user without blocking action -->
+            <b-alert
+              show
+              variant="warning"
+              v-if="studentGradStatus.studentStatus === 'TER'"
+            >
+              <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+              <strong>Warning</strong>
+              <p>
+                This student has been terminated. Re-activate by setting their
+                status to "CUR" if they are currently attending school.
+              </p>
+            </b-alert>
+            <b-alert
+              show
+              variant="warning"
+              v-else-if="studentGradStatus.studentStatus === 'ARC'"
+            >
+              <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+              <strong>Warning</strong>
+              <p>
+                This student is not active. Re-activate by setting their status
+                to "CUR" if they are currently attending school.
+              </p>
+            </b-alert>
+            <b-alert
+              show
+              variant="warning"
+              v-else-if="studentGradStatus.studentStatus === 'DEC'"
+            >
+              <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+              <strong>Warning</strong>
+              <p>This student is showing as deceased.</p>
+            </b-alert>
+            <!-- END student status warnings -->
+
+            <p class="form-label required">Optional Program</p>
+            <b-form-select
+              v-model="selectedOptionalProgram"
+              :options="activeOptionalPrograms"
+              value-field="optionalProgramID"
+              text-field="optionalProgramName"
+            ></b-form-select>
+
+            <b-alert
+              variant="primary"
+              :show="!!selectedOptionalProgram"
+              class="my-4"
+              ><i class="fa-solid fa-circle-info"></i>&nbsp;<strong>
+                {{
+                  getOptionalProgramByID(selectedOptionalProgram)
+                    .optionalProgramName
+                }}
+                ({{
+                  getOptionalProgramByID(selectedOptionalProgram)
+                    .optProgramCode
+                }})
+              </strong>
+              <p>
+                {{
+                  getOptionalProgramByID(selectedOptionalProgram).description
+                }}
+              </p>
+              <p>
+                <strong>Effective Date: </strong
+                >{{
+                  $filters.formatSimpleDate(
+                    getOptionalProgramByID(selectedOptionalProgram)
+                      .effectiveDate
+                  )
+                }}
+                <strong class="ml-4">Expiry Date: </strong
+                >{{
+                  $filters.formatSimpleDate(
+                    getOptionalProgramByID(selectedOptionalProgram).expiryDate
+                  )
+                }}
+              </p>
+            </b-alert>
+
+            <div v-if="isCareerProgram()">
+              <p class="form-label required">Career Program</p>
+              <b-form-select
+                v-model="selectedCareerProgram"
+                :options="careerProgramList"
+                value-field="code"
+                text-field="name"
+              ></b-form-select>
+              <div v-if="careerProgramsToAdd.length > 0" class="mx-4 my-3">
+                <div
+                  v-for="item in careerProgramsToAdd"
+                  :key="item.code"
+                  class="my-1"
+                >
+                  <b-btn
+                    variant="outline-danger"
+                    size="sm"
+                    class="px-1 py-0"
+                    @click="removeCareerProgram(item.code)"
+                  >
+                    <i class="fa-solid fa-xmark"></i> </b-btn
+                  >&nbsp; {{ item.code }} - {{ item.name }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- Confirmation Step -->
+        <div v-else-if="currentStep === formSteps[1]">
+          <b-alert show variant="warning">
             <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
             <strong>Warning</strong>
             <p>
-              This student is not active. Re-activate by setting their status to
-              "CUR" if they are currently attending school.
-            </p>
-          </b-alert>
-          <b-alert
-            show
-            variant="warning"
-            v-else-if="studentGradStatus.studentStatus === 'DEC'"
-          >
-            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
-            <strong>Warning</strong>
-            <p>This student is showing as deceased.</p>
-          </b-alert>
-          <!-- END student status warnings -->
-
-          <p class="form-label required">Optional Program</p>
-          <b-form-select
-            v-model="selectedOptionalProgram"
-            :options="activeOptionalPrograms"
-            value-field="optionalProgramID"
-            text-field="optionalProgramName"
-          ></b-form-select>
-
-          <b-alert
-            variant="primary"
-            :show="!!selectedOptionalProgram"
-            class="my-4"
-            ><i class="fa-solid fa-circle-info"></i>&nbsp;<strong>
+              You are about to add the
+              <strong>
+                {{
+                  getOptionalProgramByID(selectedOptionalProgram)
+                    .optionalProgramName
+                }}
+                ({{
+                  getOptionalProgramByID(selectedOptionalProgram)
+                    .optProgramCode
+                }})
+              </strong>
+              Optional Program
               {{
                 getOptionalProgramByID(selectedOptionalProgram)
-                  .optionalProgramName
-              }}
-              ({{
-                getOptionalProgramByID(selectedOptionalProgram).optProgramCode
-              }})
-            </strong>
-            <p>
-              {{ getOptionalProgramByID(selectedOptionalProgram).description }}
-            </p>
-            <p>
-              <strong>Effective Date: </strong
-              >{{
-                $filters.formatSimpleDate(
-                  getOptionalProgramByID(selectedOptionalProgram).effectiveDate
-                )
-              }}
-              <strong class="ml-4">Expiry Date: </strong
-              >{{
-                $filters.formatSimpleDate(
-                  getOptionalProgramByID(selectedOptionalProgram).expiryDate
-                )
+                  .optProgramCode === "CP"
+                  ? "with the following Career Programs"
+                  : ""
               }}
+              for this student.
             </p>
-          </b-alert>
 
-          <div v-if="isCareerProgram()">
-            <p class="form-label required">Career Program</p>
-            <b-form-select
-              v-model="selectedCareerProgram"
-              :options="careerProgramList"
-              value-field="code"
-              text-field="name"
-            ></b-form-select>
-            <div v-if="careerProgramsToAdd.length > 0" class="mx-4 my-2">
-              <div
+            <ul
+              v-if="
+                getOptionalProgramByID(selectedOptionalProgram)
+                  .optProgramCode === 'CP'
+              "
+            >
+              <li
                 v-for="item in careerProgramsToAdd"
                 :key="item.code"
                 class="my-1"
               >
                 {{ item.code }} - {{ item.name }}
-                <b-btn
-                  variant="outline-danger"
-                  size="sm"
-                  class="px-1 py-0"
-                  @click="removeCareerProgram(item.code)"
-                >
-                  <i class="fa-solid fa-xmark"></i>
-                </b-btn>
-              </div>
-            </div>
-          </div>
+              </li>
+            </ul>
+          </b-alert>
         </div>
       </template>
 
       <template v-slot:footer>
         <b-btn
+          v-if="currentStep === formSteps[0]"
           variant="outline-danger"
           class="float-left"
           size="xs"
-          @click="editStudentOptionalPrograms = false"
+          @click="closeCreateOptionalProgramDialog()"
           >Cancel</b-btn
         >
         <b-btn
+          v-else-if="currentStep === formSteps[1]"
+          variant="outline-primary"
+          class="float-left"
+          size="xs"
+          @click="currentStep = formSteps[0]"
+          >Back</b-btn
+        >
+        <b-btn
+          v-if="currentStep === formSteps[0]"
           variant="primary"
           class="float-right"
-          :disabled="studentGradStatus.studentStatus === 'MER'"
+          :disabled="validateOptionalPrograms()"
+          @click="currentStep = formSteps[1]"
           >Next</b-btn
         >
+        <b-btn
+          v-else-if="currentStep === formSteps[1]"
+          variant="danger"
+          class="float-right"
+          @click="submitForm()"
+          >Add Optional Program</b-btn
+        >
       </template>
     </DisplayModal>
   </div>
@@ -179,7 +247,11 @@ export default {
   },
   data() {
     return {
-      formSteps: "",
+      formSteps: [
+        { key: 0, label: "Choose Optional Programs" },
+        { key: 1, label: "Confirmation" },
+      ],
+      currentStep: null,
       editStudentOptionalPrograms: false,
       selectedOptionalProgram: null,
       selectedCareerProgram: null,
@@ -196,6 +268,9 @@ export default {
     // ...mapState(useAppStore, {
     //   optionalPrograms
     // })
+    optionalProgramChange() {
+      return this.selectedOptionalProgram;
+    },
     careerProgramChange() {
       return this.selectedCareerProgram;
     },
@@ -223,9 +298,6 @@ export default {
     },
   },
   methods: {
-    editOptionalPrograms() {
-      this.editStudentOptionalPrograms = true;
-    },
     isCareerProgram() {
       //determines if optional program selected is a career program
       return (
@@ -275,13 +347,42 @@ export default {
         (item) => item.code !== selectedCode
       );
     },
-    // Do we need these for bootstrap vue? Modal struct is different
-    //openCreateOptionalProgramDialog()
-    //closeCreateOptionalProgramDialog()
-    //clearForm()
-    //submitForm()
+    validateOptionalPrograms() {
+      return !(
+        (!!this.selectedOptionalProgram &&
+          this.getOptionalProgramByID(this.selectedOptionalProgram)
+            .optProgramCode !== "CP") ||
+        (!!this.selectedOptionalProgram &&
+          this.getOptionalProgramByID(this.selectedOptionalProgram)
+            .optProgramCode === "CP" &&
+          this.careerProgramsToAdd.length > 0)
+      );
+    },
+    openCreateOptionalProgramDialog() {
+      this.editStudentOptionalPrograms = true;
+      this.currentStep = this.formSteps[0];
+    },
+    closeCreateOptionalProgramDialog() {
+      this.editStudentOptionalPrograms = false;
+      this.currentStep = null;
+      this.clearForm();
+    },
+    clearForm() {
+      this.selectedOptionalProgram = null;
+      this.selectedCareerProgram = null;
+      this.careerProgramsToAdd = [];
+    },
+    submitForm() {
+      console.log("TODO - add optional program");
+      this.closeCreateOptionalProgramDialog();
+    },
   },
   watch: {
+    optionalProgramChange: function () {
+      // reset career program values if opt program changes
+      this.careerProgramsToAdd = [];
+      this.selectedCareerProgram = null;
+    },
     careerProgramChange: function () {
       this.careerProgramsToAdd.push(
         this.getCareerProgramByCode(this.selectedCareerProgram)

From 5e6c5bc3ff173c63ac78ba5dd77dd1df48998b23 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 27 Feb 2024 16:53:38 -0800
Subject: [PATCH 025/168] fix

---
 .../components/Forms/OptionalProgramsForm.vue | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 3e34dcf1..c7743d65 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -156,20 +156,14 @@
               </strong>
               Optional Program
               {{
-                getOptionalProgramByID(selectedOptionalProgram)
-                  .optProgramCode === "CP"
+                isCareerProgram(selectedOptionalProgram)
                   ? "with the following Career Programs"
                   : ""
               }}
               for this student.
             </p>
 
-            <ul
-              v-if="
-                getOptionalProgramByID(selectedOptionalProgram)
-                  .optProgramCode === 'CP'
-              "
-            >
+            <ul v-if="isCareerProgram(selectedOptionalProgram)">
               <li
                 v-for="item in careerProgramsToAdd"
                 :key="item.code"
@@ -227,7 +221,6 @@ import DisplayModal from "../DisplayModal.vue";
 import ProgramManagementService from "@/services/ProgramManagementService.js";
 
 //import stores & pinia utilities
-//import { useAppStore } from "@/store/modules/app";
 import { useStudentStore } from "@/store/modules/student";
 import { mapState } from "pinia";
 
@@ -265,9 +258,6 @@ export default {
       optionalPrograms: "getStudentOptionalPrograms",
       studentGradStatus: "getStudentGradStatus",
     }),
-    // ...mapState(useAppStore, {
-    //   optionalPrograms
-    // })
     optionalProgramChange() {
       return this.selectedOptionalProgram;
     },
@@ -350,11 +340,9 @@ export default {
     validateOptionalPrograms() {
       return !(
         (!!this.selectedOptionalProgram &&
-          this.getOptionalProgramByID(this.selectedOptionalProgram)
-            .optProgramCode !== "CP") ||
+          this.isCareerProgram(this.selectedOptionalProgram)) ||
         (!!this.selectedOptionalProgram &&
-          this.getOptionalProgramByID(this.selectedOptionalProgram)
-            .optProgramCode === "CP" &&
+          this.isCareerProgram(this.selectedOptionalProgram) &&
           this.careerProgramsToAdd.length > 0)
       );
     },
@@ -373,7 +361,11 @@ export default {
       this.careerProgramsToAdd = [];
     },
     submitForm() {
-      console.log("TODO - add optional program");
+      if (this.isCareerProgram(selectedCareerProgram)) {
+        // action to add career program
+      } else {
+        // action to add optional program
+      }
       this.closeCreateOptionalProgramDialog();
     },
   },

From 358671cfefa0f22c481f1ca69baedb5af7476700 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 28 Feb 2024 09:24:51 -0800
Subject: [PATCH 026/168] Fix CP validation

---
 frontend/src/components/Forms/OptionalProgramsForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index c7743d65..8a1c4a6c 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -340,7 +340,7 @@ export default {
     validateOptionalPrograms() {
       return !(
         (!!this.selectedOptionalProgram &&
-          this.isCareerProgram(this.selectedOptionalProgram)) ||
+          !this.isCareerProgram(this.selectedOptionalProgram)) ||
         (!!this.selectedOptionalProgram &&
           this.isCareerProgram(this.selectedOptionalProgram) &&
           this.careerProgramsToAdd.length > 0)

From cb9d56aa53e62c70a00e595dfa890013368feeaa Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 28 Feb 2024 16:13:44 -0800
Subject: [PATCH 027/168] Create Student Optional Program implemented with API

---
 frontend/src/components/DisplayTable.vue      |  1 +
 .../components/Forms/OptionalProgramsForm.vue | 42 +++++-----
 frontend/src/services/StudentService.js       | 79 +++++++++++++------
 frontend/src/store/modules/student.js         | 44 +++++++++++
 4 files changed, 118 insertions(+), 48 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index f7b69ed9..796a802e 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -193,6 +193,7 @@
           size="sm"
           @click="deleteItem(item)"
         >
+          <!-- TODO if delete label is empty, default to icon -->
           {{ deleteLabel ? deleteLabel : "Delete" }}
         </b-btn>
       </template>
diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 8a1c4a6c..c3d2142f 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -5,8 +5,9 @@
       variant="primary"
       class="float-right mb-2 mr-2"
       @click="openCreateOptionalProgramDialog()"
-      >Add Optional Program <i class="fas fa-plus" aria-hidden="true"></i
-    ></b-btn>
+      ><i class="fas fa-plus" aria-hidden="true"></i> Add Optional
+      Program</b-btn
+    >
 
     <DisplayModal
       header="Add Optional Program"
@@ -121,17 +122,17 @@
               <div v-if="careerProgramsToAdd.length > 0" class="mx-4 my-3">
                 <div
                   v-for="item in careerProgramsToAdd"
-                  :key="item.code"
+                  :key="item"
                   class="my-1"
                 >
                   <b-btn
                     variant="outline-danger"
                     size="sm"
                     class="px-1 py-0"
-                    @click="removeCareerProgram(item.code)"
+                    @click="unsetCareerProgram(item)"
                   >
                     <i class="fa-solid fa-xmark"></i> </b-btn
-                  >&nbsp; {{ item.code }} - {{ item.name }}
+                  >&nbsp; {{ item }} - {{ getCareerProgramByCode(item).name }}
                 </div>
               </div>
             </div>
@@ -164,12 +165,8 @@
             </p>
 
             <ul v-if="isCareerProgram(selectedOptionalProgram)">
-              <li
-                v-for="item in careerProgramsToAdd"
-                :key="item.code"
-                class="my-1"
-              >
-                {{ item.code }} - {{ item.name }}
+              <li v-for="item in careerProgramsToAdd" :key="item" class="my-1">
+                {{ item }} - {{ getCareerProgramByCode(item).name }}
               </li>
             </ul>
           </b-alert>
@@ -222,7 +219,7 @@ import ProgramManagementService from "@/services/ProgramManagementService.js";
 
 //import stores & pinia utilities
 import { useStudentStore } from "@/store/modules/student";
-import { mapState } from "pinia";
+import { mapState, mapActions } from "pinia";
 
 export default {
   name: "StudentOptionalProgramsForm",
@@ -288,6 +285,10 @@ export default {
     },
   },
   methods: {
+    ...mapActions(useStudentStore, [
+      "addStudentOptionalProgram",
+      "addStudentCareerPrograms",
+    ]),
     isCareerProgram() {
       //determines if optional program selected is a career program
       return (
@@ -321,12 +322,7 @@ export default {
         (careerProgram) => careerProgram.code === selectedCode
       );
     },
-    addCareerProgram() {
-      this.careerProgramsToAdd.push(
-        this.getCareerProgramByCode(this.selectedCareerProgram)
-      );
-    },
-    removeCareerProgram(selectedCode) {
+    unsetCareerProgram(selectedCode) {
       // The following using array.splice DOES NOT WORK due to multiple versions of Vue running on this branch
       // let index = this.careerProgramsToAdd.indexOf(selectedCode);
       // console.log(index);
@@ -334,7 +330,7 @@ export default {
       //   this.careerProgramsToAdd.splice(index, 1);
       // }
       this.careerProgramsToAdd = this.careerProgramsToAdd.filter(
-        (item) => item.code !== selectedCode
+        (item) => item !== selectedCode
       );
     },
     validateOptionalPrograms() {
@@ -361,10 +357,12 @@ export default {
       this.careerProgramsToAdd = [];
     },
     submitForm() {
-      if (this.isCareerProgram(selectedCareerProgram)) {
+      if (this.isCareerProgram(this.selectedCareerProgram)) {
         // action to add career program
+        this.addStudentCareerPrograms(this.careerProgramsToAdd);
       } else {
         // action to add optional program
+        this.addStudentOptionalProgram(this.selectedOptionalProgram);
       }
       this.closeCreateOptionalProgramDialog();
     },
@@ -376,9 +374,7 @@ export default {
       this.selectedCareerProgram = null;
     },
     careerProgramChange: function () {
-      this.careerProgramsToAdd.push(
-        this.getCareerProgramByCode(this.selectedCareerProgram)
-      );
+      this.careerProgramsToAdd.push(this.selectedCareerProgram);
     },
   },
 };
diff --git a/frontend/src/services/StudentService.js b/frontend/src/services/StudentService.js
index d06fdb52..05ca24e7 100644
--- a/frontend/src/services/StudentService.js
+++ b/frontend/src/services/StudentService.js
@@ -1,6 +1,10 @@
 import ApiService from "../common/apiService";
 
 export default {
+  // STUDENT INFO
+  getStudentPen(id) {
+    return ApiService.apiAxios.get("/api/v1/student/stdid/" + id);
+  },
   getStudentByPen(pen) {
     return ApiService.apiAxios.get("/api/v1/student/pen/" + pen);
   },
@@ -22,19 +26,11 @@ export default {
       "/api/v1/student/gradstudentsearch?" + queryString
     );
   },
+
+  // STUDENT GRAD STATUS
   getGraduationStatus(id) {
     return ApiService.apiAxios.get("/api/v1/student/studentid/" + id);
   },
-  getGraduationStatusOptionalPrograms(id) {
-    return ApiService.apiAxios.get(
-      "/api/v1/student/optionalprogram/studentid/" + id
-    );
-  },
-  deleteGraduationStatusOptionalPrograms(id) {
-    return ApiService.apiAxios.delete(
-      "/api/v1/student/optionalprogram/studentid/" + id
-    );
-  },
   editGraduationStatus(id, json) {
     return ApiService.apiAxios.post(
       "/api/v1/student/gradstudent/studentid/" + id,
@@ -52,14 +48,41 @@ export default {
       json
     );
   },
+
+  // STUDENT OPTIONAL PROGRAMS
+  getGraduationStatusOptionalPrograms(id) {
+    return ApiService.apiAxios.get(
+      "/api/v1/student/optionalprogram/studentid/" + id
+    );
+  },
   getStudentCareerPrograms(id) {
     return ApiService.apiAxios.get(
       "/api/v1/student/studentcareerprogram/studentid/" + id
     );
   },
-  getStudentStatusCodes() {
-    return ApiService.apiAxios.get("/api/v1/student/studentstatus");
+  createStudentOptionalProgram(studentId, optionalProgramId) {
+    return ApiService.apiAxios.post(
+      "/api/v1/student/" + studentId + "/optionalPrograms/" + optionalProgramId
+    );
+  },
+  createStudentCareerPrograms(studentId, json) {
+    return ApiService.apiAxios.post(
+      "/api/v1/student/" + studentId + "/careerPrograms",
+      json
+    );
+  },
+  deleteStudentOptionalProgram(studentId, optionalProgramId) {
+    return ApiService.apiAxios.delete(
+      "/api/v1/student/" + studentId + "/optionalPrograms/" + optionalProgramId
+    );
   },
+  deleteStudentCareerProgram(studentId, careerProgramCode) {
+    return ApiService.apiAxios.delete(
+      "/api/v1/student/" + studentId + "/optionalPrograms/" + careerProgramCode
+    );
+  },
+
+  // STUDENT NOTES
   getStudentNotes(id) {
     return ApiService.apiAxios.get(
       "/api/v1/student/studentnotes/studentid/" + id
@@ -71,34 +94,40 @@ export default {
   deleteStudentNotes(noteID) {
     return ApiService.apiAxios.delete("/api/v1/student/studentnotes/" + noteID);
   },
-  getStudentUngradReasons(id) {
+
+  // STUDENT HISTORIES
+  getStudentHistory(id) {
+    return ApiService.apiAxios.get("/api/v1/student/studentHistory/" + id);
+  },
+  getStudentOptionalProgramHistory(id) {
     return ApiService.apiAxios.get(
-      "/api/v1/studentgraduation/undocompletion/studentundocompletionreason/studentid/" +
-        id
+      "/api/v1/student/studentOptionalProgramHistory/" + id
     );
   },
-  getUngradReasons() {
+  getStudentUngradReasons(id) {
     return ApiService.apiAxios.get(
-      "/api/v1/studentgraduation/undocompletion/undocompletionreason"
+      "/api/v1/studentgraduation/undocompletion/studentundocompletionreason/studentid/" +
+        id
     );
   },
-  getStudentHistory(id) {
-    return ApiService.apiAxios.get("/api/v1/student/studentHistory/" + id);
-  },
+
+  // BATCH
   getBatchHistory(id, page) {
     return ApiService.apiAxios.get(
       "/api/v1/student/studentHistory/batchid/" + id + "?pageNumber=" + page
     );
   },
-  getStudentOptionalProgramHistory(id) {
+
+  // CODES
+  getStudentStatusCodes() {
+    return ApiService.apiAxios.get("/api/v1/student/studentstatus");
+  },
+  getUngradReasons() {
     return ApiService.apiAxios.get(
-      "/api/v1/student/studentOptionalProgramHistory/" + id
+      "/api/v1/studentgraduation/undocompletion/undocompletionreason"
     );
   },
   getStudentHistoryActivityCode() {
     return ApiService.apiAxios.get("/api/v1/student/historyactivity");
   },
-  getStudentPen(id) {
-    return ApiService.apiAxios.get("/api/v1/student/stdid/" + id);
-  },
 };
diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index 66f65d29..85914fc5 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -318,6 +318,50 @@ export const useStudentStore = defineStore("student", {
         this.student.hasNotes = true;
       }
     },
+    addStudentOptionalProgram(optionalProgramId) {
+      try {
+        let response = StudentService.createStudentOptionalProgram(
+          this.id,
+          optionalProgramId
+        );
+      } catch (error) {
+        console.error("Error creating student optional program: ", error);
+      }
+    },
+    addStudentCareerPrograms(careerPrograms) {
+      let careerProgramPayload = {
+        careerProgramCodes: careerPrograms,
+      };
+
+      try {
+        let response = StudentService.createStudentCareerPrograms(
+          this.id,
+          careerProgramPayload
+        );
+      } catch (error) {
+        console.error("Error creating student career program: ", error);
+      }
+    },
+    removeStudentOptionalProgram(optionalProgramId) {
+      try {
+        let response = StudentService.deleteStudentOptionalProgram(
+          this.id,
+          optionalProgramId
+        );
+      } catch (error) {
+        console.error("Error deleting student optional program: ", error);
+      }
+    },
+    removeStudentCareerProgram(careerProgramCode) {
+      try {
+        let response = StudentService.deleteStudentCareerProgram(
+          this.id,
+          careerProgramCode
+        );
+      } catch (error) {
+        console.error("Error deleting student career program: ", error);
+      }
+    },
     // SEARCH
   },
   getters: {

From 150f4d76af087ca3eab8db6cdcfaa856c9f401a1 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 28 Feb 2024 16:41:47 -0800
Subject: [PATCH 028/168] Student Optional Program delete implemented with API

---
 frontend/src/components/DisplayTable.vue             | 12 +++++++++---
 .../StudentProfile/StudentOptionalPrograms.vue       | 12 +++++-------
 frontend/src/services/StudentService.js              |  2 +-
 frontend/src/store/modules/student.js                |  6 ------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 796a802e..41ebd724 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -189,12 +189,13 @@
       <template v-slot:cell(delete)="{ item }">
         <b-btn
           v-if="deleteMode && item[disableDeletefield] != disableDeleteIfValue"
-          variant="danger"
+          :variant="!!deleteLabel ? 'danger' : 'outline-danger'"
+          :pill="!deleteLabel"
           size="sm"
           @click="deleteItem(item)"
         >
-          <!-- TODO if delete label is empty, default to icon -->
-          {{ deleteLabel ? deleteLabel : "Delete" }}
+          <div v-if="!!deleteLabel">{{ deleteLabel }}</div>
+          <i v-else class="fa-solid fa-trash-can"></i>
         </b-btn>
       </template>
     </b-table>
@@ -359,6 +360,11 @@ export default {
 };
 </script>
 <style scoped>
+/* removes bootstrap vue outline on icon btn */
+button.btn-outline-danger.rounded-pill {
+  border: none;
+}
+
 @media (min-width: 992px) {
   .col-lg-4.table-filter {
     position: absolute;
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 345902c3..6a19eba0 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -19,9 +19,8 @@
         title="Optional Programs"
         disableDeletefield="optionalProgramCode"
         disableDeleteIfValue="CP"
-        deleteLabel="Delete"
         store="student"
-        delete="removeOptionalProgram"
+        delete="removeStudentOptionalProgram"
       >
         <template v-slot:create>
           <OptionalProgramsForm
@@ -221,7 +220,7 @@
           <b-card class="col-6">
             <DisplayTable
               v-if="careerPrograms"
-              id="id"
+              id="careerProgramCode"
               :items="careerPrograms"
               :striped="false"
               :fields="careerProgramsFields"
@@ -230,9 +229,8 @@
               title="Career Programs"
               disableDeletefield=""
               disableDeleteIfValue=""
-              deleteLabel="Delete"
               store="student"
-              delete="removeCareerProgram"
+              delete="removeStudentCareerProgram"
             >
               <template #cell(careerProgramName)="row3">
                 {{ row3.item.careerProgramName }}
@@ -284,11 +282,11 @@ export default {
           key: "optionalProgramCompletionDate",
           label: "Optional Program Completion Date",
         },
-        { key: "delete", label: "Delete" },
+        { key: "delete", label: null },
       ],
       careerProgramsFields: [
         { key: "careerProgramName", label: "Career Program" },
-        { key: "delete", label: "Delete" },
+        { key: "delete", label: null },
       ],
     };
   },
diff --git a/frontend/src/services/StudentService.js b/frontend/src/services/StudentService.js
index 05ca24e7..8290730c 100644
--- a/frontend/src/services/StudentService.js
+++ b/frontend/src/services/StudentService.js
@@ -78,7 +78,7 @@ export default {
   },
   deleteStudentCareerProgram(studentId, careerProgramCode) {
     return ApiService.apiAxios.delete(
-      "/api/v1/student/" + studentId + "/optionalPrograms/" + careerProgramCode
+      "/api/v1/student/" + studentId + "/careerPrograms/" + careerProgramCode
     );
   },
 
diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index 85914fc5..cdc87c26 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -43,12 +43,6 @@ export const useStudentStore = defineStore("student", {
     },
   }),
   actions: {
-    removeCareerProgram(id) {
-      console.log(id);
-    },
-    removeOptionalProgram(id) {
-      console.log(id);
-    },
     loadStudentReportsAndCertificates() {
       this.loadStudentXmlReport(this.pen);
       this.loadStudentTranscripts(this.id);

From 7b47689b78acfa27906656a444a8bc82d3e69925 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 29 Feb 2024 13:05:53 -0800
Subject: [PATCH 029/168] Added refresh of optional & career programs and
 history to CRUD actions in store

---
 frontend/src/store/modules/student.js | 43 ++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index cdc87c26..3c02cf72 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -144,6 +144,23 @@ export const useStudentStore = defineStore("student", {
           }
         });
     },
+    loadStudentCareerPrograms(studentId) {
+      StudentService.getStudentCareerPrograms(studentId)
+        .then((response) => {
+          this.setStudentCareerPrograms(response.data);
+        })
+        .catch((error) => {
+          if (error.response.status) {
+            this.$bvToast.toast("ERROR " + error.response.statusText, {
+              title:
+                "There was an error with the Student Service (getting the student's Career Programs): " +
+                error.response.status,
+              variant: "danger",
+              noAutoHide: true,
+            });
+          }
+        });
+    },
     loadStudentHistory(studentId) {
       StudentService.getStudentHistory(studentId)
         .then((response) => {
@@ -317,7 +334,11 @@ export const useStudentStore = defineStore("student", {
         let response = StudentService.createStudentOptionalProgram(
           this.id,
           optionalProgramId
-        );
+        ).then(() => {
+          // reload student optional programs & optional program history after create
+          this.loadStudentOptionalProgramHistory(this.id);
+          this.loadStudentOptionalPrograms(this.id);
+        });
       } catch (error) {
         console.error("Error creating student optional program: ", error);
       }
@@ -331,7 +352,12 @@ export const useStudentStore = defineStore("student", {
         let response = StudentService.createStudentCareerPrograms(
           this.id,
           careerProgramPayload
-        );
+        ).then(() => {
+          // reload student optional/career programs & optional program history after create
+          this.loadStudentOptionalProgramHistory(this.id);
+          this.loadStudentOptionalPrograms(this.id);
+          this.loadStudentCareerPrograms(this.id);
+        });
       } catch (error) {
         console.error("Error creating student career program: ", error);
       }
@@ -341,7 +367,11 @@ export const useStudentStore = defineStore("student", {
         let response = StudentService.deleteStudentOptionalProgram(
           this.id,
           optionalProgramId
-        );
+        ).then(() => {
+          // reload student optional programs & optional program history after delete
+          this.loadStudentOptionalProgramHistory(this.id);
+          this.loadStudentOptionalPrograms(this.id);
+        });
       } catch (error) {
         console.error("Error deleting student optional program: ", error);
       }
@@ -351,7 +381,12 @@ export const useStudentStore = defineStore("student", {
         let response = StudentService.deleteStudentCareerProgram(
           this.id,
           careerProgramCode
-        );
+        ).then(() => {
+          // reload student optional/career programs & optional program history after delete
+          this.loadStudentOptionalProgramHistory(this.id);
+          this.loadStudentOptionalPrograms(this.id);
+          this.loadStudentCareerPrograms(this.id);
+        });
       } catch (error) {
         console.error("Error deleting student career program: ", error);
       }

From 40243f00632d1165455afcae8a6514c6885e4f96 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 29 Feb 2024 16:14:10 -0800
Subject: [PATCH 030/168] Delete confirmation modal added - may need some
 tweaking/improvements still

---
 frontend/src/components/DisplayTable.vue      | 58 +++++++++++++++++--
 .../StudentOptionalPrograms.vue               | 16 +++++
 2 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 41ebd724..47f8be56 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -189,14 +189,52 @@
       <template v-slot:cell(delete)="{ item }">
         <b-btn
           v-if="deleteMode && item[disableDeletefield] != disableDeleteIfValue"
-          :variant="!!deleteLabel ? 'danger' : 'outline-danger'"
-          :pill="!deleteLabel"
+          :variant="!useIconButtons ? 'danger' : 'outline-danger'"
+          :pill="!!useIconButtons"
           size="sm"
-          @click="deleteItem(item)"
+          @click="
+            deleteConfirm
+              ? (showDeleteModal[item[this.id]] = true)
+              : deleteItem(item)
+          "
         >
-          <div v-if="!!deleteLabel">{{ deleteLabel }}</div>
+          <div v-if="!useIconButtons">Delete {{ deleteLabel }}</div>
           <i v-else class="fa-solid fa-trash-can"></i>
         </b-btn>
+        <DisplayModal
+          :header="'Delete ' + deleteLabel"
+          :showModal="showDeleteModal[item[this.id]]"
+        >
+          <!-- item[this.id] -->
+          <template v-slot:body>
+            <b-alert show variant="warning"
+              ><i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+              <strong>Warning</strong>
+              <p>
+                {{ deleteMessage.prepend }}
+                <strong>{{ item[deleteMessage.labelKey] }}</strong>
+                {{ deleteMessage.append }}
+              </p></b-alert
+            >
+          </template>
+
+          <template v-slot:footer>
+            <b-btn
+              variant="outline-primary"
+              class="float-left"
+              size="xs"
+              @click="showDeleteModal = {}"
+              >Cancel</b-btn
+            >
+            <b-btn
+              variant="danger"
+              class="float-right"
+              size="xs"
+              @click="deleteItem(item)"
+              >DELETE</b-btn
+            >
+          </template>
+        </DisplayModal>
       </template>
     </b-table>
 
@@ -225,6 +263,7 @@ import { useAppStore } from "../store/modules/app.js";
 import { useBatchProcessingStore } from "../store/modules/batchprocessing.js";
 import { useStudentStore } from "../store/modules/student.js";
 import { mapState } from "pinia";
+import DisplayModal from "@/components/DisplayModal.vue";
 export default {
   name: "DisplayTable",
   props: [
@@ -238,6 +277,9 @@ export default {
     "delete",
     "store",
     "deleteLabel",
+    "deleteMessage",
+    "deleteConfirm",
+    "useIconButtons",
     "disableDeletefield",
     "disableDeleteIfValue",
     "slots",
@@ -248,6 +290,9 @@ export default {
     "sortByField",
     "sortDesc",
   ],
+  components: {
+    DisplayModal: DisplayModal,
+  },
   onMounted() {
     // Set the initial number of items
     // this.totalRows = this.items.length;
@@ -264,6 +309,7 @@ export default {
       createAllowed: false,
       editMode: false,
       deleteMode: true,
+      showDeleteModal: {},
       addMode: false,
       itemToAdd: [],
       showConfirm: false,
@@ -347,6 +393,10 @@ export default {
       } else {
         console.error("Store not found.");
       }
+      //close modal if delete confirm enabled
+      if (this.deleteConfirm) {
+        this.showDeleteModal = {};
+      }
     },
     onFiltered(filteredItems) {
       // Trigger pagination to update the number of buttons/pages due to filtering
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 6a19eba0..0f7175f6 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -19,6 +19,14 @@
         title="Optional Programs"
         disableDeletefield="optionalProgramCode"
         disableDeleteIfValue="CP"
+        useIconButtons="true"
+        deleteLabel="Optional Program"
+        :deleteMessage="{
+          prepend: 'You are about to remove the',
+          append: 'Optional Program for this student',
+          labelKey: 'optionalProgramName',
+        }"
+        deleteConfirm="true"
         store="student"
         delete="removeStudentOptionalProgram"
       >
@@ -229,6 +237,14 @@
               title="Career Programs"
               disableDeletefield=""
               disableDeleteIfValue=""
+              useIconButtons="true"
+              deleteLabel="Career Program"
+              deleteConfirm="true"
+              :deleteMessage="{
+                prepend: 'You are about to remove the',
+                append: 'Career Program for this student',
+                labelKey: 'careerProgramName',
+              }"
               store="student"
               delete="removeStudentCareerProgram"
             >

From bcceb0ed5b0762d4a3d401e1ffeb3ebb654f4b1f Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 4 Mar 2024 13:34:41 -0800
Subject: [PATCH 031/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 5576b98d..da0be300 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.14.1",
-    "test": "1.14.1",
+    "dev": "1.15.0",
+    "test": "1.15.0",
     "prod": "1.14.1"
   }
 }

From 388bf701e897634196760c0cd9873a5ca0679f97 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 7 Mar 2024 08:13:39 -0800
Subject: [PATCH 032/168] Delete validation message added

---
 frontend/src/components/DisplayTable.vue      |  13 +-
 .../components/Forms/OptionalProgramsForm.vue |  35 +++++
 .../StudentOptionalPrograms.vue               | 138 +++++++++++++++---
 frontend/src/utils/common.js                  |  53 ++++++-
 4 files changed, 202 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 47f8be56..01ed10e9 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -186,6 +186,7 @@
       <template v-for="(_, slotName) of $scopedSlots" v-slot:[slotName]="scope">
         <slot :name="slotName" v-bind="scope" />
       </template>
+      <!-- DELETE TEMPLATE - -->
       <template v-slot:cell(delete)="{ item }">
         <b-btn
           v-if="deleteMode && item[disableDeletefield] != disableDeleteIfValue"
@@ -205,17 +206,8 @@
           :header="'Delete ' + deleteLabel"
           :showModal="showDeleteModal[item[this.id]]"
         >
-          <!-- item[this.id] -->
           <template v-slot:body>
-            <b-alert show variant="warning"
-              ><i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
-              <strong>Warning</strong>
-              <p>
-                {{ deleteMessage.prepend }}
-                <strong>{{ item[deleteMessage.labelKey] }}</strong>
-                {{ deleteMessage.append }}
-              </p></b-alert
-            >
+            <slot name="delete-msg" v-bind="item"> Confirm Delete </slot>
           </template>
 
           <template v-slot:footer>
@@ -277,7 +269,6 @@ export default {
     "delete",
     "store",
     "deleteLabel",
-    "deleteMessage",
     "deleteConfirm",
     "useIconButtons",
     "disableDeletefield",
diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index c3d2142f..1bba4def 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -29,6 +29,26 @@
               </p>
             </b-alert>
           </div>
+
+          <div
+            v-else-if="
+              isProgramComplete(
+                studentGradStatus.programCompletionDate,
+                studentGradStatus.program
+              )
+            "
+            class="opt-program-form-body"
+          >
+            <b-alert variant="danger" show
+              ><i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
+              <p>
+                This student has a program completion date of
+                {{ studentGradStatus.programCompletionDate }}. You must undo
+                completion to be able to edit the Optional Programs for this
+                student.
+              </p>
+            </b-alert>
+          </div>
           <!-- Display form if student status is NOT MER -->
           <div v-else class="opt-program-form-body">
             <!-- Student status warnings that inform user without blocking action -->
@@ -214,6 +234,9 @@
 //import components
 import DisplayModal from "../DisplayModal.vue";
 
+// import shared functions & validations
+import { isProgramComplete } from "@/utils/common.js";
+
 //import services
 import ProgramManagementService from "@/services/ProgramManagementService.js";
 
@@ -289,6 +312,9 @@ export default {
       "addStudentOptionalProgram",
       "addStudentCareerPrograms",
     ]),
+    isProgramComplete(date, program) {
+      return isProgramComplete(date, program);
+    },
     isCareerProgram() {
       //determines if optional program selected is a career program
       return (
@@ -297,6 +323,15 @@ export default {
           .optProgramCode === "CP"
       );
     },
+    disableAddOptionalProgram() {
+      return (
+        !this.studentGradStatus ||
+        isProgramComplete(
+          this.studentGradStatus.programCompletionDate,
+          this.studentGradStatus.program
+        )
+      );
+    },
     async fetchPrograms() {
       try {
         const response = await ProgramManagementService.getOptionalPrograms();
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 0f7175f6..afcd7df6 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -10,7 +10,6 @@
         This student does not have any optional programs.
       </div>
       <DisplayTable
-        v-if="optionalPrograms"
         id="optionalProgramID"
         :items="optionalPrograms"
         :striped="false"
@@ -21,11 +20,6 @@
         disableDeleteIfValue="CP"
         useIconButtons="true"
         deleteLabel="Optional Program"
-        :deleteMessage="{
-          prepend: 'You are about to remove the',
-          append: 'Optional Program for this student',
-          labelKey: 'optionalProgramName',
-        }"
         deleteConfirm="true"
         store="student"
         delete="removeStudentOptionalProgram"
@@ -36,6 +30,64 @@
           ></OptionalProgramsForm>
         </template>
 
+        <template #delete-msg="{ optionalProgramName, optionalProgramCode }">
+          <b-alert
+            variant="danger"
+            show
+            v-if="studentGradStatus.studentStatus === 'MER'"
+          >
+            <i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
+            <p>
+              This student is showing as merged. Student GRAD Optional Program
+              data cannot be updated for students with a status of "MER" merged.
+            </p>
+          </b-alert>
+          <b-alert variant="warning" show v-else>
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>
+              You are about to remove the
+              <strong
+                >{{ optionalProgramName }} ({{ optionalProgramCode }})</strong
+              >
+              Optional Program for this student.
+            </p>
+          </b-alert>
+          <b-alert
+            variant="warning"
+            show
+            v-if="studentGradStatus.studentStatus === 'TER'"
+          >
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>
+              This student has been terminated. Re-activate by setting their
+              status to "CUR" if they are currently attending school.
+            </p>
+          </b-alert>
+          <b-alert
+            variant="warning"
+            show
+            v-else-if="studentGradStatus.studentStatus === 'ARC'"
+          >
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>
+              This student is not active. Re-activate by setting their status to
+              "CUR" if they are currently attending school.
+            </p>
+          </b-alert>
+          <b-alert
+            variant="warning"
+            show
+            v-else-if="studentGradStatus.studentStatus === 'DEC'"
+          >
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>This student is showing as deceased.</p>
+          </b-alert>
+        </template>
+
         <template #cell(optionalNonGradReasons)="row">
           <div v-if="row.item.studentOptionalProgramData">
             <div
@@ -216,15 +268,6 @@
           </b-btn>
         </template>
         <template #row-details="">
-          <!-- <b-card class="px-0">
-            <strong>Career Programs</strong>
-            <hr />
-            <ul id="student-career-programs">
-              <li v-for="item in careerPrograms" :key="item.careerProgramName">
-                {{ item.careerProgramName }} ({{ item.careerProgramCode }})
-              </li>
-            </ul>
-          </b-card> -->
           <b-card class="col-6">
             <DisplayTable
               v-if="careerPrograms"
@@ -240,14 +283,69 @@
               useIconButtons="true"
               deleteLabel="Career Program"
               deleteConfirm="true"
-              :deleteMessage="{
-                prepend: 'You are about to remove the',
-                append: 'Career Program for this student',
-                labelKey: 'careerProgramName',
-              }"
               store="student"
               delete="removeStudentCareerProgram"
             >
+              <template #delete-msg="{ careerProgramName, careerProgramCode }">
+                <b-alert
+                  variant="danger"
+                  show
+                  v-if="studentGradStatus.studentStatus === 'MER'"
+                >
+                  <i class="fa-solid fa-circle-xmark"></i>
+                  <strong>Error</strong>
+                  <p>
+                    This student is showing as merged. Student GRAD Optional
+                    Program data cannot be updated for students with a status of
+                    "MER" merged.
+                  </p>
+                </b-alert>
+                <b-alert variant="warning" show v-else>
+                  <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+                  <strong>Warning</strong>
+                  <p>
+                    You are about to remove the
+                    <strong
+                      >{{ careerProgramName }} ({{ careerProgramCode }})</strong
+                    >
+                    Career Program for this student.
+                  </p>
+                </b-alert>
+                <b-alert
+                  variant="warning"
+                  show
+                  v-if="studentGradStatus.studentStatus === 'TER'"
+                >
+                  <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+                  <strong>Warning</strong>
+                  <p>
+                    This student has been terminated. Re-activate by setting
+                    their status to "CUR" if they are currently attending
+                    school.
+                  </p>
+                </b-alert>
+                <b-alert
+                  variant="warning"
+                  show
+                  v-else-if="studentGradStatus.studentStatus === 'ARC'"
+                >
+                  <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+                  <strong>Warning</strong>
+                  <p>
+                    This student is not active. Re-activate by setting their
+                    status to "CUR" if they are currently attending school.
+                  </p>
+                </b-alert>
+                <b-alert
+                  variant="warning"
+                  show
+                  v-else-if="studentGradStatus.studentStatus === 'DEC'"
+                >
+                  <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+                  <strong>Warning</strong>
+                  <p>This student is showing as deceased.</p>
+                </b-alert>
+              </template>
               <template #cell(careerProgramName)="row3">
                 {{ row3.item.careerProgramName }}
                 ({{ row3.item.careerProgramCode }})
diff --git a/frontend/src/utils/common.js b/frontend/src/utils/common.js
index ec86015f..f8722570 100644
--- a/frontend/src/utils/common.js
+++ b/frontend/src/utils/common.js
@@ -9,12 +9,6 @@ export function base64ToFileTypeAndOpenWindow(data, mimeType) {
   let fileURL = URL.createObjectURL(file);
   window.open(fileURL);
 }
-export function containsAnyLetters(str) {
-  return /[a-zA-Z]/.test(str);
-}
-export function isEnvLocalHost() {
-  return location.host.includes("localhost");
-}
 export function loadStudent(student) {
   this.selectedPen = student[0].pen;
   this.selectedId = student[0].studentID;
@@ -48,3 +42,50 @@ export function showNotification(variant, bodyContent) {
     autoHideDelay: delay,
   });
 }
+
+/**
+ *  VALIDATION FUNCTIONS
+ */
+export function isEnvLocalHost() {
+  return location.host.includes("localhost");
+}
+
+export function containsAnyLetters(str) {
+  return /[a-zA-Z]/.test(str);
+}
+
+export function isMincode(mincode) {
+  return !(mincode.length != 8 || containsAnyLetters(mincode));
+}
+
+/**
+ * TEMPORARY validation until institute API is implemented with better method to identify schools offering Program Francaphone
+ * @param {string} mincode
+ * @returns true if mincode entered belongs to PF school; false otherwise or if mincode is not a valid format (8-digit string)
+ */
+export function isPFSchool(mincode) {
+  // other schools that offer *-PF that don't belong to district 093
+  const otherPFSchools = ["09898009", "09898047"];
+
+  return !!(
+    isMincode(mincode) &&
+    (mincode.search(/^093.*/) >= 0 ||
+      otherPFSchools.find((pfSchool) => pfSchool == mincode))
+  );
+}
+
+export function isProgramComplete(completionDate, programCode) {
+  console.debug(
+    "DEBUG: Program is Complete data:\n completionDate - " +
+      completionDate +
+      "\n programCode - " +
+      programCode
+  );
+
+  if (programCode === "SCCP") {
+    let today = new Date();
+    return !!completionDate && new Date(completionDate) >= today;
+  } else {
+    return !!completionDate;
+  }
+}

From d724969c10da708d7031f85eb053419be586d911 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 7 Mar 2024 09:18:58 -0800
Subject: [PATCH 033/168] Fixed delete btn disable validation

---
 frontend/src/components/DisplayTable.vue      |  18 ++-
 .../components/Forms/OptionalProgramsForm.vue |   8 +-
 .../StudentOptionalPrograms.vue               | 153 ++++++++++++++----
 3 files changed, 143 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 01ed10e9..40530729 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -189,21 +189,27 @@
       <!-- DELETE TEMPLATE - -->
       <template v-slot:cell(delete)="{ item }">
         <b-btn
-          v-if="deleteMode && item[disableDeletefield] != disableDeleteIfValue"
+          v-if="
+            deleteOptions &&
+            item[deleteOptions.disableDeletefield] !=
+              deleteOptions.disableDeleteIfValue
+          "
           :variant="!useIconButtons ? 'danger' : 'outline-danger'"
           :pill="!!useIconButtons"
           size="sm"
           @click="
-            deleteConfirm
+            deleteOptions && deleteOptions.deleteConfirm
               ? (showDeleteModal[item[this.id]] = true)
               : deleteItem(item)
           "
         >
-          <div v-if="!useIconButtons">Delete {{ deleteLabel }}</div>
+          <div v-if="!useIconButtons">
+            Delete {{ deleteOptions ?? deleteOptions.deleteLabel }}
+          </div>
           <i v-else class="fa-solid fa-trash-can"></i>
         </b-btn>
         <DisplayModal
-          :header="'Delete ' + deleteLabel"
+          :header="'Delete ' + deleteOptions ?? deleteOptions.deleteLabel"
           :showModal="showDeleteModal[item[this.id]]"
         >
           <template v-slot:body>
@@ -222,6 +228,7 @@
               variant="danger"
               class="float-right"
               size="xs"
+              :disabled="deleteOptions ? deleteOptions.disableDeleteBtn : false"
               @click="deleteItem(item)"
               >DELETE</b-btn
             >
@@ -268,6 +275,7 @@ export default {
     "update",
     "delete",
     "store",
+    "deleteOptions",
     "deleteLabel",
     "deleteConfirm",
     "useIconButtons",
@@ -385,7 +393,7 @@ export default {
         console.error("Store not found.");
       }
       //close modal if delete confirm enabled
-      if (this.deleteConfirm) {
+      if (this.deleteOptions?.deleteConfirm) {
         this.showDeleteModal = {};
       }
     },
diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 1bba4def..5de94d10 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -43,9 +43,11 @@
               ><i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
               <p>
                 This student has a program completion date of
-                {{ studentGradStatus.programCompletionDate }}. You must undo
-                completion to be able to edit the Optional Programs for this
-                student.
+                {{ studentGradStatus.programCompletionDate }}.
+              </p>
+              <p>
+                You must undo completion to be able to edit the Optional
+                Programs for this student.
               </p>
             </b-alert>
           </div>
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index afcd7df6..254b8e66 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -16,11 +16,14 @@
         :fields="optionalProgramsfields"
         showFilter="true"
         title="Optional Programs"
-        disableDeletefield="optionalProgramCode"
-        disableDeleteIfValue="CP"
         useIconButtons="true"
-        deleteLabel="Optional Program"
-        deleteConfirm="true"
+        :deleteOptions="{
+          disableDeletefield: 'optionalProgramCode',
+          disableDeleteIfValue: 'CP',
+          deleteLabel: 'Optional Program',
+          deleteConfirm: 'true',
+          disableDeleteBtn: disableDeleteBtn(),
+        }"
         store="student"
         delete="removeStudentOptionalProgram"
       >
@@ -31,6 +34,7 @@
         </template>
 
         <template #delete-msg="{ optionalProgramName, optionalProgramCode }">
+          <!-- ERROR if student status is MER/merged-->
           <b-alert
             variant="danger"
             show
@@ -42,21 +46,32 @@
               data cannot be updated for students with a status of "MER" merged.
             </p>
           </b-alert>
-          <b-alert variant="warning" show v-else>
-            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
-            <strong>Warning</strong>
+          <!-- ERROR if student grad program is complete -->
+          <b-alert
+            variant="danger"
+            show
+            v-else-if="
+              isProgramComplete(
+                studentGradStatus.programCompletionDate,
+                studentGradStatus.program
+              )
+            "
+          >
+            <i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
             <p>
-              You are about to remove the
-              <strong
-                >{{ optionalProgramName }} ({{ optionalProgramCode }})</strong
-              >
-              Optional Program for this student.
+              This student has a program completion date of
+              {{ studentGradStatus.programCompletionDate }}.
+            </p>
+            <p>
+              You must undo completion to be able to edit the Optional Programs
+              for this student.
             </p>
           </b-alert>
+          <!-- WARNING if student status is TER/terminated -->
           <b-alert
             variant="warning"
             show
-            v-if="studentGradStatus.studentStatus === 'TER'"
+            v-else-if="studentGradStatus.studentStatus === 'TER'"
           >
             <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
             <strong>Warning</strong>
@@ -65,6 +80,7 @@
               status to "CUR" if they are currently attending school.
             </p>
           </b-alert>
+          <!-- WARNING if student status is ARC/archived -->
           <b-alert
             variant="warning"
             show
@@ -77,6 +93,7 @@
               "CUR" if they are currently attending school.
             </p>
           </b-alert>
+          <!-- WARNING if student status is DEC/deceased -->
           <b-alert
             variant="warning"
             show
@@ -86,6 +103,31 @@
             <strong>Warning</strong>
             <p>This student is showing as deceased.</p>
           </b-alert>
+
+          <!-- WARNING if student optional program is able to be deleted -->
+          <b-alert
+            variant="warning"
+            show
+            v-if="
+              !(
+                studentGradStatus.studentStatus === 'MER' ||
+                isProgramComplete(
+                  studentGradStatus.programCompletionDate,
+                  studentGradStatus.program
+                )
+              )
+            "
+          >
+            <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+            <strong>Warning</strong>
+            <p>
+              You are about to remove the
+              <strong
+                >{{ optionalProgramName }} ({{ optionalProgramCode }})</strong
+              >
+              Optional Program for this student.
+            </p>
+          </b-alert>
         </template>
 
         <template #cell(optionalNonGradReasons)="row">
@@ -278,43 +320,59 @@
               :showFilter="false"
               :pagination="false"
               title="Career Programs"
-              disableDeletefield=""
-              disableDeleteIfValue=""
               useIconButtons="true"
-              deleteLabel="Career Program"
-              deleteConfirm="true"
+              :deleteOptions="{
+                disableDeletefield: '',
+                disableDeleteIfValue: '',
+                deleteLabel: 'Career Program',
+                deleteConfirm: 'true',
+                disableDeleteBtn: disableDeleteBtn(),
+              }"
               store="student"
               delete="removeStudentCareerProgram"
             >
               <template #delete-msg="{ careerProgramName, careerProgramCode }">
+                <!-- ERROR if student status is MER/merged-->
                 <b-alert
                   variant="danger"
                   show
                   v-if="studentGradStatus.studentStatus === 'MER'"
                 >
-                  <i class="fa-solid fa-circle-xmark"></i>
+                  <i class="fa-solid fa-circle-xmark"></i>&nbsp;
                   <strong>Error</strong>
                   <p>
-                    This student is showing as merged. Student GRAD Optional
+                    This student is showing as merged. Student GRAD Career
                     Program data cannot be updated for students with a status of
                     "MER" merged.
                   </p>
                 </b-alert>
-                <b-alert variant="warning" show v-else>
-                  <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
-                  <strong>Warning</strong>
+                <!-- ERROR if student grad program is complete -->
+                <b-alert
+                  variant="danger"
+                  show
+                  v-else-if="
+                    isProgramComplete(
+                      studentGradStatus.programCompletionDate,
+                      studentGradStatus.program
+                    )
+                  "
+                >
+                  <i class="fa-solid fa-circle-xmark"></i>
+                  <strong>Error</strong>
                   <p>
-                    You are about to remove the
-                    <strong
-                      >{{ careerProgramName }} ({{ careerProgramCode }})</strong
-                    >
-                    Career Program for this student.
+                    This student has a program completion date of
+                    {{ studentGradStatus.programCompletionDate }}.
+                  </p>
+                  <p>
+                    You must undo completion to be able to edit the Career
+                    Programs for this student.
                   </p>
                 </b-alert>
+                <!-- WARNING if student status is TER/terminated -->
                 <b-alert
                   variant="warning"
                   show
-                  v-if="studentGradStatus.studentStatus === 'TER'"
+                  v-else-if="studentGradStatus.studentStatus === 'TER'"
                 >
                   <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
                   <strong>Warning</strong>
@@ -324,6 +382,7 @@
                     school.
                   </p>
                 </b-alert>
+                <!-- WARNING if student status is ARC/archived -->
                 <b-alert
                   variant="warning"
                   show
@@ -336,6 +395,7 @@
                     status to "CUR" if they are currently attending school.
                   </p>
                 </b-alert>
+                <!-- WARNING if student status is DEC/deceased -->
                 <b-alert
                   variant="warning"
                   show
@@ -345,6 +405,30 @@
                   <strong>Warning</strong>
                   <p>This student is showing as deceased.</p>
                 </b-alert>
+                <!-- WARNING if student career program is able to be deleted -->
+                <b-alert
+                  variant="warning"
+                  show
+                  v-if="
+                    !(
+                      studentGradStatus.studentStatus === 'MER' ||
+                      isProgramComplete(
+                        studentGradStatus.programCompletionDate,
+                        studentGradStatus.program
+                      )
+                    )
+                  "
+                >
+                  <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
+                  <strong>Warning</strong>
+                  <p>
+                    You are about to remove the
+                    <strong
+                      >{{ careerProgramName }} ({{ careerProgramCode }})</strong
+                    >
+                    Career Program for this student.
+                  </p>
+                </b-alert>
               </template>
               <template #cell(careerProgramName)="row3">
                 {{ row3.item.careerProgramName }}
@@ -361,6 +445,7 @@
 <script>
 import { useStudentStore } from "../../store/modules/student";
 import { mapState } from "pinia";
+import { isProgramComplete } from "@/utils/common.js";
 import DisplayTable from "@/components/DisplayTable.vue";
 import OptionalProgramsForm from "@/components/Forms/OptionalProgramsForm.vue";
 export default {
@@ -405,6 +490,18 @@ export default {
     };
   },
   methods: {
+    isProgramComplete(date, program) {
+      return isProgramComplete(date, program);
+    },
+    disableDeleteBtn() {
+      return (
+        this.studentGradStatus.studentStatus === "MER" ||
+        this.isProgramComplete(
+          this.studentGradStatus.programCompletionDate,
+          this.studentGradStatus.program
+        )
+      );
+    },
     filterGradReqCourses(row) {
       if (row.gradReqMet.length > 0) {
         return true;

From 4f85661893ab96460f172f9240546375c4224a79 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 7 Mar 2024 13:12:57 -0800
Subject: [PATCH 034/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index da0be300..2ec09d2d 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.15.0",
     "test": "1.15.0",
-    "prod": "1.14.1"
+    "prod": "1.15.0"
   }
 }

From 2370ff5d4e9e55c284e6815493e124c185d3aa47 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 7 Mar 2024 13:30:44 -0800
Subject: [PATCH 035/168] Fix isProgramComplete() validation for SCCP students

---
 frontend/src/utils/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/utils/common.js b/frontend/src/utils/common.js
index f8722570..ecb8d490 100644
--- a/frontend/src/utils/common.js
+++ b/frontend/src/utils/common.js
@@ -84,7 +84,7 @@ export function isProgramComplete(completionDate, programCode) {
 
   if (programCode === "SCCP") {
     let today = new Date();
-    return !!completionDate && new Date(completionDate) >= today;
+    return !!completionDate && new Date(completionDate) <= today;
   } else {
     return !!completionDate;
   }

From ad4953a06769c4512c6d1b49d63771bffa5f5fc1 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 7 Mar 2024 13:40:53 -0800
Subject: [PATCH 036/168] Fix delete header & some spacing

---
 frontend/src/components/DisplayTable.vue                  | 2 +-
 .../components/StudentProfile/StudentOptionalPrograms.vue | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 40530729..460d26ef 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -209,7 +209,7 @@
           <i v-else class="fa-solid fa-trash-can"></i>
         </b-btn>
         <DisplayModal
-          :header="'Delete ' + deleteOptions ?? deleteOptions.deleteLabel"
+          :header="'Delete ' + (deleteOptions ? deleteOptions.deleteLabel : '')"
           :showModal="showDeleteModal[item[this.id]]"
         >
           <template v-slot:body>
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 254b8e66..d7db22c8 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -40,7 +40,8 @@
             show
             v-if="studentGradStatus.studentStatus === 'MER'"
           >
-            <i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
+            <i class="fa-solid fa-circle-xmark"></i>&nbsp;
+            <strong>Error</strong>
             <p>
               This student is showing as merged. Student GRAD Optional Program
               data cannot be updated for students with a status of "MER" merged.
@@ -57,7 +58,8 @@
               )
             "
           >
-            <i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
+            <i class="fa-solid fa-circle-xmark"></i>&nbsp;
+            <strong>Error</strong>
             <p>
               This student has a program completion date of
               {{ studentGradStatus.programCompletionDate }}.
@@ -357,7 +359,7 @@
                     )
                   "
                 >
-                  <i class="fa-solid fa-circle-xmark"></i>
+                  <i class="fa-solid fa-circle-xmark"></i>&nbsp;
                   <strong>Error</strong>
                   <p>
                     This student has a program completion date of

From 49d80324e6181c83f4c310be82b7fd43fb914fa0 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Fri, 8 Mar 2024 13:23:13 -0800
Subject: [PATCH 037/168] message formatting fixes

---
 .../components/Forms/OptionalProgramsForm.vue | 68 ++++++++++++-------
 .../StudentOptionalPrograms.vue               | 32 +++++----
 frontend/src/sharedMethods.js                 |  2 +-
 frontend/src/utils/common.js                  |  8 +++
 4 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 5de94d10..7aba41d3 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -22,10 +22,10 @@
           >
             <b-alert variant="danger" show
               ><i class="fa-solid fa-circle-xmark"></i> <strong>Error</strong>
+              <p>This student is showing as merged.</p>
               <p>
-                This student is showing as merged. Student GRAD Optional Program
-                data cannot be updated for students with a status of "MER"
-                merged.
+                Student GRAD Optional Program data cannot be updated for
+                students with a status of "MER" merged.
               </p>
             </b-alert>
           </div>
@@ -61,9 +61,10 @@
             >
               <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
               <strong>Warning</strong>
+              <p>This student has been terminated.</p>
               <p>
-                This student has been terminated. Re-activate by setting their
-                status to "CUR" if they are currently attending school.
+                Re-activate by setting their status to "CUR" if they are
+                currently attending school.
               </p>
             </b-alert>
             <b-alert
@@ -73,9 +74,10 @@
             >
               <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
               <strong>Warning</strong>
+              <p>This student is not active.</p>
               <p>
-                This student is not active. Re-activate by setting their status
-                to "CUR" if they are currently attending school.
+                Re-activate by setting their status to "CUR" if they are
+                currently attending school.
               </p>
             </b-alert>
             <b-alert
@@ -237,7 +239,7 @@
 import DisplayModal from "../DisplayModal.vue";
 
 // import shared functions & validations
-import { isProgramComplete } from "@/utils/common.js";
+import { isProgramComplete, applyDisplayOrder } from "@/utils/common.js";
 
 //import services
 import ProgramManagementService from "@/services/ProgramManagementService.js";
@@ -288,25 +290,39 @@ export default {
     },
     activeOptionalPrograms() {
       const studentProgramId = this.studentProgramId;
-
       const currentDate = new Date().toISOString().split("T")[0];
-      return this.optionalProgramList.filter((item) => {
-        let effectiveDateUTC = null;
-        let expiryDateUTC = null;
-        if (item.effectiveDate) {
-          effectiveDateUTC = new Date(item.effectiveDate)
-            .toISOString()
-            .split("T")[0];
-        }
-        if (item.expiryDate) {
-          expiryDateUTC = new Date(item.expiryDate).toISOString().split("T")[0];
-        }
-        return (
-          item.graduationProgramCode === studentProgramId &&
-          effectiveDateUTC <= currentDate &&
-          (expiryDateUTC == null || currentDate <= expiryDateUTC)
-        );
-      }); //TODO - map to filter out existing opt programs
+
+      return applyDisplayOrder(
+        this.optionalProgramList
+          ?.filter((item) => {
+            let effectiveDateUTC = null;
+            let expiryDateUTC = null;
+            if (item.effectiveDate) {
+              effectiveDateUTC = new Date(item.effectiveDate)
+                .toISOString()
+                .split("T")[0];
+            }
+            if (item.expiryDate) {
+              expiryDateUTC = new Date(item.expiryDate)
+                .toISOString()
+                .split("T")[0];
+            }
+
+            return (
+              item.graduationProgramCode === studentProgramId &&
+              effectiveDateUTC <= currentDate &&
+              (expiryDateUTC == null || currentDate <= expiryDateUTC)
+            );
+          })
+          ?.filter((activeOptionalProgram) => {
+            return !this.studentGradStatus.optionalPrograms.some(
+              (studentOptionalProgram) =>
+                studentOptionalProgram.optionalProgramID ==
+                  activeOptionalProgram.optionalProgramID &&
+                studentOptionalProgram.optionalProgramCode !== "CP"
+            );
+          })
+      );
     },
   },
   methods: {
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index d7db22c8..b29194fa 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -42,9 +42,10 @@
           >
             <i class="fa-solid fa-circle-xmark"></i>&nbsp;
             <strong>Error</strong>
+            <p>This student is showing as merged.</p>
             <p>
-              This student is showing as merged. Student GRAD Optional Program
-              data cannot be updated for students with a status of "MER" merged.
+              Student GRAD Optional Program data cannot be updated for students
+              with a status of "MER" merged.
             </p>
           </b-alert>
           <!-- ERROR if student grad program is complete -->
@@ -77,9 +78,10 @@
           >
             <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
             <strong>Warning</strong>
+            <p>This student has been terminated.</p>
             <p>
-              This student has been terminated. Re-activate by setting their
-              status to "CUR" if they are currently attending school.
+              Re-activate by setting their status to "CUR" if they are currently
+              attending school.
             </p>
           </b-alert>
           <!-- WARNING if student status is ARC/archived -->
@@ -90,9 +92,10 @@
           >
             <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
             <strong>Warning</strong>
+            <p>This student is not active.</p>
             <p>
-              This student is not active. Re-activate by setting their status to
-              "CUR" if they are currently attending school.
+              Re-activate by setting their status to "CUR" if they are currently
+              attending school.
             </p>
           </b-alert>
           <!-- WARNING if student status is DEC/deceased -->
@@ -342,10 +345,10 @@
                 >
                   <i class="fa-solid fa-circle-xmark"></i>&nbsp;
                   <strong>Error</strong>
+                  <p>This student is showing as merged.</p>
                   <p>
-                    This student is showing as merged. Student GRAD Career
-                    Program data cannot be updated for students with a status of
-                    "MER" merged.
+                    Student GRAD Career Program data cannot be updated for
+                    students with a status of "MER" merged.
                   </p>
                 </b-alert>
                 <!-- ERROR if student grad program is complete -->
@@ -378,10 +381,10 @@
                 >
                   <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
                   <strong>Warning</strong>
+                  <p>This student has been terminated.</p>
                   <p>
-                    This student has been terminated. Re-activate by setting
-                    their status to "CUR" if they are currently attending
-                    school.
+                    Re-activate by setting their status to "CUR" if they are
+                    currently attending school.
                   </p>
                 </b-alert>
                 <!-- WARNING if student status is ARC/archived -->
@@ -392,9 +395,10 @@
                 >
                   <i class="fa-solid fa-triangle-exclamation"></i>&nbsp;
                   <strong>Warning</strong>
+                  <p>This student is not active.</p>
                   <p>
-                    This student is not active. Re-activate by setting their
-                    status to "CUR" if they are currently attending school.
+                    Re-activate by setting their status to "CUR" if they are
+                    currently attending school.
                   </p>
                 </b-alert>
                 <!-- WARNING if student status is DEC/deceased -->
diff --git a/frontend/src/sharedMethods.js b/frontend/src/sharedMethods.js
index 5bb57bf9..f44ae20c 100644
--- a/frontend/src/sharedMethods.js
+++ b/frontend/src/sharedMethods.js
@@ -2,7 +2,7 @@ import StudentService from "@/services/StudentService.js";
 
 export default {
   applyDisplayOrder(unsorted) {
-    return unsorted.sort((a, b) => a.displayOrder - b.displayOrder);
+    return unsorted?.sort((a, b) => a.displayOrder - b.displayOrder);
   },
   isEnvLocalHost() {
     return location.host.includes("localhost");
diff --git a/frontend/src/utils/common.js b/frontend/src/utils/common.js
index ecb8d490..a1d075f6 100644
--- a/frontend/src/utils/common.js
+++ b/frontend/src/utils/common.js
@@ -42,6 +42,14 @@ export function showNotification(variant, bodyContent) {
     autoHideDelay: delay,
   });
 }
+/**
+ * SORTING
+ */
+
+// DUPLICATE - function is duplicated in sharedMethods; TODO Refactor uses of applyDisplayOrder() in batch before moving here
+export function applyDisplayOrder(unsorted) {
+  return unsorted?.sort((a, b) => a.displayOrder - b.displayOrder);
+}
 
 /**
  *  VALIDATION FUNCTIONS

From ef8f77d9cf57d41a3c7d26c3109ded0b0e25001d Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Fri, 8 Mar 2024 15:56:20 -0800
Subject: [PATCH 038/168] Minor updates to DisplayTable deleteOptions to cover
 edge cases

---
 frontend/src/components/DisplayTable.vue            | 13 +++++++++----
 .../StudentProfile/StudentOptionalPrograms.vue      |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
index 460d26ef..a32ed650 100644
--- a/frontend/src/components/DisplayTable.vue
+++ b/frontend/src/components/DisplayTable.vue
@@ -204,12 +204,14 @@
           "
         >
           <div v-if="!useIconButtons">
-            Delete {{ deleteOptions ?? deleteOptions.deleteLabel }}
+            Delete{{ deleteOptions ? " " + deleteOptions.deleteLabel : "" }}
           </div>
           <i v-else class="fa-solid fa-trash-can"></i>
         </b-btn>
         <DisplayModal
-          :header="'Delete ' + (deleteOptions ? deleteOptions.deleteLabel : '')"
+          :header="
+            'Delete' + (deleteOptions ? ' ' + deleteOptions.deleteLabel : '')
+          "
           :showModal="showDeleteModal[item[this.id]]"
         >
           <template v-slot:body>
@@ -228,7 +230,11 @@
               variant="danger"
               class="float-right"
               size="xs"
-              :disabled="deleteOptions ? deleteOptions.disableDeleteBtn : false"
+              :disabled="
+                deleteOptions && deleteOptions.disableDeleteBtn
+                  ? deleteOptions.disableDeleteBtn
+                  : false
+              "
               @click="deleteItem(item)"
               >DELETE</b-btn
             >
@@ -271,7 +277,6 @@ export default {
     "title",
     "fields",
     "id",
-    "create",
     "update",
     "delete",
     "store",
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index b29194fa..7c9dfd50 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -16,7 +16,7 @@
         :fields="optionalProgramsfields"
         showFilter="true"
         title="Optional Programs"
-        useIconButtons="true"
+        :useIconButtons="true"
         :deleteOptions="{
           disableDeletefield: 'optionalProgramCode',
           disableDeleteIfValue: 'CP',
@@ -325,7 +325,7 @@
               :showFilter="false"
               :pagination="false"
               title="Career Programs"
-              useIconButtons="true"
+              :useIconButtons="true"
               :deleteOptions="{
                 disableDeletefield: '',
                 disableDeleteIfValue: '',

From 5ae06cfe94dadb60dbbe41e61429db0f28330c86 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Fri, 8 Mar 2024 16:10:54 -0800
Subject: [PATCH 039/168] fixed reactivity for activeOptionalPrograms

---
 frontend/src/components/Forms/OptionalProgramsForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 7aba41d3..19929825 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -279,7 +279,7 @@ export default {
   },
   computed: {
     ...mapState(useStudentStore, {
-      optionalPrograms: "getStudentOptionalPrograms",
+      studentOptionalPrograms: "getStudentOptionalPrograms",
       studentGradStatus: "getStudentGradStatus",
     }),
     optionalProgramChange() {
@@ -315,7 +315,7 @@ export default {
             );
           })
           ?.filter((activeOptionalProgram) => {
-            return !this.studentGradStatus.optionalPrograms.some(
+            return !this.studentOptionalPrograms.some(
               (studentOptionalProgram) =>
                 studentOptionalProgram.optionalProgramID ==
                   activeOptionalProgram.optionalProgramID &&

From c74629a0fcc6b27aa9761768af98e7bff43fda26 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Fri, 8 Mar 2024 16:22:59 -0800
Subject: [PATCH 040/168] Career program options now sorted and filter out ones
 belonging to student AND selected to add

---
 .../components/Forms/OptionalProgramsForm.vue | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 19929825..3fa868e8 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -139,7 +139,7 @@
               <p class="form-label required">Career Program</p>
               <b-form-select
                 v-model="selectedCareerProgram"
-                :options="careerProgramList"
+                :options="activeCareerPrograms"
                 value-field="code"
                 text-field="name"
               ></b-form-select>
@@ -280,6 +280,7 @@ export default {
   computed: {
     ...mapState(useStudentStore, {
       studentOptionalPrograms: "getStudentOptionalPrograms",
+      studentCareerPrograms: "getStudentCareerPrograms",
       studentGradStatus: "getStudentGradStatus",
     }),
     optionalProgramChange() {
@@ -324,6 +325,25 @@ export default {
           })
       );
     },
+    activeCareerPrograms() {
+      return applyDisplayOrder(
+        this.careerProgramList
+          ?.filter(
+            (activeCareerProgram) =>
+              !this.studentCareerPrograms.some(
+                (studentCareerProgram) =>
+                  studentCareerProgram.careerProgramCode ==
+                  activeCareerProgram.code
+              )
+          )
+          ?.filter(
+            (activeCareerProgram) =>
+              !this.careerProgramsToAdd.some(
+                (careerProgram) => careerProgram == activeCareerProgram.code
+              )
+          )
+      );
+    },
   },
   methods: {
     ...mapActions(useStudentStore, [

From 242d9b05da51e3550fb393603871f31028902816 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 11 Mar 2024 09:28:38 -0700
Subject: [PATCH 041/168] Updated select options to show code alongside
 opt/career program name

---
 .../components/Forms/OptionalProgramsForm.vue | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 3fa868e8..af2b7965 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -94,10 +94,18 @@
             <p class="form-label required">Optional Program</p>
             <b-form-select
               v-model="selectedOptionalProgram"
-              :options="activeOptionalPrograms"
               value-field="optionalProgramID"
               text-field="optionalProgramName"
-            ></b-form-select>
+            >
+              <option
+                v-for="optionalProgram in activeOptionalPrograms"
+                :key="optionalProgram.optionalProgramID"
+                :value="optionalProgram.optionalProgramID"
+              >
+                ({{ optionalProgram.optProgramCode }})
+                {{ optionalProgram.optionalProgramName }}
+              </option>
+            </b-form-select>
 
             <b-alert
               variant="primary"
@@ -139,10 +147,18 @@
               <p class="form-label required">Career Program</p>
               <b-form-select
                 v-model="selectedCareerProgram"
-                :options="activeCareerPrograms"
                 value-field="code"
                 text-field="name"
-              ></b-form-select>
+              >
+                <option
+                  v-for="careerProgram in activeCareerPrograms"
+                  :key="careerProgram.code"
+                  :value="careerProgram.code"
+                >
+                  ({{ careerProgram.code }})
+                  {{ careerProgram.name }}
+                </option>
+              </b-form-select>
               <div v-if="careerProgramsToAdd.length > 0" class="mx-4 my-3">
                 <div
                   v-for="item in careerProgramsToAdd"

From 1e039caf597445d42a8514c9f18c4f682dd4f290 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 12 Mar 2024 12:38:40 -0700
Subject: [PATCH 042/168] fix error when adding optional programs to student
 with no existing optional programs

---
 .../components/Forms/OptionalProgramsForm.vue | 43 ++++++++++---------
 .../StudentOptionalPrograms.vue               |  4 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index af2b7965..e35d836b 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -266,12 +266,6 @@ import { mapState, mapActions } from "pinia";
 
 export default {
   name: "StudentOptionalProgramsForm",
-  props: {
-    studentProgramId: {
-      type: String,
-      default: "",
-    },
-  },
   components: {
     DisplayModal: DisplayModal,
   },
@@ -306,7 +300,7 @@ export default {
       return this.selectedCareerProgram;
     },
     activeOptionalPrograms() {
-      const studentProgramId = this.studentProgramId;
+      const studentProgramId = this.studentGradStatus.program;
       const currentDate = new Date().toISOString().split("T")[0];
 
       return applyDisplayOrder(
@@ -332,12 +326,20 @@ export default {
             );
           })
           ?.filter((activeOptionalProgram) => {
-            return !this.studentOptionalPrograms.some(
-              (studentOptionalProgram) =>
-                studentOptionalProgram.optionalProgramID ==
-                  activeOptionalProgram.optionalProgramID &&
-                studentOptionalProgram.optionalProgramCode !== "CP"
-            );
+            // If student optional programs exist, filter out existing programs. Otherwise returns all possible opt programs for grad program
+            if (
+              !!this.studentOptionalPrograms &&
+              this.studentOptionalPrograms.length > 0
+            ) {
+              return !this.studentOptionalPrograms.some(
+                (studentOptionalProgram) =>
+                  studentOptionalProgram.optionalProgramID ==
+                    activeOptionalProgram.optionalProgramID &&
+                  studentOptionalProgram.optionalProgramCode !== "CP"
+              );
+            } else {
+              return true;
+            }
           })
       );
     },
@@ -412,15 +414,13 @@ export default {
       );
     },
     unsetCareerProgram(selectedCode) {
-      // The following using array.splice DOES NOT WORK due to multiple versions of Vue running on this branch
-      // let index = this.careerProgramsToAdd.indexOf(selectedCode);
-      // console.log(index);
-      // if (index !== -1) {
-      //   this.careerProgramsToAdd.splice(index, 1);
-      // }
+      console.log("Before", this.selectedCareerProgram);
+      console.log("Before", this.careerProgramsToAdd);
       this.careerProgramsToAdd = this.careerProgramsToAdd.filter(
         (item) => item !== selectedCode
       );
+      console.log("After", this.selectedCareerProgram);
+      console.log("After", this.careerProgramsToAdd);
     },
     validateOptionalPrograms() {
       return !(
@@ -463,7 +463,10 @@ export default {
       this.selectedCareerProgram = null;
     },
     careerProgramChange: function () {
-      this.careerProgramsToAdd.push(this.selectedCareerProgram);
+      if (!!this.selectedCareerProgram) {
+        this.careerProgramsToAdd.push(this.selectedCareerProgram);
+        this.selectedCareerProgram = null;
+      }
     },
   },
 };
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 7c9dfd50..9cde7063 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -28,9 +28,7 @@
         delete="removeStudentOptionalProgram"
       >
         <template v-slot:create>
-          <OptionalProgramsForm
-            :studentProgramId="studentGradStatus.program"
-          ></OptionalProgramsForm>
+          <OptionalProgramsForm></OptionalProgramsForm>
         </template>
 
         <template #delete-msg="{ optionalProgramName, optionalProgramCode }">

From 137c90e0ca7ff589801854e43ad4eb06ac33e867 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 12 Mar 2024 13:46:24 -0700
Subject: [PATCH 043/168] created action to load student grad status and
 applied to optional program CRUD actions so recalc flag updates

---
 frontend/src/store/modules/student.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index 3c02cf72..ad72f5ec 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -127,6 +127,18 @@ export const useStudentStore = defineStore("student", {
           }
         });
     },
+    loadStudentGradStatus(studentId) {
+      StudentService.getGraduationStatus(studentId)
+        .then((response) => {
+          this.setStudentGradStatus(response.data);
+        })
+        .catch((error) => {
+          console.error(
+            "There was an error loading student grad status",
+            error
+          );
+        });
+    },
     loadStudentOptionalPrograms(studentId) {
       StudentService.getGraduationStatusOptionalPrograms(studentId)
         .then((response) => {
@@ -335,9 +347,10 @@ export const useStudentStore = defineStore("student", {
           this.id,
           optionalProgramId
         ).then(() => {
-          // reload student optional programs & optional program history after create
+          // reload student grad status optional programs & optional program history after create
           this.loadStudentOptionalProgramHistory(this.id);
           this.loadStudentOptionalPrograms(this.id);
+          this.loadStudentGradStatus(this.id);
         });
       } catch (error) {
         console.error("Error creating student optional program: ", error);
@@ -353,10 +366,11 @@ export const useStudentStore = defineStore("student", {
           this.id,
           careerProgramPayload
         ).then(() => {
-          // reload student optional/career programs & optional program history after create
+          // reload student grad status, optional/career programs & optional program history after create
           this.loadStudentOptionalProgramHistory(this.id);
           this.loadStudentOptionalPrograms(this.id);
           this.loadStudentCareerPrograms(this.id);
+          this.loadStudentGradStatus(this.id);
         });
       } catch (error) {
         console.error("Error creating student career program: ", error);
@@ -368,9 +382,10 @@ export const useStudentStore = defineStore("student", {
           this.id,
           optionalProgramId
         ).then(() => {
-          // reload student optional programs & optional program history after delete
+          // reload student grad status, optional programs & optional program history after delete
           this.loadStudentOptionalProgramHistory(this.id);
           this.loadStudentOptionalPrograms(this.id);
+          this.loadStudentGradStatus(this.id);
         });
       } catch (error) {
         console.error("Error deleting student optional program: ", error);
@@ -382,10 +397,11 @@ export const useStudentStore = defineStore("student", {
           this.id,
           careerProgramCode
         ).then(() => {
-          // reload student optional/career programs & optional program history after delete
+          // reload student grad status, optional/career programs & optional program history after delete
           this.loadStudentOptionalProgramHistory(this.id);
           this.loadStudentOptionalPrograms(this.id);
           this.loadStudentCareerPrograms(this.id);
+          this.loadStudentGradStatus(this.id);
         });
       } catch (error) {
         console.error("Error deleting student career program: ", error);

From cb4a5fee7cba9cf54699fabd93886aac70717c63 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 12 Mar 2024 15:33:05 -0700
Subject: [PATCH 044/168] fix searching for a student via header when student
 exists in PEN but not GRAD bringing up empty record

---
 frontend/src/components/Header/BCHeader.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/Header/BCHeader.vue b/frontend/src/components/Header/BCHeader.vue
index b829beaa..99d155d8 100644
--- a/frontend/src/components/Header/BCHeader.vue
+++ b/frontend/src/components/Header/BCHeader.vue
@@ -264,6 +264,10 @@ export default {
               if (response.data) {
                 if (response.data.length == 0) {
                   throw new Error("Student not found");
+                } else if (response.data[0].program == null || "") {
+                  throw new Error(
+                    "Student exists in PEN but does not have a GRAD system record."
+                  );
                 }
                 this.studentStore.unsetStudent();
                 this.studentStore.setQuickSearchId(response.data[0].studentID);

From c962eeae90a47de4b7ddda87c4b92b8f91bd7354 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 12 Mar 2024 15:45:46 -0700
Subject: [PATCH 045/168] Added Append to Schools column back to school search
 view

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

diff --git a/frontend/src/views/Schools.vue b/frontend/src/views/Schools.vue
index 32d6f1f8..6ae2014b 100644
--- a/frontend/src/views/Schools.vue
+++ b/frontend/src/views/Schools.vue
@@ -257,6 +257,12 @@ export default {
           sortable: true,
           class: "text-center",
         },
+        {
+          key: "appendTrans",
+          label: "Append to Schools",
+          sortable: true,
+          class: "text-center",
+        },
       ],
       totalResults: "",
       searchMessage: "",

From 4b87c4090b0778611f559ad2248b02604d3f35b1 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 12 Mar 2024 15:54:17 -0700
Subject: [PATCH 046/168] Fixed more icon not showing for school, PSI, and
 student search results

---
 frontend/src/views/PSI.vue           | 4 ++--
 frontend/src/views/Schools.vue       | 4 ++--
 frontend/src/views/StudentSearch.vue | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/PSI.vue b/frontend/src/views/PSI.vue
index e423d567..bd4f1a92 100644
--- a/frontend/src/views/PSI.vue
+++ b/frontend/src/views/PSI.vue
@@ -177,14 +177,14 @@
                   <img
                     v-show="!row.detailsShowing"
                     src="../assets/images/icon-right.svg"
-                    width="9px"
+                    width="9"
                     aria-hidden="true"
                     alt=""
                   />
                   <img
                     v-show="row.detailsShowing"
                     src="../assets/images/icon-down.svg"
-                    height="5px"
+                    height="5"
                     aria-hidden="true"
                     alt=""
                   />
diff --git a/frontend/src/views/Schools.vue b/frontend/src/views/Schools.vue
index 32d6f1f8..3ffe6626 100644
--- a/frontend/src/views/Schools.vue
+++ b/frontend/src/views/Schools.vue
@@ -144,14 +144,14 @@
                   <img
                     v-show="!row.detailsShowing"
                     src="../../src/assets/images/icon-right.svg"
-                    width="9px"
+                    width="9"
                     aria-hidden="true"
                     alt=""
                   />
                   <img
                     v-show="row.detailsShowing"
                     src="../../src/assets/images/icon-down.svg"
-                    height="5px"
+                    height="5"
                     aria-hidden="true"
                     alt=""
                   />
diff --git a/frontend/src/views/StudentSearch.vue b/frontend/src/views/StudentSearch.vue
index 9ea5d366..48a67151 100644
--- a/frontend/src/views/StudentSearch.vue
+++ b/frontend/src/views/StudentSearch.vue
@@ -711,14 +711,14 @@
                           <img
                             v-show="!row.detailsShowing"
                             src="../assets/images/icon-right.svg"
-                            width="9px"
+                            width="9"
                             aria-hidden="true"
                             alt=""
                           />
                           <img
                             v-show="row.detailsShowing"
                             src="../assets/images/icon-down.svg"
-                            height="5px"
+                            height="5"
                             aria-hidden="true"
                             alt=""
                           />

From 0559ec0d3f0a8058cef0d2dcb50da3d1ab66cbdd Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 13 Mar 2024 10:17:05 -0700
Subject: [PATCH 047/168] Fix message

---
 frontend/src/components/Header/BCHeader.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Header/BCHeader.vue b/frontend/src/components/Header/BCHeader.vue
index 99d155d8..1cf6c446 100644
--- a/frontend/src/components/Header/BCHeader.vue
+++ b/frontend/src/components/Header/BCHeader.vue
@@ -263,10 +263,12 @@ export default {
             .then((response) => {
               if (response.data) {
                 if (response.data.length == 0) {
-                  throw new Error("Student not found");
+                  throw new Error(
+                    `Student ${this.penInput} cannot be found on the GRAD or PEN database`
+                  );
                 } else if (response.data[0].program == null || "") {
                   throw new Error(
-                    "Student exists in PEN but does not have a GRAD system record."
+                    `Student ${this.penInput} exists in PEN but does not have a GRAD system record.`
                   );
                 }
                 this.studentStore.unsetStudent();
@@ -277,12 +279,9 @@ export default {
             })
             .catch((error) => {
               // eslint-disable-next-line
-              console.log("BCHeader: " + error);
+              console.error(error);
               this.searchLoading = false;
-              this.showNotification(
-                "danger",
-                `Student ${this.penInput} cannot be found on the GRAD or PEN database`
-              );
+              this.showNotification("danger", "" + error.message);
             })
             .finally(() => {
               this.penInput = "";

From 67e1fe0c0cedbc0f35a819c02d5341c29d35f2b1 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 13 Mar 2024 10:23:24 -0700
Subject: [PATCH 048/168] cleanup

---
 frontend/src/components/Header/BCHeader.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Header/BCHeader.vue b/frontend/src/components/Header/BCHeader.vue
index 1cf6c446..f8a7a991 100644
--- a/frontend/src/components/Header/BCHeader.vue
+++ b/frontend/src/components/Header/BCHeader.vue
@@ -279,9 +279,9 @@ export default {
             })
             .catch((error) => {
               // eslint-disable-next-line
-              console.error(error);
+              console.error("Header Search: ", error.message);
               this.searchLoading = false;
-              this.showNotification("danger", "" + error.message);
+              this.showNotification("danger", error.message);
             })
             .finally(() => {
               this.penInput = "";

From 97b2e537f96bcfd15ed6007a2661eb39884a4426 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 13 Mar 2024 15:34:53 -0700
Subject: [PATCH 049/168] Applied role based access to optional program CRUD

---
 .../components/Forms/OptionalProgramsForm.vue |  5 +++++
 .../StudentOptionalPrograms.vue               | 20 ++++++++++++++++---
 frontend/src/store/modules/access.js          |  6 ++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index e35d836b..8c8b3911 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -2,6 +2,7 @@
   <div>
     <!-- btn to open optional program edit form-->
     <b-btn
+      v-if="allowOptionalProgramUpdate"
       variant="primary"
       class="float-right mb-2 mr-2"
       @click="openCreateOptionalProgramDialog()"
@@ -262,6 +263,7 @@ import ProgramManagementService from "@/services/ProgramManagementService.js";
 
 //import stores & pinia utilities
 import { useStudentStore } from "@/store/modules/student";
+import { useAccessStore } from "@/store/modules/access";
 import { mapState, mapActions } from "pinia";
 
 export default {
@@ -293,6 +295,9 @@ export default {
       studentCareerPrograms: "getStudentCareerPrograms",
       studentGradStatus: "getStudentGradStatus",
     }),
+    ...mapState(useAccessStore, {
+      allowOptionalProgramUpdate: "allowOptionalProgramUpdate",
+    }),
     optionalProgramChange() {
       return this.selectedOptionalProgram;
     },
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index 9cde7063..f343e666 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -13,7 +13,7 @@
         id="optionalProgramID"
         :items="optionalPrograms"
         :striped="false"
-        :fields="optionalProgramsfields"
+        :fields="computedOptionalProgramsFields"
         showFilter="true"
         title="Optional Programs"
         :useIconButtons="true"
@@ -319,7 +319,7 @@
               id="careerProgramCode"
               :items="careerPrograms"
               :striped="false"
-              :fields="careerProgramsFields"
+              :fields="computedCareerProgramsFields"
               :showFilter="false"
               :pagination="false"
               title="Career Programs"
@@ -447,7 +447,8 @@
 </template>
 
 <script>
-import { useStudentStore } from "../../store/modules/student";
+import { useStudentStore } from "@/store/modules/student";
+import { useAccessStore } from "@/store/modules/access";
 import { mapState } from "pinia";
 import { isProgramComplete } from "@/utils/common.js";
 import DisplayTable from "@/components/DisplayTable.vue";
@@ -465,6 +466,19 @@ export default {
       careerPrograms: "getStudentCareerPrograms",
       studentGradStatus: "getStudentGradStatus",
     }),
+    ...mapState(useAccessStore, {
+      allowOptionalProgramUpdate: "allowOptionalProgramUpdate",
+    }),
+    computedOptionalProgramsFields() {
+      return this.optionalProgramsfields.filter((field) =>
+        this.allowOptionalProgramUpdate ? true : field.key != "delete"
+      );
+    },
+    computedCareerProgramsFields() {
+      return this.careerProgramsFields.filter((field) =>
+        this.allowOptionalProgramUpdate ? true : field.key != "delete"
+      );
+    },
   },
   data: function () {
     return {
diff --git a/frontend/src/store/modules/access.js b/frontend/src/store/modules/access.js
index 3e186af4..319b938f 100644
--- a/frontend/src/store/modules/access.js
+++ b/frontend/src/store/modules/access.js
@@ -61,6 +61,12 @@ export const useAccessStore = defineStore("access", {
     allowUpdateRecalcFlags: (state) => {
       return state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR);
     },
+    allowOptionalProgramUpdate: (state) => {
+      return (
+        state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR) ||
+        state.roles.includes(Roles.GRAD_INFO_OFFICER)
+      );
+    },
   },
 
   actions: {

From 235633a7f7829365a6c1d0633e2adf98e8c9274b Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 14 Mar 2024 13:39:25 -0700
Subject: [PATCH 050/168] updated scheduled jobs with displaytable update

---
 frontend/src/views/BatchProcessing.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 799783e5..2b77d8ab 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -413,9 +413,13 @@
                               :sortDesc="true"
                               :showFilter="false"
                               pagination="true"
-                              disableDeletefield="status"
-                              disableDeleteIfValue="COMPLETED"
-                              deleteLabel="Cancel"
+                              :useIconButtons="true"
+                              :deleteOptions="{
+                                disableDeletefield: 'status',
+                                disableDeleteIfValue: 'COMPLETED',
+                                deleteLabel: 'Scheduled Job',
+                                deleteConfirm: 'true',
+                              }"
                               store="batchprocessing"
                               delete="removeScheduledJobs"
                             >

From 5054f72dcb1924993fe457c27047a843672baea9 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 14 Mar 2024 13:42:07 -0700
Subject: [PATCH 051/168] ready to merge with v1.16.0

---
 frontend/src/views/BatchProcessing.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 2b77d8ab..5e6c2a64 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -404,6 +404,7 @@
                             <div v-if="!scheduledJobs.length">
                               No Scheduled Jobs
                             </div>
+
                             <DisplayTable
                               title="Job/Runs"
                               :items="scheduledJobs"

From fb0443534b7a39a6a06ea08adedec108ee872cde Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 14 Mar 2024 15:55:39 -0700
Subject: [PATCH 052/168] Can now edit grade for students with a program
 completion date

---
 .../GraduationStatus/GRADStatus.vue           | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
index c84a1b46..ca0ae26a 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
@@ -289,11 +289,16 @@
                     Student grade should not be AD or AN for this program
                   </div>
                 </div>
+                <div v-if="warningFlags.closedProgramGradeChangeWarning">
+                  <div class="form-validation-message text-warning">
+                    Warning: You are changing the grade for a student with a
+                    program completion date
+                  </div>
+                </div>
               </td>
               <td>
                 <b-form-select
                   size="sm"
-                  :disabled="disableStudentGrade"
                   v-model="editedGradStatus.studentGrade"
                   :options="gradeOptions"
                 >
@@ -753,6 +758,7 @@ import {
   containsAnyLetters,
   parseStudentStatus,
   showNotification,
+  isProgramComplete,
 } from "../../../utils/common.js";
 import SchoolService from "@/services/SchoolService.js";
 import sharedMethods from "../../../sharedMethods";
@@ -764,6 +770,7 @@ export default {
     this.showNotification = showNotification;
     this.containsAnyLetters = containsAnyLetters;
     this.parseStudentStatus = parseStudentStatus;
+    this.isProgramComplete = isProgramComplete;
   },
   setup() {
     const studentStore = useStudentStore();
@@ -845,6 +852,7 @@ export default {
       // Validation flags that do NOT prevent submission of GRAD status form
       warningFlags: {
         closedProgramWarning: false,
+        closedProgramGradeChangeWarning: false,
         programChangeWarning: false,
         schoolOfRecordWarning: false,
         schoolNotFoundWarning: false,
@@ -865,7 +873,6 @@ export default {
       studentUngradReason: "",
       disableSave: false,
       disableSchoolAtGrad: false,
-      disableStudentGrade: false,
       disableProgramInput: false,
       disableConsumerEdReqMet: false,
       disableStudentStatus: false,
@@ -931,6 +938,18 @@ export default {
           this.errorFlags.other.programGrade = true;
         }
       }
+      if (
+        this.isProgramComplete(
+          this.studentGradStatus.programCompletionDate,
+          this.studentGradStatus.program
+        ) &&
+        this.studentGradStatus.studentGrade !=
+          this.editedGradStatus.studentGrade
+      ) {
+        this.warningFlags.closedProgramGradeChangeWarning = true;
+      } else {
+        this.warningFlags.closedProgramGradeChangeWarning = false;
+      }
       this.validateFields();
     },
     programChange: function () {
@@ -941,12 +960,10 @@ export default {
         this.studentGradStatus.program != "SCCP"
       ) {
         this.disableProgramInput = true;
-        this.disableStudentGrade = true;
         this.disableConsumerEdReqMet = true;
         this.disableSchoolAtGrad = false;
       } else {
         this.disableProgramInput = false;
-        this.disableStudentGrade = false;
         this.disableConsumerEdReqMet = false;
         this.disableSchoolAtGrad = true;
       }

From afa514ab61b0f7a420e4777c274fedbff910e0cf Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 14 Mar 2024 16:19:41 -0700
Subject: [PATCH 053/168] tweaked messaging logic so warning doesn't show
 alongside AN/AD grade error and updated font style to be more readable

---
 frontend/src/assets/css/global.css            |  5 +--
 .../GraduationStatus/GRADStatus.vue           | 34 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/frontend/src/assets/css/global.css b/frontend/src/assets/css/global.css
index 421a8f59..8e5cb129 100644
--- a/frontend/src/assets/css/global.css
+++ b/frontend/src/assets/css/global.css
@@ -44,8 +44,9 @@
   width: 90% !important;
 }
 
-.text-warning{
-  color:#FCBA19 !important;
+.form-validation-message.text-warning{
+  color:#ce9608 !important;
+  font-weight: bold;
 }
 .nav-link{
   cursor: pointer;
diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
index ca0ae26a..1367876d 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
@@ -276,20 +276,20 @@
             <tr v-if="showEdit">
               <td>
                 <strong>Student grade: </strong>
-                <!-- Warning if student is not on 1950 program and grade is AN/AD.
+                <!-- Warning if student is not on 1950 program and grade is AN/AD. 
                 *Note that we have existing SCCP students with AD/AN, but future students on SCCP program should not have a grade of AN/AD -->
-                <div v-if="editedGradStatus.program != '1950'">
-                  <div
-                    class="form-validation-message text-danger"
-                    v-if="
-                      editedGradStatus.studentGrade == 'AD' ||
-                      editedGradStatus.studentGrade == 'AN'
-                    "
-                  >
+                <div
+                  v-if="
+                    (editedGradStatus.program != '1950' &&
+                      editedGradStatus.studentGrade == 'AD') ||
+                    editedGradStatus.studentGrade == 'AN'
+                  "
+                >
+                  <div class="form-validation-message text-danger">
                     Student grade should not be AD or AN for this program
                   </div>
                 </div>
-                <div v-if="warningFlags.closedProgramGradeChangeWarning">
+                <div v-else-if="warningFlags.completedProgramGradeChange">
                   <div class="form-validation-message text-warning">
                     Warning: You are changing the grade for a student with a
                     program completion date
@@ -852,7 +852,7 @@ export default {
       // Validation flags that do NOT prevent submission of GRAD status form
       warningFlags: {
         closedProgramWarning: false,
-        closedProgramGradeChangeWarning: false,
+        completedProgramGradeChange: false,
         programChangeWarning: false,
         schoolOfRecordWarning: false,
         schoolNotFoundWarning: false,
@@ -946,9 +946,9 @@ export default {
         this.studentGradStatus.studentGrade !=
           this.editedGradStatus.studentGrade
       ) {
-        this.warningFlags.closedProgramGradeChangeWarning = true;
+        this.warningFlags.completedProgramGradeChange = true;
       } else {
-        this.warningFlags.closedProgramGradeChangeWarning = false;
+        this.warningFlags.completedProgramGradeChange = false;
       }
       this.validateFields();
     },
@@ -1000,7 +1000,13 @@ export default {
           this.errorFlags.other.programGrade = false;
         }
       }
-      if (this.ifProgramsWithExpiry(this.editedGradStatus.program)) {
+      if (
+        !this.isProgramComplete(
+          this.studentGradStatus.programCompletionDate,
+          this.studentGradStatus.program
+        ) &&
+        this.ifProgramsWithExpiry(this.editedGradStatus.program)
+      ) {
         this.warningFlags.closedProgramWarning = true;
       } else {
         this.warningFlags.closedProgramWarning = false;

From 0ed01eb95357fb8b39d10ffaa92acbd0f6bbd109 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:50:14 -0700
Subject: [PATCH 054/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 2ec09d2d..5c105085 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.15.0",
-    "test": "1.15.0",
+    "dev": "1.16.0",
+    "test": "1.16.0",
     "prod": "1.15.0"
   }
 }

From c00b041532b41c46a0a886f5e82c95133604af83 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Tue, 2 Apr 2024 14:22:33 -0700
Subject: [PATCH 055/168] fixed download validation

---
 frontend/src/components/Batch/Batch.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index d96dbf53..786171a0 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -958,7 +958,7 @@
           size="sm"
           variant="primary"
           class="btn btn-primary w-100 float-right col-2 p-2"
-          :disabled="batch.details['who'] == '' || batch.details['who'] == null"
+          :disabled="!batchIsValid"
         >
           Download
         </b-button>
@@ -1436,7 +1436,8 @@ export default {
       }
       if (
         this.batch.details["what"] == "DISTRUNUSER" &&
-        this.batch.details["where"] == "BC Mail" &&
+        (this.batch.details["where"] == "BC Mail" ||
+          this.batch.details["where"] == "localDownload") &&
         this.batch.details["credential"] == "Blank certificate print" &&
         this.batch.details["blankCertificateDetails"].length == 0
       ) {
@@ -1445,7 +1446,8 @@ export default {
       }
       if (
         this.batch.details["what"] == "DISTRUNUSER" &&
-        this.batch.details["where"] == "BC Mail" &&
+        (this.batch.details["where"] == "BC Mail" ||
+          this.batch.details["where"] == "localDownload") &&
         this.batch.details["credential"] == "Blank transcript print" &&
         this.batch.details["blankTranscriptDetails"].length == 0
       ) {

From be96e0de7f99a2dda1befa6c0f99fcce93299acd Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:56:12 -0700
Subject: [PATCH 056/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 5c105085..22a336aa 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.16.0",
     "test": "1.16.0",
-    "prod": "1.15.0"
+    "prod": "1.16.0"
   }
 }

From 8c91692897b28b9c9c9ef4a9cd8c668a1830700a Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 4 Apr 2024 15:14:33 -0700
Subject: [PATCH 057/168] added fix for GRAD2-2592

---
 frontend/src/services/BatchProcessingService.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index 76c18dd6..84f8adad 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -76,9 +76,7 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      console.log(request)
-      return
-      //return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
+      return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
     }
   },
   runBlankDISTRUNUSERUserRequest(request, credentialType){

From 82c97ce2b36c4edff44d6de1cc0b61bf4fe75f02 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 8 Apr 2024 11:10:45 -0700
Subject: [PATCH 058/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 22a336aa..3a97c93d 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.16.0",
-    "test": "1.16.0",
+    "dev": "1.17.0",
+    "test": "1.17.0",
     "prod": "1.16.0"
   }
 }

From b9030628a74e480ee9d1d75d75be5fe018002930 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 9 Apr 2024 08:38:26 -0700
Subject: [PATCH 059/168] moved showEdit to student store to fix state issue
 with grad status form and PEN search in nav

---
 .../GraduationStatus/GRADStatus.vue           | 56 +++++++++----------
 frontend/src/store/modules/student.js         |  2 +
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
index 1367876d..50b96777 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
@@ -6,7 +6,7 @@
           v-if="allowUpdateGradStatus"
           class="gradstatus-actions float-right"
         >
-          <div v-if="!showEdit && allowUpdateGradStatus">
+          <div v-if="!studentGradStatus.showEdit && allowUpdateGradStatus">
             <b-link
               href="#"
               class="edit"
@@ -29,7 +29,7 @@
               Edit
             </b-link>
           </div>
-          <div v-if="showEdit">
+          <div v-if="studentGradStatus.showEdit">
             <b-button-group>
               <b-button
                 :disabled="disableSaveButton"
@@ -65,7 +65,7 @@
           v-if="
             studentGradStatus &&
             studentGradStatus.studentStatus == 'N' &&
-            showEdit
+            studentGradStatus.showEdit
           "
         >
           <b-alert show variant="warning" class="p-3 mb-1">
@@ -82,7 +82,7 @@
           v-else-if="
             studentGradStatus &&
             studentGradStatus.studentStatus == 'TER' &&
-            showEdit
+            studentGradStatus.showEdit
           "
         >
           <b-alert show variant="warning" class="p-3 mb-1">
@@ -99,7 +99,7 @@
           v-else-if="
             studentGradStatus &&
             studentGradStatus.studentStatus == 'ARC' &&
-            showEdit
+            studentGradStatus.showEdit
           "
         >
           <b-alert show variant="warning" class="p-3 mb-1">
@@ -115,7 +115,7 @@
           v-else-if="
             studentGradStatus &&
             studentGradStatus.studentStatus == 'DEC' &&
-            showEdit
+            studentGradStatus.showEdit
           "
         >
           <b-alert show variant="warning" class="p-3 mb-1">
@@ -132,7 +132,7 @@
           class="table table-hover table-sm"
         >
           <tbody>
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td class="w-50"><strong>Program: </strong></td>
               <td class="w-50">
                 <span v-b-tooltip.hover title="Program">{{
@@ -140,7 +140,7 @@
                 }}</span>
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td class="w-50">
                 <strong>Program: </strong>
                 <div v-if="editedGradStatus.program == '1950'">
@@ -193,7 +193,7 @@
               </td>
             </tr>
             <!-- END program edit -->
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>Program completion date: </strong></td>
               <td>
                 {{
@@ -203,7 +203,7 @@
                 }}
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td>
                 <strong>Program completion date: (YYYY-MM)</strong><br />
                 <!-- Warning if program completion date for SCCP is out of range -->
@@ -244,7 +244,7 @@
             </tr>
             <!-- END program completion date edit -->
 
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>Student status: </strong></td>
               <td>
                 <span v-if="studentGradStatus.studentStatus">{{
@@ -252,7 +252,7 @@
                 }}</span>
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td><strong>Student status: </strong></td>
               <td class="p-1">
                 <b-form-select
@@ -265,7 +265,7 @@
                 ></b-form-select>
               </td>
             </tr>
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>Student grade: </strong></td>
               <td>
                 <span v-if="studentGradStatus.studentGrade">{{
@@ -273,7 +273,7 @@
                 }}</span>
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td>
                 <strong>Student grade: </strong>
                 <!-- Warning if student is not on 1950 program and grade is AN/AD. 
@@ -306,7 +306,7 @@
               </td>
             </tr>
 
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>School of record: </strong></td>
               <td>
                 <b-button
@@ -389,7 +389,7 @@
                 </b-modal>
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td>
                 <strong>School of record:</strong><br />
                 <!-- Warning if school of record missing; Samara to investigate if we use this since msg is same as scoolOfRecordWarning -->
@@ -453,7 +453,7 @@
                 ></b-input>
               </td>
             </tr>
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>School at graduation: </strong></td>
               <td>
                 <b-button
@@ -541,7 +541,7 @@
                 </b-modal>
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td>
                 <strong>School at graduation:</strong><br />
                 <div
@@ -649,7 +649,7 @@
                 </ul>
               </td>
             </tr>
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>Adult start date: </strong></td>
               <td>
                 <span v-if="studentGradStatus.adultStartDate">{{
@@ -657,7 +657,7 @@
                 }}</span>
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td>
                 <strong>Adult start date: (YYYY-MM-DD)</strong>
                 <!-- Warning if adult start date contains non-numeric values -->
@@ -686,7 +686,7 @@
                 ></b-input>
               </td>
             </tr>
-            <tr v-if="showEdit">
+            <tr v-if="studentGradStatus.showEdit">
               <td><strong>Consumer education requirement met:</strong></td>
               <td>
                 <b-form-select
@@ -698,7 +698,7 @@
                 </b-form-select>
               </td>
             </tr>
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>Consumer education requirement met:</strong></td>
               <td>
                 <span v-if="studentGradStatus.consumerEducationRequirementMet">
@@ -706,7 +706,7 @@
                 >
               </td>
             </tr>
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>Recalculate Grad Status:</strong></td>
               <td>
                 {{ String(studentGradStatus.recalculateGradStatus) }}
@@ -723,7 +723,7 @@
                 />
               </td>
             </tr>
-            <tr v-if="!showEdit">
+            <tr v-if="!studentGradStatus.showEdit">
               <td><strong>Recalculate Projected Grad:</strong></td>
               <td>
                 {{ String(studentGradStatus.recalculateProjectedGrad) }}
@@ -826,7 +826,7 @@ export default {
       dismissSecs: 3, // remove?
       dismissCountDown: 0, // remove?
       showModal: false,
-      showEdit: false,
+      // showEdit: false,
       show: false,
       notificationMessage: "",
       // Validation flags that PREVENT submission of GRAD Status form
@@ -1303,7 +1303,7 @@ export default {
         this.disableProgramInput = false;
         this.disableStudentStatus = false;
       }
-      this.showEdit = true;
+      this.studentGradStatus.showEdit = true;
       if (this.studentGradStatus.programCompletionDate) {
         this.$set(
           this.editedGradStatus,
@@ -1384,7 +1384,7 @@ export default {
     },
 
     cancelGradStatus() {
-      this.showEdit = false;
+      this.studentGradStatus.showEdit = false;
 
       this.warningFlags.schoolOfRecordWarning = false;
       this.warningFlags.schoolNotFoundWarning = false;
@@ -1442,7 +1442,7 @@ export default {
           );
           this.getSchoolInfo(response.data.schoolOfRecord, "schoolOfRecord");
           this.getSchoolInfo(response.data.schoolAtGrad, "schoolAtGrad");
-          this.showEdit = false;
+          this.studentGradStatus.showEdit = false;
           this.editedGradStatus = {};
 
           this.showNotification("success", "GRAD Status Saved");
diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index ad72f5ec..61d23855 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -41,6 +41,7 @@ export const useStudentStore = defineStore("student", {
       auditHistory: [],
       auditHistoryOptionalPrograms: [],
     },
+    showEdit: false,
   }),
   actions: {
     loadStudentReportsAndCertificates() {
@@ -131,6 +132,7 @@ export const useStudentStore = defineStore("student", {
       StudentService.getGraduationStatus(studentId)
         .then((response) => {
           this.setStudentGradStatus(response.data);
+          this.showEdit = false;
         })
         .catch((error) => {
           console.error(

From 20eb42fb8dd00a1c5625f3d9387d90cd1187a420 Mon Sep 17 00:00:00 2001
From: suzalflueck <71517130+suzalflueck@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:00:47 -0700
Subject: [PATCH 060/168] Revert "added fix for GRAD2-2592"

---
 frontend/src/services/BatchProcessingService.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index 84f8adad..76c18dd6 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -76,7 +76,9 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
+      console.log(request)
+      return
+      //return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
     }
   },
   runBlankDISTRUNUSERUserRequest(request, credentialType){

From 9bd1e7e88a104315c51c40f2d2212edcb8bf19e6 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 10 Apr 2024 09:08:02 -0700
Subject: [PATCH 061/168] fixed distrunYE

---
 frontend/src/services/BatchProcessingService.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index 76c18dd6..6567b776 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -7,7 +7,6 @@ export default {
   },
   runREGALG(request, cronTime="")
    {
-    console.log(cronTime)
     if(cronTime){
       let scheduledRequest = {};
       scheduledRequest.cronExpression = cronTime
@@ -76,9 +75,7 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      console.log(request)
-      return
-      //return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
+      return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
     }
   },
   runBlankDISTRUNUSERUserRequest(request, credentialType){

From 08dc29932baf6554623134c239d20e77d77c8d21 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 11 Apr 2024 14:07:08 -0700
Subject: [PATCH 062/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 3a97c93d..2dfce307 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.17.0",
-    "test": "1.17.0",
+    "dev": "1.17.1",
+    "test": "1.17.1",
     "prod": "1.16.0"
   }
 }

From bf95e3a8ba9b877094600df193f2583bd8720858 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:19:01 -0700
Subject: [PATCH 063/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 2dfce307..737b8f06 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.17.1",
     "test": "1.17.1",
-    "prod": "1.16.0"
+    "prod": "1.17.1"
   }
 }

From 2a5b6490de859444f6016ee288f0033fe381bfc0 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 17 Apr 2024 11:40:23 -0700
Subject: [PATCH 064/168] updated regen cert

---
 frontend/package-lock.json                    | 15 +++
 frontend/package.json                         |  1 +
 frontend/src/components/Batch/Batch.vue       | 54 ++++++++++-
 .../src/services/BatchProcessingService.js    | 27 +++++-
 frontend/src/views/BatchProcessing.vue        | 92 +++++++++++++++++++
 5 files changed, 183 insertions(+), 6 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e2d2a4fd..5919e58e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -27,6 +27,7 @@
         "vue": "^3.3.4",
         "vue-router": "^4.1.6",
         "vuejs-logger": "^1.5.5",
+        "vuelidate": "^0.7.7",
         "vuex": "^4.1.0"
       },
       "devDependencies": {
@@ -11754,6 +11755,15 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
       "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
     },
+    "node_modules/vuelidate": {
+      "version": "0.7.7",
+      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
+      "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==",
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/vuex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
@@ -20510,6 +20520,11 @@
         }
       }
     },
+    "vuelidate": {
+      "version": "0.7.7",
+      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
+      "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA=="
+    },
     "vuex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index da27c8ca..21fc7f8c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -28,6 +28,7 @@
     "vue": "^3.3.4",
     "vue-router": "^4.1.6",
     "vuejs-logger": "^1.5.5",
+    "vuelidate": "^0.7.7",
     "vuex": "^4.1.0"
   },
   "devDependencies": {
diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 786171a0..f0941d61 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -174,6 +174,7 @@
             v-if="
               batch.details['what'] != '' &&
               batch.details['who'] != 'Student' &&
+              batch.details['who'] != 'all' &&
               batch.details['what'] != 'DISTRUN' &&
               batch.details['who'] != 'PSI' &&
               batch.details['credential'] != 'Blank transcript print' &&
@@ -1239,6 +1240,13 @@ export default {
           copies: true,
           where: true,
         },
+        CERT_REGEN: {
+          group: [
+            { text: "All", value: "all" },
+            "Student",
+            { text: "School Category", value: "District" },
+          ],
+        },
         ARC_STUDENTS: {
           group: [
             {
@@ -1492,8 +1500,7 @@ export default {
             if (
               type.code === "ARC_STUDENTS" ||
               type.code === "ARC_SCH_REPORTS" ||
-              type.code === "EDW_SNAPSHOT" ||
-              type.code === "CERT_REGEN"
+              type.code === "EDW_SNAPSHOT"
             ) {
               type.disabled = true;
             }
@@ -1948,12 +1955,19 @@ export default {
             batchDetail.details["who"] = "School";
           }
         }
+        if (type == "gradDateFrom") {
+          event = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
+        }
+        if (type == "gradDateTo") {
+          event = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
+        }
         if (type == "gradDate") {
           if (event == "Current Students") {
             this.editBatchJob("gradDateFrom", "");
             this.editBatchJob("gradDateTo", "");
           }
         }
+
         if (type == "categoryCode") {
           if (event != "04" || event != "09") {
             this.clearBatchGroupDetails(id);
@@ -2083,6 +2097,38 @@ export default {
     jobId: String,
     currentPSIYear: String,
   },
+  watch: {
+    gradDateFrom: function () {
+      this.validationMessage = "";
+      this.gradDateFrom = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
+      // Convert string dates to Date objects for comparison
+      const fromDate = new Date(this.gradDateFrom);
+      const toDate = new Date(this.gradDateTo);
+
+      // Check if gradDateFrom is greater than gradDateTo
+      if (fromDate.getTime() > toDate.getTime()) {
+        // Handle the error, for example, by resetting gradDateFrom or displaying a message
+        this.validationMessage = "Grad start date cannot be >  End Date";
+        // You can also display a message to the user indicating the error
+        // console.error("gradDateFrom cannot be greater than gradDateTo");
+      }
+    },
+    gradDateTo: function () {
+      this.gradDateTo = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
+      // Convert string dates to Date objects for comparison
+      const fromDate = new Date(this.gradDateFrom);
+      const toDate = new Date(this.gradDateTo);
+
+      // Check if gradDateTo is less than gradDateFrom
+      if (toDate.getTime() < fromDate.getTime()) {
+        // Handle the error, for example, by resetting gradDateTo or displaying a message
+        this.gradDateTo = null;
+        this.validationMessage = "Grad End date cannot be <  Start Date";
+        // You can also display a message to the user indicating the error
+        // console.error("gradDateTo cannot be less than gradDateFrom");
+      }
+    },
+  },
   computed: {
     ...mapState(useBatchProcessingStore, {
       tabContent: "getBatchDetails",
@@ -2109,6 +2155,10 @@ export default {
     requestId() {
       return this.jobId.replace("job-", "");
     },
+    formattedGradDateFrom() {
+      // Format gradDateFrom using dateFormatYYYYMM function
+      return dateFormatYYYYMM(this.gradDateFrom);
+    },
   },
 };
 </script>
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index 6567b776..fda7db02 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -16,8 +16,6 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      console.log("REGALG SERVICE")
-      console.log(request)
       return ApiService.apiAxios.post('/api/v1/batch/specialrun', request);
     }
   },
@@ -84,6 +82,28 @@ export default {
   runPSIRUN(request, transmissionType){
     return ApiService.apiAxios.post('/api/v1/batch/executepsireportbatchjob/' + transmissionType, request);
   },
+  runCERTREGEN(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 = [];
+    }
+    if(cronTime){
+      let scheduledRequest = {};
+      scheduledRequest.cronExpression = cronTime;
+      scheduledRequest.jobName = "RCBJ";
+      scheduledRequest.blankPayLoad = null;
+      scheduledRequest.payload = request;
+      this.addScheduledJob(scheduledRequest);
+      return
+    }else{
+      return ApiService.apiAxios.post('/api/v1/batch/executecertregenbatchjob', request);
+    } 
+  },
+  runCERTREGEN_ALL(){
+    
+    return ApiService.apiAxios.get('/api/v1/batch/executecertregenbatchjob');
+  
+  },  
   getBatchErrors(id, page) {
     return ApiService.apiAxios.get('/api/v1/batch/dashboard/errors/'  + id + '?pageNumber=' + page);
   },
@@ -94,8 +114,7 @@ export default {
     return ApiService.apiAxios.get('/api/v1/batch/schedule/listjobs');
   },
   addScheduledJob(scheduledJob) {
-    console.log("SCHEDULE")
-    console.log(scheduledJob)
+
     return ApiService.apiAxios.post('/api/v1/batch/schedule/add?batchJobTypeCode=' + scheduledJob.jobName, scheduledJob);
   },
   removeScheduledJobs(id) {
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 5e6c2a64..a208c4b2 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1117,6 +1117,82 @@ export default {
           }
         });
     },
+    runCERTREGEN(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.runCERTREGEN(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_ALL(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.runCERTREGEN_ALL()
+        .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,
+            });
+          }
+        });
+    },
     runNONGRADRUN(request, id) {
       let requestId = id.replace("job-", "");
       this.$set(this.spinners, id, true);
@@ -1678,6 +1754,22 @@ export default {
         } else {
           this.runDISTRUN_SUPP(request, id);
         }
+      } else if (this.tabContent[id].details["what"] == "CERT_REGEN") {
+        request.runMode = "Y";
+        if (cronTime) {
+          let scheduledRequest = {};
+          scheduledRequest.cronExpression = cronTime;
+          scheduledRequest.jobName = "SDBJ";
+          scheduledRequest.blankPayLoad = null;
+          scheduledRequest.payload = request;
+          this.addScheduledJob(scheduledRequest, id);
+        } else {
+          if (this.tabContent[id].details["who"] == "all") {
+            this.runCERTREGEN_ALL(request, id);
+          } else {
+            this.runCERTREGEN(request, id);
+          }
+        }
       } else if (this.tabContent[id].details["what"] == "ARC_STUDENTS") {
         if (cronTime) {
           let scheduledRequest = {};

From 52023e548dba0dfbd7d64436daef9a98f942c3ff Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 19 Apr 2024 09:08:41 -0700
Subject: [PATCH 065/168] branch for datevalidation

---
 frontend/src/components/Batch/Batch.vue | 114 ++++++++----------------
 1 file changed, 39 insertions(+), 75 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index f0941d61..702c24d3 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -244,8 +244,10 @@
                     type="text"
                     placeholder="YYYY-MM-DD"
                     autocomplete="off"
-                    @input="editBatchJob('gradDateFrom', $event)"
+                    @input="setGradFromDate($event)"
                   ></b-form-input>
+                  ss
+                  {{ v$.gradDateFrom.$invalid }}
                   <!-- <ul
                     class="position-absolute form-validation-message text-danger"
                   >
@@ -258,13 +260,15 @@
                       button-only
                       right
                       locale="en-US"
-                      @input="editBatchJob('gradDateFrom', $event)"
+                      @input="setGradFromDate($event)"
                     ></b-form-datepicker>
                   </b-input-group-append>
                 </b-input-group>
+                ERROR
               </div>
 
               <div class="float-left col-4">
+                {{ validationMessage }}
                 <strong><label class="pt-1">Grad End Date</label></strong>
                 <b-input-group class="mb-3">
                   <!-- <ValidationProvider
@@ -1071,7 +1075,8 @@
   </div>
 </template>
 <script>
-//import { ValidationProvider, ValidationObserver, extend } from "vee-validate";
+import { useVuelidate } from "@vuelidate/core";
+import { required } from "@vuelidate/validators";
 import TRAXService from "@/services/TRAXService.js";
 import SchoolService from "@/services/SchoolService.js";
 import StudentService from "@/services/StudentService.js";
@@ -1146,11 +1151,33 @@ import SharedMethods from "../../sharedMethods";
 // });
 
 export default {
+  setup: () => ({ v$: useVuelidate() }),
   components: {
     // ValidationProvider: ValidationProvider,
     // ValidationObserver: ValidationObserver,
     BatchConfirmInfo: BatchConfirmInfo,
   },
+  validations() {
+    return {
+      gradDateFrom: function () {
+        this.gradDateFrom = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
+        // Convert string dates to Date objects for comparison
+        const fromDate = new Date(this.gradDateFrom);
+        const toDate = new Date(this.gradDateTo);
+
+        // Check if gradDateFrom is greater than gradDateTo
+        if (fromDate.getTime() && fromDate.getTime() > toDate.getTime()) {
+          console.log("Grad start date cannot be >  End Date");
+          // Handle the error, for example, by resetting gradDateFrom or displaying a message
+          this.validationMessage = "Grad start date cannot be >  End Date";
+          // You can also display a message to the user indicating the error
+          // console.error("gradDateFrom cannot be greater than gradDateTo");
+          console.log("INVALID");
+          return false;
+        }
+      },
+    };
+  },
   data: function () {
     return {
       runType: "",
@@ -1281,65 +1308,11 @@ export default {
         },
       },
     };
+    220;
   },
 
-  mounted() {
-    // extend(
-    //   "validateschool",
-    //   (value, refValues) => {
-    //     return SchoolService.getSchoolInfo(value)
-    //       .then((response) => {
-    //         let credential = refValues[2];
-    //         if (
-    //           (credential == "Blank certificate print" || credential == "OT") &&
-    //           response.data.transcriptEligibility == "N"
-    //         ) {
-    //           return "This school is not eligible for trasncripts.";
-    //         }
-    //         if (
-    //           (credential == "Blank certificate print" ||
-    //             credential == "OC" ||
-    //             credential == "RC") &&
-    //           response.data.certificateEligibility == "N"
-    //         ) {
-    //           return "This school is not eligible for certificates.";
-    //         }
-    //         if (response.data.minCode) {
-    //           this.$refs[
-    //             "schoolName" + refValues[0] + refValues[1]
-    //           ][0].placeholder = response.data.schoolName;
-    //           this.$refs[
-    //             "transcriptEligibility" + refValues[0] + refValues[1]
-    //           ][0].placeholder = response.data.transcriptEligibility;
-    //           this.$refs[
-    //             "certificateEligibility" + refValues[0] + refValues[1]
-    //           ][0].placeholder = response.data.certificateEligibility;
-    //           this.$refs[
-    //             "schoolCategory" + refValues[0] + refValues[1]
-    //           ][0].placeholder = response.data.schoolCategory;
-    //           this.$refs[
-    //             "reportingFlag" + refValues[0] + refValues[1]
-    //           ][0].placeholder = response.data.reportingFlag;
-    //           return { valid: true };
-    //         } else {
-    //           return {
-    //             valid: false,
-    //           };
-    //         }
-    //       })
-    //       .catch((error) => {
-    //         // eslint-disable-next-line
-    //         console.log(error);
-    //         return {
-    //           valid: false,
-    //         };
-    //       });
-    //   },
-    //   {
-    //     immediate: false,
-    //   }
-    // );
-  },
+  mounted() {},
+
   created() {
     this.formElements = Object.assign({}, this.formElements);
     this.transcriptTypes = this.getTranscriptTypes();
@@ -1371,6 +1344,12 @@ export default {
   },
 
   methods: {
+    setGradFromDate($event) {
+      // do some silly transformation
+
+      this.gradDateFrom = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
+      this.editBatchJob("gradDateFrom", this.gradDateFrom);
+    },
     ...mapActions(useBatchProcessingStore, [
       "addValueToTypeInBatchId",
       "deleteStudentBatch",
@@ -2098,21 +2077,6 @@ export default {
     currentPSIYear: String,
   },
   watch: {
-    gradDateFrom: function () {
-      this.validationMessage = "";
-      this.gradDateFrom = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
-      // Convert string dates to Date objects for comparison
-      const fromDate = new Date(this.gradDateFrom);
-      const toDate = new Date(this.gradDateTo);
-
-      // Check if gradDateFrom is greater than gradDateTo
-      if (fromDate.getTime() > toDate.getTime()) {
-        // Handle the error, for example, by resetting gradDateFrom or displaying a message
-        this.validationMessage = "Grad start date cannot be >  End Date";
-        // You can also display a message to the user indicating the error
-        // console.error("gradDateFrom cannot be greater than gradDateTo");
-      }
-    },
     gradDateTo: function () {
       this.gradDateTo = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
       // Convert string dates to Date objects for comparison

From ce9fffa9d1adfe96878b65ce346cf870f0c153ad Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 19 Apr 2024 10:50:33 -0700
Subject: [PATCH 066/168] updated district select for REGENT CERT

---
 frontend/src/components/Batch/Batch.vue           | 11 ++++++++---
 frontend/src/components/Batch/BatchConfimInfo.vue | 13 +++++++++++--
 frontend/src/views/BatchProcessing.vue            |  5 ++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index f0941d61..f58969e9 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -184,7 +184,10 @@
           >
             <div
               class="p-0 mt-3 col-3"
-              v-if="batch.details['who'] == 'District'"
+              v-if="
+                batch.details['who'] == 'District' &&
+                batch.details['what'] != 'CERT_REGEN'
+              "
             >
               <label class="font-weight-bold">Category</label>
               <b-form-select
@@ -210,7 +213,8 @@
                 batch.details['what'] != 'NONGRADRUN' &&
                 batch.details['what'] != 'DISTRUN_YE' &&
                 batch.details['what'] != 'DISTRUN_SUPP' &&
-                batch.details['what'] != 'ARC_STUDENTS'
+                batch.details['what'] != 'ARC_STUDENTS' &&
+                batch.details['what'] != 'CERT_REGEN'
               "
             >
               <label class="font-weight-bold p-0 m-0 row"
@@ -1244,7 +1248,7 @@ export default {
           group: [
             { text: "All", value: "all" },
             "Student",
-            { text: "School Category", value: "District" },
+            { text: "District", value: "District" },
           ],
         },
         ARC_STUDENTS: {
@@ -1414,6 +1418,7 @@ export default {
 
       if (
         this.batch.details["who"] == "District" &&
+        this.batch.details["what"] != "CERT_REGEN" &&
         !this.batch.details["categoryCode"]
       ) {
         this.batchIsValid = false;
diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
index 1966749b..7c8b8fb1 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -11,7 +11,13 @@
       </li>
       <li v-if="details.who">
         <strong>Group: </strong
-        >{{ details.who == "District" ? "School Category" : details.who }}
+        >{{
+          details.who == "District"
+            ? details.what == "CERT_REGEN"
+              ? "District"
+              : "School Category"
+            : details.who
+        }}
       </li>
       <li v-if="details.credential">
         <strong>Credential Type: </strong>{{ details.credential }}
@@ -100,7 +106,10 @@
       </ul>
       <li
         v-if="
-          details.where && details.what != 'REGALG' && details.what != 'TVRRUN'
+          details.where &&
+          details.what != 'REGALG' &&
+          details.what != 'TVRRUN' &&
+          details.what != 'CERT_REGEN'
         "
       >
         <strong>Where: </strong>
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index a208c4b2..932a462f 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1556,7 +1556,10 @@ export default {
         if (this.tabContent[id]["details"].categoryCode == "") {
           districtCategoryCode = [];
         }
-        if (!districtCategoryCode.length) {
+        if (
+          !districtCategoryCode.length &&
+          this.tabContent[id].details["what"] != "CERT_REGEN"
+        ) {
           this.validationMessage = "Please select a district category";
           return;
         }

From c9dace8d0745d52ff05ec7a3afd7526814284a19 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 19 Apr 2024 11:34:46 -0700
Subject: [PATCH 067/168] updated the payload to fix district certrun

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

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 932a462f..94dc0d7f 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1759,6 +1759,14 @@ export default {
         }
       } else if (this.tabContent[id].details["what"] == "CERT_REGEN") {
         request.runMode = "Y";
+        delete request.credentialTypeCode;
+        delete request.schoolCategoryCodes;
+        delete request.gradDateFrom;
+        delete request.gradDateTo;
+        delete request.quantity;
+        delete request.localDownload;
+        delete request.reportType;
+
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;

From 09dd5c6e9846c77ca9f3cd47f3df571d5211213e Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 23 Apr 2024 11:56:33 -0700
Subject: [PATCH 068/168] Upgrade zap scan version in git actions

---
 .github/workflows/build-n-deploy-backend-km.yml               | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml  | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-dev.yml       | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-tools.yml     | 2 +-
 .github/workflows/build-n-deploy-frontend-km.yml              | 2 +-
 .github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml | 2 +-
 .github/workflows/build-n-deploy-frontend-to-ocp-dev.yml      | 2 +-
 .github/workflows/build-n-deploy-frontend-to-ocp-tools.yml    | 2 +-
 .github/workflows/deploy-backend-to-ocp-test.yml              | 2 +-
 .github/workflows/deploy-frontend-to-ocp-test.yml             | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-n-deploy-backend-km.yml b/.github/workflows/build-n-deploy-backend-km.yml
index 67b8e352..01472fc6 100644
--- a/.github/workflows/build-n-deploy-backend-km.yml
+++ b/.github/workflows/build-n-deploy-backend-km.yml
@@ -169,6 +169,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
index e782d255..867875dd 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
@@ -169,6 +169,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: "https://educ-grad-admin-${{secrets.GRAD_NAMESPACE_NO_ENV}}-dev.apps.silver.devops.gov.bc.ca"
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
index 9bbb7df7..8ced2195 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
@@ -169,6 +169,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml b/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
index 0a5fb816..6dd58694 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
@@ -173,6 +173,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-tools.apps.silver.devops.gov.bc.ca'
diff --git a/.github/workflows/build-n-deploy-frontend-km.yml b/.github/workflows/build-n-deploy-frontend-km.yml
index 0459d1b1..59756b68 100644
--- a/.github/workflows/build-n-deploy-frontend-km.yml
+++ b/.github/workflows/build-n-deploy-frontend-km.yml
@@ -171,6 +171,6 @@ jobs:
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'
diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml
index 7bb0cfb7..5de37ee6 100644
--- a/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml
+++ b/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml
@@ -171,6 +171,6 @@ jobs:
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: "https://educ-grad-admin-${{secrets.GRAD_NAMESPACE_NO_ENV}}-dev.apps.silver.devops.gov.bc.ca"
diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
index 3fafa038..1ebccbde 100644
--- a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
+++ b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
@@ -171,7 +171,7 @@ jobs:
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'
 
diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml
index ad55a89f..50019fec 100644
--- a/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml
+++ b/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml
@@ -173,7 +173,7 @@ jobs:
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-tools.apps.silver.devops.gov.bc.ca'
 
diff --git a/.github/workflows/deploy-backend-to-ocp-test.yml b/.github/workflows/deploy-backend-to-ocp-test.yml
index 86fb9ba7..5e5f4dd7 100644
--- a/.github/workflows/deploy-backend-to-ocp-test.yml
+++ b/.github/workflows/deploy-backend-to-ocp-test.yml
@@ -93,6 +93,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-test.apps.silver.devops.gov.bc.ca'
diff --git a/.github/workflows/deploy-frontend-to-ocp-test.yml b/.github/workflows/deploy-frontend-to-ocp-test.yml
index 6f0eb2b0..d5cf0914 100644
--- a/.github/workflows/deploy-frontend-to-ocp-test.yml
+++ b/.github/workflows/deploy-frontend-to-ocp-test.yml
@@ -94,6 +94,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-test.apps.silver.devops.gov.bc.ca'

From 7db697f22dca311eecbeeb15535fcab7db1001d1 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 24 Apr 2024 10:24:08 -0700
Subject: [PATCH 069/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 737b8f06..09d20298 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.17.1",
-    "test": "1.17.1",
+    "dev": "1.18.0",
+    "test": "1.18.0",
     "prod": "1.17.1"
   }
 }

From 5241ef0f5349e2b92a27ee8226e8f18f89e09892 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 24 Apr 2024 13:37:55 -0700
Subject: [PATCH 070/168] fixed validation for batch date

---
 frontend/src/components/Batch/Batch.vue | 71 +++++++++++++------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 9a7ac80c..476a02c0 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -238,10 +238,6 @@
               <div class="float-left col-3 m-0 p-0">
                 <strong><label class="pt-1">Grad Start Date</label></strong>
                 <b-input-group class="mb-3">
-                  <!-- <ValidationProvider
-                    :rules="'validDate|lessthangraddateto:' + gradDateTo"
-                    v-slot="{ errors }"
-                  > -->
                   <b-form-input
                     id="gradDateFromInput"
                     v-model="gradDateFrom"
@@ -250,14 +246,6 @@
                     autocomplete="off"
                     @input="setGradFromDate($event)"
                   ></b-form-input>
-                  ss
-                  {{ v$.gradDateFrom.$invalid }}
-                  <!-- <ul
-                    class="position-absolute form-validation-message text-danger"
-                  >
-                    <li v-for="error in errors" :key="error">{{ error }}</li>
-                  </ul> -->
-                  <!-- </ValidationProvider> -->
                   <b-input-group-append>
                     <b-form-datepicker
                       v-model="gradDateFrom"
@@ -268,11 +256,16 @@
                     ></b-form-datepicker>
                   </b-input-group-append>
                 </b-input-group>
-                ERROR
+                <div class="form-validation-message text-danger">
+                  {{
+                    v$.gradDateFrom.$invalid
+                      ? "Grad start date cannot be >  End Date"
+                      : ""
+                  }}
+                </div>
               </div>
 
               <div class="float-left col-4">
-                {{ validationMessage }}
                 <strong><label class="pt-1">Grad End Date</label></strong>
                 <b-input-group class="mb-3">
                   <!-- <ValidationProvider
@@ -303,6 +296,13 @@
                     ></b-form-datepicker>
                   </b-input-group-append>
                 </b-input-group>
+                <div class="form-validation-message text-danger">
+                  {{
+                    v$.gradDateTo.$invalid
+                      ? "Grad End date cannot be <  Start Date"
+                      : ""
+                  }}
+                </div>
               </div>
             </div>
           </div>
@@ -1171,13 +1171,30 @@ export default {
 
         // Check if gradDateFrom is greater than gradDateTo
         if (fromDate.getTime() && fromDate.getTime() > toDate.getTime()) {
-          console.log("Grad start date cannot be >  End Date");
           // Handle the error, for example, by resetting gradDateFrom or displaying a message
           this.validationMessage = "Grad start date cannot be >  End Date";
           // You can also display a message to the user indicating the error
           // console.error("gradDateFrom cannot be greater than gradDateTo");
-          console.log("INVALID");
           return false;
+        } else {
+          return true;
+        }
+      },
+      gradDateTo: function () {
+        this.gradDateTo = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
+        // Convert string dates to Date objects for comparison
+        const fromDate = new Date(this.gradDateFrom);
+        const toDate = new Date(this.gradDateTo);
+
+        // Check if gradDateFrom is greater than gradDateTo
+        if (toDate.getTime() && toDate.getTime() < fromDate.getTime()) {
+          // Handle the error, for example, by resetting gradDateFrom or displaying a message
+          this.validationMessage = "End Date date cannot be <  Start Date";
+          // You can also display a message to the user indicating the error
+          // console.error("gradDateFrom cannot be greater than gradDateTo");
+          return false;
+        } else {
+          return true;
         }
       },
     };
@@ -1364,6 +1381,10 @@ export default {
       "editBatchDetails",
     ]),
     validBatch() {
+      if (this.v$.$invalid) {
+        this.batchIsValid = false;
+        return;
+      }
       if (
         this.batch.details["what"] != "DISTRUN_YE" &&
         this.batch.details["what"] != "DISTRUN" &&
@@ -2081,23 +2102,7 @@ export default {
     jobId: String,
     currentPSIYear: String,
   },
-  watch: {
-    gradDateTo: function () {
-      this.gradDateTo = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
-      // Convert string dates to Date objects for comparison
-      const fromDate = new Date(this.gradDateFrom);
-      const toDate = new Date(this.gradDateTo);
-
-      // Check if gradDateTo is less than gradDateFrom
-      if (toDate.getTime() < fromDate.getTime()) {
-        // Handle the error, for example, by resetting gradDateTo or displaying a message
-        this.gradDateTo = null;
-        this.validationMessage = "Grad End date cannot be <  Start Date";
-        // You can also display a message to the user indicating the error
-        // console.error("gradDateTo cannot be less than gradDateFrom");
-      }
-    },
-  },
+  watch: {},
   computed: {
     ...mapState(useBatchProcessingStore, {
       tabContent: "getBatchDetails",

From df883b97f09a9bf9ebc1f275ff997ab6707f7f5e Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 26 Apr 2024 10:14:28 -0700
Subject: [PATCH 071/168] removed some invalid code found in sonarcloud

---
 frontend/src/components/Batch/Batch.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 476a02c0..69c95407 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -259,7 +259,7 @@
                 <div class="form-validation-message text-danger">
                   {{
                     v$.gradDateFrom.$invalid
-                      ? "Grad start date cannot be >  End Date"
+                      ? "Grad start date cannot be greater than " + gradDateTo
                       : ""
                   }}
                 </div>
@@ -299,7 +299,7 @@
                 <div class="form-validation-message text-danger">
                   {{
                     v$.gradDateTo.$invalid
-                      ? "Grad End date cannot be <  Start Date"
+                      ? "Grad End date cannot be less than " + gradDateFrom
                       : ""
                   }}
                 </div>
@@ -1080,7 +1080,6 @@
 </template>
 <script>
 import { useVuelidate } from "@vuelidate/core";
-import { required } from "@vuelidate/validators";
 import TRAXService from "@/services/TRAXService.js";
 import SchoolService from "@/services/SchoolService.js";
 import StudentService from "@/services/StudentService.js";
@@ -1329,7 +1328,6 @@ export default {
         },
       },
     };
-    220;
   },
 
   mounted() {},

From db69957f540cb2b211fdb3b034fc382ac0aa213d Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:12:57 -0700
Subject: [PATCH 072/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 09d20298..168b6b87 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.18.0",
     "test": "1.18.0",
-    "prod": "1.17.1"
+    "prod": "1.18.0"
   }
 }

From 9bfc77c647ca1a0a9488a6a7643b12171e080eda Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 1 May 2024 10:45:22 -0700
Subject: [PATCH 073/168] removed date range logic from activeOptionalPrograms

---
 .../components/Forms/OptionalProgramsForm.vue | 19 +------------------
 .../StudentOptionalPrograms.vue               |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/Forms/OptionalProgramsForm.vue b/frontend/src/components/Forms/OptionalProgramsForm.vue
index 8c8b3911..6bd25f02 100644
--- a/frontend/src/components/Forms/OptionalProgramsForm.vue
+++ b/frontend/src/components/Forms/OptionalProgramsForm.vue
@@ -311,24 +311,7 @@ export default {
       return applyDisplayOrder(
         this.optionalProgramList
           ?.filter((item) => {
-            let effectiveDateUTC = null;
-            let expiryDateUTC = null;
-            if (item.effectiveDate) {
-              effectiveDateUTC = new Date(item.effectiveDate)
-                .toISOString()
-                .split("T")[0];
-            }
-            if (item.expiryDate) {
-              expiryDateUTC = new Date(item.expiryDate)
-                .toISOString()
-                .split("T")[0];
-            }
-
-            return (
-              item.graduationProgramCode === studentProgramId &&
-              effectiveDateUTC <= currentDate &&
-              (expiryDateUTC == null || currentDate <= expiryDateUTC)
-            );
+            return item.graduationProgramCode === studentProgramId;
           })
           ?.filter((activeOptionalProgram) => {
             // If student optional programs exist, filter out existing programs. Otherwise returns all possible opt programs for grad program
diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index f343e666..dae1fef9 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -521,7 +521,7 @@ export default {
       );
     },
     filterGradReqCourses(row) {
-      if (row.gradReqMet.length > 0) {
+      if (row.gradReqMet?.length > 0) {
         return true;
       }
     },

From 643a8c73a38c327bfdb63470a4749023663f165a Mon Sep 17 00:00:00 2001
From: Tang <Michael.Tang@gov.bc.ca>
Date: Fri, 3 May 2024 14:40:49 -0700
Subject: [PATCH 074/168] GRAD2-2461 changes

---
 .../GraduationStatus/GRADStatus.vue           | 24 +++++++++++++++++--
 frontend/src/utils/common.js                  |  4 ++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
index 50b96777..75e63f77 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
@@ -276,7 +276,7 @@
             <tr v-if="studentGradStatus.showEdit">
               <td>
                 <strong>Student grade: </strong>
-                <!-- Warning if student is not on 1950 program and grade is AN/AD. 
+                <!-- Warning if student is not on 1950 program and grade is AN/AD.
                 *Note that we have existing SCCP students with AD/AN, but future students on SCCP program should not have a grade of AN/AD -->
                 <div
                   v-if="
@@ -435,6 +435,17 @@
                     aria-hidden="true"
                   ></i>
                 </div>
+                <!-- Warning if the User is changing the School of Record to a non-093 school and the student is still being reported as on *-PF. -->
+                <div
+                  v-if="warningFlags.schoolOfRecordNotPFWarning"
+                  class="form-validation-message text-warning"
+                >
+                  This change requires Supervisor approval if student is
+                  remaining on the PF program, otherwise change program to EN.<i
+                    class="fas fa-exclamation-triangle"
+                    aria-hidden="true"
+                  ></i>
+                </div>
                 <div
                   v-if="schoolFound"
                   class="form-validation-message text-success"
@@ -759,6 +770,8 @@ import {
   parseStudentStatus,
   showNotification,
   isProgramComplete,
+  isProgramPF,
+  isPFSchool,
 } from "../../../utils/common.js";
 import SchoolService from "@/services/SchoolService.js";
 import sharedMethods from "../../../sharedMethods";
@@ -857,6 +870,7 @@ export default {
         schoolOfRecordWarning: false,
         schoolNotFoundWarning: false,
         schoolOfRecordInputWarning: false, //look at moving to error flags, but fine for now since backend prevents submission
+        schoolOfRecordNotPFWarning: false,
         schoolAtGraduationWarning: false,
         schoolAtGraduationNotFoundWarning: false,
         schoolAtGraduationInputWarning: false,
@@ -1062,6 +1076,13 @@ export default {
       } else {
         this.errorFlags.emptyError.schoolOfRecordMissing = false;
       }
+      if (isProgramPF(this.studentGradStatus.program)) {
+        if (!isPFSchool(this.editedGradStatus.schoolOfRecord)) {
+          this.warningFlags.schoolOfRecordNotPFWarning = true;
+        } else {
+          this.warningFlags.schoolOfRecordNotPFWarning = false;
+        }
+      }
       if (this.editedGradStatus.schoolOfRecord?.length < 8) {
         this.warningFlags.schoolOfRecordWarning = false;
         this.warningFlags.schoolNotFoundWarning = false;
@@ -1078,7 +1099,6 @@ export default {
         this.errorFlags.other.offshore1950 = false;
         this.disableSave = false;
       }
-
       if (
         this.editedGradStatus.schoolOfRecord ==
         this.studentGradStatus.schoolOfRecord
diff --git a/frontend/src/utils/common.js b/frontend/src/utils/common.js
index a1d075f6..27afcfed 100644
--- a/frontend/src/utils/common.js
+++ b/frontend/src/utils/common.js
@@ -97,3 +97,7 @@ export function isProgramComplete(completionDate, programCode) {
     return !!completionDate;
   }
 }
+
+export function isProgramPF(program) {
+  return program.includes("PF");
+}

From 32bd7058c96b258650dcd7bd3f2c2144a717f379 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 3 May 2024 15:34:56 -0700
Subject: [PATCH 075/168] fix date validation

---
 frontend/src/components/Batch/Batch.vue | 211 ++++++++++++------------
 frontend/src/sharedMethods.js           |   5 +
 2 files changed, 109 insertions(+), 107 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 69c95407..200801e6 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -231,6 +231,7 @@
                 @change="editBatchJob('gradDate', $event)"
               ></b-form-select>
             </div>
+
             <div
               class="date-ranges col-12 row"
               v-if="batch.details['gradDate'] == 'Date Range'"
@@ -257,11 +258,12 @@
                   </b-input-group-append>
                 </b-input-group>
                 <div class="form-validation-message text-danger">
-                  {{
-                    v$.gradDateFrom.$invalid
-                      ? "Grad start date cannot be greater than " + gradDateTo
-                      : ""
-                  }}
+                  <div
+                    v-for="error in v$.gradDateFrom?.$silentErrors"
+                    :key="error"
+                  >
+                    <span>{{ error.$message }}</span>
+                  </div>
                 </div>
               </div>
 
@@ -278,7 +280,7 @@
                     type="text"
                     placeholder="YYYY-MM-DD"
                     autocomplete="off"
-                    @input="editBatchJob('gradDateTo', $event)"
+                    @input="setGradToDate('gradDateTo', $event)"
                   ></b-form-input>
                   <!-- <span
                     class="position-absolute form-validation-message text-danger"
@@ -292,16 +294,18 @@
                       right
                       locale="en-US"
                       aria-controls="example-input"
-                      @input="editBatchJob('gradDateTo', $event)"
+                      @input="setGradToDate('gradDateTo', $event)"
                     ></b-form-datepicker>
                   </b-input-group-append>
                 </b-input-group>
+
                 <div class="form-validation-message text-danger">
-                  {{
-                    v$.gradDateTo.$invalid
-                      ? "Grad End date cannot be less than " + gradDateFrom
-                      : ""
-                  }}
+                  <div
+                    v-for="error in v$.gradDateTo?.$silentErrors"
+                    :key="error"
+                  >
+                    <span>{{ error.$message }}</span>
+                  </div>
                 </div>
               </div>
             </div>
@@ -1080,6 +1084,7 @@
 </template>
 <script>
 import { useVuelidate } from "@vuelidate/core";
+import { required, helpers } from "@vuelidate/validators";
 import TRAXService from "@/services/TRAXService.js";
 import SchoolService from "@/services/SchoolService.js";
 import StudentService from "@/services/StudentService.js";
@@ -1095,64 +1100,6 @@ import { mapState, mapActions } from "pinia";
 
 import SharedMethods from "../../sharedMethods";
 
-// extend("minmax", {
-//   validate(value, { min, max }) {
-//     return value.length >= min && value.length <= max;
-//   },
-//   params: ["min", "max"],
-//   message:
-//     "The {_field_} field must have at least {min} characters and {max} characters at most",
-// });
-// extend("validDate", {
-//   validate(value) {
-//     if ((value.match(/-/g) || []).length != 2) {
-//       return false;
-//     } else return true;
-//   },
-//   params: ["gradDateFrom"],
-//   message: "Format: YYYY-MM-DD",
-// });
-// extend("mincodelength", {
-//   validate(value) {
-//     return value.length == 8;
-//   },
-//   message: "Minimum 8 characters",
-// });
-// extend("lessthangraddateto", {
-//   validate(value, { gradDateTo }) {
-//     const date1 = new Date(value);
-//     const date2 = new Date(gradDateTo);
-//     if (gradDateTo) {
-//       return date1 < date2;
-//     } else return true;
-//   },
-//   params: ["gradDateTo"],
-//   message: "The Grad Start Date field must be less than {gradDateTo}",
-// });
-// extend("greaterthangraddateFrom", {
-//   validate(value, { gradDateFrom }) {
-//     const date1 = new Date(gradDateFrom);
-//     const date2 = new Date(value);
-//     if (gradDateFrom) {
-//       return date1 < date2;
-//     } else return true;
-//   },
-//   params: ["gradDateFrom"],
-//   message: "The Grad End Date field must be less than {gradDateFrom}",
-// });
-// extend("adultdogwoodpublicrestrictedtoministryofadvancededgroup", {
-//   validate(value, args) {
-//     // eslint-disable-next-line
-
-//     if (
-//       value == "Ministry of Advanced Education" &&
-//       args[0] == "Blank certificate print"
-//     ) {
-//       return "You can only print for public Adult Dogwood for Ministry of Advanced Education";
-//     } else return true;
-//   },
-// });
-
 export default {
   setup: () => ({ v$: useVuelidate() }),
   components: {
@@ -1162,40 +1109,89 @@ export default {
   },
   validations() {
     return {
-      gradDateFrom: function () {
-        this.gradDateFrom = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
-        // Convert string dates to Date objects for comparison
-        const fromDate = new Date(this.gradDateFrom);
-        const toDate = new Date(this.gradDateTo);
+      gradDateFrom: {
+        isDateInvalid: helpers.withMessage(
+          "Enter a valid start date",
+          (value) => {
+            const regex = /^\d{4}-\d{2}-\d{2}$/;
+            if (
+              this.batch.details["gradDate"] == "Date Range" &&
+              !regex.test(this.gradDateFrom)
+            ) {
+              return false;
+            } else return true;
+          }
+        ),
+        isValidFromDate: helpers.withMessage(
+          "Grad start date cannot be greater than End Date",
+          (value) => {
+            const fromDate = new Date(this.gradDateFrom);
+            const toDate = new Date(this.gradDateTo);
 
-        // Check if gradDateFrom is greater than gradDateTo
-        if (fromDate.getTime() && fromDate.getTime() > toDate.getTime()) {
-          // Handle the error, for example, by resetting gradDateFrom or displaying a message
-          this.validationMessage = "Grad start date cannot be >  End Date";
-          // You can also display a message to the user indicating the error
-          // console.error("gradDateFrom cannot be greater than gradDateTo");
-          return false;
-        } else {
-          return true;
-        }
+            if (
+              this.batch.details["gradDate"] == "Date Range" &&
+              fromDate.getTime() > toDate.getTime()
+            ) {
+              return false;
+            } else {
+              return true;
+            }
+          }
+        ),
       },
-      gradDateTo: function () {
-        this.gradDateTo = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
-        // Convert string dates to Date objects for comparison
-        const fromDate = new Date(this.gradDateFrom);
-        const toDate = new Date(this.gradDateTo);
+      gradDateTo: {
+        isDateInvalid: helpers.withMessage(
+          "Enter a valid end date",
+          (value) => {
+            const regex = /^\d{4}-\d{2}-\d{2}$/;
+            if (
+              this.batch.details["gradDate"] == "Date Range" &&
+              !regex.test(value)
+            ) {
+              return false;
+            } else return true;
+          }
+        ),
+        isValidFromDate: helpers.withMessage(
+          "End Date date cannot be earlier than Start Date",
+          (value) => {
+            const fromDate = new Date(this.gradDateFrom);
+            const toDate = new Date(this.gradDateTo);
 
-        // Check if gradDateFrom is greater than gradDateTo
-        if (toDate.getTime() && toDate.getTime() < fromDate.getTime()) {
-          // Handle the error, for example, by resetting gradDateFrom or displaying a message
-          this.validationMessage = "End Date date cannot be <  Start Date";
-          // You can also display a message to the user indicating the error
-          // console.error("gradDateFrom cannot be greater than gradDateTo");
-          return false;
-        } else {
-          return true;
-        }
+            if (
+              this.batch.details["gradDate"] == "Date Range" &&
+              toDate.getTime() < fromDate.getTime()
+            ) {
+              return false;
+            } else {
+              return true;
+            }
+          }
+        ),
       },
+      // gradDateTo: function () {
+      //   this.gradDateTo = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
+      //   // Convert string dates to Date objects for comparison
+      //   const regex = /^\d{4}-\d{2}-\d{2}$/;
+      //   if (!this.gradDateTo) {
+      //     return { isValid: false, message: "Date cannot be empty" };
+      //   }
+      //   if (!regex.test(this.gradDateTo)) {
+      //     return { isValid: false, message: "Invalid date" };
+      //   }
+      //   const fromDate = new Date(this.gradDateFrom);
+      //   const toDate = new Date(this.gradDateTo);
+
+      //   // Check if gradDateFrom is greater than gradDateTo
+      //   if (toDate.getTime() < fromDate.getTime()) {
+      //     return {
+      //       isValid: false,
+      //       message: "End Date date cannot be earlier than Start Date",
+      //     };
+      //   } else {
+      //     return { isValid: true, message: "" };
+      //   }
+      // },
     };
   },
   data: function () {
@@ -1364,11 +1360,13 @@ export default {
 
   methods: {
     setGradFromDate($event) {
-      // do some silly transformation
-
       this.gradDateFrom = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
       this.editBatchJob("gradDateFrom", this.gradDateFrom);
     },
+    setGradToDate($event) {
+      this.gradDateTo = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
+      this.editBatchJob("gradDateTo", this.gradDateTo);
+    },
     ...mapActions(useBatchProcessingStore, [
       "addValueToTypeInBatchId",
       "deleteStudentBatch",
@@ -1672,7 +1670,6 @@ export default {
         if (value) {
           SchoolService.getSchoolInfo(value)
             .then((response) => {
-              console.log(response);
               if (response.data.minCode) {
                 this.addValueToTypeInBatchId({
                   id,
@@ -1965,10 +1962,10 @@ export default {
           event = SharedMethods.dateFormatYYYYMMDD(this.gradDateTo);
         }
         if (type == "gradDate") {
-          if (event == "Current Students") {
-            this.editBatchJob("gradDateFrom", "");
-            this.editBatchJob("gradDateTo", "");
-          }
+          this.editBatchJob("gradDateFrom", "");
+          this.editBatchJob("gradDateTo", "");
+          this.gradDateFrom = "";
+          this.gradDateTo = "";
         }
 
         if (type == "categoryCode") {
diff --git a/frontend/src/sharedMethods.js b/frontend/src/sharedMethods.js
index f44ae20c..3574ca9f 100644
--- a/frontend/src/sharedMethods.js
+++ b/frontend/src/sharedMethods.js
@@ -108,6 +108,11 @@ export default {
   dateFormatYYYYMMDD(value) {
     return value.replace(/^([\d]{4})([\d]{2})([\d]{2})$/, "$1-$2-$3");
   },
+  isValidDateString(value) {
+    // Regular expression for YYYY-MM-DD format
+    const regex = /^\d{4}-\d{2}-\d{2}$/;
+    return regex.test(value);
+  },
   jobLabel(jobId) {
     return this.jobId.replace("job-", "");
   },

From 906162e376e9314c5954bee88ffbaeb0f57ef4ed Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Tue, 7 May 2024 09:23:58 -0700
Subject: [PATCH 076/168] fixed batch invalid date

---
 frontend/src/components/Batch/Batch.vue | 46 ++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 200801e6..4ac5249d 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1111,15 +1111,29 @@ export default {
     return {
       gradDateFrom: {
         isDateInvalid: helpers.withMessage(
-          "Enter a valid start date",
+          "Enter a valid end date",
           (value) => {
             const regex = /^\d{4}-\d{2}-\d{2}$/;
             if (
-              this.batch.details["gradDate"] == "Date Range" &&
-              !regex.test(this.gradDateFrom)
+                this.batch.details["gradDate"] == "Date Range" &&
+                regex.test(value) // Check if the date format is valid
             ) {
-              return false;
-            } else return true;
+                // Split the date string into year, month, and day parts
+                const parts = value.split('-');
+                const year = parseInt(parts[0]);
+                const month = parseInt(parts[1]) - 1; // Months are zero-indexed
+                const day = parseInt(parts[2]);
+                
+                // Create a Date object and check if it represents a valid date
+                const date = new Date(year, month, day);
+                return (
+                    date.getFullYear() === year &&
+                    date.getMonth() === month &&
+                    date.getDate() === day
+                );
+            } else {
+                return false;
+            }
           }
         ),
         isValidFromDate: helpers.withMessage(
@@ -1144,12 +1158,26 @@ export default {
           "Enter a valid end date",
           (value) => {
             const regex = /^\d{4}-\d{2}-\d{2}$/;
-            if (
+          if (
               this.batch.details["gradDate"] == "Date Range" &&
-              !regex.test(value)
-            ) {
+              regex.test(value) // Check if the date format is valid
+          ) {
+              // Split the date string into year, month, and day parts
+              const parts = value.split('-');
+              const year = parseInt(parts[0]);
+              const month = parseInt(parts[1]) - 1; // Months are zero-indexed
+              const day = parseInt(parts[2]);
+              
+              // Create a Date object and check if it represents a valid date
+              const date = new Date(year, month, day);
+              return (
+                  date.getFullYear() === year &&
+                  date.getMonth() === month &&
+                  date.getDate() === day
+              );
+          } else {
               return false;
-            } else return true;
+          }
           }
         ),
         isValidFromDate: helpers.withMessage(

From 2c148045879fa42dcf35e81b2de35010febbd6e8 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Tue, 7 May 2024 12:29:05 -0700
Subject: [PATCH 077/168] fixed batch current students date greying out button

---
 frontend/src/components/Batch/Batch.vue | 86 +++++++++++++------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 4ac5249d..75bbc541 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1113,27 +1113,28 @@ export default {
         isDateInvalid: helpers.withMessage(
           "Enter a valid end date",
           (value) => {
-            const regex = /^\d{4}-\d{2}-\d{2}$/;
-            if (
-                this.batch.details["gradDate"] == "Date Range" &&
-                regex.test(value) // Check if the date format is valid
-            ) {
-                // Split the date string into year, month, and day parts
-                const parts = value.split('-');
-                const year = parseInt(parts[0]);
-                const month = parseInt(parts[1]) - 1; // Months are zero-indexed
-                const day = parseInt(parts[2]);
-                
-                // Create a Date object and check if it represents a valid date
-                const date = new Date(year, month, day);
-                return (
-                    date.getFullYear() === year &&
-                    date.getMonth() === month &&
-                    date.getDate() === day
-                );
-            } else {
-                return false;
-            }
+            if(this.batch.details["gradDate"] == "Date Range"){
+              const regex = /^\d{4}-\d{2}-\d{2}$/;
+              if (regex.test(value)){ // Check if the date format is valid
+                  // Split the date string into year, month, and day parts
+                  const parts = value.split('-');
+                  const year = parseInt(parts[0]);
+                  const month = parseInt(parts[1]) - 1; // Months are zero-indexed
+                  const day = parseInt(parts[2]);
+                  
+                  // Create a Date object and check if it represents a valid date
+                  const date = new Date(year, month, day);
+                  return (
+                      date.getFullYear() === year &&
+                      date.getMonth() === month &&
+                      date.getDate() === day
+                  );
+              } else {
+                  return false;
+              }
+
+            }else{ return true }
+
           }
         ),
         isValidFromDate: helpers.withMessage(
@@ -1157,27 +1158,28 @@ export default {
         isDateInvalid: helpers.withMessage(
           "Enter a valid end date",
           (value) => {
-            const regex = /^\d{4}-\d{2}-\d{2}$/;
-          if (
-              this.batch.details["gradDate"] == "Date Range" &&
-              regex.test(value) // Check if the date format is valid
-          ) {
-              // Split the date string into year, month, and day parts
-              const parts = value.split('-');
-              const year = parseInt(parts[0]);
-              const month = parseInt(parts[1]) - 1; // Months are zero-indexed
-              const day = parseInt(parts[2]);
-              
-              // Create a Date object and check if it represents a valid date
-              const date = new Date(year, month, day);
-              return (
-                  date.getFullYear() === year &&
-                  date.getMonth() === month &&
-                  date.getDate() === day
-              );
-          } else {
-              return false;
-          }
+            if(this.batch.details["gradDate"] == "Date Range"){
+              const regex = /^\d{4}-\d{2}-\d{2}$/;
+              if (regex.test(value)){ // Check if the date format is valid
+                  // Split the date string into year, month, and day parts
+                  const parts = value.split('-');
+                  const year = parseInt(parts[0]);
+                  const month = parseInt(parts[1]) - 1; // Months are zero-indexed
+                  const day = parseInt(parts[2]);
+                  
+                  // Create a Date object and check if it represents a valid date
+                  const date = new Date(year, month, day);
+                  return (
+                      date.getFullYear() === year &&
+                      date.getMonth() === month &&
+                      date.getDate() === day
+                  );
+              } else {
+                  return false;
+              }
+
+            }else{ return true }
+
           }
         ),
         isValidFromDate: helpers.withMessage(

From 57eecd5a09c068da02260814731b4fddcf1e560c Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Mon, 13 May 2024 10:32:39 -0700
Subject: [PATCH 078/168] fixed gradto error

---
 frontend/src/components/Batch/Batch.vue | 82 +++++++++++++------------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 75bbc541..432c4c21 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -280,7 +280,7 @@
                     type="text"
                     placeholder="YYYY-MM-DD"
                     autocomplete="off"
-                    @input="setGradToDate('gradDateTo', $event)"
+                    @input="setGradToDate($event)"
                   ></b-form-input>
                   <!-- <span
                     class="position-absolute form-validation-message text-danger"
@@ -294,7 +294,7 @@
                       right
                       locale="en-US"
                       aria-controls="example-input"
-                      @input="setGradToDate('gradDateTo', $event)"
+                      @input="setGradToDate($event)"
                     ></b-form-datepicker>
                   </b-input-group-append>
                 </b-input-group>
@@ -1113,28 +1113,29 @@ export default {
         isDateInvalid: helpers.withMessage(
           "Enter a valid end date",
           (value) => {
-            if(this.batch.details["gradDate"] == "Date Range"){
+            if (this.batch.details["gradDate"] == "Date Range") {
               const regex = /^\d{4}-\d{2}-\d{2}$/;
-              if (regex.test(value)){ // Check if the date format is valid
-                  // Split the date string into year, month, and day parts
-                  const parts = value.split('-');
-                  const year = parseInt(parts[0]);
-                  const month = parseInt(parts[1]) - 1; // Months are zero-indexed
-                  const day = parseInt(parts[2]);
-                  
-                  // Create a Date object and check if it represents a valid date
-                  const date = new Date(year, month, day);
-                  return (
-                      date.getFullYear() === year &&
-                      date.getMonth() === month &&
-                      date.getDate() === day
-                  );
+              if (regex.test(value)) {
+                // Check if the date format is valid
+                // Split the date string into year, month, and day parts
+                const parts = value.split("-");
+                const year = parseInt(parts[0]);
+                const month = parseInt(parts[1]) - 1; // Months are zero-indexed
+                const day = parseInt(parts[2]);
+
+                // Create a Date object and check if it represents a valid date
+                const date = new Date(year, month, day);
+                return (
+                  date.getFullYear() === year &&
+                  date.getMonth() === month &&
+                  date.getDate() === day
+                );
               } else {
-                  return false;
+                return false;
               }
-
-            }else{ return true }
-
+            } else {
+              return true;
+            }
           }
         ),
         isValidFromDate: helpers.withMessage(
@@ -1158,28 +1159,29 @@ export default {
         isDateInvalid: helpers.withMessage(
           "Enter a valid end date",
           (value) => {
-            if(this.batch.details["gradDate"] == "Date Range"){
+            if (this.batch.details["gradDate"] == "Date Range") {
               const regex = /^\d{4}-\d{2}-\d{2}$/;
-              if (regex.test(value)){ // Check if the date format is valid
-                  // Split the date string into year, month, and day parts
-                  const parts = value.split('-');
-                  const year = parseInt(parts[0]);
-                  const month = parseInt(parts[1]) - 1; // Months are zero-indexed
-                  const day = parseInt(parts[2]);
-                  
-                  // Create a Date object and check if it represents a valid date
-                  const date = new Date(year, month, day);
-                  return (
-                      date.getFullYear() === year &&
-                      date.getMonth() === month &&
-                      date.getDate() === day
-                  );
+              if (regex.test(value)) {
+                // Check if the date format is valid
+                // Split the date string into year, month, and day parts
+                const parts = value.split("-");
+                const year = parseInt(parts[0]);
+                const month = parseInt(parts[1]) - 1; // Months are zero-indexed
+                const day = parseInt(parts[2]);
+
+                // Create a Date object and check if it represents a valid date
+                const date = new Date(year, month, day);
+                return (
+                  date.getFullYear() === year &&
+                  date.getMonth() === month &&
+                  date.getDate() === day
+                );
               } else {
-                  return false;
+                return false;
               }
-
-            }else{ return true }
-
+            } else {
+              return true;
+            }
           }
         ),
         isValidFromDate: helpers.withMessage(

From 453cc0527db37d33cd25668a90d7a4f6e68a2d3f Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Mon, 13 May 2024 12:55:36 -0700
Subject: [PATCH 079/168] removed empty elements

---
 frontend/src/sharedMethods.js          | 20 ++++++++++++++++++++
 frontend/src/views/BatchProcessing.vue |  1 +
 2 files changed, 21 insertions(+)

diff --git a/frontend/src/sharedMethods.js b/frontend/src/sharedMethods.js
index 3574ca9f..622c6918 100644
--- a/frontend/src/sharedMethods.js
+++ b/frontend/src/sharedMethods.js
@@ -108,6 +108,26 @@ export default {
   dateFormatYYYYMMDD(value) {
     return value.replace(/^([\d]{4})([\d]{2})([\d]{2})$/, "$1-$2-$3");
   },
+  removeEmptyElements(obj) {
+    for (var prop in obj) {
+        if (obj.hasOwnProperty(prop)) {
+            if (Array.isArray(obj[prop])) {
+                obj[prop] = obj[prop].filter(item => item !== "");
+                if (obj[prop].length === 0) {
+                    delete obj[prop];
+                }
+            } else if (typeof obj[prop] === 'object' && obj[prop] !== null) {
+                removeEmptyElements(obj[prop]);
+                if (Object.keys(obj[prop]).length === 0) {
+                    delete obj[prop];
+                }
+            } else if (obj[prop] === "") {
+                obj[prop] = null;
+            }
+        }
+    }
+    return obj;
+},
   isValidDateString(value) {
     // Regular expression for YYYY-MM-DD format
     const regex = /^\d{4}-\d{2}-\d{2}$/;
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 94dc0d7f..841fe43c 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1618,6 +1618,7 @@ export default {
         quantity: quantity,
         localDownload: localDownload,
       };
+      request = sharedMethods.removeEmptyElements(request);
 
       if (this.batchHasErrors(this.tabContent[id])) {
         return;

From 132784c47d4b9776a7c6a2c54c48c28c415ea2d5 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Tue, 14 May 2024 10:42:19 -0700
Subject: [PATCH 080/168] updated empty payload to remove strings

---
 frontend/src/sharedMethods.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/sharedMethods.js b/frontend/src/sharedMethods.js
index 622c6918..abbf9d28 100644
--- a/frontend/src/sharedMethods.js
+++ b/frontend/src/sharedMethods.js
@@ -114,11 +114,13 @@ export default {
             if (Array.isArray(obj[prop])) {
                 obj[prop] = obj[prop].filter(item => item !== "");
                 if (obj[prop].length === 0) {
-                    delete obj[prop];
+                    // Do not delete empty arrays
+                    // delete obj[prop];
+                    obj[prop] = [];
                 }
             } else if (typeof obj[prop] === 'object' && obj[prop] !== null) {
                 removeEmptyElements(obj[prop]);
-                if (Object.keys(obj[prop]).length === 0) {
+                if (Object.keys(obj[prop]).length === 0 && !Array.isArray(obj[prop])) {
                     delete obj[prop];
                 }
             } else if (obj[prop] === "") {
@@ -127,7 +129,7 @@ export default {
         }
     }
     return obj;
-},
+  },
   isValidDateString(value) {
     // Regular expression for YYYY-MM-DD format
     const regex = /^\d{4}-\d{2}-\d{2}$/;

From 7344a8d02b5623b7592b1a94d5ddcdf6e3cd9102 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 15 May 2024 10:14:26 -0700
Subject: [PATCH 081/168] fixed school at grad

---
 frontend/src/components/Batch/Batch.vue | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 432c4c21..fabaa5e6 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -765,28 +765,11 @@
                   class="row col-12"
                 >
                   <div class="col-2 p-0 m-0">
-                    <!-- <ValidationProvider
-                        name="Mincode"
-                        :rules="
-                          'mincodelength|validateschool:' +
-                          jobId +
-                          ',' +
-                          index +
-                          ',' +
-                          batch.details['credential']
-                        "
-                        v-slot="{ errors }"
-                      > -->
                     <b-form-input
                       type="number"
                       v-model="school.value"
                       maxLength="8"
                     />
-                    <!-- <span
-                      class="position-absolute w-100 form-validation-message text-danger"
-                      >{{ errors[0] }}</span
-                    > -->
-                    <!-- </ValidationProvider> -->
                   </div>
                   <b-form-input
                     show="false"
@@ -829,7 +812,6 @@
                     </button>
                   </div>
                 </form>
-                <!-- </ValidationObserver> -->
               </div>
               <div class="row col-12 mb-2">
                 <div v-if="school.schoolName" class="col-2">
@@ -1831,8 +1813,9 @@ export default {
               this.$refs["student-status" + id + valueIndex][0].updateValue(
                 student.data[0].studentStatus
               );
+
               this.$refs["schoolAtGraduation" + id + valueIndex][0].updateValue(
-                student.data[0].schoolAtGrad
+                studentGradStatus.data.schoolAtGrad
               );
               this.$refs["program" + id + valueIndex][0].updateValue(
                 student.data[0].program

From 4233582ea2807c3b71b6efad6ea53e32debeb8fc Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 23 May 2024 11:21:21 -0700
Subject: [PATCH 082/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 168b6b87..6724ca66 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.18.0",
-    "test": "1.18.0",
+    "dev": "1.19.0",
+    "test": "1.19.0",
     "prod": "1.18.0"
   }
 }

From b9b7397c36987386da3f397f0314c0f1b1274e0a Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Mon, 27 May 2024 11:22:53 -0700
Subject: [PATCH 083/168] validation for cert regen

---
 frontend/src/components/Batch/Batch.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 432c4c21..e7ac3518 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1756,6 +1756,13 @@ export default {
           } else if (student.data[0].studentStatus == "MER") {
             this.validationMessage =
               value + " is a merged student and not permitted";
+          } else if (
+            !student.data[0].programCompletionDate &&
+            this.batch.details["what"] == "CERT_REGEN"
+          ) {
+            this.validationMessage =
+              value +
+              " does not have a program completion date and has not graduated";
           } else {
             //check if student has a gradStatus
             let studentGradStatus = await StudentService.getGraduationStatus(

From 7630192916d979b0c98584d2bacc5853c1063190 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Mon, 27 May 2024 11:51:08 -0700
Subject: [PATCH 084/168] fixed message

---
 frontend/src/components/Batch/Batch.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index e7ac3518..529cce63 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1761,8 +1761,7 @@ export default {
             this.batch.details["what"] == "CERT_REGEN"
           ) {
             this.validationMessage =
-              value +
-              " does not have a program completion date and has not graduated";
+              "Cannot regenerate a certificate for this student - this student has not completed their program";
           } else {
             //check if student has a gradStatus
             let studentGradStatus = await StudentService.getGraduationStatus(

From 0f83d212be97df359ae1e3cfbd6dfdf3faa95ce3 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Mon, 27 May 2024 13:06:08 -0700
Subject: [PATCH 085/168] fixed

---
 frontend/src/components/Batch/Batch.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 529cce63..7d909511 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1746,7 +1746,6 @@ export default {
         this.validating = false;
       }
       if (type == "students") {
-        //remove duplicates
         this.validating = true;
         if (value) {
           let student = await StudentService.getStudentByPen(value);
@@ -1756,12 +1755,6 @@ export default {
           } else if (student.data[0].studentStatus == "MER") {
             this.validationMessage =
               value + " is a merged student and not permitted";
-          } else if (
-            !student.data[0].programCompletionDate &&
-            this.batch.details["what"] == "CERT_REGEN"
-          ) {
-            this.validationMessage =
-              "Cannot regenerate a certificate for this student - this student has not completed their program";
           } else {
             //check if student has a gradStatus
             let studentGradStatus = await StudentService.getGraduationStatus(
@@ -1814,6 +1807,17 @@ export default {
                   return;
                 }
               }
+              // Students must have a program completion date if regenerating their certificate
+              if (
+                !studentGradStatus.data.programCompletionDate &&
+                this.batch.details["what"] == "CERT_REGEN"
+              ) {
+                this.validationMessage =
+                  "Cannot regenerate a certificate for this student - this student has not completed their program";
+                this.validating = false;
+                return;
+              }
+
               this.addValueToTypeInBatchId({
                 id,
                 type,

From 68b12b4ecda281efda51a3370832ea4cb35787d4 Mon Sep 17 00:00:00 2001
From: "chris.ditcher" <Chris.Ditcher@QP.GOV.BC.CA>
Date: Thu, 30 May 2024 14:01:57 -0700
Subject: [PATCH 086/168] Updated HPA to alleviate info alerts

---
 .github/workflows/build-n-deploy-backend-km.yml              | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-dev.yml      | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-tools.yml    | 2 +-
 .github/workflows/deploy-backend-to-ocp-test.yml             | 2 +-
 .github/workflows/deploy-frontend-to-ocp-test.yml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-n-deploy-backend-km.yml b/.github/workflows/build-n-deploy-backend-km.yml
index 01472fc6..aa813727 100644
--- a/.github/workflows/build-n-deploy-backend-km.yml
+++ b/.github/workflows/build-n-deploy-backend-km.yml
@@ -34,7 +34,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "1"
-  MAX_REPLICAS: "1"
+  MAX_REPLICAS: "2"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
   HOST_ROUTE: ${{ secrets.SITE_URL }}
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
index 867875dd..2766bf20 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
@@ -34,7 +34,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "1"
-  MAX_REPLICAS: "1"
+  MAX_REPLICAS: "2"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
   HOST_ROUTE: ${{ secrets.SITE_URL }}
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
index 8ced2195..5a390ef2 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
@@ -34,7 +34,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "1"
-  MAX_REPLICAS: "1"
+  MAX_REPLICAS: "2"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
   HOST_ROUTE: ${{ secrets.SITE_URL }}
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml b/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
index 6dd58694..c198a33e 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
@@ -34,7 +34,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "1"
-  MAX_REPLICAS: "1"
+  MAX_REPLICAS: "2"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
   HOST_ROUTE: ${{ secrets.SITE_URL }}
diff --git a/.github/workflows/deploy-backend-to-ocp-test.yml b/.github/workflows/deploy-backend-to-ocp-test.yml
index 5e5f4dd7..c2ad6e39 100644
--- a/.github/workflows/deploy-backend-to-ocp-test.yml
+++ b/.github/workflows/deploy-backend-to-ocp-test.yml
@@ -38,7 +38,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "3"
-  MAX_REPLICAS: "3"
+  MAX_REPLICAS: "5"
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/deploy-frontend-to-ocp-test.yml b/.github/workflows/deploy-frontend-to-ocp-test.yml
index d5cf0914..f2c969a1 100644
--- a/.github/workflows/deploy-frontend-to-ocp-test.yml
+++ b/.github/workflows/deploy-frontend-to-ocp-test.yml
@@ -34,7 +34,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "3"
-  MAX_REPLICAS: "3"
+  MAX_REPLICAS: "5"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
   HOST_ROUTE: ${{ secrets.SITE_URL }}

From 13e20d7078807960539672523acf79e997a833dd Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 30 May 2024 15:06:18 -0700
Subject: [PATCH 087/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 6724ca66..121a8b59 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.19.0",
     "test": "1.19.0",
-    "prod": "1.18.0"
+    "prod": "1.19.0"
   }
 }

From 149c206458699e67f06b13623bba5d3a9eac48e9 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:24:42 -0700
Subject: [PATCH 088/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 121a8b59..05692cb1 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.19.0",
-    "test": "1.19.0",
+    "dev": "1.20.0",
+    "test": "1.20.0",
     "prod": "1.19.0"
   }
 }

From 2485d55eb53aa17567ba287f8f432ba4bba9ad4b Mon Sep 17 00:00:00 2001
From: Kamal Mohammed <kamal.mohammed@outlook.com>
Date: Tue, 4 Jun 2024 14:58:51 -0600
Subject: [PATCH 089/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 05692cb1..5ad0f06b 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
     "dev": "1.20.0",
-    "test": "1.20.0",
+    "test": "1.19.0",
     "prod": "1.19.0"
   }
 }

From ae3ace975ea26a120492031fb9fa42276acb065b Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 5 Jun 2024 11:55:25 -0700
Subject: [PATCH 090/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 5ad0f06b..05692cb1 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
     "dev": "1.20.0",
-    "test": "1.19.0",
+    "test": "1.20.0",
     "prod": "1.19.0"
   }
 }

From 811f03e1f47d8c7e3ededcd94f654c8b63df4c29 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 6 Jun 2024 14:21:52 -0700
Subject: [PATCH 091/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 05692cb1..c9b50fee 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.20.0",
     "test": "1.20.0",
-    "prod": "1.19.0"
+    "prod": "1.20.0"
   }
 }

From ac783a8df38461503ed31269af4146c9854a12c0 Mon Sep 17 00:00:00 2001
From: githubmamatha <harmainimamatha@gmail.com>
Date: Mon, 17 Jun 2024 12:01:06 -0700
Subject: [PATCH 092/168] Grad2-2622 Fine Arts Applied Skills code table on
 Codes tab.

---
 .../Codes/FineArtsAppliedSkillsCodes.vue      | 87 +++++++++++++++++++
 frontend/src/router/index.js                  |  8 ++
 frontend/src/services/CourseService.js        |  3 +
 frontend/src/views/Codes.vue                  | 34 ++++++++
 4 files changed, 132 insertions(+)
 create mode 100644 frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue

diff --git a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue
new file mode 100644
index 00000000..b136b4ce
--- /dev/null
+++ b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue
@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <p>A list of Fine Arts Applied Skills Codes maintained in this table.</p>
+    {{fineArtsAppliedSkillsTypes}}
+    <DisplayTable
+        title="Fine Arts Applied Skills Codes"
+        v-bind:items="fineArtsAppliedSkillsTypes"
+        v-bind:fields="fineArtsAppliedSkillsTypesFields"
+        id=""
+        showFilter="true"
+    >
+      <template #cell(effectiveDate)="row">
+        {{ $filters.formatSimpleDate(row.item.effectiveDate) }}
+      </template>
+      <template #cell(expiryDate)="row">
+        {{ $filters.formatSimpleDate(row.item.expiryDate) }}
+      </template>
+    </DisplayTable>
+  </div>
+</template>
+
+<script>
+import DisplayTable from "@/components/DisplayTable.vue";
+import CourseService from "@/services/CourseService";
+
+export default {
+  name: "FineArtsAppliedSkillsTypes",
+  components: {
+    DisplayTable: DisplayTable,
+  },
+  created() {
+    CourseService.getFineArtsAppliedSkillsTypes()
+        .then((response) => {
+          this.fineArtsAppliedSkillsTypes = response.data;
+        })
+        // eslint-disable-next-line
+        .catch((error) => {
+          this.$bvToast.toast("ERROR " + error.response.statusText, {
+            title: "ERROR" + error.response.status,
+            variant: "danger",
+            noAutoHide: true,
+          });
+        });
+  },
+  data: function () {
+    return {
+      fineArtsAppliedSkillsTypes: [],
+      fineArtsAppliedSkillsTypesFields: [
+        {
+          key: "code",
+          label: "Code",
+          sortable: true,
+          sortDirection: "desc",
+        },
+        {
+          key: "label",
+          label: "Label",
+          sortable: true,
+        },
+        {
+          key: "description",
+          label: "Description",
+          sortable: true,
+        },
+        {
+          key: "effectiveDate",
+          label: "Effective Date",
+          sortable: true,
+        },
+        {
+          key: "expiryDate",
+          label: "Expiry Date",
+          sortable: true,
+        },
+      ],
+    };
+  },
+  methods: {},
+};
+</script>
+
+<style>
+.table th,
+.table td {
+  border-top: none !important;
+}
+</style>
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index e896d303..45279dce 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -20,6 +20,7 @@ import UngradReasons from "../components/Codes/UngradReasons.vue";
 import HistoryActivityCodes from "../components/Codes/HistoryActivityCodes.vue";
 import DocumentStatusCode from "../components/Codes/DocumentStatusCode.vue";
 import BatchTypes from "../components/Codes/BatchTypes.vue";
+import FineArtsAppliedSkillsTypes from "../components/Codes/FineArtsAppliedSkillsCodes.vue";
 // Programs
 import AdminGraduationPrograms from "../views/Programs.vue";
 import AlgorithmRules from "../components/Programs/AlgorithmRules.vue";
@@ -351,6 +352,13 @@ const router = createRouter({
             requiresAuth: true,
           },
         },
+        {
+          path: "/codes/fine-arts-applied-skills",
+          component: FineArtsAppliedSkillsTypes,
+          meta: {
+            requiresAuth: true,
+          },
+        },
       ],
       meta: {
         requiresAuth: true,
diff --git a/frontend/src/services/CourseService.js b/frontend/src/services/CourseService.js
index 43aeccf8..966a03c5 100644
--- a/frontend/src/services/CourseService.js
+++ b/frontend/src/services/CourseService.js
@@ -44,4 +44,7 @@ export default {
       "/api/v1/course/studentexam/pen/" + pen + "?sortForUI=true"
     );
   },
+  getFineArtsAppliedSkillsTypes() {
+    return ApiService.apiAxios.get("/api/v1/course/fineArtsAppliedSkillsCodes");
+  },
 };
diff --git a/frontend/src/views/Codes.vue b/frontend/src/views/Codes.vue
index 5ab184fa..946b6f8b 100644
--- a/frontend/src/views/Codes.vue
+++ b/frontend/src/views/Codes.vue
@@ -103,6 +103,12 @@
               @click="tab = 7"
               >Batch Type Codes</b-nav-item
             >
+          <b-nav-item
+            to="/codes/fine-arts-applied-skills"
+            :active="tab === 8"
+            @click="tab = 8"
+            >Fine Arts Applied Skills Code</b-nav-item
+          >
           </b-nav>
         </b-card-header>
         <b-card-body>
@@ -123,6 +129,7 @@ import GraduationReportService from "@/services/GraduationReportService.js";
 import StudentService from "@/services/StudentService.js";
 import ProgramManagementService from "@/services/ProgramManagementService.js";
 import BatchProcessingService from "@/services/BatchProcessingService.js";
+import CourseService from "@/services/CourseService";
 
 export default {
   name: "codes",
@@ -148,6 +155,19 @@ export default {
           sortable: true,
         },
       ],
+      fineArtsAppliedSkillsTypes: [],
+      fineArtsAppliedSkillsTypesFields: [
+        {
+          key: "code",
+          label: "Code",
+          sortable: true,
+        },
+        {
+          key: "label",
+          label: "Label",
+          sortable: true,
+        },
+      ],
       reportSignaturesFields: [
         {
           key: "signatureContent",
@@ -328,6 +348,7 @@ export default {
     this.getStudentStatusCodes();
     this.getUngradReasons();
     this.getBatchJobTypes();
+    this.getFineArtsAppliedSkillsTypes();
   },
   methods: {
     closeDropdown(dropdown) {
@@ -420,6 +441,19 @@ export default {
           });
         });
     },
+    getFineArtsAppliedSkillsTypes() {
+      console.log(CourseService.getFineArtsAppliedSkillsTypes()
+          .then((response) => {
+            this.fineArtsAppliedSkillsTypes = response.data;
+          })
+          .catch((error) => {
+            this.$bvToast.toast("ERROR " + error.response.statusText, {
+              title: "ERROR" + error.response.status,
+              variant: "danger",
+              noAutoHide: true,
+            });
+          }));
+    },
     getUngradReasons() {
       StudentService.getUngradReasons()
         .then((response) => {

From fdb5b3043a83373c92fa401c8f27c4eb389e1191 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 17 Jun 2024 15:23:40 -0700
Subject: [PATCH 093/168] Updated FaAs code key and applied displayOrder sort

---
 .../Codes/FineArtsAppliedSkillsCodes.vue      | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue
index b136b4ce..9fb8f3c5 100644
--- a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue
+++ b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue
@@ -1,13 +1,12 @@
 <template>
   <div>
     <p>A list of Fine Arts Applied Skills Codes maintained in this table.</p>
-    {{fineArtsAppliedSkillsTypes}}
     <DisplayTable
-        title="Fine Arts Applied Skills Codes"
-        v-bind:items="fineArtsAppliedSkillsTypes"
-        v-bind:fields="fineArtsAppliedSkillsTypesFields"
-        id=""
-        showFilter="true"
+      title="Fine Arts Applied Skills Codes"
+      v-bind:items="sortedFaAsCodes"
+      v-bind:fields="fineArtsAppliedSkillsTypesFields"
+      id="fineArtsAppliedSkillsCode"
+      showFilter="true"
     >
       <template #cell(effectiveDate)="row">
         {{ $filters.formatSimpleDate(row.item.effectiveDate) }}
@@ -23,6 +22,9 @@
 import DisplayTable from "@/components/DisplayTable.vue";
 import CourseService from "@/services/CourseService";
 
+// import shared functions & validations
+import { applyDisplayOrder } from "@/utils/common.js";
+
 export default {
   name: "FineArtsAppliedSkillsTypes",
   components: {
@@ -30,24 +32,24 @@ export default {
   },
   created() {
     CourseService.getFineArtsAppliedSkillsTypes()
-        .then((response) => {
-          this.fineArtsAppliedSkillsTypes = response.data;
-        })
-        // eslint-disable-next-line
-        .catch((error) => {
-          this.$bvToast.toast("ERROR " + error.response.statusText, {
-            title: "ERROR" + error.response.status,
-            variant: "danger",
-            noAutoHide: true,
-          });
+      .then((response) => {
+        this.fineArtsAppliedSkillsTypes = response.data;
+      })
+      // eslint-disable-next-line
+      .catch((error) => {
+        this.$bvToast.toast("ERROR " + error.response.statusText, {
+          title: "ERROR" + error.response.status,
+          variant: "danger",
+          noAutoHide: true,
         });
+      });
   },
   data: function () {
     return {
       fineArtsAppliedSkillsTypes: [],
       fineArtsAppliedSkillsTypesFields: [
         {
-          key: "code",
+          key: "fineArtsAppliedSkillsCode",
           label: "Code",
           sortable: true,
           sortDirection: "desc",
@@ -75,7 +77,11 @@ export default {
       ],
     };
   },
-  methods: {},
+  computed: {
+    sortedFaAsCodes() {
+      return applyDisplayOrder(this.fineArtsAppliedSkillsTypes);
+    },
+  },
 };
 </script>
 

From ec621497f74261b088a6e056798ed92a8a634c38 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 17 Jun 2024 15:57:25 -0700
Subject: [PATCH 094/168] Moved FaAs codes to courses view/tab

---
 .../FineArtsAppliedSkillsCodes.vue            |  7 ++--
 frontend/src/views/Codes.vue                  | 33 -------------------
 frontend/src/views/Courses.vue                |  7 ++++
 3 files changed, 12 insertions(+), 35 deletions(-)
 rename frontend/src/components/{Codes => Courses}/FineArtsAppliedSkillsCodes.vue (91%)

diff --git a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue b/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
similarity index 91%
rename from frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue
rename to frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
index 9fb8f3c5..4c978a97 100644
--- a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue
+++ b/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
-    <p>A list of Fine Arts Applied Skills Codes maintained in this table.</p>
+    <p>
+      Fine Arts Applied Skills codes Indicates that a course is being used for
+      the Fine Arts and/or Applied Skills graduation requirement.
+    </p>
     <DisplayTable
       title="Fine Arts Applied Skills Codes"
       v-bind:items="sortedFaAsCodes"
@@ -26,7 +29,7 @@ import CourseService from "@/services/CourseService";
 import { applyDisplayOrder } from "@/utils/common.js";
 
 export default {
-  name: "FineArtsAppliedSkillsTypes",
+  name: "FineArtsAppliedSkillsCodes",
   components: {
     DisplayTable: DisplayTable,
   },
diff --git a/frontend/src/views/Codes.vue b/frontend/src/views/Codes.vue
index 946b6f8b..95032c3a 100644
--- a/frontend/src/views/Codes.vue
+++ b/frontend/src/views/Codes.vue
@@ -103,12 +103,6 @@
               @click="tab = 7"
               >Batch Type Codes</b-nav-item
             >
-          <b-nav-item
-            to="/codes/fine-arts-applied-skills"
-            :active="tab === 8"
-            @click="tab = 8"
-            >Fine Arts Applied Skills Code</b-nav-item
-          >
           </b-nav>
         </b-card-header>
         <b-card-body>
@@ -155,19 +149,6 @@ export default {
           sortable: true,
         },
       ],
-      fineArtsAppliedSkillsTypes: [],
-      fineArtsAppliedSkillsTypesFields: [
-        {
-          key: "code",
-          label: "Code",
-          sortable: true,
-        },
-        {
-          key: "label",
-          label: "Label",
-          sortable: true,
-        },
-      ],
       reportSignaturesFields: [
         {
           key: "signatureContent",
@@ -348,7 +329,6 @@ export default {
     this.getStudentStatusCodes();
     this.getUngradReasons();
     this.getBatchJobTypes();
-    this.getFineArtsAppliedSkillsTypes();
   },
   methods: {
     closeDropdown(dropdown) {
@@ -441,19 +421,6 @@ export default {
           });
         });
     },
-    getFineArtsAppliedSkillsTypes() {
-      console.log(CourseService.getFineArtsAppliedSkillsTypes()
-          .then((response) => {
-            this.fineArtsAppliedSkillsTypes = response.data;
-          })
-          .catch((error) => {
-            this.$bvToast.toast("ERROR " + error.response.statusText, {
-              title: "ERROR" + error.response.status,
-              variant: "danger",
-              noAutoHide: true,
-            });
-          }));
-    },
     getUngradReasons() {
       StudentService.getUngradReasons()
         .then((response) => {
diff --git a/frontend/src/views/Courses.vue b/frontend/src/views/Courses.vue
index f8cadb19..762a0335 100644
--- a/frontend/src/views/Courses.vue
+++ b/frontend/src/views/Courses.vue
@@ -173,6 +173,7 @@
             </b-card-text>
           </b-tab>
           <b-tab title="Course restrictions">
+            <!-- TODO: Refactor this into it's own component for Vuetify -->
             <b-card-text>
               <DisplayTable
                 title="Course restrictions"
@@ -304,6 +305,9 @@
               </DisplayTable>
             </b-card-text>
           </b-tab>
+          <b-tab title="Fine Arts Applied Skills">
+            <FineArtsAppliedSkillsCodes
+          /></b-tab>
         </b-tabs>
       </b-card>
     </div>
@@ -314,10 +318,13 @@
 import { showNotification } from "../utils/common.js";
 import CourseService from "@/services/CourseService.js";
 import DisplayTable from "@/components/DisplayTable.vue";
+import FineArtsAppliedSkillsCodes from "@/components/Courses/FineArtsAppliedSkillsCodes.vue";
+
 export default {
   name: "courses",
   components: {
     DisplayTable: DisplayTable,
+    FineArtsAppliedSkillsCodes: FineArtsAppliedSkillsCodes,
   },
   data() {
     return {

From 8a4b2f03a3a9953a95413e0134505605d3bf3b42 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 17 Jun 2024 16:05:18 -0700
Subject: [PATCH 095/168] Remove unused import from codes view

---
 frontend/src/views/Codes.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/views/Codes.vue b/frontend/src/views/Codes.vue
index 95032c3a..04e28cf2 100644
--- a/frontend/src/views/Codes.vue
+++ b/frontend/src/views/Codes.vue
@@ -122,8 +122,6 @@ import { useAuthStore } from "../store/modules/auth";
 import GraduationReportService from "@/services/GraduationReportService.js";
 import StudentService from "@/services/StudentService.js";
 import ProgramManagementService from "@/services/ProgramManagementService.js";
-import BatchProcessingService from "@/services/BatchProcessingService.js";
-import CourseService from "@/services/CourseService";
 
 export default {
   name: "codes",

From bbf40d1b6d60677c6611949ada040cfa5d162d03 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 17 Jun 2024 16:07:01 -0700
Subject: [PATCH 096/168] fix

---
 frontend/src/views/Codes.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/Codes.vue b/frontend/src/views/Codes.vue
index 04e28cf2..5ab184fa 100644
--- a/frontend/src/views/Codes.vue
+++ b/frontend/src/views/Codes.vue
@@ -122,6 +122,7 @@ import { useAuthStore } from "../store/modules/auth";
 import GraduationReportService from "@/services/GraduationReportService.js";
 import StudentService from "@/services/StudentService.js";
 import ProgramManagementService from "@/services/ProgramManagementService.js";
+import BatchProcessingService from "@/services/BatchProcessingService.js";
 
 export default {
   name: "codes",

From f42c03d4756bf5ba3222f8e2f62b5f49cbaaa6f7 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 18 Jun 2024 08:45:57 -0700
Subject: [PATCH 097/168] fix import

---
 frontend/src/router/index.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 45279dce..f328297c 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -20,7 +20,7 @@ import UngradReasons from "../components/Codes/UngradReasons.vue";
 import HistoryActivityCodes from "../components/Codes/HistoryActivityCodes.vue";
 import DocumentStatusCode from "../components/Codes/DocumentStatusCode.vue";
 import BatchTypes from "../components/Codes/BatchTypes.vue";
-import FineArtsAppliedSkillsTypes from "../components/Codes/FineArtsAppliedSkillsCodes.vue";
+
 // Programs
 import AdminGraduationPrograms from "../views/Programs.vue";
 import AlgorithmRules from "../components/Programs/AlgorithmRules.vue";
@@ -352,13 +352,6 @@ const router = createRouter({
             requiresAuth: true,
           },
         },
-        {
-          path: "/codes/fine-arts-applied-skills",
-          component: FineArtsAppliedSkillsTypes,
-          meta: {
-            requiresAuth: true,
-          },
-        },
       ],
       meta: {
         requiresAuth: true,

From 400688738ba93534f252bb9a2dc4b5b31900cad4 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 18 Jun 2024 13:25:24 -0700
Subject: [PATCH 098/168] added exam special case codes to courses view on UI

---
 .../Courses/ExamSpecialCaseCodes.vue          | 98 +++++++++++++++++++
 .../Courses/FineArtsAppliedSkillsCodes.vue    |  1 -
 frontend/src/services/CourseService.js        |  3 +
 frontend/src/views/Courses.vue                | 11 ++-
 4 files changed, 109 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/components/Courses/ExamSpecialCaseCodes.vue

diff --git a/frontend/src/components/Courses/ExamSpecialCaseCodes.vue b/frontend/src/components/Courses/ExamSpecialCaseCodes.vue
new file mode 100644
index 00000000..17ad4aaf
--- /dev/null
+++ b/frontend/src/components/Courses/ExamSpecialCaseCodes.vue
@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <p>
+      Identifies the special cases associated with writing the exam or allowing
+      an exemption from exam writing
+    </p>
+    <DisplayTable
+      title="Exam Special Case Codes"
+      v-bind:items="sortedExamSpecialCaseCodes"
+      v-bind:fields="examSpecialCaseCodesFields"
+      id="examSpecialCaseCode"
+      showFilter="true"
+    >
+      <template #cell(effectiveDate)="row">
+        {{ $filters.formatSimpleDate(row.item.effectiveDate) }}
+      </template>
+      <template #cell(expiryDate)="row">
+        {{ $filters.formatSimpleDate(row.item.expiryDate) }}
+      </template>
+    </DisplayTable>
+  </div>
+</template>
+
+<script>
+import DisplayTable from "@/components/DisplayTable.vue";
+import CourseService from "@/services/CourseService";
+
+// import shared functions & validations
+import { applyDisplayOrder } from "@/utils/common.js";
+
+export default {
+  name: "ExamSpecialCaseCodes",
+  components: {
+    DisplayTable: DisplayTable,
+  },
+  created() {
+    // get codes
+    CourseService.getExamSpecialCaseCodes()
+      .then((response) => {
+        this.examSpecialCaseCodes = response.data;
+      })
+      // eslint-disable-next-line
+      .catch((error) => {
+        this.$bvToast.toast("ERROR " + error.response.statusText, {
+          title: "ERROR" + error.response.status,
+          variant: "danger",
+          noAutoHide: true,
+        });
+      });
+  },
+  data: function () {
+    return {
+      examSpecialCaseCodes: [],
+      examSpecialCaseCodesFields: [
+        {
+          key: "examSpecialCaseCode",
+          label: "Code",
+          sortable: true,
+        },
+        {
+          key: "label",
+          label: "Label",
+          sortable: true,
+        },
+        {
+          key: "description",
+          label: "Description",
+          sortable: true,
+        },
+        {
+          key: "effectiveDate",
+          label: "Effective Date",
+          sortable: true,
+          class: "w-25",
+        },
+        {
+          key: "expiryDate",
+          label: "Expiry Date",
+          sortable: true,
+          class: "w-25",
+        },
+      ],
+    };
+  },
+  computed: {
+    sortedExamSpecialCaseCodes() {
+      return applyDisplayOrder(this.examSpecialCaseCodes);
+    },
+  },
+};
+</script>
+
+<style>
+.table th,
+.table td {
+  border-top: none !important;
+}
+</style>
diff --git a/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue b/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
index 4c978a97..ac94ca11 100644
--- a/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
+++ b/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
@@ -55,7 +55,6 @@ export default {
           key: "fineArtsAppliedSkillsCode",
           label: "Code",
           sortable: true,
-          sortDirection: "desc",
         },
         {
           key: "label",
diff --git a/frontend/src/services/CourseService.js b/frontend/src/services/CourseService.js
index 966a03c5..eefc94e7 100644
--- a/frontend/src/services/CourseService.js
+++ b/frontend/src/services/CourseService.js
@@ -47,4 +47,7 @@ export default {
   getFineArtsAppliedSkillsTypes() {
     return ApiService.apiAxios.get("/api/v1/course/fineArtsAppliedSkillsCodes");
   },
+  getExamSpecialCaseCodes() {
+    return ApiService.apiAxios.get("/api/v1/course/examSpecialCaseCodes");
+  },
 };
diff --git a/frontend/src/views/Courses.vue b/frontend/src/views/Courses.vue
index 762a0335..176f573c 100644
--- a/frontend/src/views/Courses.vue
+++ b/frontend/src/views/Courses.vue
@@ -172,11 +172,11 @@
               ></DisplayTable>
             </b-card-text>
           </b-tab>
-          <b-tab title="Course restrictions">
+          <b-tab title="Course Restrictions">
             <!-- TODO: Refactor this into it's own component for Vuetify -->
             <b-card-text>
               <DisplayTable
-                title="Course restrictions"
+                title="Course Restrictions"
                 v-bind:items="courseRestrictions"
                 v-bind:fields="courseRestrictionFields"
                 id="courseRestrictionId"
@@ -186,7 +186,7 @@
               </DisplayTable>
             </b-card-text>
           </b-tab>
-          <b-tab title="Course requirements">
+          <b-tab title="Course Requirements">
             <b-card-text>
               <form v-on:submit.prevent>
                 <div class="advanced-search-form">
@@ -308,6 +308,9 @@
           <b-tab title="Fine Arts Applied Skills">
             <FineArtsAppliedSkillsCodes
           /></b-tab>
+          <b-tab title="Exam Special Cases">
+            <ExamSpecialCaseCodes />
+          </b-tab>
         </b-tabs>
       </b-card>
     </div>
@@ -319,12 +322,14 @@ import { showNotification } from "../utils/common.js";
 import CourseService from "@/services/CourseService.js";
 import DisplayTable from "@/components/DisplayTable.vue";
 import FineArtsAppliedSkillsCodes from "@/components/Courses/FineArtsAppliedSkillsCodes.vue";
+import ExamSpecialCaseCodes from "@/components/Courses/ExamSpecialCaseCodes.vue";
 
 export default {
   name: "courses",
   components: {
     DisplayTable: DisplayTable,
     FineArtsAppliedSkillsCodes: FineArtsAppliedSkillsCodes,
+    ExamSpecialCaseCodes: ExamSpecialCaseCodes,
   },
   data() {
     return {

From bf4ae6ef38f36877a332661b2cbe0ae3adca5fee Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 18 Jun 2024 14:10:00 -0700
Subject: [PATCH 099/168] added equivalency or challenge codes to courses view
 on UI

---
 .../Courses/EquivalentOrChallengeCodes.vue    | 96 +++++++++++++++++++
 .../Courses/ExamSpecialCaseCodes.vue          |  2 +-
 frontend/src/services/CourseService.js        |  3 +
 frontend/src/views/Courses.vue                |  5 +
 4 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/components/Courses/EquivalentOrChallengeCodes.vue

diff --git a/frontend/src/components/Courses/EquivalentOrChallengeCodes.vue b/frontend/src/components/Courses/EquivalentOrChallengeCodes.vue
new file mode 100644
index 00000000..bd852bfc
--- /dev/null
+++ b/frontend/src/components/Courses/EquivalentOrChallengeCodes.vue
@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <p>
+      Indicates if credit for the course was granted through the Equivalency (E)
+      or Challenge (C) process.
+    </p>
+    <DisplayTable
+      title="Exam Special Case Codes"
+      v-bind:items="sortedEquivalentOrChallengeCodes"
+      v-bind:fields="equivalentOrChallengeCodesFields"
+      id="equivalentOrChallengeCode"
+      showFilter="true"
+    >
+      <template #cell(effectiveDate)="row">
+        {{ $filters.formatSimpleDate(row.item.effectiveDate) }}
+      </template>
+      <template #cell(expiryDate)="row">
+        {{ $filters.formatSimpleDate(row.item.expiryDate) }}
+      </template>
+    </DisplayTable>
+  </div>
+</template>
+
+<script>
+import DisplayTable from "@/components/DisplayTable.vue";
+import CourseService from "@/services/CourseService";
+
+// import shared functions & validations
+import { applyDisplayOrder } from "@/utils/common.js";
+
+export default {
+  name: "EquivalentOrChallengeCodes",
+  components: {
+    DisplayTable: DisplayTable,
+  },
+  created() {
+    // get codes
+    CourseService.getEquivalentOrChallengeCodes()
+      .then((response) => {
+        this.equivalentOrChallengeCodes = response.data;
+      })
+      // eslint-disable-next-line
+      .catch((error) => {
+        this.$bvToast.toast("ERROR " + error.response.statusText, {
+          title: "ERROR" + error.response.status,
+          variant: "danger",
+          noAutoHide: true,
+        });
+      });
+  },
+  data: function () {
+    return {
+      equivalentOrChallengeCodes: [],
+      equivalentOrChallengeCodesFields: [
+        {
+          key: "equivalentOrChallengeCode",
+          label: "Code",
+          sortable: true,
+        },
+        {
+          key: "label",
+          label: "Label",
+          sortable: true,
+        },
+        {
+          key: "description",
+          label: "Description",
+          sortable: true,
+        },
+        {
+          key: "effectiveDate",
+          label: "Effective Date",
+          sortable: true,
+        },
+        {
+          key: "expiryDate",
+          label: "Expiry Date",
+          sortable: true,
+        },
+      ],
+    };
+  },
+  computed: {
+    sortedEquivalentOrChallengeCodes() {
+      return applyDisplayOrder(this.equivalentOrChallengeCodes);
+    },
+  },
+};
+</script>
+
+<style>
+.table th,
+.table td {
+  border-top: none !important;
+}
+</style>
diff --git a/frontend/src/components/Courses/ExamSpecialCaseCodes.vue b/frontend/src/components/Courses/ExamSpecialCaseCodes.vue
index 17ad4aaf..d92fd8c4 100644
--- a/frontend/src/components/Courses/ExamSpecialCaseCodes.vue
+++ b/frontend/src/components/Courses/ExamSpecialCaseCodes.vue
@@ -2,7 +2,7 @@
   <div>
     <p>
       Identifies the special cases associated with writing the exam or allowing
-      an exemption from exam writing
+      an exemption from exam writing.
     </p>
     <DisplayTable
       title="Exam Special Case Codes"
diff --git a/frontend/src/services/CourseService.js b/frontend/src/services/CourseService.js
index eefc94e7..3a7a0bf7 100644
--- a/frontend/src/services/CourseService.js
+++ b/frontend/src/services/CourseService.js
@@ -50,4 +50,7 @@ export default {
   getExamSpecialCaseCodes() {
     return ApiService.apiAxios.get("/api/v1/course/examSpecialCaseCodes");
   },
+  getEquivalentOrChallengeCodes() {
+    return ApiService.apiAxios.get("/api/v1/course/equivalentOrChallengeCodes");
+  },
 };
diff --git a/frontend/src/views/Courses.vue b/frontend/src/views/Courses.vue
index 176f573c..ad6d39b4 100644
--- a/frontend/src/views/Courses.vue
+++ b/frontend/src/views/Courses.vue
@@ -311,6 +311,9 @@
           <b-tab title="Exam Special Cases">
             <ExamSpecialCaseCodes />
           </b-tab>
+          <b-tab title="Equivalency or Challenge">
+            <EquivalentOrChallengeCodes />
+          </b-tab>
         </b-tabs>
       </b-card>
     </div>
@@ -323,6 +326,7 @@ import CourseService from "@/services/CourseService.js";
 import DisplayTable from "@/components/DisplayTable.vue";
 import FineArtsAppliedSkillsCodes from "@/components/Courses/FineArtsAppliedSkillsCodes.vue";
 import ExamSpecialCaseCodes from "@/components/Courses/ExamSpecialCaseCodes.vue";
+import EquivalentOrChallengeCodes from "@/components/Courses/EquivalentOrChallengeCodes.vue";
 
 export default {
   name: "courses",
@@ -330,6 +334,7 @@ export default {
     DisplayTable: DisplayTable,
     FineArtsAppliedSkillsCodes: FineArtsAppliedSkillsCodes,
     ExamSpecialCaseCodes: ExamSpecialCaseCodes,
+    EquivalentOrChallengeCodes: EquivalentOrChallengeCodes,
   },
   data() {
     return {

From 7a65e69f31ce66edd124fd75e94dc8e893041209 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 19 Jun 2024 08:29:47 -0700
Subject: [PATCH 100/168] formatting fix

---
 frontend/src/views/Courses.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Courses.vue b/frontend/src/views/Courses.vue
index ad6d39b4..06bdc029 100644
--- a/frontend/src/views/Courses.vue
+++ b/frontend/src/views/Courses.vue
@@ -306,8 +306,8 @@
             </b-card-text>
           </b-tab>
           <b-tab title="Fine Arts Applied Skills">
-            <FineArtsAppliedSkillsCodes
-          /></b-tab>
+            <FineArtsAppliedSkillsCodes />
+          </b-tab>
           <b-tab title="Exam Special Cases">
             <ExamSpecialCaseCodes />
           </b-tab>

From 981eb0c20f4c940a4840b265de05de446ff3dbdc Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 19 Jun 2024 09:21:25 -0700
Subject: [PATCH 101/168] fixed format of opt program completion date to
 YYYY-MM

---
 .../components/StudentProfile/StudentOptionalPrograms.vue   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
index dae1fef9..c400d369 100644
--- a/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
+++ b/frontend/src/components/StudentProfile/StudentOptionalPrograms.vue
@@ -441,6 +441,12 @@
             </DisplayTable>
           </b-card>
         </template>
+
+        <template #cell(optionalProgramCompletionDate)="row">
+          {{
+            $filters.formatYYYYMMDate(row.item.optionalProgramCompletionDate)
+          }}
+        </template>
       </DisplayTable>
     </div>
   </div>

From 866baeaaa017af20c4eb8841bf992b7b1ecff48e Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 19 Jun 2024 13:51:35 -0700
Subject: [PATCH 102/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index c9b50fee..c4fee326 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.20.0",
-    "test": "1.20.0",
+    "dev": "1.21.0",
+    "test": "1.21.0",
     "prod": "1.20.0"
   }
 }

From d05a826e8e1dab96648fc0308d541920a332ceef Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 20 Jun 2024 14:09:15 -0700
Subject: [PATCH 103/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index c4fee326..5d58c75e 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.21.0",
-    "test": "1.21.0",
+    "dev": "1.21.1",
+    "test": "1.21.1",
     "prod": "1.20.0"
   }
 }

From ca24c156a80dafb6bc84845e955cf3cc6e1e26c3 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 25 Jun 2024 11:06:12 -0700
Subject: [PATCH 104/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 5d58c75e..c2f61a23 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.21.1",
-    "test": "1.21.1",
+    "dev": "1.21.2",
+    "test": "1.21.2",
     "prod": "1.20.0"
   }
 }

From 3014e2ff37463be901c00136b69a4101a818f329 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 26 Jun 2024 12:19:38 -0700
Subject: [PATCH 105/168] fix grammar typo

---
 frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue b/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
index ac94ca11..45c2cbd8 100644
--- a/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
+++ b/frontend/src/components/Courses/FineArtsAppliedSkillsCodes.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <p>
-      Fine Arts Applied Skills codes Indicates that a course is being used for
+      Fine Arts Applied Skills codes indicates that a course is being used for
       the Fine Arts and/or Applied Skills graduation requirement.
     </p>
     <DisplayTable

From 5f1e99b77fb54679309dba19d0b70705c0deb816 Mon Sep 17 00:00:00 2001
From: "chris.ditcher" <Chris.Ditcher@QP.GOV.BC.CA>
Date: Wed, 26 Jun 2024 13:34:38 -0700
Subject: [PATCH 106/168] Updated to Ubuntu 22.04

---
 .github/workflows/build-n-deploy-backend-km.yml               | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml  | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-dev.yml       | 2 +-
 .github/workflows/build-n-deploy-backend-to-ocp-tools.yml     | 2 +-
 .github/workflows/build-n-deploy-frontend-km.yml              | 2 +-
 .github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml | 2 +-
 .github/workflows/build-n-deploy-frontend-to-ocp-dev.yml      | 2 +-
 .github/workflows/build-n-deploy-frontend-to-ocp-tools.yml    | 2 +-
 .github/workflows/create_tag.yml                              | 2 +-
 .github/workflows/deploy-backend-to-ocp-prod.yml              | 2 +-
 .github/workflows/deploy-backend-to-ocp-test.yml              | 2 +-
 .github/workflows/deploy-frontend-to-ocp-prod.yml             | 2 +-
 .github/workflows/deploy-frontend-to-ocp-test.yml             | 2 +-
 .github/workflows/main.yml                                    | 2 +-
 .github/workflows/test-daily.regression.on.dev-sh-runners.yml | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-n-deploy-backend-km.yml b/.github/workflows/build-n-deploy-backend-km.yml
index aa813727..01198f22 100644
--- a/.github/workflows/build-n-deploy-backend-km.yml
+++ b/.github/workflows/build-n-deploy-backend-km.yml
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: KM-Build & Deploy Backend
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
index 2766bf20..3222de06 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-dev-vue3.yml
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: VUE3 Build & Deploy Backend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: vue3-dev
 
     outputs:
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
index 5a390ef2..cff9a032 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Backend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml b/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
index c198a33e..27a77fd8 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-tools.yml
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Backend to TOOLS
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/build-n-deploy-frontend-km.yml b/.github/workflows/build-n-deploy-frontend-km.yml
index 59756b68..ec188ac0 100644
--- a/.github/workflows/build-n-deploy-frontend-km.yml
+++ b/.github/workflows/build-n-deploy-frontend-km.yml
@@ -39,7 +39,7 @@ jobs:
   openshift-ci-cd:
     name: KM-Build & Deploy Frontend
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml
index 5de37ee6..c3e4353d 100644
--- a/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml
+++ b/.github/workflows/build-n-deploy-frontend-to-ocp-dev-vue3.yml
@@ -39,7 +39,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Frontend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
index 1ebccbde..8cf4f5e8 100644
--- a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
+++ b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
@@ -39,7 +39,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Frontend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml
index 50019fec..f2fffabb 100644
--- a/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml
+++ b/.github/workflows/build-n-deploy-frontend-to-ocp-tools.yml
@@ -39,7 +39,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Frontend to TOOLS
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/create_tag.yml b/.github/workflows/create_tag.yml
index 74848b2a..347977a4 100644
--- a/.github/workflows/create_tag.yml
+++ b/.github/workflows/create_tag.yml
@@ -27,7 +27,7 @@ jobs:
   tag_image:
     name: Tag Image
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
diff --git a/.github/workflows/deploy-backend-to-ocp-prod.yml b/.github/workflows/deploy-backend-to-ocp-prod.yml
index 8c973405..8021ec56 100644
--- a/.github/workflows/deploy-backend-to-ocp-prod.yml
+++ b/.github/workflows/deploy-backend-to-ocp-prod.yml
@@ -47,7 +47,7 @@ jobs:
   openshift-ci-cd:
     name: Deploy Backend to PROD
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: prod
 
     outputs:
diff --git a/.github/workflows/deploy-backend-to-ocp-test.yml b/.github/workflows/deploy-backend-to-ocp-test.yml
index c2ad6e39..84a9fafb 100644
--- a/.github/workflows/deploy-backend-to-ocp-test.yml
+++ b/.github/workflows/deploy-backend-to-ocp-test.yml
@@ -47,7 +47,7 @@ jobs:
   openshift-ci-cd:
     name: Deploy Backend to TEST
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: test
 
     outputs:
diff --git a/.github/workflows/deploy-frontend-to-ocp-prod.yml b/.github/workflows/deploy-frontend-to-ocp-prod.yml
index c17674c1..0aff14c8 100644
--- a/.github/workflows/deploy-frontend-to-ocp-prod.yml
+++ b/.github/workflows/deploy-frontend-to-ocp-prod.yml
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: Deploy Frontend to PROD
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: prod
 
     outputs:
diff --git a/.github/workflows/deploy-frontend-to-ocp-test.yml b/.github/workflows/deploy-frontend-to-ocp-test.yml
index f2c969a1..bf427153 100644
--- a/.github/workflows/deploy-frontend-to-ocp-test.yml
+++ b/.github/workflows/deploy-frontend-to-ocp-test.yml
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: Deploy Frontend to TEST
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: test
 
     outputs:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d43d2ec5..7d391700 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   sonarcloud:
     name: SonarCloud
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./frontend
diff --git a/.github/workflows/test-daily.regression.on.dev-sh-runners.yml b/.github/workflows/test-daily.regression.on.dev-sh-runners.yml
index c5d79f8c..4a8ebf57 100644
--- a/.github/workflows/test-daily.regression.on.dev-sh-runners.yml
+++ b/.github/workflows/test-daily.regression.on.dev-sh-runners.yml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   DeployRunner:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       runner_name: ${{ steps.deploy_runner.outputs.runner_name }}
     steps:
@@ -65,7 +65,7 @@ jobs:
           url: ${{ secrets.ROCKETCHAT_WEBHOOK_FAILURES }}
   # now burn it all down!!
   TearDown:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ always() }}
     needs: [DeployRunner, DailyRegression]
     steps:

From 3d5c5d8cfbac1372b23407bad7e702e4eb0a4b65 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 27 Jun 2024 11:20:52 -0700
Subject: [PATCH 107/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index c2f61a23..7eaae2d1 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.21.2",
     "test": "1.21.2",
-    "prod": "1.20.0"
+    "prod": "1.21.2"
   }
 }

From 80e8c80d15d10c91a7bcb1c4e09b17899f3336a9 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:47:14 -0700
Subject: [PATCH 108/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 7eaae2d1..f3fcbc11 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
     "dev": "1.21.2",
-    "test": "1.21.2",
+    "test": "1.21.3",
     "prod": "1.21.2"
   }
 }

From e83a748b87390f62e599c8ddebedd39c51de771f Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:12:29 -0700
Subject: [PATCH 109/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index f3fcbc11..c9378ff6 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.21.2",
+    "dev": "1.21.3",
     "test": "1.21.3",
-    "prod": "1.21.2"
+    "prod": "1.21.3"
   }
 }

From ade624028a7662f6280dc624601f339be4bd9224 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:43:07 -0700
Subject: [PATCH 110/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index c9378ff6..efe63a40 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.21.3",
-    "test": "1.21.3",
+    "dev": "1.22.0",
+    "test": "1.22.0",
     "prod": "1.21.3"
   }
 }

From 6e4f26ed4e8c27d6b95711badd5ada40ec4622c0 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Tue, 16 Jul 2024 10:24:42 -0700
Subject: [PATCH 111/168] ui updates added

---
 frontend/src/components/Batch/Batch.vue | 33 ++++++++++++++-
 frontend/src/views/BatchProcessing.vue  | 55 +++++++++++++------------
 2 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 2fa7c267..fbb6cbe8 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -737,6 +737,7 @@
               variant="warning"
               >{{ validationMessage }}</b-alert
             >
+            {{ ARC_STUDENTS_confirm }}
             <div class="row col-12 border-bottom mb-3">
               <div class="col-2"><strong>Mincode</strong></div>
               <div class="col-4"><strong>School Name</strong></div>
@@ -968,6 +969,7 @@
           Schedule/Run Batch
         </b-button>
         <!-- Modal Dialogs -->
+
         <b-modal
           :id="'batch-modal-' + jobId"
           :title="'Run  Request ' + requestId"
@@ -981,6 +983,26 @@
             :items="batch"
             :batchTypes="batchTypes"
           ></BatchConfirmInfo>
+
+          <b-form-group v-if="batch.details['what'] == 'ARC_STUDENTS'">
+            <h2>Batch Confirmation</h2>
+            <b-form-checkbox-group
+              v-model="ARC_STUDENTS_confirm"
+              name="checkbox-group"
+            >
+              <b-form-checkbox value="finalGraduation">
+                Final Graduation Algorithm and TVR batch jobs have been run for
+                students from the previous cycle
+              </b-form-checkbox>
+              <b-form-checkbox value="regenerateReports">
+                Regenerate School Reports process has been completed for any
+                schools that require final updates
+              </b-form-checkbox>
+              <b-form-checkbox value="archiveReports">
+                Archive School Reports process has been completed
+              </b-form-checkbox>
+            </b-form-checkbox-group>
+          </b-form-group>
           <b-form-group label="Batch Run" v-slot="{ ariaDescribedby }">
             <b-form-radio-group v-model="batchRunTime">
               <b-form-radio
@@ -1210,6 +1232,7 @@ export default {
   },
   data: function () {
     return {
+      ARC_STUDENTS_confirm: [],
       runType: "",
       reportTypes: [],
       reportType: "",
@@ -1513,7 +1536,7 @@ export default {
           //disable code for release 1.7.0
           this.batchTypes = this.batchTypes.map((type) => {
             if (
-              type.code === "ARC_STUDENTS" ||
+              type.code === "SCHL_RPT_REGEN" ||
               type.code === "ARC_SCH_REPORTS" ||
               type.code === "EDW_SNAPSHOT"
             ) {
@@ -1597,7 +1620,12 @@ export default {
       alert(JSON.stringify(values, null, 2));
     },
     disableConfirm() {
-      if (this.batchRunTime == "Run Now") {
+      if (
+        this.batch.details["what"] == "ARC_STUDENTS" &&
+        this.ARC_STUDENTS_confirm.length !== 3
+      ) {
+        return true;
+      } else if (this.batchRunTime == "Run Now") {
         return false;
       } else {
         if (this.batchRunSchedule && this.batchRunSchedule == "Custom") {
@@ -2127,6 +2155,7 @@ export default {
     ...mapState(useBatchProcessingStore, {
       tabContent: "getBatchDetails",
     }),
+
     batch() {
       return this.tabContent[this.jobId];
     },
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 841fe43c..99b921e1 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1322,33 +1322,34 @@ export default {
       let index = id.replace("job-", "") - 1;
       let value = true;
       this.setTabLoading({ index, value });
-      BatchProcessingService.runYearlyArchiveBatchJobStudents(request)
-        .then((response) => {
-          //update the admin dashboard
-          this.getAdminDashboardData();
-          this.cancelBatchJob(id);
-          this.selectedTab = 0;
-          if (response) {
-            this.$bvToast.toast(
-              "Batch run has started for request " + requestId,
-              {
-                title: "BATCH PROCESSING STARTED",
-                variant: "success",
-                noAutoHide: true,
-              }
-            );
-          }
-        })
-        .catch((error) => {
-          if (error) {
-            this.cancelBatchJob(id);
-            this.$bvToast.toast("There was an error processing " + requestId, {
-              title: "BATCH PROCESSING UPDATE",
-              variant: "error",
-              noAutoHide: true,
-            });
-          }
-        });
+      console.log(request);
+      // BatchProcessingService.runYearlyArchiveBatchJobStudents(request)
+      //   .then((response) => {
+      //     //update the admin dashboard
+      //     this.getAdminDashboardData();
+      //     this.cancelBatchJob(id);
+      //     this.selectedTab = 0;
+      //     if (response) {
+      //       this.$bvToast.toast(
+      //         "Batch run has started for request " + requestId,
+      //         {
+      //           title: "BATCH PROCESSING STARTED",
+      //           variant: "success",
+      //           noAutoHide: true,
+      //         }
+      //       );
+      //     }
+      //   })
+      //   .catch((error) => {
+      //     if (error) {
+      //       this.cancelBatchJob(id);
+      //       this.$bvToast.toast("There was an error processing " + requestId, {
+      //         title: "BATCH PROCESSING UPDATE",
+      //         variant: "error",
+      //         noAutoHide: true,
+      //       });
+      //     }
+      //   });
     },
     runManageSchoolReports(request, id) {
       let requestId = id.replace("job-", "");

From 2bdbea07dc19f172407154789aea94f0a33b4b73 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 18 Jul 2024 10:55:06 -0700
Subject: [PATCH 112/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index efe63a40..4bc622fd 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.22.0",
     "test": "1.22.0",
-    "prod": "1.21.3"
+    "prod": "1.22.0"
   }
 }

From a4c90b194b0eb518f6fad47de9291bf983850ba8 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 24 Jul 2024 10:44:14 -0700
Subject: [PATCH 113/168] changes to student reports regen

---
 frontend/src/components/Batch/Batch.vue       | 79 +++++++++++++++----
 .../src/components/Batch/BatchConfimInfo.vue  |  8 +-
 .../src/services/BatchProcessingService.js    |  4 +
 frontend/src/store/modules/batchprocessing.js |  1 -
 frontend/src/views/BatchProcessing.vue        | 72 ++++++++++++++++-
 5 files changed, 143 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 2fa7c267..1093a765 100644
--- 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,19 +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
@@ -214,7 +222,8 @@
                 batch.details['what'] != 'DISTRUN_YE' &&
                 batch.details['what'] != 'DISTRUN_SUPP' &&
                 batch.details['what'] != 'ARC_STUDENTS' &&
-                batch.details['what'] != 'CERT_REGEN'
+                batch.details['what'] != 'CERT_REGEN' &&
+                batch.details['what'] != 'SCHL_RPT_REGEN'
               "
             >
               <label class="font-weight-bold p-0 m-0 row"
@@ -1211,7 +1220,8 @@ export default {
   data: function () {
     return {
       runType: "",
-      reportTypes: [],
+      ARC_SCH_REPORTS_reportTypes: [],
+      SCHL_RPT_REGEN_reportTypes: [],
       reportType: "",
       batchIsValid: false,
       batchTypes: [],
@@ -1333,6 +1343,27 @@ export default {
             },
           ],
 
+          copies: true,
+          where: true,
+        },
+        SCHL_RPT_REGEN: {
+          group: [
+            {
+              text: "School",
+              value: "School",
+              description:
+                "All students with a School of Record matching the entered school and with a student status of CUR or TER will have their status changed to ARC",
+            },
+            {
+              text: "School Category",
+              value: "District",
+            },
+            {
+              text: "All",
+              value: "All",
+            },
+          ],
+
           copies: true,
           where: true,
         },
@@ -1347,7 +1378,8 @@ export default {
     this.transcriptTypes = this.getTranscriptTypes();
     this.certificateTypes = this.getCertificateTypes();
     this.batchTypes = this.getBatchJobTypes();
-    this.reportTypes = [
+
+    this.ARC_SCH_REPORTS_reportTypes = [
       {
         code: "NONGRADREGARC",
         label:
@@ -1370,6 +1402,26 @@ export default {
           "The final list of grade 12 or AD students on a graduation program who were not projected to graduate based on missing course registrations or assessment registrations submitted by the school in the reporting cycle.",
       },
     ];
+    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",
+        label: "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.",
+      },
+      {
+        code: "NONGRADREG",
+        label: "Not-Yet Graduated Students (MM YYYY to MM YYYY) Report",
+        description:
+          "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.",
+      },
+    ];
   },
 
   methods: {
@@ -1444,7 +1496,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;
@@ -1512,11 +1565,7 @@ export default {
 
           //disable code for release 1.7.0
           this.batchTypes = this.batchTypes.map((type) => {
-            if (
-              type.code === "ARC_STUDENTS" ||
-              type.code === "ARC_SCH_REPORTS" ||
-              type.code === "EDW_SNAPSHOT"
-            ) {
+            if (type.code === "ARC_STUDENTS" || 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
index 7c8b8fb1..2171cb8a 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -28,7 +28,8 @@
             details.gradDate &&
             details.who != 'PSI' &&
             details.who != 'Student' &&
-            details.who != 'District'
+            details.who != 'District' &&
+            details.what != 'SCHL_RPT_REGEN'
           "
         >
           <strong>Select Students: </strong>{{ details.gradDate }}
@@ -94,7 +95,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">
@@ -109,7 +110,8 @@
           details.where &&
           details.what != 'REGALG' &&
           details.what != 'TVRRUN' &&
-          details.what != 'CERT_REGEN'
+          details.what != 'CERT_REGEN' &&
+          details.what != 'SCHL_RPT_REGEN'
         "
       >
         <strong>Where: </strong>
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index fda7db02..7b49154e 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -52,6 +52,10 @@ export default {
   runDISTRUN_SUPP(){
     return ApiService.apiAxios.get('/api/v1/batch/executesuppdisrunbatchjob');
   },
+  runSCHL_RPT_REGEN(request, cronTime=""){
+    let type = (request.activityCode === 'NONGRADPRJ') ? 'TVRRUN' : 'REGALG';
+    return ApiService.apiAxios.post(`/api/v1/batch/regenerate/school-report?type=${type}`,request);
+  },  
   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
diff --git a/frontend/src/store/modules/batchprocessing.js b/frontend/src/store/modules/batchprocessing.js
index 9ec84243..cb4efdc5 100644
--- 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
index 841fe43c..517734cc 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1117,6 +1117,38 @@ 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(response.data, {
+              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);
@@ -1611,7 +1643,7 @@ export default {
         schoolCategoryCodes: [this.tabContent[id].details["categoryCode"]],
         programs: programs,
         psiCodes: psi,
-        reportType: [this.tabContent[id].details["reportType"]],
+        activityCode: this.tabContent[id].details["reportType"],
         gradDateFrom: gradDateFrom,
         gradDateTo: gradDateTo,
         validateInput: false,
@@ -1766,7 +1798,7 @@ export default {
         delete request.gradDateTo;
         delete request.quantity;
         delete request.localDownload;
-        delete request.reportType;
+        delete request.activityCode;
 
         if (cronTime) {
           let scheduledRequest = {};
@@ -1782,6 +1814,42 @@ export default {
             this.runCERTREGEN(request, id);
           }
         }
+      } else if (this.tabContent[id].details["what"] == "SCHL_RPT_REGEN") {
+        delete request.credentialTypeCode;
+        request.statuses = null;
+        request.studentIDs = null;
+        request.user = "xx";
+        request.address = {
+          streetLine1: "string",
+          streetLine2: "string",
+          streetLine3: "string",
+          city: "string",
+          region: "string",
+          country: "string",
+          code: "string",
+        };
+
+        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") {
         if (cronTime) {
           let scheduledRequest = {};

From 902d49ee8d628bc82e0f9de01e5593f9d64f6bad Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:12:46 -0700
Subject: [PATCH 114/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 4bc622fd..b5c456cc 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
     "dev": "1.22.0",
-    "test": "1.22.0",
+    "test": "1.22.1",
     "prod": "1.22.0"
   }
 }

From 310fca5293831d468806293c2a2a80141c4fcf61 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 31 Jul 2024 14:38:27 -0700
Subject: [PATCH 115/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index b5c456cc..f759ab5f 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
     "dev": "1.22.0",
-    "test": "1.22.1",
+    "test": "1.22.2",
     "prod": "1.22.0"
   }
 }

From 996ae671a7b22e1cd589e55729a3473928830509 Mon Sep 17 00:00:00 2001
From: Kamal Mohammed <kamal.mohammed@outlook.com>
Date: Wed, 31 Jul 2024 15:42:09 -0600
Subject: [PATCH 116/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index f759ab5f..8b473375 100644
--- a/grad-version
+++ b/grad-version
@@ -1,6 +1,6 @@
 {
   "version": {
-    "dev": "1.22.0",
+    "dev": "1.22.2",
     "test": "1.22.2",
     "prod": "1.22.0"
   }

From 738275fc997d12f2b82c0ae77d090653bdb3e5e4 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 1 Aug 2024 09:41:28 -0700
Subject: [PATCH 117/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 8b473375..66666433 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.22.2",
     "test": "1.22.2",
-    "prod": "1.22.0"
+    "prod": "1.22.2"
   }
 }

From b89741de37d4e486ae4fe027c2c23bfa10865c18 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 1 Aug 2024 15:43:39 -0700
Subject: [PATCH 118/168] Able to get a successful POST request for TVR delete

---
 frontend/src/components/Batch/Batch.vue       |  21 ++
 .../src/services/BatchProcessingService.js    | 213 +++++++++++-------
 frontend/src/views/BatchProcessing.vue        |  54 +++++
 3 files changed, 206 insertions(+), 82 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 2fa7c267..d840ee8a 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1336,6 +1336,24 @@ export default {
           copies: true,
           where: true,
         },
+        TVR_DELETE: {
+          group: [
+            {
+              text: "School",
+              value: "School",
+            },
+            {
+              text: "Student",
+              value: "Student",
+            },
+            {
+              text: "All Students",
+              value: "All Students",
+            },
+          ],
+          copies: true,
+          where: true,
+        },
       },
     };
   },
@@ -1450,6 +1468,9 @@ export default {
         this.batchIsValid = false;
         return;
       }
+      if (this.batch.details["what"] == "TVR_DELETE") {
+        //this.batchIsValid = false;
+      }
       if (
         this.batch.details["what"] == "DISTRUNUSER" &&
         this.batch.details["credential"] == ""
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index fda7db02..f54c7d18 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -1,26 +1,24 @@
-import ApiService from '../common/apiService';
+import ApiService from "../common/apiService";
 
 export default {
-
   getDashboardInfo() {
-    return ApiService.apiAxios.get('/api/v1/batch/dashboard');
+    return ApiService.apiAxios.get("/api/v1/batch/dashboard");
   },
-  runREGALG(request, cronTime="")
-   {
-    if(cronTime){
+  runREGALG(request, cronTime = "") {
+    if (cronTime) {
       let scheduledRequest = {};
-      scheduledRequest.cronExpression = cronTime
+      scheduledRequest.cronExpression = cronTime;
       scheduledRequest.jobName = "SGBJ";
       scheduledRequest.blankPayLoad = null;
       scheduledRequest.payload = request;
       this.addScheduledJob(scheduledRequest);
-      return
-    }else{
-      return ApiService.apiAxios.post('/api/v1/batch/specialrun', request);
+      return;
+    } else {
+      return ApiService.apiAxios.post("/api/v1/batch/specialrun", request);
     }
   },
-  runTVRRUN(request, cronTime="") {
-    if(cronTime){
+  runTVRRUN(request, cronTime = "") {
+    if (cronTime) {
       let scheduledRequest = {};
       scheduledRequest.cronExpression = cronTime;
       scheduledRequest.jobName = "STBJ";
@@ -28,115 +26,166 @@ export default {
       scheduledRequest.payload = request;
       scheduledRequest.psiPayload = null;
       this.addScheduledJob(scheduledRequest);
-      return
-    }else{
-      return ApiService.apiAxios.post('/api/v1/batch/tvrspecialrun', request);
+      return;
+    } else {
+      return ApiService.apiAxios.post("/api/v1/batch/tvrspecialrun", request);
     }
   },
-  runDISTRUNUSER(request,credentialType) {
-    if(credentialType == "OT"){
-      return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OT', request);
-    }else if(credentialType == "OC"){
-      return ApiService.apiAxios.post('/api/v1/batch/userrequestdisrun/OC', request);
-    }else if(credentialType == "RC"){
-      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);
-    }else if(credentialType == "Blank certificate print"){
-      return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/OC', request);
+  runDISTRUNUSER(request, credentialType) {
+    if (credentialType == "OT") {
+      return ApiService.apiAxios.post(
+        "/api/v1/batch/userrequestdisrun/OT",
+        request
+      );
+    } else if (credentialType == "OC") {
+      return ApiService.apiAxios.post(
+        "/api/v1/batch/userrequestdisrun/OC",
+        request
+      );
+    } else if (credentialType == "RC") {
+      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
+      );
+    } else if (credentialType == "Blank certificate print") {
+      return ApiService.apiAxios.post(
+        "/api/v1/batch/userrequestblankdisrun/OC",
+        request
+      );
     }
-  },     
-  runDISTRUN_MONTHLY(){
-    return ApiService.apiAxios.get('/api/v1/batch/executedisrunbatchjob');
   },
-  runDISTRUN_SUPP(){
-    return ApiService.apiAxios.get('/api/v1/batch/executesuppdisrunbatchjob');
+  runDISTRUN_MONTHLY() {
+    return ApiService.apiAxios.get("/api/v1/batch/executedisrunbatchjob");
   },
-  runNONGRADRUN(request, cronTime=""){
-    if (Array.isArray(request.districts) && request.districts.length === 1 && request.districts[0].toLowerCase() === "all") {
+  runDISTRUN_SUPP() {
+    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);
-  },  
-  runDISTRUN_YE(request, cronTime=""){
-    if (Array.isArray(request.districts) && request.districts.length === 1 && request.districts[0].toLowerCase() === "all") {
+    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"
+    ) {
       // If the condition is true, set districts to an empty array
       request.districts = [];
     }
-    if(cronTime){
+    if (cronTime) {
       let scheduledRequest = {};
       scheduledRequest.cronExpression = cronTime;
       scheduledRequest.jobName = "YDBJ";
       scheduledRequest.blankPayLoad = null;
       scheduledRequest.payload = request;
       this.addScheduledJob(scheduledRequest);
-      return
-    }else{
-      return ApiService.apiAxios.post('/api/v1/batch/executeyearlydisrunbatchjob', request);
+      return;
+    } else {
+      return ApiService.apiAxios.post(
+        "/api/v1/batch/executeyearlydisrunbatchjob",
+        request
+      );
     }
   },
-  runBlankDISTRUNUSERUserRequest(request, credentialType){
-    return ApiService.apiAxios.post('/api/v1/batch/userrequestblankdisrun/'+ credentialType, request);
-  },
-  runPSIRUN(request, transmissionType){
-    return ApiService.apiAxios.post('/api/v1/batch/executepsireportbatchjob/' + transmissionType, request);
-  },
-  runCERTREGEN(request, cronTime=""){
-    if (Array.isArray(request.districts) && request.districts.length === 1 && request.districts[0].toLowerCase() === "all") {
+  runBlankDISTRUNUSERUserRequest(request, credentialType) {
+    return ApiService.apiAxios.post(
+      "/api/v1/batch/userrequestblankdisrun/" + credentialType,
+      request
+    );
+  },
+  runPSIRUN(request, transmissionType) {
+    return ApiService.apiAxios.post(
+      "/api/v1/batch/executepsireportbatchjob/" + transmissionType,
+      request
+    );
+  },
+  runCERTREGEN(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 = [];
     }
-    if(cronTime){
+    if (cronTime) {
       let scheduledRequest = {};
       scheduledRequest.cronExpression = cronTime;
       scheduledRequest.jobName = "RCBJ";
       scheduledRequest.blankPayLoad = null;
       scheduledRequest.payload = request;
       this.addScheduledJob(scheduledRequest);
-      return
-    }else{
-      return ApiService.apiAxios.post('/api/v1/batch/executecertregenbatchjob', request);
-    } 
-  },
-  runCERTREGEN_ALL(){
-    
-    return ApiService.apiAxios.get('/api/v1/batch/executecertregenbatchjob');
-  
-  },  
+      return;
+    } else {
+      return ApiService.apiAxios.post(
+        "/api/v1/batch/executecertregenbatchjob",
+        request
+      );
+    }
+  },
+  runCERTREGEN_ALL() {
+    return ApiService.apiAxios.get("/api/v1/batch/executecertregenbatchjob");
+  },
+  runTVR_DELETE(request) {
+    return ApiService.apiAxios.post("/api/v1/batch/tvrspecialrun", request);
+    //console.log(request);
+  },
   getBatchErrors(id, page) {
-    return ApiService.apiAxios.get('/api/v1/batch/dashboard/errors/'  + id + '?pageNumber=' + page);
+    return ApiService.apiAxios.get(
+      "/api/v1/batch/dashboard/errors/" + id + "?pageNumber=" + page
+    );
   },
   getBatchSummary() {
-    return ApiService.apiAxios.get('/api/v1/batch/dashboard/summary');
-  },    
+    return ApiService.apiAxios.get("/api/v1/batch/dashboard/summary");
+  },
   getScheduledBatchJobs() {
-    return ApiService.apiAxios.get('/api/v1/batch/schedule/listjobs');
+    return ApiService.apiAxios.get("/api/v1/batch/schedule/listjobs");
   },
   addScheduledJob(scheduledJob) {
-
-    return ApiService.apiAxios.post('/api/v1/batch/schedule/add?batchJobTypeCode=' + scheduledJob.jobName, scheduledJob);
+    return ApiService.apiAxios.post(
+      "/api/v1/batch/schedule/add?batchJobTypeCode=" + scheduledJob.jobName,
+      scheduledJob
+    );
   },
   removeScheduledJobs(id) {
-    return ApiService.apiAxios.delete('/api/v1/batch/schedule/remove/' + id);
+    return ApiService.apiAxios.delete("/api/v1/batch/schedule/remove/" + id);
   },
   batchProcessingRoutines() {
-    return ApiService.apiAxios.get('/api/v1/batch/processing/all');
+    return ApiService.apiAxios.get("/api/v1/batch/processing/all");
+  },
+  batchProcessingToggleRoutine(jobType) {
+    return ApiService.apiAxios.put(
+      "/api/v1/batch/processing/toggle/" + jobType
+    );
+  },
+  getBatchJobTypes() {
+    return ApiService.apiAxios.get("/api/v1/batch/batchjobtype");
   },
-  batchProcessingToggleRoutine(jobType){
-    return ApiService.apiAxios.put('/api/v1/batch/processing/toggle/' + jobType );
+  rerunBatchSchoolReports(bid) {
+    return ApiService.apiAxios.get(
+      "/api/v1/batch/regenerate/school-report/" + bid
+    );
   },
-  getBatchJobTypes(){
-    return ApiService.apiAxios.get('/api/v1/batch/batchjobtype');
-  }, 
-  rerunBatchSchoolReports(bid){
-    return ApiService.apiAxios.get('/api/v1/batch/regenerate/school-report/' + bid);
+  rerunBatch(bid) {
+    return ApiService.apiAxios.get("/api/v1/batch/rerun/all/" + bid);
   },
-  rerunBatch(bid){
-    return ApiService.apiAxios.get('/api/v1/batch/rerun/all/' + bid);
+  rerunBatchStudentErrors(bid) {
+    return ApiService.apiAxios.get("/api/v1/batch/rerun/failed/" + bid);
   },
-  rerunBatchStudentErrors(bid){
-    return ApiService.apiAxios.get('/api/v1/batch/rerun/failed/' + bid);
-  },    
-   
-}
\ No newline at end of file
+};
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 841fe43c..3ad83a1b 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1455,6 +1455,47 @@ export default {
           }
         });
     },
+    runTVR_DELETE(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 });
+      //TODO batch processing service
+      // console.log(requestId);
+      // console.log(request);
+
+      BatchProcessingService.runTVR_DELETE(request)
+        .then((response) => {
+          //update the admin dashboard
+          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.cancelBatchJob(id);
+            this.$bvToast.toast("There was an error processing " + requestId, {
+              title: "BATCH PROCESSING UPDATE",
+              variant: "error",
+              noAutoHide: true,
+            });
+          }
+        });
+    },
     runREGALG(request, id) {
       let requestId = id.replace("job-", "");
       this.$set(this.spinners, id, true);
@@ -1646,6 +1687,19 @@ export default {
         } else {
           this.runTVRRUN(request, id);
         }
+      } else if (this.tabContent[id].details["what"] == "TVR_DELETE") {
+        request.activityCode = "tvrDelete";
+        if (cronTime) {
+          let scheduledRequest = {};
+          scheduledRequest.cronExpression = cronTime;
+          scheduledRequest.jobName = "STBJ";
+          scheduledRequest.blankPayLoad = null;
+          scheduledRequest.payload = request;
+          scheduledRequest.psiPayload = null;
+          this.addScheduledJob(scheduledRequest, id);
+        } else {
+          this.runTVR_DELETE(request, id);
+        }
       } else if (this.tabContent[id].details["what"] == "PSIRUN") {
         if (cronTime) {
           let scheduledRequest = {};

From cb68f89b4426a9381fa211583364494ed887fc91 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 7 Aug 2024 08:53:53 -0700
Subject: [PATCH 119/168] cleared output

---
 backend/src/components/utils.js               |  1 +
 backend/src/routes/batch-router.js            |  1 +
 .../src/services/BatchProcessingService.js    | 16 ++++-
 frontend/src/views/BatchProcessing.vue        | 61 ++++++++++---------
 test/src/helpers/restUtils.js                 |  1 +
 5 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/backend/src/components/utils.js b/backend/src/components/utils.js
index 08b52269..4497a43e 100644
--- a/backend/src/components/utils.js
+++ b/backend/src/components/utils.js
@@ -183,6 +183,7 @@ async function postData(token, url, data, correlationID) {
     };
  
     log.info('post Data Url', url);
+    
     log.verbose('post Data Req', minify(data));
     data.createUser = 'GRAD';
     data.updateUser = 'GRAD';
diff --git a/backend/src/routes/batch-router.js b/backend/src/routes/batch-router.js
index f307d832..79070da6 100644
--- a/backend/src/routes/batch-router.js
+++ b/backend/src/routes/batch-router.js
@@ -31,6 +31,7 @@ async function getBatchInfoAPI(req, res) {
 async function postBatchInfoAPI(req, res) {
   const token = getBackendToken(req);
   try {  
+    console.log(req.body)
     const url = `${config.get('server:batchAPIURL')}/batch` + req.url;
     const data = await postData(token, url, req.body, req.session?.correlationID);
     return res.status(200).json(data);
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index fda7db02..b0c3f177 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -99,10 +99,22 @@ export default {
       return ApiService.apiAxios.post('/api/v1/batch/executecertregenbatchjob', request);
     } 
   },
+  runYearlyArchiveBatchJobStudents(request, cronTime=""){
+    if(cronTime){
+      let scheduledRequest = {};
+      scheduledRequest.cronExpression = cronTime;
+      scheduledRequest.jobName = "";
+      scheduledRequest.blankPayLoad = null;
+      scheduledRequest.payload = request;
+      this.addScheduledJob(scheduledRequest);
+      return
+    }else{
+      console.log(request)
+      return ApiService.apiAxios.post('/api/v1/batch/executeyearlyarchivebatchjobstudents', request);
+    } 
+  },
   runCERTREGEN_ALL(){
-    
     return ApiService.apiAxios.get('/api/v1/batch/executecertregenbatchjob');
-  
   },  
   getBatchErrors(id, page) {
     return ApiService.apiAxios.get('/api/v1/batch/dashboard/errors/'  + id + '?pageNumber=' + page);
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 99b921e1..756c2730 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1322,34 +1322,33 @@ export default {
       let index = id.replace("job-", "") - 1;
       let value = true;
       this.setTabLoading({ index, value });
-      console.log(request);
-      // BatchProcessingService.runYearlyArchiveBatchJobStudents(request)
-      //   .then((response) => {
-      //     //update the admin dashboard
-      //     this.getAdminDashboardData();
-      //     this.cancelBatchJob(id);
-      //     this.selectedTab = 0;
-      //     if (response) {
-      //       this.$bvToast.toast(
-      //         "Batch run has started for request " + requestId,
-      //         {
-      //           title: "BATCH PROCESSING STARTED",
-      //           variant: "success",
-      //           noAutoHide: true,
-      //         }
-      //       );
-      //     }
-      //   })
-      //   .catch((error) => {
-      //     if (error) {
-      //       this.cancelBatchJob(id);
-      //       this.$bvToast.toast("There was an error processing " + requestId, {
-      //         title: "BATCH PROCESSING UPDATE",
-      //         variant: "error",
-      //         noAutoHide: true,
-      //       });
-      //     }
-      //   });
+      BatchProcessingService.runYearlyArchiveBatchJobStudents(request)
+        .then((response) => {
+          //update the admin dashboard
+          this.getAdminDashboardData();
+          this.cancelBatchJob(id);
+          this.selectedTab = 0;
+          if (response) {
+            this.$bvToast.toast(
+              "Batch run has started for request " + requestId,
+              {
+                title: "BATCH PROCESSING STARTED",
+                variant: "success",
+                noAutoHide: true,
+              }
+            );
+          }
+        })
+        .catch((error) => {
+          if (error) {
+            this.cancelBatchJob(id);
+            this.$bvToast.toast("There was an error processing " + requestId, {
+              title: "BATCH PROCESSING UPDATE",
+              variant: "error",
+              noAutoHide: true,
+            });
+          }
+        });
     },
     runManageSchoolReports(request, id) {
       let requestId = id.replace("job-", "");
@@ -1612,10 +1611,10 @@ export default {
         schoolCategoryCodes: [this.tabContent[id].details["categoryCode"]],
         programs: programs,
         psiCodes: psi,
-        reportType: [this.tabContent[id].details["reportType"]],
+        reportTypes: [this.tabContent[id].details["reportType"]],
         gradDateFrom: gradDateFrom,
         gradDateTo: gradDateTo,
-        validateInput: false,
+        validateInput: true,
         quantity: quantity,
         localDownload: localDownload,
       };
@@ -1784,6 +1783,8 @@ export default {
           }
         }
       } else if (this.tabContent[id].details["what"] == "ARC_STUDENTS") {
+        delete request.credentialTypeCode;
+
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;
diff --git a/test/src/helpers/restUtils.js b/test/src/helpers/restUtils.js
index 12e02801..a4a7c1f1 100644
--- a/test/src/helpers/restUtils.js
+++ b/test/src/helpers/restUtils.js
@@ -41,6 +41,7 @@ const restService = {
      * @returns {Promise<any>}
      */
     async postData(token, url, data, params) {
+  
         try {
             params = setToken(params, token);
             log.info('post Data Url', url);

From 7ce30d638c4568eda248b81ceec2846561d3d827 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 8 Aug 2024 17:42:25 -0700
Subject: [PATCH 120/168] cleaned up and ready for testing

---
 frontend/src/components/Batch/Batch.vue         | 1 -
 frontend/src/services/BatchProcessingService.js | 3 +--
 frontend/src/views/BatchProcessing.vue          | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index fbb6cbe8..faf186f9 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -737,7 +737,6 @@
               variant="warning"
               >{{ validationMessage }}</b-alert
             >
-            {{ ARC_STUDENTS_confirm }}
             <div class="row col-12 border-bottom mb-3">
               <div class="col-2"><strong>Mincode</strong></div>
               <div class="col-4"><strong>School Name</strong></div>
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index b0c3f177..e82cd84c 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -103,13 +103,12 @@ export default {
     if(cronTime){
       let scheduledRequest = {};
       scheduledRequest.cronExpression = cronTime;
-      scheduledRequest.jobName = "";
+      scheduledRequest.jobName = "ASBJ";
       scheduledRequest.blankPayLoad = null;
       scheduledRequest.payload = request;
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      console.log(request)
       return ApiService.apiAxios.post('/api/v1/batch/executeyearlyarchivebatchjobstudents', request);
     } 
   },
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 756c2730..57fa5cbc 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1788,7 +1788,7 @@ export default {
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;
-          scheduledRequest.jobName = "ARCS";
+          scheduledRequest.jobName = "ASBJ";
           scheduledRequest.blankPayLoad = null;
           scheduledRequest.payload = request;
           this.addScheduledJob(scheduledRequest, id);

From 34860edf2c3e7bd0c276ace15768e5af06bf10a6 Mon Sep 17 00:00:00 2001
From: Chris Ditcher <chris.ditcher@gov.bc.ca>
Date: Fri, 9 Aug 2024 10:24:30 -0700
Subject: [PATCH 121/168] Update grad-version

Updated version to 1.22.3
---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 66666433..9102cfec 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.22.2",
-    "test": "1.22.2",
+    "dev": "1.22.3",
+    "test": "1.22.3",
     "prod": "1.22.2"
   }
 }

From f5941c56ab4e3b72123fa9c21356b38bf54f4fdf Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 9 Aug 2024 13:10:13 -0700
Subject: [PATCH 122/168] updated changes requested by BA

---
 frontend/src/components/Batch/Batch.vue           |  4 +++-
 frontend/src/components/Batch/BatchConfimInfo.vue |  9 +++++++--
 frontend/src/views/BatchProcessing.vue            | 12 ++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index faf186f9..97f96ad5 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -984,7 +984,9 @@
           ></BatchConfirmInfo>
 
           <b-form-group v-if="batch.details['what'] == 'ARC_STUDENTS'">
-            <h2>Batch Confirmation</h2>
+            <h4>
+              Batch Confirmation: please read and accept before submitting
+            </h4>
             <b-form-checkbox-group
               v-model="ARC_STUDENTS_confirm"
               name="checkbox-group"
diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
index 7c8b8fb1..36355dfa 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -31,7 +31,11 @@
             details.who != 'District'
           "
         >
-          <strong>Select Students: </strong>{{ details.gradDate }}
+          <strong>Select Students: </strong>
+          <div v-if="details.what == 'ARC_STUDENTS'">
+            Current and Terminated Students
+          </div>
+          <div v-else>{{ details.gradDate }}</div>
         </li>
         <li v-if="details.who == 'PSI'">
           <strong>PSI: </strong>
@@ -109,7 +113,8 @@
           details.where &&
           details.what != 'REGALG' &&
           details.what != 'TVRRUN' &&
-          details.what != 'CERT_REGEN'
+          details.what != 'CERT_REGEN' &&
+          details.what != 'ARC_STUDENTS'
         "
       >
         <strong>Where: </strong>
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 57fa5cbc..a87a0a9e 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -123,7 +123,12 @@
                                         <div class="col-9"></div>
                                         <div class="col-3"></div>
                                       </div>
-                                      <div class="row border-bottom p-2">
+                                      <div
+                                        class="row border-bottom p-2"
+                                        v-if="
+                                          row.item.jobType != 'ARC_STUDENTS'
+                                        "
+                                      >
                                         <div class="col-12">
                                           <a
                                             href="#"
@@ -152,6 +157,7 @@
                                           row.item.jobType != 'DISTRUN_YE' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
                                           row.item.jobType != 'NONGRADRUN' &&
+                                          row.item.jobType != 'ARC_STUDENTS' &&
                                           row.item.jobType != 'PSIRUN'
                                         "
                                       >
@@ -205,6 +211,7 @@
                                           row.item.jobType != 'DISTRUN_YE' &&
                                           row.item.jobType != 'NONGRADRUN' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
+                                          row.item.jobType != 'ARC_STUDENTS' &&
                                           row.item.failedStudentsProcessed != 0
                                         "
                                       >
@@ -256,7 +263,8 @@
                                           row.item.jobType != 'DISTRUN_YE' &&
                                           row.item.jobType != 'NONGRADRUN' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
-                                          row.item.jobType != 'PSIRUN'
+                                          row.item.jobType != 'PSIRUN' &&
+                                          row.item.jobType != 'ARC_STUDENTS'
                                         "
                                       >
                                         <div class="col-9 p-2">

From 8f35e0f0c42b6fb2b534d3820e4a73421576efb8 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 9 Aug 2024 13:31:00 -0700
Subject: [PATCH 123/168] added bold statement

---
 frontend/src/components/Batch/Batch.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 97f96ad5..7074e02c 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -157,8 +157,9 @@
               "
             >
               All students with a School of Record matching the entered school
-              and with a student status of CUR will have their status changed to
-              ARC
+              and with a student status of CUR
+              <strong>or a student status of TER</strong> will have their status
+              changed to ARC
             </b-alert>
             <b-alert
               :show="

From 33dcfd48a33a17d026907b91baa39e7f512f10d6 Mon Sep 17 00:00:00 2001
From: Chris Ditcher <chris.ditcher@gov.bc.ca>
Date: Mon, 12 Aug 2024 10:28:53 -0700
Subject: [PATCH 124/168] Update grad-version

Updated version to 1.22.3 for PROD.
---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 9102cfec..0be89a70 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.22.3",
     "test": "1.22.3",
-    "prod": "1.22.2"
+    "prod": "1.22.3"
   }
 }

From d836fd570029d36c9dbe03a9cabc5124a1341739 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 15 Aug 2024 11:23:09 -0700
Subject: [PATCH 125/168] new branch

---
 frontend/src/components/Batch/Batch.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 2fa7c267..41e519eb 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1510,13 +1510,8 @@ export default {
             });
           }
 
-          //disable code for release 1.7.0
           this.batchTypes = this.batchTypes.map((type) => {
-            if (
-              type.code === "ARC_STUDENTS" ||
-              type.code === "ARC_SCH_REPORTS" ||
-              type.code === "EDW_SNAPSHOT"
-            ) {
+            if (type.code === "ARC_STUDENTS" || type.code === "EDW_SNAPSHOT") {
               type.disabled = true;
             }
             return type;

From 90a2fe9956e7e92c8f5b2d7a53978c1e865c61e2 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 15 Aug 2024 11:50:47 -0700
Subject: [PATCH 126/168] fix typo

---
 frontend/src/views/BatchProcessing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 3ad83a1b..899476bf 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1688,7 +1688,7 @@ export default {
           this.runTVRRUN(request, id);
         }
       } else if (this.tabContent[id].details["what"] == "TVR_DELETE") {
-        request.activityCode = "tvrDelete";
+        request.activityCode = "tvrDeleted";
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;

From bbd674e1c449e8b6b4750057be6f0701b9ad507e Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 15 Aug 2024 12:16:54 -0700
Subject: [PATCH 127/168] changed student histories to use updateDate instead
 of createDate

---
 .../AuditHistory/StudentAuditHistory.vue         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/StudentProfile/AuditHistory/StudentAuditHistory.vue b/frontend/src/components/StudentProfile/AuditHistory/StudentAuditHistory.vue
index 46373025..73a842df 100644
--- a/frontend/src/components/StudentProfile/AuditHistory/StudentAuditHistory.vue
+++ b/frontend/src/components/StudentProfile/AuditHistory/StudentAuditHistory.vue
@@ -9,7 +9,7 @@
             showFilter="false"
             title="Student Change History"
             :sortDesc="sortDesc"
-            :sortBy="'createDate'"
+            :sortBy="'updateDate'"
           >
             <template #cell(more)="row">
               <b-btn
@@ -55,7 +55,7 @@
               {{ $filters.formatYYYYMMDate(row.value.value) }}
             </template>
 
-            <template #cell(createDate)="row">
+            <template #cell(updateDate)="row">
               {{ $filters.formatTime(row.value.value) }}
             </template>
 
@@ -78,7 +78,7 @@
             showFilter="false"
             title="Optional Program Change History"
             :sort-desc="true"
-            :sortBy="'createDate'"
+            :sortBy="'updateDate'"
           >
             <template #cell(more)="row">
               <b-btn
@@ -120,7 +120,7 @@
               </b-card>
             </template>
 
-            <template #cell(createDate)="row">
+            <template #cell(updateDate)="row">
               {{ $filters.formatTime(row.value.value) }}
             </template>
 
@@ -179,7 +179,7 @@ export default {
           sortable: true,
         },
         {
-          key: "createDate",
+          key: "updateDate",
           label: "Date",
           sortable: true,
           sortDirection: "desc",
@@ -277,7 +277,7 @@ export default {
           sortable: true,
         },
         {
-          key: "createDate",
+          key: "updateDate",
           label: "Date",
           sortable: true,
           sortDirection: "desc",
@@ -358,7 +358,7 @@ export default {
         for (const field of this.studentChangeFields) {
           if (
             index > 0 &&
-            field.key != "createDate" &&
+            field.key != "updateDate" &&
             field.key != "activityCode"
           ) {
             tempEntry[field.key] = {
@@ -386,7 +386,7 @@ export default {
         // temp entry to build our change highlight
         let tempEntry = {};
         for (const field of this.optionalProgramChangeFields) {
-          if (index === 0 || field.key == "createDate") {
+          if (index === 0 || field.key == "updateDate") {
             tempEntry[field.key] = {
               value: value[field.key],
               changed: true,

From be9c2b1cc106f5fd564245e2651b53f1cf87b4d8 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 15 Aug 2024 14:45:38 -0700
Subject: [PATCH 128/168] batch job set up and readdy for deploy and testing

---
 frontend/src/components/Batch/Batch.vue       | 60 ++++++++++++++++---
 .../src/components/Batch/BatchConfimInfo.vue  | 13 ++--
 frontend/src/components/Batch/v3BatchRuns.vue |  7 ++-
 .../src/services/BatchProcessingService.js    | 13 ++++
 frontend/src/views/BatchProcessing.vue        | 15 +++--
 5 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index dd1555a3..96c25647 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -20,6 +20,7 @@
             >
             </b-form-select>
           </div>
+
           <div class="mt-2" v-if="batch.details['what'] == 'ARC_SCH_REPORTS'">
             <label class="font-weight-bold">Report Type</label>
             <b-form-select
@@ -149,6 +150,15 @@
               @change="editBatchJob('who', $event)"
             ></b-form-select>
           </div>
+
+          <div v-if="batch.details['what'] == 'ARC_SCH_REPORTS'">
+            <b-alert :show="batch.details['what'] == 'ARC_SCH_REPORTS'">
+              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.
+            </b-alert>
+          </div>
           <div v-if="batch.details['what'] == 'ARC_STUDENTS'">
             <b-alert
               :show="
@@ -215,6 +225,7 @@
                 batch.details['what'] != 'DISTRUN_YE' &&
                 batch.details['what'] != 'DISTRUN_SUPP' &&
                 batch.details['what'] != 'ARC_STUDENTS' &&
+                batch.details['what'] != 'ARC_SCH_REPORTS' &&
                 batch.details['what'] != 'CERT_REGEN'
               "
             >
@@ -1005,6 +1016,25 @@
               </b-form-checkbox>
             </b-form-checkbox-group>
           </b-form-group>
+
+          <b-form-group v-if="batch.details['what'] == 'ARC_SCH_REPORTS'">
+            <h4>
+              Batch Confirmation: please read and accept before submitting
+            </h4>
+            <b-form-checkbox-group
+              v-model="ARC_SCHOOL_REPORTS_confirm"
+              name="checkbox-group"
+            >
+              <b-form-checkbox value="finalGraduation">
+                Final Graduation Algorithm and TVR batch jobs have been run for
+                students from the previous cycle.
+              </b-form-checkbox>
+              <b-form-checkbox value="regenerateReports">
+                Regenerate School Reports are completed for any schools that
+                require final updates
+              </b-form-checkbox>
+            </b-form-checkbox-group>
+          </b-form-group>
           <b-form-group label="Batch Run" v-slot="{ ariaDescribedby }">
             <b-form-radio-group v-model="batchRunTime">
               <b-form-radio
@@ -1054,8 +1084,6 @@
                 >Custom</b-form-radio
               >
               <div class="pl-4" v-if="batchRunSchedule == 'Custom'">
-                <!-- <label for="batch-datepicker">Choose a date:</label> -->
-
                 <b-form-datepicker
                   id="batch-datepicker"
                   v-model="batchRunCustomDate"
@@ -1235,6 +1263,7 @@ export default {
   data: function () {
     return {
       ARC_STUDENTS_confirm: [],
+      ARC_SCHOOL_REPORTS_confirm: [],
       runType: "",
       reportTypes: [],
       reportType: "",
@@ -1349,8 +1378,6 @@ export default {
             {
               text: "School",
               value: "School",
-              description:
-                "All students with a School of Record matching the entered school and with a student status of CUR or TER will have their status changed to ARC",
             },
             {
               text: "All Schools",
@@ -1625,15 +1652,28 @@ export default {
         this.ARC_STUDENTS_confirm.length !== 3
       ) {
         return true;
+      } else if (
+        this.batch.details["what"] == "ARC_SCH_REPORTS" &&
+        this.ARC_SCHOOL_REPORTS_confirm.length !== 2
+      ) {
+        return true;
       } else if (this.batchRunTime == "Run Now") {
         return false;
-      } else {
-        if (this.batchRunSchedule && this.batchRunSchedule == "Custom") {
-          if (this.batchRunTime && this.batchRunCustomDate) {
+      } else if (this.batchRunTime == "Run Later") {
+        if (this.batchRunSchedule) {
+          if (this.batchRunSchedule != "Custom") {
+            return false;
+          } else if (
+            this.batchRunSchedule == "Custom" &&
+            this.batchRunCustomDate &&
+            this.batchRunCustomTime
+          ) {
             return false;
           } else {
             return true;
           }
+        } else {
+          return true;
         }
       }
     },
@@ -2007,6 +2047,9 @@ export default {
           if (event == "ARC_STUDENTS") {
             batchDetail.details["who"] = "School";
           }
+          if (event == "ARC_SCH_REPORTS") {
+            batchDetail.details["who"] = "School";
+          }
         }
         if (type == "gradDateFrom") {
           event = SharedMethods.dateFormatYYYYMMDD(this.gradDateFrom);
@@ -2189,4 +2232,7 @@ export default {
 input {
   border-radius: 0px;
 }
+.modal-body {
+  margin: 10px !important;
+}
 </style>
diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
index 36355dfa..181f3e90 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -4,9 +4,12 @@
       >Warning: You have selected a large volume of documents to be
       printed</b-alert
     >
-    <ul>
+    <ul class="p-3">
       <li v-if="typeLabel"><strong>Run Type: </strong>{{ typeLabel }}</li>
-      <li v-if="details.copies">
+      <li v-if="typeLabel">
+        <strong>Run Type: </strong>{{ details.reportType }}
+      </li>
+      <li v-if="details.copies && details.what != 'ARC_SCH_REPORTS'">
         <strong>Copies: </strong>{{ details.copies }}
       </li>
       <li v-if="details.who">
@@ -28,7 +31,8 @@
             details.gradDate &&
             details.who != 'PSI' &&
             details.who != 'Student' &&
-            details.who != 'District'
+            details.who != 'District' &&
+            details.what == 'ARC_STUDENTS'
           "
         >
           <strong>Select Students: </strong>
@@ -114,7 +118,8 @@
           details.what != 'REGALG' &&
           details.what != 'TVRRUN' &&
           details.what != 'CERT_REGEN' &&
-          details.what != 'ARC_STUDENTS'
+          details.what != 'ARC_STUDENTS' &&
+          details.what != 'ARC_SCH_REPORTS'
         "
       >
         <strong>Where: </strong>
diff --git a/frontend/src/components/Batch/v3BatchRuns.vue b/frontend/src/components/Batch/v3BatchRuns.vue
index 8e8a06ec..2de8051e 100644
--- a/frontend/src/components/Batch/v3BatchRuns.vue
+++ b/frontend/src/components/Batch/v3BatchRuns.vue
@@ -82,7 +82,10 @@
             </div>
             <div
               class="row border-bottom p-2"
-              v-if="row.item.jobType != 'DISTRUNUSER'"
+              v-if="
+                row.item.jobType != 'DISTRUNUSER' &&
+                row.item.jobType != 'ARC_SCH_REPORTS'
+              "
             >
               <div class="col-10 p-2">
                 Rerun this batch for <br />{{
@@ -113,7 +116,7 @@
             <div
               class="row border-bottom p-2"
               v-if="
-                row.item.jobType != 'DISTRUNUSER' &&
+                (row.item.jobType != 'DISTRUNUSER' || row.item.jobType != '' ||) &&
                 row.item.failedStudentsProcessed != 0
               "
             >
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index e82cd84c..ea3c91bc 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -112,6 +112,19 @@ export default {
       return ApiService.apiAxios.post('/api/v1/batch/executeyearlyarchivebatchjobstudents', request);
     } 
   },
+  runYearlyArchiveBatchJobSchools(request, cronTime=""){
+    if(cronTime){
+      let scheduledRequest = {};
+      scheduledRequest.cronExpression = cronTime;
+      scheduledRequest.jobName = "ASRBJ";
+      scheduledRequest.blankPayLoad = null;
+      scheduledRequest.payload = request;
+      this.addScheduledJob(scheduledRequest);
+      return
+    }else{
+      return ApiService.apiAxios.post('/api/v1/batch/executearchivebatchjobschoolreports', request);
+    } 
+  },
   runCERTREGEN_ALL(){
     return ApiService.apiAxios.get('/api/v1/batch/executecertregenbatchjob');
   },  
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index a87a0a9e..41d1329a 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -126,7 +126,8 @@
                                       <div
                                         class="row border-bottom p-2"
                                         v-if="
-                                          row.item.jobType != 'ARC_STUDENTS'
+                                          row.item.jobType != 'ARC_STUDENTS' &&
+                                          row.item.jobType != 'ARC_SCH_REPORTS'
                                         "
                                       >
                                         <div class="col-12">
@@ -158,6 +159,8 @@
                                           row.item.jobType != 'DISTRUN_SUPP' &&
                                           row.item.jobType != 'NONGRADRUN' &&
                                           row.item.jobType != 'ARC_STUDENTS' &&
+                                          row.item.jobType !=
+                                            'ARC_SCH_REPORTS' &&
                                           row.item.jobType != 'PSIRUN'
                                         "
                                       >
@@ -212,6 +215,8 @@
                                           row.item.jobType != 'NONGRADRUN' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
                                           row.item.jobType != 'ARC_STUDENTS' &&
+                                          row.item.jobType !=
+                                            'ARC_SCH_REPORTS' &&
                                           row.item.failedStudentsProcessed != 0
                                         "
                                       >
@@ -264,6 +269,8 @@
                                           row.item.jobType != 'NONGRADRUN' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
                                           row.item.jobType != 'PSIRUN' &&
+                                          row.item.jobType !=
+                                            'ARC_SCH_REPORTS' &&
                                           row.item.jobType != 'ARC_STUDENTS'
                                         "
                                       >
@@ -1358,7 +1365,7 @@ export default {
           }
         });
     },
-    runManageSchoolReports(request, id) {
+    runArchiveSchoolReports(request, id) {
       let requestId = id.replace("job-", "");
       this.$set(this.spinners, id, true);
       let index = id.replace("job-", "") - 1;
@@ -1807,12 +1814,12 @@ export default {
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;
-          scheduledRequest.jobName = "ARCS";
+          scheduledRequest.jobName = "ASRBJ";
           scheduledRequest.blankPayLoad = null;
           scheduledRequest.payload = request;
           this.addScheduledJob(scheduledRequest, id);
         } else {
-          this.runManageSchoolReports(request, id);
+          this.runArchiveSchoolReports(request, id);
         }
       }
     },

From 7420edeb032084f41fc1d813c59da9dd4d76c852 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 16 Aug 2024 10:09:53 -0700
Subject: [PATCH 129/168] remove bolded words

---
 frontend/src/components/Batch/Batch.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 7074e02c..4c2411f6 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -157,9 +157,8 @@
               "
             >
               All students with a School of Record matching the entered school
-              and with a student status of CUR
-              <strong>or a student status of TER</strong> will have their status
-              changed to ARC
+              and with a student status of CUR or a student status of TER will
+              have their status changed to ARC
             </b-alert>
             <b-alert
               :show="

From deb4704e07477865d0b6b4637dd877d66bf7a78d Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 16 Aug 2024 12:24:07 -0700
Subject: [PATCH 130/168] fixed report types options

---
 frontend/src/components/Batch/Batch.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 40018e9d..8acf4c89 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -167,8 +167,9 @@
               "
             >
               All students with a School of Record matching the entered school
-              and with a student status of CUR or a student status of TER will
-              have their status changed to ARC
+              and with a student status of CUR
+              <strong>or a student status of TER</strong> will have their status
+              changed to ARC
             </b-alert>
             <b-alert
               :show="
@@ -1400,25 +1401,24 @@ export default {
     this.batchTypes = this.getBatchJobTypes();
     this.reportTypes = [
       {
-        code: "NONGRADREGARC",
+        code: "NONGRADPRJ",
         label:
-          "Archived Not-Yet Graduated Students (MM YYYY to MM YYYY) Report",
+          "NONGRADPRJ - Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)",
         description:
-          "The final 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.",
+          "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: "GRADREGARC",
-        label:
-          "Archived Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)",
+        code: "GRADREG",
+        label: "GRADREG - Graduated Students (MM YYYY to MM YYYY) Report",
         description:
-          "The final 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.",
+          "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.",
       },
       {
-        code: "NONGRADPRJARC",
+        code: "NONGRADREG",
         label:
-          "Archived Projected Non-Graduates - Summary Report (MM YYYY to MM YYYY)",
+          "NONGRADREG - Not-Yet Graduated Students (MM YYYY to MM YYYY) Report",
         description:
-          "The final list of grade 12 or AD students on a graduation program who were not projected to graduate based on missing course registrations or assessment registrations submitted by the school in the reporting cycle.",
+          "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.",
       },
     ];
   },

From 982797ab34d6adf56beb7a686a93e54c8132da92 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 19 Aug 2024 09:45:25 -0700
Subject: [PATCH 131/168] remove unused if statement

---
 frontend/src/components/Batch/Batch.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index d840ee8a..7c04db76 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1468,9 +1468,6 @@ export default {
         this.batchIsValid = false;
         return;
       }
-      if (this.batch.details["what"] == "TVR_DELETE") {
-        //this.batchIsValid = false;
-      }
       if (
         this.batch.details["what"] == "DISTRUNUSER" &&
         this.batch.details["credential"] == ""

From 7d61f24de9b48098238dbfbbb3bb8bb49266635b Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 19 Aug 2024 11:13:31 -0700
Subject: [PATCH 132/168] Fix validation msg for all students TVR Delete run

---
 frontend/src/components/Batch/BatchConfimInfo.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
index 36355dfa..4fb83861 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -1,8 +1,16 @@
 <template>
   <div>
     <b-alert show variant="warning" v-if="docWarning || paperWarning"
-      >Warning: You have selected a large volume of documents to be
-      printed</b-alert
+      ><strong>Warning:</strong> You have selected a large volume of documents
+      to be printed</b-alert
+    >
+    <b-alert
+      show
+      variant="warning"
+      v-if="details.what === 'TVR_DELETE' && details.who === 'All Students'"
+    >
+      <strong>Warning:</strong> You have selected to delete TVRs for all ARC
+      students</b-alert
     >
     <ul>
       <li v-if="typeLabel"><strong>Run Type: </strong>{{ typeLabel }}</li>

From c3fdd8e27c58807e5e39baf1ff0fb0f8d08963ab Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Mon, 19 Aug 2024 14:52:29 -0700
Subject: [PATCH 133/168] removed Copies and Where from batch confirm for TVR
 Delete and ARC students, and removed select students section from TVR_DELETE

---
 frontend/src/components/Batch/Batch.vue           |  1 +
 frontend/src/components/Batch/BatchConfimInfo.vue | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index a4843d7c..6228c383 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -214,6 +214,7 @@
                 batch.details['what'] != 'DISTRUN_YE' &&
                 batch.details['what'] != 'DISTRUN_SUPP' &&
                 batch.details['what'] != 'ARC_STUDENTS' &&
+                batch.details['what'] != 'TVR_DELETE' &&
                 batch.details['what'] != 'CERT_REGEN'
               "
             >
diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
index 4fb83861..62d9a175 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -14,7 +14,13 @@
     >
     <ul>
       <li v-if="typeLabel"><strong>Run Type: </strong>{{ typeLabel }}</li>
-      <li v-if="details.copies">
+      <li
+        v-if="
+          details.copies &&
+          details.what != 'ARC_STUDENTS' &&
+          details.what != 'TVR_DELETE'
+        "
+      >
         <strong>Copies: </strong>{{ details.copies }}
       </li>
       <li v-if="details.who">
@@ -122,7 +128,8 @@
           details.what != 'REGALG' &&
           details.what != 'TVRRUN' &&
           details.what != 'CERT_REGEN' &&
-          details.what != 'ARC_STUDENTS'
+          details.what != 'ARC_STUDENTS' &&
+          details.what != 'TVR_DELETE'
         "
       >
         <strong>Where: </strong>

From a2291600b9505b47b07de692caead0c2cff57c19 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 20 Aug 2024 10:42:43 -0700
Subject: [PATCH 134/168] updated Organization field key to use
 gradReportSignatureOrganizationName instead of districtName

---
 frontend/src/components/Codes/DigitalSignatures.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Codes/DigitalSignatures.vue b/frontend/src/components/Codes/DigitalSignatures.vue
index 03f74ecf..f1f89ccc 100644
--- a/frontend/src/components/Codes/DigitalSignatures.vue
+++ b/frontend/src/components/Codes/DigitalSignatures.vue
@@ -70,7 +70,7 @@ export default {
           sortable: true,
         },
         {
-          key: "districtName",
+          key: "gradReportSignatureOrganizationName",
           label: "Organization",
           sortable: true,
         },

From caeae5fedb91420b17216a8b9f1ca25d67566ec4 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Tue, 20 Aug 2024 14:11:06 -0700
Subject: [PATCH 135/168] added effectiveDate column to letter grade table

---
 .../src/components/Programs/LetterGrades.vue     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend/src/components/Programs/LetterGrades.vue b/frontend/src/components/Programs/LetterGrades.vue
index 84d07069..0970b73b 100644
--- a/frontend/src/components/Programs/LetterGrades.vue
+++ b/frontend/src/components/Programs/LetterGrades.vue
@@ -8,6 +8,11 @@
       id="letterGrade"
       showFilter="true"
     >
+      <template #cell(effectiveDate)="row">
+        <div v-if="row.item.effectiveDate">
+          {{ $filters.formatSimpleDate(row.item.effectiveDate) }}
+        </div>
+      </template>
       <template #cell(expiryDate)="row">
         <div v-if="row.item.expiryDate">
           {{ $filters.formatSimpleDate(row.item.expiryDate) }}
@@ -89,10 +94,17 @@ export default {
           label: "Description",
           sortable: true,
         },
+        {
+          key: "effectiveDate",
+          label: "Effective Date",
+          sortable: true,
+          class: "table-date",
+        },
         {
           key: "expiryDate",
           label: "Expiry Date",
           sortable: true,
+          class: "table-date",
         },
       ],
     };
@@ -102,6 +114,10 @@ export default {
 </script>
 
 <style>
+.table .table-date {
+  width: 110px;
+}
+
 .table th,
 .table td {
   border-top: none !important;

From a4c06677460a00385326309704f7af839348bfc6 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 21 Aug 2024 15:09:47 -0700
Subject: [PATCH 136/168] updates

---
 frontend/src/views/BatchProcessing.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 41d1329a..171f2fe5 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1371,6 +1371,7 @@ export default {
       let index = id.replace("job-", "") - 1;
       let value = true;
       this.setTabLoading({ index, value });
+      delete request.credentialTypeCode;
       BatchProcessingService.runYearlyArchiveBatchJobSchools(request)
         .then((response) => {
           //update the admin dashboard

From 1f1e506b862fa8f0e36e9362ccef52c6269ded74 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 22 Aug 2024 10:51:06 -0700
Subject: [PATCH 137/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 0be89a70..18f17f61 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.22.3",
-    "test": "1.22.3",
+    "dev": "1.22.4",
+    "test": "1.22.4",
     "prod": "1.22.3"
   }
 }

From 56ce3fa52de2ed8c80750df49ec95a5477d27fdd Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 22 Aug 2024 14:53:04 -0700
Subject: [PATCH 138/168] added all option

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

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index a87a0a9e..a9331329 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1792,7 +1792,10 @@ export default {
         }
       } else if (this.tabContent[id].details["what"] == "ARC_STUDENTS") {
         delete request.credentialTypeCode;
-
+        //All Students group selected, set the payload activityCode:ALL
+        if (this.tabContent[id].details["who"] == "All Students") {
+          request.activityCode = "ALL";
+        }
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;

From 60dce7dc7000691494edc1effb75a88d093f02de Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 22 Aug 2024 15:57:35 -0700
Subject: [PATCH 139/168] updated roles

---
 frontend/src/components/Batch/Batch.vue | 6 ++++++
 frontend/src/store/modules/access.js    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 4c2411f6..47769df1 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1533,6 +1533,11 @@ export default {
               return type;
             });
           }
+          if (!this.allowRunArchiveStudents) {
+            this.batchTypes = this.batchTypes.filter(
+              (type) => type.code != "ARC_STUDENTS"
+            );
+          }
 
           //disable code for release 1.7.0
           this.batchTypes = this.batchTypes.map((type) => {
@@ -2167,6 +2172,7 @@ export default {
       allowRunDistrunMonthly: "allowRunDistrunMonthly",
       allowSelectProgramGroup: "allowSelectProgramGroup",
       allowSelectCategoryCodeGroup: "allowSelectCategoryCodeGroup",
+      allowRunArchiveStudents: "allowRunArchiveStudents",
       allowRunPSI: "allowRunPSI",
     }),
     ...mapState(useAppStore, {
diff --git a/frontend/src/store/modules/access.js b/frontend/src/store/modules/access.js
index 319b938f..6fdd6331 100644
--- a/frontend/src/store/modules/access.js
+++ b/frontend/src/store/modules/access.js
@@ -16,6 +16,11 @@ export const useAccessStore = defineStore("access", {
         state.roles.includes(Roles.GRAD_INFO_OFFICER)
       );
     },
+    allowRunArchiveStudents: (state) => {
+      return (
+        state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR) 
+      );
+    },
     allowCreateStudentNotes: (state) => {
       return (
         state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR) ||

From 220f38d1ab7fcdca60a01979e6bd1197121efffd Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Tue, 27 Aug 2024 13:16:49 -0700
Subject: [PATCH 140/168] removed copies from confirmation

---
 frontend/src/components/Batch/BatchConfimInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
index 36355dfa..327b511a 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -6,7 +6,7 @@
     >
     <ul>
       <li v-if="typeLabel"><strong>Run Type: </strong>{{ typeLabel }}</li>
-      <li v-if="details.copies">
+      <li v-if="details.copies && details.what == 'DISTRUNUSER'">
         <strong>Copies: </strong>{{ details.copies }}
       </li>
       <li v-if="details.who">

From e6671e3678de828b41c5809328cd36688775f282 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:11:30 -0700
Subject: [PATCH 141/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 18f17f61..989aea3f 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.22.4",
     "test": "1.22.4",
-    "prod": "1.22.3"
+    "prod": "1.22.4"
   }
 }

From 98c978b2296d2746a315ce0929de6ac10e73539d Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Fri, 30 Aug 2024 10:41:52 -0700
Subject: [PATCH 142/168] updated ednpoints

---
 frontend/src/services/BatchProcessingService.js |  8 ++++----
 frontend/src/views/BatchProcessing.vue          | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index ea3c91bc..7c38e8ff 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -99,7 +99,7 @@ export default {
       return ApiService.apiAxios.post('/api/v1/batch/executecertregenbatchjob', request);
     } 
   },
-  runYearlyArchiveBatchJobStudents(request, cronTime=""){
+  runArchiveStudents(request, cronTime=""){
     if(cronTime){
       let scheduledRequest = {};
       scheduledRequest.cronExpression = cronTime;
@@ -109,10 +109,10 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      return ApiService.apiAxios.post('/api/v1/batch/executeyearlyarchivebatchjobstudents', request);
+      return ApiService.apiAxios.post('/api/v1/batch/student/archive', request);
     } 
   },
-  runYearlyArchiveBatchJobSchools(request, cronTime=""){
+  runArchiveSchoolReports(request, cronTime=""){
     if(cronTime){
       let scheduledRequest = {};
       scheduledRequest.cronExpression = cronTime;
@@ -122,7 +122,7 @@ export default {
       this.addScheduledJob(scheduledRequest);
       return
     }else{
-      return ApiService.apiAxios.post('/api/v1/batch/executearchivebatchjobschoolreports', request);
+      return ApiService.apiAxios.post('/api/v1/batch/report/school/archive', request);
     } 
   },
   runCERTREGEN_ALL(){
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 0084f7ee..bb366ff5 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1337,7 +1337,10 @@ export default {
       let index = id.replace("job-", "") - 1;
       let value = true;
       this.setTabLoading({ index, value });
-      BatchProcessingService.runYearlyArchiveBatchJobStudents(request)
+      if (this.tabContent[id].details["who"] == "All Students") {
+        request.activityCode = "ALL";
+      }
+      BatchProcessingService.runArchiveStudents(request)
         .then((response) => {
           //update the admin dashboard
           this.getAdminDashboardData();
@@ -1371,8 +1374,11 @@ export default {
       let index = id.replace("job-", "") - 1;
       let value = true;
       this.setTabLoading({ index, value });
+      if (this.tabContent[id].details["who"] == "All Schools") {
+        request.activityCode = "ALL";
+      }
       delete request.credentialTypeCode;
-      BatchProcessingService.runYearlyArchiveBatchJobSchools(request)
+      BatchProcessingService.runArchiveSchoolReports(request)
         .then((response) => {
           //update the admin dashboard
           this.getAdminDashboardData();
@@ -1800,10 +1806,7 @@ export default {
         }
       } else if (this.tabContent[id].details["what"] == "ARC_STUDENTS") {
         delete request.credentialTypeCode;
-        //All Students group selected, set the payload activityCode:ALL
-        if (this.tabContent[id].details["who"] == "All Students") {
-          request.activityCode = "ALL";
-        }
+
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;

From 36ce65f46f8897a6fb66f52217266c00d9650487 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Tue, 3 Sep 2024 10:53:28 -0700
Subject: [PATCH 143/168] updated text for student archive

---
 frontend/src/components/Batch/Batch.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 39662f3a..8f682aed 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -167,9 +167,8 @@
               "
             >
               All students with a School of Record matching the entered school
-              and with a student status of CUR
-              <strong>or a student status of TER</strong> will have their status
-              changed to ARC
+              and with a student status of CUR or a student status of TER will
+              have their status changed to ARC
             </b-alert>
             <b-alert
               :show="
@@ -177,8 +176,8 @@
                 batch.details['who'] == 'All Students'
               "
             >
-              All students with a student status of CUR will have their student
-              status changed to ARC
+              All students with a status of CUR (current) and TER (terminated)
+              will have their student status changed to ARC (archived)
             </b-alert>
           </div>
           <div

From b72bc7190dbb7ccafc82d1df66d1e4c2839a87cf Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 4 Sep 2024 10:09:42 -0700
Subject: [PATCH 144/168] Updated UI for new endpoint and implemented role
 access

---
 frontend/src/components/Batch/Batch.vue         | 16 +++++++++++++++-
 frontend/src/services/BatchProcessingService.js |  6 +++++-
 frontend/src/store/modules/access.js            | 10 +++++++++-
 frontend/src/views/BatchProcessing.vue          |  8 ++++----
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 7a5af6cb..dae2137a 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1583,7 +1583,11 @@ export default {
               (type) => type.code != "ARC_STUDENTS"
             );
           }
-
+          if (!this.allowRunTVRDeleteStudent) {
+            this.batchTypes = this.batchTypes.filter(
+              (type) => type.code != "TVR_DELETE"
+            );
+          }
           this.batchTypes = this.batchTypes.map((type) => {
             if (
               type.code === "SCHL_RPT_REGEN" ||
@@ -1611,6 +1615,14 @@ export default {
       if (runType == "") {
         return;
       }
+      if (
+        this.batch.details["what"] == "TVR_DELETE" &&
+        !this.allowRunTVRDeleteSchools
+      ) {
+        return [{ text: "Student", value: "Student" }];
+      }
+
+      // this hits with almost every job and is hard to override, place overrides above
       if (
         this.batch.details["credential"] != "Blank certificate print" &&
         this.batch.details["credential"] != "Blank transcript print"
@@ -2232,6 +2244,8 @@ export default {
       allowSelectProgramGroup: "allowSelectProgramGroup",
       allowSelectCategoryCodeGroup: "allowSelectCategoryCodeGroup",
       allowRunArchiveStudents: "allowRunArchiveStudents",
+      allowRunTVRDeleteStudent: "allowRunTVRDeleteStudent",
+      allowRunTVRDeleteSchools: "allowRunTVRDeleteSchools",
       allowRunPSI: "allowRunPSI",
     }),
     ...mapState(useAppStore, {
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index 0e99c630..d427b8f6 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -140,7 +140,11 @@ export default {
     }
   },
   runTVR_DELETE(request) {
-    return ApiService.apiAxios.post("/api/v1/batch/tvrspecialrun", request);
+    //return ApiService.apiAxios.post("/api/v1/batch/tvrspecialrun", request);
+    return ApiService.apiAxios.post(
+      "/api/v1/batch/report/student/delete",
+      request
+    );
     //console.log(request);
   },
   runArchiveStudents(request, cronTime = "") {
diff --git a/frontend/src/store/modules/access.js b/frontend/src/store/modules/access.js
index 6fdd6331..91c318a8 100644
--- a/frontend/src/store/modules/access.js
+++ b/frontend/src/store/modules/access.js
@@ -17,10 +17,18 @@ export const useAccessStore = defineStore("access", {
       );
     },
     allowRunArchiveStudents: (state) => {
+      return state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR);
+    },
+    // Role mapping could be improved for TVR Delete since existing pattern doesn't account for granularity needed
+    allowRunTVRDeleteStudent: (state) => {
       return (
-        state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR) 
+        state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR) ||
+        state.roles.includes(Roles.GRAD_INFO_OFFICER)
       );
     },
+    allowRunTVRDeleteSchools: (state) => {
+      return state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR);
+    },
     allowCreateStudentNotes: (state) => {
       return (
         state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR) ||
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 3bcef0b1..4670d36e 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1483,9 +1483,10 @@ export default {
       let index = id.replace("job-", "") - 1;
       let value = true;
       this.setTabLoading({ index, value });
-      //TODO batch processing service
-      // console.log(requestId);
-      // console.log(request);
+      if (this.tabContent[id].details["who"] == "All Students") {
+        request.activityCode = "ALL";
+      }
+      request.reportTypes = ["ACHV"];
 
       BatchProcessingService.runTVR_DELETE(request)
         .then((response) => {
@@ -1710,7 +1711,6 @@ export default {
           this.runTVRRUN(request, id);
         }
       } else if (this.tabContent[id].details["what"] == "TVR_DELETE") {
-        request.activityCode = "tvrDeleted";
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;

From 0d7ab5e7126dd806fc4948f706da74cce311b462 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 4 Sep 2024 10:11:18 -0700
Subject: [PATCH 145/168] remove commented out code

---
 frontend/src/services/BatchProcessingService.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index d427b8f6..44c4be50 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -140,12 +140,10 @@ export default {
     }
   },
   runTVR_DELETE(request) {
-    //return ApiService.apiAxios.post("/api/v1/batch/tvrspecialrun", request);
     return ApiService.apiAxios.post(
       "/api/v1/batch/report/student/delete",
       request
     );
-    //console.log(request);
   },
   runArchiveStudents(request, cronTime = "") {
     if (cronTime) {

From e6b68fe869673c268eecaa45ca2306536e50a5b0 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 4 Sep 2024 10:12:34 -0700
Subject: [PATCH 146/168] rename access function for better readability

---
 frontend/src/components/Batch/Batch.vue | 4 ++--
 frontend/src/store/modules/access.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index dae2137a..a2d2231b 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1583,7 +1583,7 @@ export default {
               (type) => type.code != "ARC_STUDENTS"
             );
           }
-          if (!this.allowRunTVRDeleteStudent) {
+          if (!this.allowRunTVRDelete) {
             this.batchTypes = this.batchTypes.filter(
               (type) => type.code != "TVR_DELETE"
             );
@@ -2244,7 +2244,7 @@ export default {
       allowSelectProgramGroup: "allowSelectProgramGroup",
       allowSelectCategoryCodeGroup: "allowSelectCategoryCodeGroup",
       allowRunArchiveStudents: "allowRunArchiveStudents",
-      allowRunTVRDeleteStudent: "allowRunTVRDeleteStudent",
+      allowRunTVRDelete: "allowRunTVRDelete",
       allowRunTVRDeleteSchools: "allowRunTVRDeleteSchools",
       allowRunPSI: "allowRunPSI",
     }),
diff --git a/frontend/src/store/modules/access.js b/frontend/src/store/modules/access.js
index 91c318a8..2616ab97 100644
--- a/frontend/src/store/modules/access.js
+++ b/frontend/src/store/modules/access.js
@@ -20,7 +20,7 @@ export const useAccessStore = defineStore("access", {
       return state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR);
     },
     // Role mapping could be improved for TVR Delete since existing pattern doesn't account for granularity needed
-    allowRunTVRDeleteStudent: (state) => {
+    allowRunTVRDelete: (state) => {
       return (
         state.roles.includes(Roles.GRAD_SYSTEM_COORDINATOR) ||
         state.roles.includes(Roles.GRAD_INFO_OFFICER)

From a8449d6c82d29ebdd9897fcea0b36cb7392960a3 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Wed, 4 Sep 2024 12:59:03 -0700
Subject: [PATCH 147/168] Removed info from batch processing list per Kim's
 request for TVR_DELETE

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

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 4670d36e..380b2cb0 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -126,6 +126,7 @@
                                       <div
                                         class="row border-bottom p-2"
                                         v-if="
+                                          row.item.jobType != 'TVR_DELETE' &&
                                           row.item.jobType != 'ARC_STUDENTS' &&
                                           row.item.jobType != 'ARC_SCH_REPORTS'
                                         "
@@ -158,6 +159,7 @@
                                           row.item.jobType != 'DISTRUN_YE' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
                                           row.item.jobType != 'NONGRADRUN' &&
+                                          row.item.jobType != 'TVR_DELETE' &&
                                           row.item.jobType != 'ARC_STUDENTS' &&
                                           row.item.jobType !=
                                             'ARC_SCH_REPORTS' &&
@@ -214,6 +216,7 @@
                                           row.item.jobType != 'DISTRUN_YE' &&
                                           row.item.jobType != 'NONGRADRUN' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
+                                          row.item.jobType != 'TVR_DELETE' &&
                                           row.item.jobType != 'ARC_STUDENTS' &&
                                           row.item.jobType !=
                                             'ARC_SCH_REPORTS' &&
@@ -269,6 +272,7 @@
                                           row.item.jobType != 'NONGRADRUN' &&
                                           row.item.jobType != 'DISTRUN_SUPP' &&
                                           row.item.jobType != 'PSIRUN' &&
+                                          row.item.jobType != 'TVR_DELETE' &&
                                           row.item.jobType !=
                                             'ARC_SCH_REPORTS' &&
                                           row.item.jobType != 'ARC_STUDENTS'

From 7b403bebd1291da0398c65f52f0397433b304270 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 5 Sep 2024 08:47:00 -0700
Subject: [PATCH 148/168] fix schedule job code

---
 frontend/src/views/BatchProcessing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 380b2cb0..aca61230 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1718,7 +1718,7 @@ export default {
         if (cronTime) {
           let scheduledRequest = {};
           scheduledRequest.cronExpression = cronTime;
-          scheduledRequest.jobName = "STBJ";
+          scheduledRequest.jobName = "DSRBJ";
           scheduledRequest.blankPayLoad = null;
           scheduledRequest.payload = request;
           scheduledRequest.psiPayload = null;

From 362a241fc36277fcbe4ec4eaeafa1e57d43b9a8f Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 5 Sep 2024 11:18:53 -0700
Subject: [PATCH 149/168] update confirm message for TVR Delete - All Students

---
 frontend/src/components/Batch/BatchConfimInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Batch/BatchConfimInfo.vue b/frontend/src/components/Batch/BatchConfimInfo.vue
index fa138d50..64217fbd 100644
--- a/frontend/src/components/Batch/BatchConfimInfo.vue
+++ b/frontend/src/components/Batch/BatchConfimInfo.vue
@@ -9,7 +9,7 @@
       variant="warning"
       v-if="details.what === 'TVR_DELETE' && details.who === 'All Students'"
     >
-      <strong>Warning:</strong> You have selected to delete TVRs for all ARC
+      <strong>Warning:</strong> You have selected to delete TVRs for all
       students</b-alert
     >
     <ul class="p-3">

From e65fbb13abdccdc467877c15054df39884b83497 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Wed, 11 Sep 2024 10:11:16 -0700
Subject: [PATCH 150/168] updated options for regen

---
 frontend/src/components/Batch/Batch.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index d1d954ab..4b60c4b1 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1467,16 +1467,11 @@ export default {
       },
       {
         code: "GRADREG and NONGRADREG",
-        label: "Graduated Students (MM YYYY to MM YYYY) Report",
+        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.",
       },
-      {
-        code: "GRADREG and NONGRADREG",
-        label: "Not-Yet Graduated Students (MM YYYY to MM YYYY) Report",
-        description:
-          "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.",
-      },
     ];
   },
 

From 45b23804dd6a30bc2ce3640f3d777381cb5fb3ee Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 12 Sep 2024 10:37:48 -0700
Subject: [PATCH 151/168] fixed ui for report regen

---
 frontend/src/components/Batch/Batch.vue         | 2 +-
 frontend/src/services/BatchProcessingService.js | 1 -
 frontend/src/views/BatchProcessing.vue          | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Batch/Batch.vue b/frontend/src/components/Batch/Batch.vue
index 4b60c4b1..218da729 100644
--- a/frontend/src/components/Batch/Batch.vue
+++ b/frontend/src/components/Batch/Batch.vue
@@ -1403,7 +1403,7 @@ export default {
             { text: "School Category", value: "District" },
             {
               text: "All",
-              value: "All Students",
+              value: "All Schools",
             },
           ],
         },
diff --git a/frontend/src/services/BatchProcessingService.js b/frontend/src/services/BatchProcessingService.js
index dde9ad35..24067a34 100644
--- a/frontend/src/services/BatchProcessingService.js
+++ b/frontend/src/services/BatchProcessingService.js
@@ -63,7 +63,6 @@ export default {
     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() {
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index c8596f10..11ea8594 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1909,10 +1909,8 @@ export default {
         }
       } else if (this.tabContent[id].details["what"] == "SCHL_RPT_REGEN") {
         delete request.credentialTypeCode;
-        request.statuses = null;
-        request.studentIDs = null;
         request.reportTypes = [this.tabContent[id].details["reportType"]];
-        if (this.tabContent[id].details["who"] == "All Students") {
+        if (this.tabContent[id].details["who"] == "All Schools") {
           request.activityCode = "ALL";
         }
         if (cronTime) {

From 28db01fcaec0bc21b310198c4bc500b75a9742ec Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:18:30 -0700
Subject: [PATCH 152/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 989aea3f..da9962a0 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.22.4",
-    "test": "1.22.4",
+    "dev": "1.23.0",
+    "test": "1.23.0",
     "prod": "1.22.4"
   }
 }

From f0a510b9db06488b0d5a1208b1aaf4f4e7ad9824 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:19:33 -0700
Subject: [PATCH 153/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index da9962a0..10a3d92e 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.23.0",
-    "test": "1.23.0",
+    "dev": "1.23.1",
+    "test": "1.23.1",
     "prod": "1.22.4"
   }
 }

From a0545cdf68814f7e666dfac57ec5629074b221be Mon Sep 17 00:00:00 2001
From: Chris Ditcher <chris.ditcher@gov.bc.ca>
Date: Fri, 20 Sep 2024 11:04:25 -0700
Subject: [PATCH 154/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 10a3d92e..934278fa 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.23.1",
-    "test": "1.23.1",
+    "dev": "1.23.2",
+    "test": "1.23.2",
     "prod": "1.22.4"
   }
 }

From 2c2aafa28da4aedfe25326db6891eb5a08caed27 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 23 Sep 2024 11:12:29 -0700
Subject: [PATCH 155/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 934278fa..f1771650 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.23.2",
-    "test": "1.23.2",
+    "dev": "1.23.3",
+    "test": "1.23.3",
     "prod": "1.22.4"
   }
 }

From 5c5d0a8c4e255b65f48e24771ef5a513c9236cc2 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 25 Sep 2024 09:17:04 -0700
Subject: [PATCH 156/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index f1771650..3e2aac15 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.23.3",
     "test": "1.23.3",
-    "prod": "1.22.4"
+    "prod": "1.23.3"
   }
 }

From 72724d583109e391f2262d8082c490c264d62197 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:04:45 -0700
Subject: [PATCH 157/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 3e2aac15..3d05c8bd 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
     "dev": "1.23.3",
-    "test": "1.23.3",
+    "test": "1.23.4",
     "prod": "1.23.3"
   }
 }

From abf51fefd0ebd36aac321b57b52d54b626b143e5 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:18:11 -0700
Subject: [PATCH 158/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 3d05c8bd..707436d6 100644
--- a/grad-version
+++ b/grad-version
@@ -1,6 +1,6 @@
 {
   "version": {
-    "dev": "1.23.3",
+    "dev": "1.23.4",
     "test": "1.23.4",
     "prod": "1.23.3"
   }

From 3a7965147e45840734014f169ce4589db4a39364 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:05:13 -0700
Subject: [PATCH 159/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 707436d6..a98223aa 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.23.4",
     "test": "1.23.4",
-    "prod": "1.23.3"
+    "prod": "1.23.4"
   }
 }

From c3fdba18fef34fdf150dba2e3e527b55cb2b2bb6 Mon Sep 17 00:00:00 2001
From: Chris Ditcher <chris.ditcher@gov.bc.ca>
Date: Thu, 3 Oct 2024 10:22:21 -0700
Subject: [PATCH 160/168] Update grad-version

Updated version to 1.24.0 on dev and test.
---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index a98223aa..ca0655d3 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.23.4",
-    "test": "1.23.4",
+    "dev": "1.24.0",
+    "test": "1.24.0",
     "prod": "1.23.4"
   }
 }

From bee412ef2b9a1109a0ae05ddd1caa342048b32f2 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:14:32 -0700
Subject: [PATCH 161/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index ca0655d3..8417d5d4 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
     "dev": "1.24.0",
-    "test": "1.24.0",
+    "test": "1.24.1",
     "prod": "1.23.4"
   }
 }

From e09bfbab17f4e0778a5560db0e5f00f55700201c Mon Sep 17 00:00:00 2001
From: Chris Ditcher <chris.ditcher@gov.bc.ca>
Date: Thu, 10 Oct 2024 10:55:36 -0700
Subject: [PATCH 162/168] Update grad-version

---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 8417d5d4..c22a647d 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.24.0",
-    "test": "1.24.1",
+    "dev": "1.24.2",
+    "test": "1.24.2",
     "prod": "1.23.4"
   }
 }

From 6189d6094e913dc86f7f803eaf915893ab7a2b99 Mon Sep 17 00:00:00 2001
From: githubmamatha <106563495+githubmamatha@users.noreply.github.com>
Date: Tue, 15 Oct 2024 12:58:22 -0700
Subject: [PATCH 163/168] Update grad-version

---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index c22a647d..882ceafb 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.24.2",
     "test": "1.24.2",
-    "prod": "1.23.4"
+    "prod": "1.24.2"
   }
 }

From ca09c3e92d4385d109782b5e8444ffc5de36d70f Mon Sep 17 00:00:00 2001
From: Chris Ditcher <chris.ditcher@gov.bc.ca>
Date: Fri, 18 Oct 2024 10:29:17 -0700
Subject: [PATCH 164/168] Update grad-version

v1.25.0
---
 grad-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grad-version b/grad-version
index 882ceafb..9260bf5d 100644
--- a/grad-version
+++ b/grad-version
@@ -1,7 +1,7 @@
 {
   "version": {
-    "dev": "1.24.2",
-    "test": "1.24.2",
+    "dev": "1.25.0",
+    "test": "1.25.0",
     "prod": "1.24.2"
   }
 }

From 78723a036a5c6c2e571e247c8c00e9234d7728c3 Mon Sep 17 00:00:00 2001
From: Chris Ditcher <chris.ditcher@gov.bc.ca>
Date: Fri, 18 Oct 2024 13:50:08 -0700
Subject: [PATCH 165/168] Update grad-version

1.25.0 PROD
---
 grad-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grad-version b/grad-version
index 9260bf5d..17ed231d 100644
--- a/grad-version
+++ b/grad-version
@@ -2,6 +2,6 @@
   "version": {
     "dev": "1.25.0",
     "test": "1.25.0",
-    "prod": "1.24.2"
+    "prod": "1.25.0"
   }
 }

From 91c149eb7d085b94104bb05a752724bcdcc6f392 Mon Sep 17 00:00:00 2001
From: suzalflueck <samflueck95@gmail.com>
Date: Thu, 31 Oct 2024 11:35:13 -0700
Subject: [PATCH 166/168] fix state issues in student profile around exams,
 assessments, and courses

---
 .../StudentProfile/StudentAssessments.vue     |  1 -
 .../StudentProfile/StudentCourses.vue         | 25 ++++++-------------
 frontend/src/store/modules/student.js         | 24 ++++++++++--------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/StudentProfile/StudentAssessments.vue b/frontend/src/components/StudentProfile/StudentAssessments.vue
index d85f2aab..b9d75436 100644
--- a/frontend/src/components/StudentProfile/StudentAssessments.vue
+++ b/frontend/src/components/StudentProfile/StudentAssessments.vue
@@ -10,7 +10,6 @@
       showFilter="true"
       title="Assessments"
       :items-per-page="'-1'"
-      :id="id"
     >
       <template
         v-slot:item.data-table-expand="{
diff --git a/frontend/src/components/StudentProfile/StudentCourses.vue b/frontend/src/components/StudentProfile/StudentCourses.vue
index 375e2eeb..826288c2 100644
--- a/frontend/src/components/StudentProfile/StudentCourses.vue
+++ b/frontend/src/components/StudentProfile/StudentCourses.vue
@@ -10,17 +10,8 @@
           :items="courses"
           :headers="fields"
           :items-per-page="'-1'"
-          :id="id"
           showFilter="true"
           title="studentCourse"
-          :delete="{
-            disable: {
-              condition: 'OR',
-              criteria: [],
-            },
-            label: 'Delete',
-            action: 'removeStudentCourse',
-          }"
         >
           <template
             v-slot:item.data-table-expand="{
@@ -318,14 +309,14 @@ export default {
       // Set the data property to false to close the modal
       this.modalState = false;
     },
-    toggle(id) {
-      const index = this.opened.indexOf(id);
-      if (index > -1) {
-        this.opened.splice(index, 1);
-      } else {
-        this.opened.push(id);
-      }
-    },
+    // toggle(id) {
+    //   const index = this.opened.indexOf(id);
+    //   if (index > -1) {
+    //     this.opened.splice(index, 1);
+    //   } else {
+    //     this.opened.push(id);
+    //   }
+    // },
     checkForPendingUpdates() {
       if (this.hasGradStatus) {
         for (let i = 0; i < this.courses.length; i++) {
diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index 0b138825..7175a310 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -22,12 +22,12 @@ export const useStudentStore = defineStore("student", {
     quickSearchId: "",
     student: {
       profile: {},
-      courses: "not loaded",
-      assessments: "not loaded",
-      exams: "not loaded",
+      courses: [],
+      assessments: [],
+      exams: [],
       notes: [],
       gradStatus: "not loaded",
-      optionalPrograms: "not loaded",
+      optionalPrograms: [],
       hasExams: false,
       hasAssessments: false,
       hasCourses: false,
@@ -341,12 +341,12 @@ export const useStudentStore = defineStore("student", {
     unsetStudent() {
       this.student.profile = {};
       this.student.notes = [];
-      this.student.id = "not loaded";
-      this.student.courses = "not loaded";
-      this.student.assessments = "not loaded";
-      this.student.exams = "not loaded";
+      this.student.id = [];
+      this.student.courses = [];
+      this.student.assessments = [];
+      this.student.exams = [];
       this.student.gradStatus = "not loaded";
-      this.student.optionalPrograms = "not loaded";
+      this.student.optionalPrograms = [];
       this.student.hasExams = false;
       this.student.hasAssessments = false;
       this.student.hasCourses = false;
@@ -624,7 +624,11 @@ export const useStudentStore = defineStore("student", {
       }));
     },
     getStudentExams() {
-      return this.student.exams;
+      if (!this.student.exams || this.student.exams.length === 0) {
+        return [];
+      } else {
+        return this.student.exams;
+      }
     },
     getStudentAssessments() {
       if (

From 3578dacc2fd476097e387636c6d4e1ad4ea31cc0 Mon Sep 17 00:00:00 2001
From: Shaun Lum <51839198+shaunlumbcgov@users.noreply.github.com>
Date: Thu, 31 Oct 2024 12:12:36 -0700
Subject: [PATCH 167/168] Update build-n-deploy-frontend-to-ocp-dev.yml

updated os version
---
 .github/workflows/build-n-deploy-frontend-to-ocp-dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
index 3fafa038..8cf4f5e8 100644
--- a/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
+++ b/.github/workflows/build-n-deploy-frontend-to-ocp-dev.yml
@@ -39,7 +39,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Frontend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
@@ -171,7 +171,7 @@ jobs:
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'
 

From f2f41cd6b6fa771b3e25cbe9bf174e8e37f1df48 Mon Sep 17 00:00:00 2001
From: Shaun Lum <51839198+shaunlumbcgov@users.noreply.github.com>
Date: Thu, 31 Oct 2024 12:13:45 -0700
Subject: [PATCH 168/168] Update build-n-deploy-backend-to-ocp-dev.yml

updated os version
---
 .github/workflows/build-n-deploy-backend-to-ocp-dev.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
index 9bbb7df7..cff9a032 100644
--- a/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
+++ b/.github/workflows/build-n-deploy-backend-to-ocp-dev.yml
@@ -34,7 +34,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   MIN_REPLICAS: "1"
-  MAX_REPLICAS: "1"
+  MAX_REPLICAS: "2"
 
   # SITE_URL should have no scheme or port. It will be prepended with https://
   HOST_ROUTE: ${{ secrets.SITE_URL }}
@@ -46,7 +46,7 @@ jobs:
   openshift-ci-cd:
     name: Build & Deploy Backend to DEV
     # ubuntu-latest can also be used.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:
@@ -169,6 +169,6 @@ jobs:
           oc rollout status dc/${{ env.IMAGE_NAME }}-dc
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
           target: 'https://educ-grad-admin-bbe4c3-dev.apps.silver.devops.gov.bc.ca'