Merge branch 'working' into develop

2024-01-18 13:59:04 +07:00 · 2024-01-18 13:59:04 +07:00 · 19e41782c0
commit 19e41782c0
parent d3b138254b 031c68f33a
7 changed files with 87 additions and 72 deletions
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@ -489,9 +489,9 @@ onMounted(() => {
                    outlined
                    hide-bottom-space
                    v-model="formData.title"
-                    :rules="[(val) => !!val || 'กรุณากรอกอุทธรณ์/ร้องทุกข์']"
+                    :rules="[(val) => !!val || 'กรุณากรอกเรื่องอุทธรณ์/ร้องทุกข์']"
                    lazy-rules
-                    label="อุทธรณ์/ร้องทุกข์"
+                    label="เรื่องอุทธรณ์/ร้องทุกข์"
                  />
                </div>
              </div>
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
@ -411,9 +411,9 @@ onMounted(async () => {
                    </div>
                  </div>
                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="row col-12 q-pa-sm">
-                    <div v-if="store.currentStep == 8" class="row col-12">
+                <div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
+                <div class="row col-12 q-pa-sm" v-if="store.currentStep == 8">
+                    <div  class="row col-12">
                        <q-file
                          ref="fileEvaluation81Ref"
                          v-model="fileEvaluation81"
@ -497,9 +497,9 @@ onMounted(async () => {
                    </div>
                  </div>
                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-12 q-pa-sm">
-                    <div v-if="store.currentStep == 8" class="row col-12">
+                <div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
+                <div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
+                    <div class="row col-12">
                      <q-file
                        ref="fileEvaluation82Ref"
                        v-model="fileEvaluation82"
@ -581,9 +581,9 @@ onMounted(async () => {
                      </div>
                  </div>
                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-12 q-pa-sm">
-                  <div v-if="store.currentStep == 8" class="row col-12">
+                <div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
+                <div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
+                  <div class="row col-12">
                    <q-file
                      ref="fileEvaluation83Ref"
                      v-model="fileEvaluation83"
@ -666,9 +666,9 @@ onMounted(async () => {
                      </div>
                  </div>
                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-12 q-pa-sm">
-                  <div v-if="store.currentStep == 8" class="row col-12">
+                <div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
+                <div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
+                  <div class="row col-12">
                    <q-file
                      ref="fileEvaluation84Ref"
                      v-model="fileEvaluation84"
@ -751,10 +751,10 @@ onMounted(async () => {
                    </div>
                  </div>
                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-12 q-pa-sm">
+                <div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
+                <div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
                  <div class="row q-col-gutter-md col-12">
-                    <div v-if="store.currentStep == 8" class="row col-12">
+                    <div class="row col-12">
                      <q-file
                        ref="fileEvaluation85Ref"
                        v-model="fileEvaluation85"
@ -835,9 +835,9 @@ onMounted(async () => {
                    </div>
                  </div>
                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-12 q-pa-sm">                     
-                  <div v-if="store.currentStep == 8" class="row col-12">
+                <div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
+                <div class="col-12 q-pa-sm" v-if="store.currentStep == 8">                     
+                  <div class="row col-12">
                    <q-file
                      ref="fileEvaluation86Ref"
                      v-model="fileEvaluation86"
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
@ -26,13 +26,13 @@ function copyLink() {

 <template>
  <div class="row q-pa-md">
-    <div class="col-12 row items-center justify-center">
-      <div class="row"><strong>Public URL : </strong>
+    <div class="col-12 row items-center justify-center q-col-gutter-sm">
+      <div class="row q-pr-md"><strong>Public URL : </strong>
        <a :href="`${link}/${id}`" class="q-pl-sm"> {{link}}/{{ id }}
        </a>
      </div>
      <q-space/>
-      <div class="q-pt-sm">
+      <div>
        <q-btn
          outline
          icon="mdi-content-copy"
--- a/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue
+++ b/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue
@ -55,7 +55,7 @@ function addData(formData: any) {
        class="q-mr-sm"
        @click="$router.push(`/evaluate/meeting`)"
      />
-      เพิ่มรายการการประชุม
+      เพิ่มการประชุม
    </div>

    <Form :on-submit="onSubmit" />
--- a/src/modules/12_evaluatePersonal/components/Meeting/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Meeting/Form.vue
@ -273,6 +273,7 @@ onMounted(() => {
            <template #trigger>
              <q-input
                for="selectDate"
+                ref="dateMeetingStartRef"
                dense
                outlined
                lazy-rules
@ -283,6 +284,7 @@ onMounted(() => {
                "
                hide-bottom-space
                :label="`${'วันเวลาที่เริ่มต้นการประชุม'}`"
+                :rules="[(val: string) => !!val || `${'กรุณาเลือกวันเวลาที่เริ่มต้นการประชุม'}`]"
              >
                <template v-slot:prepend>
                  <q-icon name="event" class="cursor-pointer text-primary">
@ -309,6 +311,7 @@ onMounted(() => {
            <template #trigger>
              <q-input
                for="selectDate"
+                ref="dateMeetingEndRef"
                dense
                outlined
                lazy-rules
@ -318,7 +321,8 @@ onMounted(() => {
                    : null
                "
                hide-bottom-space
-                :label="`${'วันเวลาที่สิ้นสุด'}`"
+                :label="`${'วันเวลาสิ้นสุดการประชุม'}`"
+                :rules="[(val: string) => !!val || `${'กรุณาเลือกวันเวลาสิ้นสุดการประชุม'}`]"
              >
                <template v-slot:prepend>
                  <q-icon name="event" class="cursor-pointer text-primary">
--- a/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue
+++ b/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue
@ -140,7 +140,7 @@ function filterFn() {
          color="add"
          icon="mdi-plus"
        >
-          <q-tooltip>เพิ่มรายชื่อกรรมการ</q-tooltip>
+          <q-tooltip>เพิ่มการประชุม</q-tooltip>
        </q-btn>
      </div>
      <q-space />
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@ -54,14 +54,7 @@ const role = ref<string[]>([]);
 const notiTrigger = ref<boolean>(false);
 const text = ref<string>("");

-const notiList = ref<notiType[]>([
-  {
-    id: "1",
-    sender: "ท",
-    body: "ขอแก้ไขข้อมูลทะเบียนประวัติ",
-    timereceive: new Date(),
-  },
-]);
+const notiList = ref<notiType[]>([]);
 const options = ref<optionType[]>([
  {
    icon: "mdi-account-cog",
@ -83,29 +76,49 @@ const options = ref<optionType[]>([
  },
 ]);

-const getDataNotification = async (index: number) => {
+const getDataNotification = async (index: number, type: string) => {
  // showLoader();
  await http
    .get(config.API.msgNotificate + `?page=${index}&pageSize=${20}`)
    .then((res: any) => {
      const response = res.data.result.data;
-      totalInbox.value = res.data.result.total;
      let list: notiType[] = [];
-      response.map((e: any) => {
-        list.push({
-          id: e.id,
-          sender:
-            e.createdFullName == "" || e.createdFullName == null
-              ? "เจ้าหน้าที่"[0]
-              : e.createdFullName[0],
-          body: e.body ?? "",
-          timereceive: new Date(e.receiveDate),
+
+      if (type === "DEL") {
+        totalInbox.value = res.data.result.total;
+        if (notiList.value.length === 16) {
+          notiList.value = [];
+          response.map((e: any) => {
+            list.push({
+              id: e.id,
+              sender:
+                e.createdFullName == "" || e.createdFullName == null
+                  ? "เจ้าหน้าที่"[0]
+                  : e.createdFullName[0],
+              body: e.body ?? "",
+              timereceive: new Date(e.receiveDate),
+            });
+          });
+          notiList.value.push(...list);
+        }
+      } else {
+        response.map((e: any) => {
+          list.push({
+            id: e.id,
+            sender:
+              e.createdFullName == "" || e.createdFullName == null
+                ? "เจ้าหน้าที่"[0]
+                : e.createdFullName[0],
+            body: e.body ?? "",
+            timereceive: new Date(e.receiveDate),
+          });
        });
-      });
-      notiList.value.push(...list);
+        notiList.value.push(...list);
+        totalInbox.value = res.data.result.total;
+      }
    })
    .catch((e) => {
-      // messageError($q, e);
+      messageError($q, e);
    })
    .finally(() => {
      // hideLoader();
@ -219,7 +232,7 @@ onMounted(async () => {
    await fetchroleUser(keycloak.tokenParsed.role);
  }

-  await getDataNotification(1);
+  await getDataNotification(1, "NOMAL");
  myEventHandler(null, false);
  window.addEventListener("resize", (e: any) => {
    myEventHandler(e, true);
@ -410,32 +423,30 @@ if (keycloak.tokenParsed != null) {
  role.value = keycloak.tokenParsed.role;
 }

-const deleteData = async (id: string) => {
-  console.log("delete=", id);
-  showLoader();
-  await http
-    .delete(config.API.msgId(id))
-    .then((res) => {
-      success($q, "ลบข้อมูลสำเร็จ");
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      getDataNotification(1);
-      hideLoader();
-    });
-};
-
-const clickDelete = (id: string) => {
-  dialogRemove($q, () => deleteData(id));
+const clickDelete = async (id: string, index: number) => {
+  dialogRemove($q, async () => {
+    showLoader();
+    await http
+      .delete(config.API.msgId(id))
+      .then(() => {
+        notiList.value.splice(index, 1);
+        success($q, "ลบข้อมูลสำเร็จ");
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(async () => {
+        getDataNotification(1, "DEL");
+        hideLoader();
+      });
+  });
 };

 const totalInbox = ref<number>(0);
 function onLoad(index: any, done: any) {
  if (notiList.value.length < totalInbox.value) {
    setTimeout(() => {
-      getDataNotification(index + 1);
+      getDataNotification(index + 1, "NOMAL");
      done();
    }, 2000);
  }
@ -510,8 +521,8 @@ function onLoad(index: any, done: any) {
            >
              <q-list
                style="min-width: 300px"
-                v-for="n in notiList"
-                :key="n.id"
+                v-for="(n, index) in notiList"
+                :key="index"
              >
                <q-item v-ripple class="mytry q-py-xs" dense>
                  <q-item-section avatar top style="min-width: 40px">
@ -537,7 +548,7 @@ function onLoad(index: any, done: any) {
                    dense
                    icon="mdi-close"
                    class="mybtn q-mx-xs"
-                    @click="clickDelete(n.id)"
+                    @click="clickDelete(n.id, index)"
                  ></q-btn>
                </q-item>
                <q-separator color="grey-2" />