From 1bc6f606bc6f398c5cfdf7275aed0bca9f3dedde Mon Sep 17 00:00:00 2001
From: Tang <Michael.Tang@gov.bc.ca>
Date: Wed, 30 Oct 2024 11:32:29 -0700
Subject: [PATCH] changed the school of GRAD in Status to trax

---
 frontend/src/components/Header/BCHeader.vue   | 27 ++++----
 .../GraduationStatus/GRADStatus.vue           | 68 +------------------
 .../GraduationStatus/GRADStatusForm.vue       |  8 +--
 .../StudentSearch/StudentAdvancedSearch.vue   |  1 -
 4 files changed, 19 insertions(+), 85 deletions(-)

diff --git a/frontend/src/components/Header/BCHeader.vue b/frontend/src/components/Header/BCHeader.vue
index 9b634e6e..b856eff7 100644
--- a/frontend/src/components/Header/BCHeader.vue
+++ b/frontend/src/components/Header/BCHeader.vue
@@ -34,12 +34,19 @@
             :key="link.id"
             @click="menu = false"
           >
-            <router-link
+            <v-btn
               :to="link.route"
-              style="text-decoration: none; color: inherit"
+              variant="text"
+              color="primary"
+              style="
+                text-transform: none;
+                text-decoration: none;
+                color: inherit;
+              "
+              class="text-start"
             >
               <v-list-item-title>{{ link.title }}</v-list-item-title>
-            </router-link>
+            </v-btn>
           </v-list-item>
           <v-spacer />
           <v-list-item v-if="!profile.pen">
@@ -63,13 +70,7 @@
 
     <v-app-bar v-if="!smallScreen" density="compact">
       <v-toolbar>
-        <v-btn
-          text
-          v-for="link in menuLinks"
-          :key="link.id"
-          class="text-none"
-          density="compact"
-        >
+        <v-btn text v-for="link in menuLinks" :key="link.id" class="text-none">
           <router-link
             :to="link.route"
             style="text-decoration: none; color: inherit"
@@ -77,7 +78,7 @@
             {{ link.title }}
           </router-link>
         </v-btn>
-        <v-btn v-if="!profile.pen" class="text-none" density="compact">
+        <v-btn v-if="!profile.pen" class="text-none">
           <a
             id="profile-route"
             class="text-decoration-none text-disabled"
@@ -85,7 +86,7 @@
             >Profile (Student Not Loaded)</a
           >
         </v-btn>
-        <v-btn v-else density="compact">
+        <v-btn v-else>
           <router-link
             :to="`/student-profile/${profile.studentID}`"
             id="profile-route"
@@ -99,7 +100,7 @@
             <v-text-field
               density="compact"
               variant="outlined"
-              size="30"
+              size="40"
               type="search"
               v-model="penInput"
               maxlength="9"
diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
index 4575ccde..8337556a 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
@@ -3,73 +3,7 @@
     <v-card no-body title="GRAD Status">
       <v-card-text class="p-3">
         <GRADStatusForm class="gradstatus-actions float-right"></GRADStatusForm>
-
-        <!-- Info callout in edit form when student status is MER/Merged -->
-        <!-- <div
-          v-if="studentGradStatus && studentGradStatus.studentStatus == 'MER'"
-        >
-          <v-alert show variant="info" type="info" class="p-3 mb-1">
-            <h4 class="alert-heading">Student status: Merged</h4>
-            <p class="locked-message">
-              This student's status is set to 'Merged'. Their data cannot be
-              changed.
-            </p>
-          </v-alert>
-        </div> -->
-        <!-- Warning callout in edit form when student status is N/Not Active -->
-        <!-- <div v-if="studentGradStatus && studentGradStatus.studentStatus == 'N'">
-          <v-alert show variant="tonal" type="warning" class="p-3 mb-1">
-            <h4 class="alert-heading">Student status: Not active</h4>
-            <p class="locked-message">
-              This student's status is set to 'Not active'. Re-activate their
-              record by setting their 'Student status' to 'Active' if they are
-              enrolled in a school.
-            </p>
-          </v-alert>
-        </div> -->
-        <!-- Warning callout in edit form when student status is TER/Terminated -->
-        <!-- <div
-          v-else-if="
-            studentGradStatus && studentGradStatus.studentStatus == 'TER'
-          "
-        >
-          <v-alert show variant="tonal" type="warning" class="p-3 mb-1">
-            <h4 class="alert-heading">Student status: Terminated</h4>
-            <p class="locked-message">
-              This student's status is set to 'Terminated'. Re-activate their
-              record by setting their 'Student status' to 'Current' if they are
-              enrolled in a school.
-            </p>
-          </v-alert>
-        </div> -->
-        <!-- Warning callout in edit form when student status is ARC/Archived -->
-        <!-- <div
-          v-else-if="
-            studentGradStatus && studentGradStatus.studentStatus == 'ARC'
-          "
-        >
-          <v-alert show variant="tonal" type="warning" class="p-3 mb-1">
-            <h4 class="alert-heading">Student status: Archived</h4>
-            <p class="locked-message">
-              This student is not active. Re-activate by setting their status to
-              "Current" if they are currently attending school
-            </p>
-          </v-alert>
-        </div> -->
-        <!-- Warning callout in edit form when student status is DEC/Deceased -->
-        <!-- <div
-          v-else-if="
-            studentGradStatus && studentGradStatus.studentStatus == 'DEC'
-          "
-        >
-          <v-alert show variant="tonal" type="warning" class="p-3 mb-1">
-            <h4 class="alert-heading">Student status: Deceased</h4>
-            <p class="locked-message">
-              Warning: This student is showing as "Deceased".
-            </p>
-          </v-alert>
-        </div> -->
-        <v-table density="compact" aria-label="edit grad status">
+        <v-table density="comfortable" aria-label="edit grad status">
           <tbody>
             <!-- Program -->
             <tr>
diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue
index f6a3a6c7..63bbf491 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue
@@ -322,7 +322,7 @@
                     label="Select a school"
                     :items="getSchoolsList"
                     :item-title="schoolTitle"
-                    item-value="mincode"
+                    item-value="minCode"
                     variant="outlined"
                     density="compact"
                     class="mt-4"
@@ -352,13 +352,13 @@
                         .$message
                     }}
                   </div>
+                  <!--    :disabled="disableSchoolAtGrad" -->
                   <v-autocomplete
-                    :disabled="disableSchoolAtGrad"
                     v-model="editedGradStatus.schoolAtGrad"
                     label="Select a school"
                     :items="getSchoolsList"
                     :item-title="schoolTitle"
-                    item-value="mincode"
+                    item-value="minCode"
                     variant="outlined"
                     class="mt-4"
                     density="compact"
@@ -878,7 +878,7 @@ export default {
     schoolTitle(item) {
       // Customize this method to return the desired format
       if (item) {
-        return `${item.mincode} - ${item.displayName}`;
+        return `${item.minCode} - ${item.schoolName}`;
       } else {
         return null;
       }
diff --git a/frontend/src/components/StudentSearch/StudentAdvancedSearch.vue b/frontend/src/components/StudentSearch/StudentAdvancedSearch.vue
index baaf3afd..2e177398 100644
--- a/frontend/src/components/StudentSearch/StudentAdvancedSearch.vue
+++ b/frontend/src/components/StudentSearch/StudentAdvancedSearch.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="advanced-search-form mb-4">
     <h3>Advanced Student Search</h3>
-    {{ advancedSearchInput }}
     <p class="px-1">
       Use the advanced search to look up students by specified criteria.
     </p>