From 48f9bc77e40e236481cb4e689f42536633e3ca5f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Nov 2023 10:30:55 +0700
Subject: [PATCH 1/6] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20tabl?=
 =?UTF-8?q?e=20popup=20=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B9=84=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B7=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Complaint/Popup.vue            | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Popup.vue b/src/modules/11_discipline/components/1_Complaint/Popup.vue
index b0e50a663..186d316e9 100644
--- a/src/modules/11_discipline/components/1_Complaint/Popup.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Popup.vue
@@ -114,9 +114,14 @@ const selected = ref<any>([]);
 const inspectionResults = ref<string>("");
 const inputRef = ref<any>(null);
 
+const initialPagination = ref<any>({
+  descending: false,
+  rowsPerPage: 25,
+});
+
 function onclickSend() {
   inputRef.value.validate();
-  if (!inputRef.value.hasError) {
+  if (!inputRef.value.hasError && selected.value.length > 0) {
     dialogConfirm(
       $q,
       async () => {
@@ -137,6 +142,8 @@ function onClickClose() {
 
 watch([() => props.modal], () => {
   inspectionResults.value = props.modal ? "" : "";
+  selected.value = props.modal ? [] : [];
+
   selected.value.push(complainstStore.rowsAdd);
 });
 </script>
@@ -164,22 +171,24 @@ watch([() => props.modal], () => {
           row-key="id"
           flat
           bordered
-          :paging="true"
+          :paging="false"
           dense
           class="custom-header-table"
           :visible-columns="visibleColumns"
           selection="multiple"
           v-model:selected="selected"
+          :pagination="initialPagination"
+          hide-bottom
         >
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th auto-width>
-                <q-checkbox
+                <!-- <q-checkbox
                   keep-color
                   color="primary"
                   dense
                   v-model="props.selected"
-                />
+                /> -->
               </q-th>
               <q-th
                 v-for="col in props.cols"

From 528bbf9186967d89964ca65f29dfe4898265bcf7 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 23 Nov 2023 11:29:39 +0700
Subject: [PATCH 2/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20popup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Complaint/Popup.vue          | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Popup.vue b/src/modules/11_discipline/components/1_Complaint/Popup.vue
index 186d316e9..5fa2ef2fa 100644
--- a/src/modules/11_discipline/components/1_Complaint/Popup.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Popup.vue
@@ -1,15 +1,17 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
-import type { QTableProps } from "quasar";
+import DialogHeader from "@/components/DialogHeader.vue";
 
-const $q = useQuasar();
+import type { QTableProps } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
 const complainstStore = useComplainstDataStore();
 
 const mixin = useCounterMixin();
+const $q = useQuasar();
+
 const { dialogConfirm, success } = mixin;
 
 const props = defineProps({
@@ -149,18 +151,9 @@ watch([() => props.modal], () => {
 </script>
 <template>
   <q-dialog v-model="props.modal">
-    <q-card style="width: 700px; max-width: 80vw">
-      <q-toolbar class="q-py-md">
-        <q-toolbar-title class="header-text">มีมูลส่งไปสืบสวน </q-toolbar-title>
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="onClickClose"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
+    <q-card style="width: 800px; max-width: 80vw">
+      <DialogHeader tittle="มีมูลส่งไปสืบสวน" :close="onClickClose" />
+
       <q-separator />
 
       <q-card-section class="q-pt-none q-mt-md">
@@ -178,7 +171,6 @@ watch([() => props.modal], () => {
           selection="multiple"
           v-model:selected="selected"
           :pagination="initialPagination"
-          hide-bottom
         >
           <template v-slot:header="props">
             <q-tr :props="props">
@@ -221,7 +213,7 @@ watch([() => props.modal], () => {
             </q-tr>
           </template>
         </d-table>
-        <div class="col-xs-12 col-sm-12 q-mt-sm">
+        <!-- <div class="col-xs-12 col-sm-12 q-mt-sm">
           <q-input
             for="inputInspectionResults"
             ref="inputRef"
@@ -235,7 +227,7 @@ watch([() => props.modal], () => {
             type="textarea"
             rows="5"
           />
-        </div>
+        </div> -->
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white text-teal">

From af5e60bdba3437415dff17786a0859391c8cec34 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Nov 2023 11:35:48 +0700
Subject: [PATCH 3/6] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20filter=20=20popup=20=E0=B8=A1=E0=B8=B5=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=A5=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B9=84=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B7=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Complaint/Popup.vue          | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Popup.vue b/src/modules/11_discipline/components/1_Complaint/Popup.vue
index 5fa2ef2fa..e1e522dc0 100644
--- a/src/modules/11_discipline/components/1_Complaint/Popup.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Popup.vue
@@ -114,7 +114,8 @@ const visibleColumns = ref<string[]>([
 
 const selected = ref<any>([]);
 const inspectionResults = ref<string>("");
-const inputRef = ref<any>(null);
+const filter = ref<string>("");
+// const inputRef = ref<any>(null);
 
 const initialPagination = ref<any>({
   descending: false,
@@ -122,8 +123,8 @@ const initialPagination = ref<any>({
 });
 
 function onclickSend() {
-  inputRef.value.validate();
-  if (!inputRef.value.hasError && selected.value.length > 0) {
+  // inputRef.value.validate();
+  if (selected.value.length > 0) {
     dialogConfirm(
       $q,
       async () => {
@@ -151,16 +152,58 @@ watch([() => props.modal], () => {
 </script>
 <template>
   <q-dialog v-model="props.modal">
-    <q-card style="width: 800px; max-width: 80vw">
+    <q-card style="width: 820px; max-width: 80vw">
       <DialogHeader tittle="มีมูลส่งไปสืบสวน" :close="onClickClose" />
 
       <q-separator />
 
       <q-card-section class="q-pt-none q-mt-md">
+        <div class="col-12 row q-pb-sm items-center">
+          <q-space />
+          <div class="items-center" style="display: flex">
+            <!-- ค้นหาข้อความใน table -->
+            <q-input
+              standout
+              dense
+              v-model="filter"
+              ref="filterRef"
+              outlined
+              debounce="300"
+              placeholder="ค้นหา"
+              style="max-width: 200px"
+              class="q-ml-sm"
+            >
+              <template v-slot:append>
+                <q-icon v-if="filter == ''" name="search" />
+                <q-icon
+                  v-if="filter !== ''"
+                  name="clear"
+                  class="cursor-pointer"
+                />
+              </template>
+            </q-input>
+            <!-- แสดงคอลัมน์ใน table -->
+            <q-select
+              v-model="visibleColumns"
+              :display-value="$q.lang.table.columns"
+              multiple
+              outlined
+              dense
+              :options="columns"
+              options-dense
+              option-value="name"
+              map-options
+              emit-value
+              style="min-width: 150px"
+              class="gt-xs q-ml-sm"
+            />
+          </div>
+        </div>
         <d-table
           ref="table"
           :columns="columns"
           :rows="complainstStore.rowsAdd"
+          :filter="filter"
           row-key="id"
           flat
           bordered

From 6214c54b37c361b01a8cffd8845d25a24df075fa Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Nov 2023 11:37:03 +0700
Subject: [PATCH 4/6] no message

---
 src/modules/11_discipline/components/1_Complaint/Popup.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Popup.vue b/src/modules/11_discipline/components/1_Complaint/Popup.vue
index e1e522dc0..80ef7de61 100644
--- a/src/modules/11_discipline/components/1_Complaint/Popup.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Popup.vue
@@ -163,10 +163,10 @@ watch([() => props.modal], () => {
           <div class="items-center" style="display: flex">
             <!-- ค้นหาข้อความใน table -->
             <q-input
+              for="inputfilterRef"
               standout
               dense
               v-model="filter"
-              ref="filterRef"
               outlined
               debounce="300"
               placeholder="ค้นหา"
@@ -184,6 +184,7 @@ watch([() => props.modal], () => {
             </q-input>
             <!-- แสดงคอลัมน์ใน table -->
             <q-select
+              for="selectVisibleColumns"
               v-model="visibleColumns"
               :display-value="$q.lang.table.columns"
               multiple

From 995b402b35ce6876f835eb6e8c6bbc3b2f08cbf5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Nov 2023 11:39:25 +0700
Subject: [PATCH 5/6] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20dialogMessageNotify=20=E0=B9=80=E0=B8=A5=E0=B8=B7?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=94=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/11_discipline/components/1_Complaint/Popup.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Popup.vue b/src/modules/11_discipline/components/1_Complaint/Popup.vue
index 80ef7de61..54d7e8398 100644
--- a/src/modules/11_discipline/components/1_Complaint/Popup.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Popup.vue
@@ -12,7 +12,7 @@ const complainstStore = useComplainstDataStore();
 const mixin = useCounterMixin();
 const $q = useQuasar();
 
-const { dialogConfirm, success } = mixin;
+const { dialogConfirm, dialogMessageNotify, success } = mixin;
 
 const props = defineProps({
   modal: {
@@ -136,6 +136,8 @@ function onclickSend() {
       "ยืนยันการส่งไปสืบสวน",
       "ต้องการยืนยันการส่งไปสืบสวนหรือไม่"
     );
+  } else {
+    dialogMessageNotify($q, "กรุณาเลือกรายชื่อ");
   }
 }
 

From f063f62e6eec26a4198c472553befc03c29e3ec8 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Thu, 23 Nov 2023 11:45:48 +0700
Subject: [PATCH 6/6] =?UTF-8?q?fetchData=20=E0=B8=88=E0=B8=B2=E0=B8=81=20a?=
 =?UTF-8?q?pi=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../6_BasicInformation/Director/EditPage.vue  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue
index 8dfcc63fd..749ff94e6 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue
@@ -26,7 +26,7 @@ onMounted(() => {
  * get ข้อมูลเก่ากรณีแก้ไขข้อมูล
  */
 const data = reactive<FormData>({
-  personalId:"",
+  personalId: "",
   prefix: "",
   firstname: "",
   lastname: "",
@@ -39,19 +39,32 @@ const data = reactive<FormData>({
  * ดึงค่าจาก api
  */
 const fetchData = async () => {
-  data.prefix = "นาง";
-  data.firstname = "เกสินี";
-  data.lastname = "เจียรสุมัย";
-  data.position = "ครู";
-  data.phone = "0800808080";
-  data.email = "e@email.com";
+  showLoader();
+  await http
+    .get(config.API.directorbyId(personalId.value))
+    .then((res) => {
+      const dataApi = res.data.result;
+      personalId.value = dataApi.id;
+      data.prefix = dataApi.prefix;
+      data.firstname = dataApi.firstName;
+      data.lastname = dataApi.lastName;
+      data.position = dataApi.position;
+      data.phone = dataApi.phone;
+      data.email = dataApi.email;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
 };
 
 /**
  * บันทึกข้อมูลที่เเก้ไข
  * @param id ระบุ บุคคล
  */
-function onSubmit(formData:FormData) {
+function onSubmit(formData: FormData) {
   dialogConfirm($q, () => putData(formData));
 }
 
@@ -93,6 +106,6 @@ function putData(formData: FormData) {
       แก้ไขรายชื่อกรรมการ
     </div>
 
-    <Form :on-submit="onSubmit" :data="data"/>
+    <Form :on-submit="onSubmit" :data="data" />
   </div>
 </template>