added varinat outine to batch forms

bcgov · Nov 6, 2024 · 378443d · 378443d
1 parent 95a7cf0
commit 378443d
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 56 deletions.
diff --git a/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue b/frontend/src/components/Batch/Forms/ArchiveSchoolReportsForm.vue
@@ -49,7 +49,7 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-col sm="2"> Report Type </v-col>
+                    <v-col sm="2">Report Type </v-col>
                     <v-col sm="10">
                       <v-select
                         v-model="reportType"
@@ -70,15 +70,21 @@
                         item-title="text"
                         item-value="value"
                         label="Select a report type"
+                        variant="outlined"
+                        class="mt-2"
                       ></v-select>
                     </v-col>
                   </v-row>
                   <v-row>
-                    <v-select
-                      v-model="group"
-                      :items="['School', 'All Schools']"
-                      label="Select a group"
-                    ></v-select>
+                    <v-col>
+                      <v-select
+                        class="mt-2"
+                        v-model="group"
+                        :items="['School', 'All Schools']"
+                        label="Select a group"
+                        variant="outlined"
+                      ></v-select>
+                    </v-col>
                   </v-row>
                   <v-row v-if="group == 'School'">
                     <SchoolInput>

diff --git a/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue b/frontend/src/components/Batch/Forms/ArchiveStudentsForm.vue
@@ -52,9 +52,10 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="['School', 'All Students']"
-                      label="Select a Group"
+                      label="Select a group"
                     ></v-select>
                   </v-row>
                   <v-row v-if="group == 'School'">

diff --git a/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue b/frontend/src/components/Batch/Forms/DistrunFormYearEndForm.vue
@@ -57,7 +57,8 @@
                     <v-select
                       v-model="getGroup"
                       :items="['School Category']"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                     ></v-select>
                   </v-row>
                   <v-row v-if="getGroup == 'School Category'">

diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -115,6 +115,8 @@
                   <v-row>
                     <v-col>
                       <v-select
+                        class="mt-2"
+                        variant="outlined"
                         v-model="group"
                         :items="groupItems"
                         label="Select group"

diff --git a/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DateRangeInput.vue
@@ -7,6 +7,7 @@
       <v-col md="10">
         <v-select
           v-model="includeStudents"
+          variant="outlined"
           :items="['Current Students', 'Date Range']"
           label="Select which students to include"
           class=""
@@ -16,8 +17,9 @@
         <v-row v-if="includeStudents === 'Date Range'">
           <v-col sm="6">
             <v-text-field
+              variant="outlined"
               label="Graduation Date From:"
-              class="form__input"
+              class="mt-4"
               id="datepicker-birthdate-from"
               v-model="gradDateFrom"
               type="date"
@@ -46,8 +48,9 @@
           </v-col>
           <v-col sm="6">
             <v-text-field
+              variant="outlined"
               label="Graduation Date To:"
-              class="form__input"
+              class="mt-4"
               id="datepicker-birthdate-from"
               v-model="gradDateTo"
               type="date"
@@ -67,9 +70,7 @@
                 new Date(gradDateTo) < new Date(gradDateFrom)
               "
             >
-              <span class="text-red"
-                >End Date must be greater than Start Date.</span
-              >
+              <span color="red">End Date must be greater than Start Date.</span>
             </div>
             <div v-if="v$.gradDateTo.$invalid && !v$.gradDateTo.$pending">
               <span class="text-red">End Date is invalid or required.</span>

diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
@@ -8,6 +8,7 @@
           label="Copies"
           type="number"
           required
+          variant="outlined"
         ></v-text-field>
       </v-col> </v-row
     ><v-row>
@@ -23,6 +24,7 @@
           item-title="title"
           item-value="value"
           label="Where"
+          variant="outlined"
           require
           hide-details
         ></v-select>

diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistrictInput.vue
@@ -17,6 +17,7 @@
               item-value="value"
               label="School Category"
               class="my-2"
+              variant="outlined"
               outlined
               hide-details
             ></v-select>
@@ -43,7 +44,7 @@
               v-if="!selectAllDistricts"
               :items="getDistrictList"
               label="Category"
-              outlined
+              variant="outlined"
               :item-title="districtTitle"
               item-value="districtNumber"
             ></v-autocomplete>

diff --git a/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue b/frontend/src/components/Batch/Forms/FormInputs/PSIInput.vue
@@ -7,7 +7,7 @@
           v-model="transmissionMode"
           label="Select a Transmission Mode"
           :items="[{ title: 'Paper', value: 'PAPER' }, 'FTP']"
-          outlined
+          variant="outlined"
           small
           hide-details
         >
@@ -21,7 +21,7 @@
           v-model="psiYear"
           type="number"
           label="Enter PSI Year"
-          outlined
+          variant="outlined"
           small
         >
         </v-text-field>
@@ -36,7 +36,7 @@
           v-model="psi"
           maxlength="3"
           @input="validatePSI"
-          outlined
+          variant="outlined"
         />
 
         <div

diff --git a/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue b/frontend/src/components/Batch/Forms/FormInputs/ProgramInput.vue
@@ -16,6 +16,7 @@
               :item-title="programTitle"
               item-value="programCode"
               :item-disabled="true"
+              variant="outlined"
             ></v-autocomplete>
           </v-col>
           <v-col sm="2" class="p-2 my-2">

diff --git a/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue b/frontend/src/components/Batch/Forms/FormInputs/SchoolInput.vue
@@ -18,6 +18,7 @@
           </v-col>
           <v-col md="8">
             <v-autocomplete
+              variant="outlined"
               v-model="mincode"
               label="Select a school to include"
               :items="getSchoolsList"

diff --git a/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue b/frontend/src/components/Batch/Forms/FormInputs/StudentInput.vue
@@ -8,7 +8,8 @@
           v-model="pen"
           @input="validateStudent"
           type="number"
-          class="mr-2"
+          variant="outlined"
+          class="mr-2 mt-2"
         ></v-text-field>
       </v-col>
       <v-col md="3">

diff --git a/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue b/frontend/src/components/Batch/Forms/GraduationAlgorithmForm.vue
@@ -52,6 +52,7 @@
                   <v-row>
                     <v-col>
                       <v-select
+                        class="mt-2"
                         v-model="group"
                         :items="[
                           { title: 'Student', value: 'Student' },
@@ -73,7 +74,8 @@
                             ),
                           },
                         ]"
-                        label="Select group"
+                        label="Select a group"
+                        variant="outlined"
                         hide-details
                       >
                         <template v-slot:item="{ props, item }">

diff --git a/frontend/src/components/Batch/Forms/NongradDistrunForm.vue b/frontend/src/components/Batch/Forms/NongradDistrunForm.vue
@@ -55,7 +55,8 @@
                     <v-select
                       v-model="getGroup"
                       :items="['School Category']"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                     ></v-select>
                   </v-row>
                   <v-row v-if="getGroup == 'School Category'">

diff --git a/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue b/frontend/src/components/Batch/Forms/RegenerateCertificateForm.vue
@@ -50,6 +50,7 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="[
                         {
@@ -66,7 +67,8 @@
                           value: 'School Category',
                         },
                       ]"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                       ><template v-slot:item="{ props, item }">
                         <v-list-item
                           v-bind="props"

diff --git a/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue b/frontend/src/components/Batch/Forms/RegenerateSchoolReportForm.vue
@@ -51,7 +51,9 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-col sm="2"> Report Type </v-col>
+                    <v-col sm="2" class="mt-3"
+                      ><strong>Report Type</strong></v-col
+                    >
                     <v-col sm="10">
                       <v-select
                         v-model="reportType"
@@ -68,12 +70,15 @@
                         item-title="text"
                         item-value="value"
                         label="Select a report type"
+                        variant="outlined"
+                        class="mt-2"
                       ></v-select>
                     </v-col>
                     <v-col> </v-col>
                   </v-row>
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :item-title="title"
                       :item-value="value"
@@ -83,6 +88,7 @@
                         { title: 'All', value: 'All Schools' },
                       ]"
                       label="Select a group"
+                      variant="outlined"
                     />
                   </v-row>
                   <v-row v-if="group == 'School'">

diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmDeleteForm.vue
@@ -51,6 +51,7 @@
                 <v-stepper-window-item value="0">
                   <v-row>
                     <v-select
+                      class="mt-2"
                       v-model="group"
                       :items="[
                         { title: 'Student', value: 'Student' },
@@ -68,7 +69,8 @@
                           disabled: !hasPermissions('BATCH', 'selectAllOption'),
                         },
                       ]"
-                      label="Select a Group"
+                      label="Select a group"
+                      variant="outlined"
                       ><template v-slot:item="{ props, item }">
                         <v-list-item
                           v-bind="props"

diff --git a/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue b/frontend/src/components/Batch/Forms/TranscriptAlgorithmForm.vue
@@ -49,38 +49,41 @@
               <v-stepper-window>
                 <v-stepper-window-item value="0">
                   <v-row>
-                    <v-select
-                      v-model="group"
-                      :items="[
-                        { title: 'Student', value: 'Student' },
-                        { title: 'School', value: 'School' },
-                        {
-                          title: 'School Category',
-                          value: 'School Category',
-                          disabled: !this.hasPermissions(
-                            'BATCH',
-                            'selectSchoolCategoryGroup'
-                          ),
-                        },
-                        {
-                          title: 'Program',
-                          value: 'Program',
-                          disabled: !this.hasPermissions(
-                            'BATCH',
-                            'selectProgramGroup'
-                          ),
-                        },
-                      ]"
-                      label="Select group"
-                      hide-details
-                    >
-                      <template v-slot:item="{ props, item }">
-                        <v-list-item
-                          v-bind="props"
-                          :subtitle="item.raw.department"
-                          :disabled="item.raw.disabled"
-                        ></v-list-item> </template
-                    ></v-select>
+                    <v-col>
+                      <v-select
+                        v-model="group"
+                        :items="[
+                          { title: 'Student', value: 'Student' },
+                          { title: 'School', value: 'School' },
+                          {
+                            title: 'School Category',
+                            value: 'School Category',
+                            disabled: !this.hasPermissions(
+                              'BATCH',
+                              'selectSchoolCategoryGroup'
+                            ),
+                          },
+                          {
+                            title: 'Program',
+                            value: 'Program',
+                            disabled: !this.hasPermissions(
+                              'BATCH',
+                              'selectProgramGroup'
+                            ),
+                          },
+                        ]"
+                        label="Select a group"
+                        variant="outlined"
+                        hide-details
+                      >
+                        <template v-slot:item="{ props, item }">
+                          <v-list-item
+                            v-bind="props"
+                            :subtitle="item.raw.department"
+                            :disabled="item.raw.disabled"
+                          ></v-list-item> </template
+                      ></v-select>
+                    </v-col>
                   </v-row>
                   <v-row v-if="group == 'Student'">
                     <StudentInput></StudentInput>
@@ -252,7 +255,7 @@ export default {
   },
   data: () => ({
     step: 0,
-    batchLoading: false,
+
     dialog: false,
     snackbarStore: useSnackbarStore(),
   }),