Merge branch 'vuetifyv3' of https://github.com/bcgov/EDUC-GRAD-ADMIN …

…into sam-student-profile
bcgov · Oct 31, 2024 · 59f0a20 · 59f0a20
2 parents 91c149e + 7bc336c
commit 59f0a20
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -18,7 +18,6 @@
               <!-- You can display more user info here or switch roles -->
               <p>Username: {{ userInfoGet.userName }}</p>
               <p>Current Role: {{ roles }}</p>
-              <v-btn @click="switchRole">Switch Role</v-btn>
             </v-card-text>
 
             <v-card-actions>

diff --git a/frontend/src/components/Batch/BatchJobErrorResults.vue b/frontend/src/components/Batch/BatchJobErrorResults.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-card :title="'Batch Job #' + selectedErrorId + ' Error(s)'">
+  <v-card>
     <div class="d-flex justify-space-between align-center">
       <v-card-title> Batch Job #{{ selectedErrorId }} Error(s) </v-card-title>
 
@@ -18,6 +18,7 @@
       id="id"
       :showFilter="false"
       :pagination="true"
+      class="p-3"
     >
       <template v-slot:item.pen="{ item }">
         <v-btn

diff --git a/frontend/src/components/Batch/BatchJobSearchResults.vue b/frontend/src/components/Batch/BatchJobSearchResults.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-card>
+  <v-card class="p-3">
     <div class="d-flex justify-space-between align-center">
       <v-card-title> Batch Job #{{ selectedBatchId }} students </v-card-title>
 
@@ -20,7 +20,7 @@
       There are no results to display.<br />
       Please select another Job Execution ID.
     </p>
-    {{ getBatchRequest }}
+
     <v-data-table-server
       v-model:items-per-page="itemsPerPage"
       :headers="batchDataFields"

diff --git a/frontend/src/components/Batch/BatchRuns.vue b/frontend/src/components/Batch/BatchRuns.vue
@@ -42,7 +42,11 @@
                 <v-btn
                   variant="plain"
                   v-bind="props"
-                  class="no-outline-btn v-btn-link"
+                  :class="
+                    item.jobExecutionId == adminSelectedBatchId
+                      ? 'no-outline-btn v-btn-link selected'
+                      : 'no-outline-btn v-btn-link'
+                  "
                 >
                   {{ item.jobExecutionId }}
                 </v-btn>
@@ -176,7 +180,10 @@
               variant="outlined"
               class="text-none mr-3"
               density="default"
-              @click="isBatchShowing ^= true"
+              @click="
+                isBatchShowing ^= true;
+                adminSelectedBatchId = '';
+              "
             >
               Close
             </v-btn></template
@@ -191,7 +198,10 @@
               variant="outlined"
               class="text-none mr-3"
               density="default"
-              @click="isErrorShowing ^= true"
+              @click="
+                isErrorShowing ^= true;
+                adminSelectedBatchId = '';
+              "
             >
               Close
             </v-btn>
@@ -454,4 +464,7 @@ input {
   text-decoration: underline;
   /* You can add more styles as needed to make it look like a link */
 }
+.v-btn-link.selected {
+  font-weight: bold;
+}
 </style>
diff --git a/frontend/src/views/Programs.vue b/frontend/src/views/Programs.vue
@@ -20,11 +20,13 @@
               >
             </template>
             <v-list>
-              <v-list-item to="/programs/programs">Programs</v-list-item>
-              <v-list-item to="/programs/program-rules"
+              <v-list-item @click="tab = 1" to="/programs/programs"
+                >Programs</v-list-item
+              >
+              <v-list-item @click="tab = 1" to="/programs/program-rules"
                 >Program Rules</v-list-item
               >
-              <v-list-item to="/programs/transcript-message"
+              <v-list-item @click="tab = 1" to="/programs/transcript-message"
                 >Transcript Messaging</v-list-item
               >
             </v-list>
@@ -44,10 +46,12 @@
               >
             </template>
             <v-list>
-              <v-list-item to="/programs/optional-programs"
+              <v-list-item @click="tab = 2" to="/programs/optional-programs"
                 >Optional Programs</v-list-item
               >
-              <v-list-item to="/programs/optional-program-rules"
+              <v-list-item
+                @click="tab = 2"
+                to="/programs/optional-program-rules"
                 >Optional Program Rules</v-list-item
               >
             </v-list>
@@ -75,7 +79,7 @@ export default {
   name: "graduationPrograms",
   data() {
     return {
-      tab: 1,
+      tab: 0,
     };
   },
   methods: {},