Merge branch 'working' into develop

src/modules/05_placement/components/Main.vue

@@ -299,7 +299,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
     รายการสอบแข่งขัน / คัดเลือก
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-    <div class="row q-col-gutter-md">
+    <div class="row q-col-gutter-sm">
       <div class="row col-12 q-col-gutter-sm">
         <q-select
           class="col-xs-12 col-sm-3 col-md-2"
@@ -422,7 +422,8 @@ const paginationLabel = (start: number, end: number, total: number) => {
           <template v-slot:pagination="scope">
             <q-pagination
               v-model="pagination.page"
-              color="primary"
+              active-color="primary"
+							color="dark"
               :max="scope.pagesNumber"
               :max-pages="5"
               size="sm"

src/modules/05_placement/components/OrderPlacement/step/step02.vue

@@ -138,7 +138,8 @@
         <template v-slot:pagination="scope">
           <q-pagination
             v-model="pagination.page"
-            color="primary"
+            active-color="primary"
+						color="dark"
             :max="scope.pagesNumber"
             :max-pages="5"
             size="sm"

src/modules/05_placement/components/OrderPlacement/step/step03.vue

@@ -130,7 +130,8 @@
         <template v-slot:pagination="scope">
           <q-pagination
             v-model="pagination.page"
-            color="primary"
+            active-color="primary"
+						color="dark"
             :max="scope.pagesNumber"
             :max-pages="5"
             size="sm"
@@ -306,7 +307,8 @@
                 <template v-slot:pagination="scope">
                   <q-pagination
                     v-model="paginationModal.page"
-                    color="primary"
+                    active-color="primary"
+								    color="dark"
                     :max="scope.pagesNumber"
                     :max-pages="5"
                     size="sm"

src/modules/05_placement/components/PersonalList/TableView.vue

@@ -23,7 +23,7 @@
               <q-table ref="table" flat bordered class="custom-header-table" v-bind="attrs" virtual-scroll
                 :virtual-scroll-sticky-size-start="48" dense :pagination-label="paginationLabel" v-model:pagination="pagination">
                 <template v-slot:pagination="scope">
-                  <q-pagination v-model="pagination.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
+                  <q-pagination v-model="pagination.page" active-color="primary" color="dark" :max="scope.pagesNumber" :max-pages="5" size="sm"
                     boundary-links direction-links></q-pagination>
                 </template>
                 <template v-slot:header="props">