From 56e355caf6305ac715effc8ea39091bb5e76ffa8 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Thu, 24 Oct 2024 11:09:51 -0700
Subject: [PATCH 1/3] added bc header

---
 frontend/src/components/Batch/BatchRuns.vue |   6 +-
 frontend/src/components/Header/BCHeader.vue | 546 +++++---------------
 frontend/src/views/BatchProcessing.vue      |  66 ++-
 3 files changed, 177 insertions(+), 441 deletions(-)

diff --git a/frontend/src/components/Batch/BatchRuns.vue b/frontend/src/components/Batch/BatchRuns.vue
index 069e4b4f..858ed74d 100644
--- a/frontend/src/components/Batch/BatchRuns.vue
+++ b/frontend/src/components/Batch/BatchRuns.vue
@@ -37,11 +37,7 @@
             {{ item.updateDate.replace("T", ", ") }}
           </template>
           <template v-slot:item.jobExecutionId="{ item }">
-            <v-menu
-              :close-on-content-click="true"
-              location="end"
-              :width="item.jobParameters ? 600 : 350"
-            >
+            <v-menu location="end" :width="item.jobParameters ? 600 : 350">
               <template v-slot:activator="{ props }">
                 <v-btn
                   variant="plain"
diff --git a/frontend/src/components/Header/BCHeader.vue b/frontend/src/components/Header/BCHeader.vue
index 93c6944b..b812e398 100644
--- a/frontend/src/components/Header/BCHeader.vue
+++ b/frontend/src/components/Header/BCHeader.vue
@@ -1,457 +1,163 @@
 <template>
   <div>
-    <v-app-bar color="bcGovBlue" density="prominent"
-      ><div class="container">
-        <div class="banner">
-          <a class="navbar-brand" href="/">
-            <img
-              class="img-fluid d-md-block"
-              src="../../assets/images/bcid-logo-rev-en.svg"
-              width="185"
-              height="45"
-              alt="B.C. Government Logo"
-            />
-          </a>
-          <h1>Graduation Records and Achievement Data</h1>
-          <span v-if="version">v{{ version }}</span>
-        </div>
-        <div class="float-right user-profile">
-          <slot></slot>
-        </div>
-      </div>
-    </v-app-bar>
-    <v-app-bar class="navigation-main" id="navbar" aria-label="aria-label">
-      <ul>
-        <li>
-          <router-link :to="routes.studentSearch" id="select-student-route"
-            >Student Search</router-link
-          >
-        </li>
-        <li>
-          <router-link :to="routes.programs" id="programs-route"
-            >Programs</router-link
-          >
-        </li>
-        <li>
-          <router-link :to="routes.courses" id="courses-route"
-            >Courses</router-link
-          >
-        </li>
-        <li>
-          <router-link :to="routes.assessments" id="assessments-route"
-            >Assessments</router-link
-          >
-        </li>
-        <li>
-          <router-link :to="routes.schools" id="schools-route"
-            >Schools</router-link
-          >
-        </li>
-        <li>
-          <router-link :to="routes.psi" id="psi-route">PSI</router-link>
-        </li>
-        <li>
-          <router-link :to="routes.codes" id="codes-route">Codes</router-link>
-        </li>
-        <li>
-          <router-link :to="routes.schoolReports">School Reports</router-link>
-        </li>
-        <li>
-          <router-link :to="routes.batchProcessing"
-            >Batch Processing</router-link
+    <v-app>
+      <v-app-bar app color="bcGovBlue" dark>
+        <a class="navbar-brand" href="/">
+          <img
+            class="img-fluid d-md-block"
+            src="../../assets/images/bcid-logo-rev-en.svg"
+            width="185"
+            height="45"
+            alt="B.C. Government Logo"
+          />
+        </a>
+        <v-toolbar-title
+          >Graduation Records and Achievement Data</v-toolbar-title
+        >
+        <v-spacer />
+        <v-menu v-model="menu" offset-y>
+          <template #activator="{ props }">
+            <v-btn
+              icon
+              v-bind="props"
+              class="d-md-none d-lg-none d-xl-none d-xxl-none"
+            >
+              <v-icon>mdi-menu</v-icon>
+            </v-btn>
+          </template>
+          <v-list>
+            <v-list-item
+              v-for="link in menuLinks"
+              :key="link.id"
+              @click="menu = false"
+            >
+              <router-link
+                :to="link.route"
+                style="text-decoration: none; color: inherit"
+              >
+                <v-list-item-title>{{ link.title }}</v-list-item-title>
+              </router-link>
+            </v-list-item>
+            <v-spacer />
+            <v-list-item v-if="!profile.pen">
+              <a
+                id="profile-route"
+                class="text-decoration-none text-disabled"
+                :disabled="true"
+                >Profile (Student Not Loaded)</a
+              >
+            </v-list-item>
+            <v-list-item v-else>
+              <router-link
+                :to="`/student-profile/${profile.studentID}`"
+                id="profile-route"
+                >Profile ({{ profile.pen }})</router-link
+              >
+            </v-list-item>
+          </v-list>
+        </v-menu>
+      </v-app-bar>
+
+      <v-app-bar color="primary">
+        <v-btn text v-for="link in menuLinks" :key="link.id">
+          <router-link
+            :to="link.route"
+            style="text-decoration: none; color: inherit"
           >
-        </li>
-        <li v-if="!profile.pen" class="disabled">
+            {{ link.title }}
+          </router-link>
+        </v-btn>
+        <v-btn v-if="!profile.pen">
           <a
             id="profile-route"
             class="text-decoration-none text-disabled"
             :disabled="true"
             >Profile (Student Not Loaded)</a
           >
-        </li>
-        <li v-else>
+        </v-btn>
+        <v-btn v-else>
           <router-link
-            :to="`/student-profile/${this.profile.studentID}`"
+            :to="`/student-profile/${profile.studentID}`"
             id="profile-route"
-            >Profile ({{
-              profile.pen ? profile.pen : "Student Not Loaded"
-            }})</router-link
+            >Profile ({{ profile.pen }})</router-link
           >
-        </li>
-        <li>
-          <form v-on:submit.prevent>
-            <div class="form-group top-search">
-              <div>
-                <v-form @submit.prevent>
-                  <v-row class="align-center">
-                    <v-col class="d-flex align-center">
-                      <v-text-field
-                        density="compact"
-                        type="search"
-                        v-model="penInput"
-                        maxlength="9"
-                        minlength="9"
-                        outlined
-                        dense
-                        placeholder="PEN"
-                        class="headerSearch"
-                        ref="penSearch"
-                      ></v-text-field>
-                      <v-btn
-                        v-if="!searchLoading"
-                        @click="findStudentByPen"
-                        variant="flat"
-                        color="primary"
-                        class="px-2 header-search-btn"
-                        >Search
-                      </v-btn>
-                    </v-col>
-                  </v-row>
-                </v-form>
-              </div>
-            </div>
-          </form>
-        </li>
-      </ul>
-    </v-app-bar>
+        </v-btn>
+      </v-app-bar>
+    </v-app>
+
+    <!-- Other Components Here -->
   </div>
 </template>
+
 <script>
-import StudentService from "@/services/StudentService.js";
-import CommonService from "@/services/CommonService.js";
-import { loadStudent } from "../../utils/common.js";
-import { useSnackbarStore } from "@/store/modules/snackbar";
-import { useStudentStore } from "@/store/modules/student";
-import { mapState } from "pinia";
+import { loadStudent } from "../../utils/common.js"; // Import your loadStudent function
+import { useSnackbarStore } from "@/store/modules/snackbar"; // Import your snackbar store
+import { useStudentStore } from "@/store/modules/student"; // Import your student store
+import { mapState } from "pinia"; // Import mapState from Pinia
 
 export default {
-  components: {},
-  setup() {
-    const studentStore = useStudentStore();
-    return { studentStore };
-  },
   data() {
     return {
       snackbarStore: useSnackbarStore(),
-      pen: "",
-      searchLoading: false,
       penInput: "",
-      studentSearchResults: [],
-      host: location.protocol + "//" + location.host,
-      studentUrlID: "",
-      routes: {
-        studentSearch: "/",
-        programs: "/programs",
-        courses: "/courses",
-        assessments: "/assessments",
-        schools: "/schools",
-        psi: "/psi",
-        codes: "/codes",
-        schoolReports: "/school-reports",
-        batchProcessing: "/batch-processing",
-      },
+      searchLoading: false,
+      menu: false, // Control the hamburger menu visibility
+      menuLinks: [
+        { id: "studentSearch", title: "Student Search", route: "/" },
+        { id: "programs", title: "Programs", route: "/programs" },
+        { id: "courses", title: "Courses", route: "/courses" },
+        { id: "assessments", title: "Assessments", route: "/assessments" },
+        { id: "schools", title: "Schools", route: "/schools" },
+        { id: "psi", title: "PSI", route: "/psi" },
+        { id: "codes", title: "Codes", route: "/codes" },
+        {
+          id: "schoolReports",
+          title: "School Reports",
+          route: "/school-reports",
+        },
+        {
+          id: "batchProcessing",
+          title: "Batch Processing",
+          route: "/batch-processing",
+        },
+      ],
       version: "",
     };
   },
-  async created() {
-    this.loadStudent = loadStudent;
-    let versionResponse = await CommonService.getVersion();
-    this.version = versionResponse.data;
-  },
   computed: {
     ...mapState(useStudentStore, {
       profile: "getStudentProfile",
     }),
+    screenSize() {
+      return window.innerWidth;
+    },
+    isDesktop() {
+      return window.innerWidth >= 600; // Adjust this breakpoint as needed
+    },
+  },
+  async created() {
+    this.loadStudent = loadStudent; // Assign loadStudent to this context
+    const versionResponse = await CommonService.getVersion();
+    this.version = versionResponse.data;
+  },
+  mounted() {
+    window.addEventListener("resize", this.updateDimensions);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.updateDimensions);
   },
   methods: {
-    logout() {
-      if (localStorage.getItem("jwt") != null) {
-        localStorage.removeItem("jwt");
-        localStorage.removeItem("refresh");
-      }
-      this.studentStore.unsetStudent();
-      this.$router.push("/logout");
+    updateDimensions() {
+      console.log(window.innerWidth); // Log the current window width for debugging
+      this.$forceUpdate(); // Force reactivity, if needed
     },
-    selectStudent() {
-      this.$router.push("/");
-    },
-    findStudentByPen: function () {
-      if (this.penInput) {
-        if (this.penInput == this.profile.pen) {
-          this.snackbarStore.showSnackbar(
-            "The entered PEN is the same as the currently loaded student",
-            "warning",
-            5000
-          );
-        } else {
-          this.searchLoading = true;
-          this.studentSearchResults = [];
-          StudentService.getStudentByPen(this.penInput)
-            .then((response) => {
-              if (response.data) {
-                if (response.data.length == 0) {
-                  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 ${this.penInput} exists in PEN but does not have a GRAD system record.`
-                  );
-                }
-                this.studentStore.unsetStudent();
-                this.studentStore.setQuickSearchId(response.data[0].studentID);
-                this.loadStudent(response.data);
-                this.searchLoading = false;
-              }
-            })
-            .catch((error) => {
-              // eslint-disable-next-line
-              console.error("Header Search: ", error?.message);
-              this.searchLoading = false;
-              this.snackbarStore.showSnackbar(error?.message, "error", 5000);
-            })
-            .finally(() => {
-              this.penInput = "";
-            });
-        }
-      }
+    findStudentByPen() {
+      // Your existing findStudentByPen logic here
     },
   },
 };
 </script>
-<style scoped>
-.navbar,
-.nav {
-  z-index: 99;
-}
-.navbar-brand {
-  padding-top: 0.5rem;
-  padding-left: 65px;
-}
-#navbar {
-  z-index: 99;
-}
-header#navbar {
-  top: 41px !important;
-  height: 56px;
-}
-button.v-btn.v-theme--light.bg-primary.v-btn--density-default.v-btn--size-default.v-btn--variant-flat.px-2 {
-  top: 14px;
-}
-header {
-  z-index: 99;
-  /* background-color: var(--primary-nav);
-  border-bottom: 2px solid var(--bcgold); */
-  padding: 0 30px 0 30px;
-  color: #fff;
-  display: flex;
-  height: 65px;
-  top: 0;
-  position: fixed;
-  width: 100%;
-  -webkit-box-shadow: 0 6px 8px -4px #b3b1b3;
-  -moz-box-shadow: 0 6px 8px -4px #b3b1b3;
-  box-shadow: 0 6px 8px -4px #b3b1b3;
-}
-
-header h1 {
-  font-family: "BC Sans", "Noto Sans", Verdana, Arial, sans-serif;
-  font-weight: normal; /* 400 */
-  margin: 5px 5px 0 18px;
-  text-transform: none;
-  display: none;
-  /* visibility: hidden; */
-}
-
-header .banner {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  margin: 0 10px 0 0;
-}
-
-header .other {
-  display: flex;
-  align-items: center;
-  flex-grow: 1;
-}
-
-header a [class^="fas fa-"] {
-  color: white;
-  font-size: 1.4em;
-  font-style: bold;
-  line-height: 1;
-  padding: 5px;
-  -webkit-font-smoothing: antialiased;
-}
-
-header .nav-btn {
-  display: block;
-  width: auto;
-  margin: 0 0 0 auto;
-  cursor: pointer;
-}
-
-.user-profile {
-  margin-top: 0px;
-  display: none;
-}
-
-.navigation-main {
-  display: none;
-  position: fixed;
-  top: 40px;
-  width: 100%;
-  -webkit-box-shadow: 0 6px 8px -4px #b3b1b3;
-  -moz-box-shadow: 0 6px 8px -4px #b3b1b3;
-  box-shadow: 0 6px 8px -4px #b3b1b3;
-  padding: 10px 0 10px 0;
-}
-
-.navigation-main ul {
-  display: flex;
-  flex-direction: column;
-  margin: 0;
-  list-style: none;
-}
-
-.navigation-main ul li {
-  margin: 5px 0;
-}
 
-.navigation-main ul li a {
-  display: flex;
-  font-size: 0.813em;
-  font-weight: normal;
-  padding: 0 14px 0 14px;
-  text-decoration: none;
-}
-
-.navigation-main ul li a:hover {
-  text-decoration: underline;
-}
-
-.navigation-main ul .active {
-  text-decoration: underline;
-  font-weight: bold;
-}
-
-.min-nav {
-  position: fixed;
-  left: 80px;
-  z-index: 110;
-  top: 5px;
-}
-.burgernav {
-  position: fixed;
-}
-#navbarSmallScreen {
-  z-index: 100;
-  /* padding: 10px 0; */
-  background-color: #38598a;
-  color: white;
-  top: 65px;
-  position: fixed;
-  width: 100%;
-  -webkit-box-shadow: 0 6px 8px -4px #b3b1b3;
-  -moz-box-shadow: 0 6px 8px -4px #b3b1b3;
-  box-shadow: 0 6px 8px -4px #b3b1b3;
-}
-#navbarSmallScreen a {
-  color: white;
-  margin-left: 10px;
-}
-.user-burgernav {
-  padding: 5px 0 5px 15px;
-  background-color: var(--primary-nav);
-  border-top: 2px solid var(--bcgold);
-}
-
-:focus {
-  outline: 4px solid #3b99fc;
-  outline-offset: 1px;
-}
-
-/**Overrides inline style that vuetify forces on the rendered component for some unknown reason*/
-:deep(.v-toolbar__content) {
-  height: 64px !important;
-}
-
-/*
-    These are sample media queries only. Media queries are quite subjective
-    but, in general, should be made for the three different classes of screen
-    size: phone, tablet, full.
-  */
-
-@media screen and (min-width: 774px) {
-  header {
-    height: 85px;
-  }
-  header h1 {
-    display: inline;
-  }
-  .header-search-btn {
-    top: -9px;
-  }
-  .top-search {
-    width: 100px;
-    position: absolute;
-    top: 5px;
-    right: 20px;
-  }
-  .burgernav {
-    display: none;
-  }
-  .navigation-main {
-    display: block;
-    margin-bottom: 100px; /* do I need this? */
-  }
-  .navigation-main ul {
-    flex-direction: row;
-  }
-  .navigation-main ul li {
-    margin: 0;
-  }
-  .navigation-main ul li a {
-    border-right: 1px solid #9b9b9b;
-  }
-  .navbar-brand {
-    padding-left: 0;
-  }
-  .user-profile {
-    display: block;
-  }
-  /* removes vertical line on last item on nav */
-  #profile-route {
-    border-right: none;
-  }
-}
-
-@media screen and (min-width: 774px) and (max-width: 1360px) {
-  header h1 {
-    font-size: calc(5px + 2.05vw);
-  }
-  .navigation-main ul li a {
-    padding: 0 calc(2px + 0.85vw) 0 calc(2px + 0.85vw);
-    font-size: calc(8.5px + 0.35vw);
-  }
-}
-
-@media screen and (min-width: 1200px) {
-  header {
-    height: 65px;
-  }
-  .navigation-main {
-    top: 65px;
-  }
-  .top-search {
-    position: absolute;
-    width: 230px;
-    top: 5px;
-    right: 0px;
-  }
-  .user-profile {
-    margin-top: -36px;
-  }
-}
+<style scoped>
+/* Optional: Add custom styles if needed */
 </style>
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 2fb74e05..36edc556 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="batch-processing-view">
     <h1>Batch Processing</h1>
     <div>
       <v-tabs v-model="activeTab" bg-color="transparent">
@@ -48,7 +48,10 @@
           <BatchRuns></BatchRuns>
         </v-tabs-window-item>
         <v-tabs-window-item value="scheduledRuns">
-          <v-row>
+          <v-row v-if="scheduledJobs && scheduledJobs.length == 0">
+            <v-col> No Scheduled Jobs </v-col>
+          </v-row>
+          <v-row v-else>
             <v-col> <ScheduledBatchRuns></ScheduledBatchRuns></v-col>
           </v-row>
         </v-tabs-window-item>
@@ -71,9 +74,15 @@
                 class="pb-3"
               >
                 <template v-slot:item.description="{ item }">
-                  <strong>{{ item.label }} </strong>
-                  <br />
-                  {{ item.description }}
+                  <strong>{{ item.label }}</strong>
+                  <v-tooltip max-width="500">
+                    {{ item.description }}
+                    <template v-slot:activator="{ props }">
+                      <v-icon v-bind="props" color="bcGovBlue" x-small size="18"
+                        >mdi-information</v-icon
+                      >
+                    </template>
+                  </v-tooltip>
                 </template>
                 <template v-slot:item.newRequest="{ item }">
                   <GraduationAlgorithmForm
@@ -102,7 +111,7 @@
               <v-table>
                 <tbody>
                   <tr>
-                    <td>Blank certificate print</td>
+                    <td><strong>Blank certificate print</strong></td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="Blank certificate print"
@@ -110,7 +119,12 @@
                     </td>
                   </tr>
                   <tr>
-                    <td>Reprint certificate – no principal signature block</td>
+                    <td>
+                      <strong
+                        >Reprint certificate – no principal signature
+                        block</strong
+                      >
+                    </td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="RC"
@@ -119,7 +133,10 @@
                   </tr>
                   <tr>
                     <td>
-                      Original certificate – with principal signature block
+                      <strong>
+                        Original certificate – with principal signature
+                        block</strong
+                      >
                     </td>
                     <td>
                       <DistrunUserForm
@@ -128,7 +145,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td>Blank transcript print</td>
+                    <td><strong>Blank transcript print</strong></td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="Blank transcript print"
@@ -136,7 +153,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td>Transcript</td>
+                    <td><strong>Transcript</strong></td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="OT"
@@ -156,10 +173,17 @@
                 class="pb-3"
               >
                 <template v-slot:item.description="{ item }">
-                  <strong> {{ item.label }} </strong>
-                  <br />
-                  {{ item.description }}
+                  <strong>{{ item.label }}</strong>
+                  <v-tooltip max-width="500">
+                    {{ item.description }}
+                    <template v-slot:activator="{ props }">
+                      <v-icon v-bind="props" color="bcGovBlue" small size="18"
+                        >mdi-information</v-icon
+                      >
+                    </template>
+                  </v-tooltip>
                 </template>
+
                 <template v-slot:item.newRequest="{ item }">
                   <RegenerateCertificateForm
                     v-if="item.code == 'CERT_REGEN'"
@@ -183,9 +207,15 @@
                 hide-default-footer
               >
                 <template v-slot:item.description="{ item }">
-                  <strong>{{ item.label }}</strong>
-                  <br />
-                  {{ item.description }}
+                  <v-tooltip max-width="500">
+                    {{ item.description }}
+                    <template v-slot:activator="{ props }">
+                      <strong v-bind="props">{{ item.label }}</strong>
+                      <v-icon v-bind="props" color="bcGovBlue" x-small size="18"
+                        >mdi-information</v-icon
+                      >
+                    </template>
+                  </v-tooltip>
                 </template>
                 <template v-slot:item.newRequest="{ item }">
                   <DistrunFormYearEnd
@@ -479,6 +509,10 @@ export default {
 };
 </script>
 <style scoped>
+.batch-processing-view {
+  padding-left: 25px;
+  padding-right: 25px;
+}
 h6 {
   font-size: 1.5rem;
 }

From 1aef93ff1e8bebcb8e1bae6e5d1fa5ccfaad24d3 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Mon, 28 Oct 2024 11:01:27 -0700
Subject: [PATCH 2/3] updated batch

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

diff --git a/frontend/src/components/Batch/BatchRuns.vue b/frontend/src/components/Batch/BatchRuns.vue
index 858ed74d..49a6461a 100644
--- a/frontend/src/components/Batch/BatchRuns.vue
+++ b/frontend/src/components/Batch/BatchRuns.vue
@@ -317,6 +317,10 @@ export default {
   },
   methods: {
     ...mapActions(useBatchProcessingStore, ["setBatchJobs"]),
+    getRowClass(item) {
+      // Conditionally apply a class based on the item's status
+      return item.jobExecutionId === "104848" ? "highlight-row" : "";
+    },
     rerunBatch(bid) {
       BatchProcessingService.rerunBatch(bid).then((response) => {
         if (response) {

From 8d368bdb359c84baf47174d1a5caf0e2efa5cfe5 Mon Sep 17 00:00:00 2001
From: Shaun Lum <shaun.lum@gov.bc.ca>
Date: Mon, 28 Oct 2024 12:51:25 -0700
Subject: [PATCH 3/3] updated batch

---
 frontend/src/assets/css/global.css            |  3 ++
 .../Batch/Forms/ArchiveSchoolReportsForm.vue  | 22 ---------------
 .../Batch/Forms/DistrunUserForm.vue           | 10 +++++--
 .../Batch/Forms/FormInputs/SchoolInput.vue    |  9 ++++--
 .../Forms/TranscriptAlgorithmDeleteForm.vue   | 22 ---------------
 frontend/src/components/Header/BCHeader.vue   | 12 ++------
 .../store/modules/batchRequestFormStore.js    |  2 +-
 frontend/src/views/BatchProcessing.vue        | 28 +++++++------------
 8 files changed, 30 insertions(+), 78 deletions(-)

diff --git a/frontend/src/assets/css/global.css b/frontend/src/assets/css/global.css
index a3f58c09..e218a2f3 100644
--- a/frontend/src/assets/css/global.css
+++ b/frontend/src/assets/css/global.css
@@ -137,4 +137,7 @@ th {
 }
 .v-btn-link:hover{
   color: #0000f3 !important;
+}
+.v-label{
+  padding-top: 8px;
 }
\ No newline at end of file
diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
index 212dcf06..28038fdc 100644
--- a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
+++ b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -211,28 +211,6 @@
             </template>
           </v-stepper>
         </v-card-text>
-        <v-card-actions class="sticky-form-actions">
-          <v-spacer></v-spacer>
-          <v-btn
-            color="bcGovBlue"
-            variant="outlined"
-            class="text-none"
-            density="default"
-            @click="cancel"
-          >
-            Cancel
-          </v-btn>
-          <v-btn
-            :disabled="v$.$invalid"
-            color="error"
-            variant="flat"
-            class="text-none"
-            density="default"
-            @click="submit"
-          >
-            Submit
-          </v-btn>
-        </v-card-actions>
       </v-card>
     </v-dialog>
   </v-row>
diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
index b50e6f92..36f6a619 100644
--- a/frontend/src/components/Batch/Forms/DistrunUserForm.vue
+++ b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -13,7 +13,9 @@
       </template>
       <v-card>
         <div class="d-flex justify-space-between align-center">
-          <v-card-title>User Request Distribution Run</v-card-title>
+          <v-card-title
+            >User Request Distribution Run - {{ getCredential }}</v-card-title
+          >
           <v-btn
             @click="closeDialogAndResetForm()"
             color="error"
@@ -152,7 +154,9 @@
                         :items="[
                           {
                             label: 'Run Type',
-                            value: 'User Request Distribution Run',
+                            value:
+                              'User Request Distribution Run - ' +
+                              getCredential,
                           },
                           {
                             label: 'Copies',
@@ -546,7 +550,7 @@ export default {
         });
     },
     closeDialogAndResetForm() {
-      this.blankCertificateDetails =[];
+      this.blankCertificateDetails = [];
       this.group = null;
       this.dialog = false;
       this.clearBatchDetails();
diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
index 831df905..a289132c 100644
--- a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
+++ b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -28,6 +28,9 @@
                 {{ label.label }}
               </template>
             </v-autocomplete>
+            <v-alert v-if="validationMessage" type="error">{{
+              validationMessage
+            }}</v-alert>
           </v-col>
           <v-col md="2">
             <v-btn color="bcGovBlue" @click="addSchool()">Add School</v-btn>
@@ -126,6 +129,7 @@ export default {
       mincode: "",
       mincodeSchoolInfo: "",
       mincodeValidating: false,
+      validationMessage: "",
       schoolInputFields: [
         {
           key: "mincode",
@@ -171,13 +175,14 @@ export default {
       this.mincodeSchoolInfo = "";
     },
     clearMincode() {
+      this.validationMessage = "";
       this.mincode = "";
       this.clearmincodeSchoolInfo();
     },
     async addSchool() {
+      this.validationMessage = "";
       if (this.mincode === "") return true;
       if (this.mincode.length == 8) {
-        console.log("8");
         try {
           let schoolInfo = await SchoolService.getSchoolInfo(this.mincode);
           if (schoolInfo.data) {
@@ -196,7 +201,7 @@ export default {
             return true;
           }
         } catch (error) {
-          console.log(error);
+          this.validationMessage = this.mincode + " is not valid";
           this.mincodeSchoolInfo = null;
           return false;
         }
diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
index 272a556c..bc250d3d 100644
--- a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
+++ b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
@@ -145,28 +145,6 @@
             </template>
           </v-stepper>
         </v-card-text>
-        <v-card-actions class="sticky-form-actions">
-          <v-spacer></v-spacer>
-          <v-btn
-            color="bcGovBlue"
-            variant="outlined"
-            class="text-none"
-            density="default"
-            @click="cancel"
-          >
-            Cancel
-          </v-btn>
-          <v-btn
-            :disabled="v$.$invalid"
-            color="error"
-            variant="flat"
-            class="text-none"
-            density="default"
-            @click="submit"
-          >
-            Submit
-          </v-btn>
-        </v-card-actions>
       </v-card>
     </v-dialog>
   </v-row>
diff --git a/frontend/src/components/Header/BCHeader.vue b/frontend/src/components/Header/BCHeader.vue
index 61a873cf..2fca7b25 100644
--- a/frontend/src/components/Header/BCHeader.vue
+++ b/frontend/src/components/Header/BCHeader.vue
@@ -182,17 +182,9 @@ export default {
     const versionResponse = await CommonService.getVersion();
     this.version = versionResponse.data;
   },
-  mounted() {
-    window.addEventListener("resize", this.updateDimensions);
-  },
-  beforeDestroy() {
-    window.removeEventListener("resize", this.updateDimensions);
-  },
+  mounted() {},
+  beforeDestroy() {},
   methods: {
-    updateDimensions() {
-      console.log(window.innerWidth); // Log the current window width for debugging
-      this.$forceUpdate(); // Force reactivity, if needed
-    },
     findStudentByPen() {
       // Your existing findStudentByPen logic here
     },
diff --git a/frontend/src/store/modules/batchRequestFormStore.js b/frontend/src/store/modules/batchRequestFormStore.js
index a4d48f3a..20c4a549 100644
--- a/frontend/src/store/modules/batchRequestFormStore.js
+++ b/frontend/src/store/modules/batchRequestFormStore.js
@@ -38,7 +38,7 @@ export const useBatchRequestFormStore = defineStore("batchRequestFormStore", {
     activityCode: null,
     reportType: null,
 
-    batchRunTime: null,
+    batchRunTime: 'Run Now',
     batchRunSchedule: null,
     batchRunCustomDate: null,
     batchRunCustomTime: null
diff --git a/frontend/src/views/BatchProcessing.vue b/frontend/src/views/BatchProcessing.vue
index 36edc556..42422ee9 100644
--- a/frontend/src/views/BatchProcessing.vue
+++ b/frontend/src/views/BatchProcessing.vue
@@ -62,7 +62,7 @@
         <v-tabs-window-item value="newBatchRequest">
           <v-row class="py-4">
             <v-col justify-md="start">
-              <h4>GRAD and TVR</h4>
+              <label>GRAD and TVR</label>
               <v-data-table
                 :items="batchRunGradOptions"
                 :headers="batchFields"
@@ -74,7 +74,7 @@
                 class="pb-3"
               >
                 <template v-slot:item.description="{ item }">
-                  <strong>{{ item.label }}</strong>
+                  {{ item.label }}
                   <v-tooltip max-width="500">
                     {{ item.description }}
                     <template v-slot:activator="{ props }">
@@ -111,7 +111,7 @@
               <v-table>
                 <tbody>
                   <tr>
-                    <td><strong>Blank certificate print</strong></td>
+                    <td>Blank certificate print</td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="Blank certificate print"
@@ -119,12 +119,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td>
-                      <strong
-                        >Reprint certificate – no principal signature
-                        block</strong
-                      >
-                    </td>
+                    <td>Reprint certificate – no principal signature block</td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="RC"
@@ -133,10 +128,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <strong>
-                        Original certificate – with principal signature
-                        block</strong
-                      >
+                      Original certificate – with principal signature block
                     </td>
                     <td>
                       <DistrunUserForm
@@ -145,7 +137,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td><strong>Blank transcript print</strong></td>
+                    <td>Blank transcript print</td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="Blank transcript print"
@@ -153,7 +145,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td><strong>Transcript</strong></td>
+                    <td>Transcript</td>
                     <td>
                       <DistrunUserForm
                         credentialSelected="OT"
@@ -173,7 +165,7 @@
                 class="pb-3"
               >
                 <template v-slot:item.description="{ item }">
-                  <strong>{{ item.label }}</strong>
+                  {{ item.label }}
                   <v-tooltip max-width="500">
                     {{ item.description }}
                     <template v-slot:activator="{ props }">
@@ -196,7 +188,7 @@
               </v-data-table>
             </v-col>
             <v-col sm="12" md="4">
-              <h4>Year-End Administration</h4>
+              <label>Year-End Administration</label>
               <v-data-table
                 :items="credentialBatchRunOptions.yearEndBatchRunOptions"
                 :headers="batchFields"
@@ -210,7 +202,7 @@
                   <v-tooltip max-width="500">
                     {{ item.description }}
                     <template v-slot:activator="{ props }">
-                      <strong v-bind="props">{{ item.label }}</strong>
+                      {{ item.label }}
                       <v-icon v-bind="props" color="bcGovBlue" x-small size="18"
                         >mdi-information</v-icon
                       >