style fixes

bcgov · Oct 29, 2024 · 573f3ee · 573f3ee
2 parents 2beb099 + 9c5a7a5
commit 573f3ee
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 68 deletions.
diff --git a/frontend/src/assets/css/global.css b/frontend/src/assets/css/global.css
@@ -138,3 +138,6 @@ th {
 .v-btn-link:hover{
   color: #0000f3 !important;
 }
+.v-label{
+  padding-top: 8px;
+}
diff --git 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"
@@ -321,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) {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -187,6 +187,13 @@ export default {
   beforeDestroy() {
     window.removeEventListener("resize", this.updateDimensions);
   },
+  async created() {
+    this.loadStudent = loadStudent; // Assign loadStudent to this context
+    const versionResponse = await CommonService.getVersion();
+    this.version = versionResponse.data;
+  },
+  mounted() {},
+  beforeDestroy() {},
   methods: {
     updateDimensions() {
       //console.log(window.innerWidth); // Log the current window width for debugging

diff --git 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
@@ -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>
@@ -59,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"
@@ -71,9 +74,15 @@
                 class="pb-3"
               >
                 <template v-slot:item.description="{ item }">
-                  <strong>{{ item.label }} </strong>
-                  <br />
-                  {{ item.description }}
+                  {{ item.label }}
+                  <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
@@ -156,10 +165,17 @@
                 class="pb-3"
               >
                 <template v-slot:item.description="{ item }">
-                  <strong> {{ item.label }} </strong>
-                  <br />
-                  {{ item.description }}
+                  {{ item.label }}
+                  <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'"
@@ -172,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"
@@ -183,9 +199,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 }">
+                      {{ item.label }}
+                      <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 +501,10 @@ export default {
 };
 </script>
 <style scoped>
+.batch-processing-view {
+  padding-left: 25px;
+  padding-right: 25px;
+}
 h6 {
   font-size: 1.5rem;
 }