ui specialTime

เพิ่มตัวแปร checkIn checkOut

src/modules/09_leave/components/4_specialTime/DialogApprove.vue

@@ -14,24 +14,22 @@ const $q = useQuasar();
 const mixin = useCounterMixin();
 const { dialogConfirm, date2Thai } = mixin;
 const currentDate = ref<Date | null>(new Date());
-const startTimeMorningRef = ref<Object | null>(null);
+const checkInRef = ref<Object | null>(null);
-const endTimeMorningRef = ref<Object | null>(null);
+const checkOutRef = ref<Object | null>(null);
 const checkInStatusRef = ref<Object | null>(null);
 const checkOutStatusRef = ref<Object | null>(null);
 
 const formData = reactive<dataRowRound>({
-  startTimeMorning: "",
+  checkIn: "",
-  endTimeMorning: "",
+  checkOut: "",
-  startTimeAfternoon: "",
-  endTimeAfternoon: "",
   note: "",
   checkInStatus: "",
   checkOutStatus: "",
 });
 
 const objectRound: MyObjectRoundRef = {
-  startTimeMorning: startTimeMorningRef,
+  checkIn: checkInRef,
-  endTimeMorning: endTimeMorningRef,
+  checkOut: checkOutRef,
   checkInStatus: checkInStatusRef,
   checkOutStatus: checkOutStatusRef,
 };
@@ -81,17 +79,13 @@ watch(
   () => props.modal,
   (newDetailData, oldDetailData) => {
     if (props.editCheck === "APPROVE") {
-      formData.startTimeMorning = "";
+      formData.checkIn = "";
-      formData.endTimeMorning = "";
+      formData.checkOut = "";
-      formData.startTimeAfternoon = "";
-      formData.endTimeAfternoon = "";
       formData.note = "";
     } else if (props.editCheck === "PENDING") {
       if (props.detailData) {
-        formData.startTimeMorning = props.detailData.startTimeMorning;
+        formData.checkIn = props.detailData.checkIn;
-        formData.endTimeMorning = props.detailData.endTimeMorning;
+        formData.checkOut = props.detailData.checkOut;
-        formData.startTimeAfternoon = props.detailData.startTimeAfternoon;
-        formData.endTimeAfternoon = props.detailData.endTimeAfternoon;
         formData.note = props.detailData.note;
       }
     }
@@ -174,27 +168,21 @@ watch(
             <div class="row justify-between q-my-sm items-start">
               <p class="q-ma-none mt">เวลาเข้างาน</p>
               <q-input
-                ref="startTimeMorningRef"
+                ref="checkInRef"
                 class="inputgreen"
                 dense
                 lazy-rules
                 borderless
                 outlined
-                v-model="formData.startTimeMorning"
+                v-model="formData.checkIn"
                 :rules="[
                   (val) => !!val || 'กรุณากรอกเวลาเข้างาน',
                   (val) => {
-                    if (val && formData.endTimeMorning) {
+                    if (val && formData.checkOut) {
-                      if (val > formData.endTimeMorning) {
+                      if (val > formData.checkOut) {
                         return 'ต้องน้อยกว่าเวลาออกงาน';
                       }
-                      if (
+                      if (val === formData.checkOut) {
-                        val >= formData.startTimeAfternoon &&
-                        val <= formData.endTimeAfternoon
-                      ) {
-                        return 'ช่วงเวลาทับซ้อนกับช่วงบ่าย';
-                      }
-                      if (val === formData.endTimeMorning) {
                         return 'เวลาเข้างานช่วงเช้าต้องไม่ซ้ำกับออกงานเช้า';
                       }
                     }
@@ -210,27 +198,21 @@ watch(
             <div class="row items-start q-my-sm justify-between">
               <p class="q-ma-none mt">เวลาออกงาน</p>
               <q-input
-                ref="endTimeMorningRef"
+                ref="checkOutRef"
                 class="inputgreen"
                 dense
-                v-model="formData.endTimeMorning"
+                v-model="formData.checkOut"
                 lazy-rules
                 borderless
                 outlined
                 :rules="[
                   (val) => !!val || 'กรุณากรอกเวลาออกงาน',
                   (val) => {
-                    if (val && formData.startTimeMorning) {
+                    if (val && formData.checkIn) {
-                      if (val < formData.startTimeMorning) {
+                      if (val < formData.checkIn) {
                         return 'ต้องมากกว่าเวลาเข้างาน';
                       }
-                      if (
+                      if (val === formData.checkIn) {
-                        val >= formData.startTimeAfternoon &&
-                        val <= formData.endTimeAfternoon
-                      ) {
-                        return 'ช่วงเวลาทับซ้อนกับช่วงบ่าย';
-                      }
-                      if (val === formData.startTimeMorning) {
                         return 'เวลาออกงานช่วงเช้าต้องไม่ซ้ำกับเข้างานเช้า';
                       }
                     }

src/modules/09_leave/interface/request/specialTime.ts

@@ -10,5 +10,7 @@ interface ListData {
   status: string;
   checkInStatus: string;
   checkOutStatus: string;
+  checkOut: string;
+  checkIn: string;
 }
 export type { ListData };

src/modules/09_leave/interface/response/specialTime.ts

@@ -8,17 +8,15 @@ interface DataRows {
   status: string;
 }
 interface dataRowRound {
-  startTimeMorning: string;
+  checkIn: string;
-  endTimeMorning: string;
+  checkOut: string;
-  startTimeAfternoon: string;
-  endTimeAfternoon: string;
   checkInStatus: string;
   checkOutStatus: string;
   note: string;
 }
 interface MyObjectRoundRef {
-  startTimeMorning: object | null;
+  checkIn: object | null;
-  endTimeMorning: object | null;
+  checkOut: object | null;
   checkInStatus: object | null;
   checkOutStatus: object | null;
   [key: string]: any;

src/modules/09_leave/stores/SpecialTimeStore.ts

@@ -31,6 +31,8 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
       endTimeMorning: e.endTimeMorning,
       startTimeAfternoon: e.startTimeAfternoon,
       endTimeAfternoon: e.endTimeAfternoon,
+      checkIn: e.checkOut,
+      checkOut: e.checkOut,
       status: e.status,
       checkInStatus: convertStatus(e.checkInStatus),
       checkOutStatus: convertStatus(e.checkOutStatus),

src/modules/09_leave/views/SpecialTimeMain.vue

@@ -76,6 +76,8 @@ onMounted(async () => {
       status: "PENDING",
       checkInStatus: "normal",
       checkOutStatus: "late",
+      checkIn: "08:00",
+      checkOut: "12.00",
     },
     {
       id: "00000000-0000-0000-0000-000000000000",
@@ -89,6 +91,8 @@ onMounted(async () => {
       status: "APPROVE",
       checkInStatus: "normal",
       checkOutStatus: "late",
+      checkIn: "08:00",
+      checkOut: "12.00",
     },
     {
       id: "00000000-0000-0000-0000-000000000000",
@@ -102,6 +106,8 @@ onMounted(async () => {
       status: "REJECT",
       checkInStatus: "normal",
       checkOutStatus: "late",
+      checkIn: "08:00",
+      checkOut: "12.00",
     },
   ]);
 });