เพิ่มปุ่มลบ/refactor
This commit is contained in:
AnandaTon
parent
01b550520e
commit
aa76e7d030
30 changed files with 8420 additions and 7699 deletions
|
|
@ -1,46 +1,50 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch } from "vue"
|
||||
import { useQuasar } from "quasar"
|
||||
import keycloak from "@/plugins/keycloak"
|
||||
import http from "@/plugins/http"
|
||||
import config from "@/app.config"
|
||||
import { ref, onMounted, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
/**import calendar*/
|
||||
import FullCalendar from "@fullcalendar/vue3"
|
||||
import dayGridPlugin from "@fullcalendar/daygrid"
|
||||
import FullCalendar from "@fullcalendar/vue3";
|
||||
import dayGridPlugin from "@fullcalendar/daygrid";
|
||||
// import type { CalendarOptions } from "@fullcalendar/core"
|
||||
import timeGridPlugin from "@fullcalendar/timegrid"
|
||||
import interactionPlugin from "@fullcalendar/interaction"
|
||||
import allLocales from "@fullcalendar/core/locales-all"
|
||||
import listPlugin from "@fullcalendar/list"
|
||||
import timeGridPlugin from "@fullcalendar/timegrid";
|
||||
import interactionPlugin from "@fullcalendar/interaction";
|
||||
import allLocales from "@fullcalendar/core/locales-all";
|
||||
import listPlugin from "@fullcalendar/list";
|
||||
|
||||
/** import type*/
|
||||
import type { DataDateMonthObject } from "@/modules/05_leave/interface/request/Calendar.ts"
|
||||
import type { DataCalendar, LeaveType } from "@/modules/05_leave/interface/response/leave"
|
||||
import type { DataDateMonthObject } from "@/modules/05_leave/interface/request/Calendar.ts";
|
||||
import type {
|
||||
DataCalendar,
|
||||
LeaveType,
|
||||
} from "@/modules/05_leave/interface/response/leave";
|
||||
|
||||
/** import componest*/
|
||||
import DialogDetail from "@/modules/05_leave/components/DialogDetail.vue"
|
||||
import DialogDetail from "@/modules/05_leave/components/DialogDetail.vue";
|
||||
|
||||
/** import stort*/
|
||||
import { useCounterMixin } from "@/stores/mixin"
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
// import { aR } from "@fullcalendar/core/internal-common"
|
||||
|
||||
const mixin = useCounterMixin()
|
||||
const { showLoader, hideLoader, messageError, date2Thai, monthYear2Thai, dateToISO } = mixin
|
||||
|
||||
const $q = useQuasar()
|
||||
|
||||
const emit = defineEmits(["update:dateYear"])
|
||||
|
||||
const fullName = ref<string>("")
|
||||
const mainData = ref<DataCalendar[]>([])
|
||||
|
||||
const keycloakId = ref<string>(keycloak.tokenParsed ? keycloak.tokenParsed.sub!.toString() : "")
|
||||
/**ตัวแปรที่ใช้ */
|
||||
const mixin = useCounterMixin();
|
||||
const { showLoader, hideLoader, messageError, monthYear2Thai } = mixin;
|
||||
const $q = useQuasar();
|
||||
const emit = defineEmits(["update:dateYear"]);
|
||||
const fullName = ref<string>("");
|
||||
const mainData = ref<DataCalendar[]>([]);
|
||||
const keycloakId = ref<string>(
|
||||
keycloak.tokenParsed ? keycloak.tokenParsed.sub!.toString() : ""
|
||||
);
|
||||
const modal = ref<boolean>(false);
|
||||
const leaveId = ref<string>("");
|
||||
|
||||
/**
|
||||
* Option ของปฏิทิน
|
||||
*/
|
||||
const fullCalendar = ref<any>() //ref calendar
|
||||
const fullCalendar = ref<any>(); //ref calendar
|
||||
const calendarOptions = ref<any>({
|
||||
plugins: [
|
||||
dayGridPlugin,
|
||||
|
|
@ -65,38 +69,43 @@ const calendarOptions = ref<any>({
|
|||
displayEventTime: false,
|
||||
editable: true,
|
||||
events: [],
|
||||
})
|
||||
});
|
||||
|
||||
/**Map ตัวแปร dateMonth */
|
||||
const dateMonth = ref<DataDateMonthObject>({
|
||||
month: new Date().getMonth(),
|
||||
year: new Date().getFullYear(),
|
||||
})
|
||||
});
|
||||
|
||||
/** function เรียกข้อมูล calendar*/
|
||||
async function fetchDataCalendar() {
|
||||
showLoader()
|
||||
showLoader();
|
||||
await http
|
||||
.post(config.API.leaveCalendar(), {
|
||||
year: dateMonth.value.year,
|
||||
})
|
||||
.then(res => {
|
||||
mainData.value = res.data.result
|
||||
.then((res) => {
|
||||
mainData.value = res.data.result;
|
||||
|
||||
const double_name = [...new Set(mainData.value.map((item: DataCalendar) => item.keycloakId))]
|
||||
filterLists.value = []
|
||||
const double_name = [
|
||||
...new Set(mainData.value.map((item: DataCalendar) => item.keycloakId)),
|
||||
];
|
||||
filterLists.value = [];
|
||||
for (let i = 1; i <= double_name.length; i++) {
|
||||
const name = double_name[i - 1]
|
||||
const name = double_name[i - 1];
|
||||
const filterName = {
|
||||
id: name,
|
||||
name: convertKeycloakId(name),
|
||||
color: name === keycloakId.value ? "green" : "grey",
|
||||
}
|
||||
filterLists.value.push(filterName)
|
||||
};
|
||||
filterLists.value.push(filterName);
|
||||
}
|
||||
console.log(double_name)
|
||||
console.log(double_name);
|
||||
|
||||
if (filterVal.value.length !== 0) {
|
||||
const data = mainData.value.filter((e: any) => e.keycloakId === keycloakId.value)
|
||||
const data = mainData.value.filter(
|
||||
(e: any) => e.keycloakId === keycloakId.value
|
||||
);
|
||||
|
||||
const event = data
|
||||
.filter((x: any) => x.status != "REJECT" && x.status != "DELETE")
|
||||
|
|
@ -104,45 +113,57 @@ async function fetchDataCalendar() {
|
|||
id: e.id,
|
||||
title: `${e.fullName} (${e.leaveTypeName})`,
|
||||
start: e.leaveStartDate,
|
||||
end: new Date(new Date(e.leaveEndDate).setHours(23, 59, 59)).toISOString(),
|
||||
end: new Date(
|
||||
new Date(e.leaveEndDate).setHours(23, 59, 59)
|
||||
).toISOString(),
|
||||
allDay: e.leaveStartDate === e.leaveEndDate ? true : false,
|
||||
color: e.keycloakId === keycloakId.value ? "#DCEDC8" : "#CFD8DC",
|
||||
textColor: "black",
|
||||
}))
|
||||
calendarOptions.value.events = event
|
||||
console.log(calendarOptions.value.events)
|
||||
}));
|
||||
calendarOptions.value.events = event;
|
||||
console.log(calendarOptions.value.events);
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
messageError($q, err)
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader()
|
||||
})
|
||||
await fetchData()
|
||||
hideLoader();
|
||||
});
|
||||
await fetchData();
|
||||
}
|
||||
|
||||
/**
|
||||
* fetch วันหยุดในปฏิทิน
|
||||
*/
|
||||
const fetchData = async () => {
|
||||
showLoader()
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.listHolidayHistoryYearMonth(dateMonth.value.year, dateMonth.value.month + 1))
|
||||
.then(res => {
|
||||
const dataNormal = res.data.result.normal
|
||||
const dataSixDays = res.data.result.sixDays
|
||||
const data = dataNormal
|
||||
.get(
|
||||
config.API.listHolidayHistoryYearMonth(
|
||||
dateMonth.value.year,
|
||||
dateMonth.value.month + 1
|
||||
)
|
||||
)
|
||||
.then((res) => {
|
||||
const dataNormal = res.data.result.normal;
|
||||
const dataSixDays = res.data.result.sixDays;
|
||||
const data = dataNormal;
|
||||
const event = data.map((e: any) => ({
|
||||
id: e.id,
|
||||
title: `${e.name} `,
|
||||
start: e.holidayDate,
|
||||
end: new Date(new Date(e.holidayDate).setHours(23, 59, 59)).toISOString(),
|
||||
end: new Date(
|
||||
new Date(e.holidayDate).setHours(23, 59, 59)
|
||||
).toISOString(),
|
||||
allDay: e.holidayDate === e.holidayDate ? true : false,
|
||||
color: " #CCE5FF",
|
||||
textColor: "#0080FF",
|
||||
}))
|
||||
calendarOptions.value.events = [...calendarOptions.value.events, ...event]
|
||||
}));
|
||||
calendarOptions.value.events = [
|
||||
...calendarOptions.value.events,
|
||||
...event,
|
||||
];
|
||||
// const dataSix = dataSixDays
|
||||
// const eventSix = dataSix.map((e: any) => ({
|
||||
// id: e.id,
|
||||
|
|
@ -154,32 +175,33 @@ const fetchData = async () => {
|
|||
// textColor: "#FF8000",
|
||||
// }))
|
||||
// calendarOptions.value.events = [...calendarOptions.value.events, ...eventSix]
|
||||
console.log(calendarOptions.value.events)
|
||||
console.log(calendarOptions.value.events);
|
||||
})
|
||||
.catch(e => {
|
||||
messageError($q, e)
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(async () => {
|
||||
hideLoader()
|
||||
})
|
||||
}
|
||||
hideLoader();
|
||||
});
|
||||
};
|
||||
|
||||
/**function แปลงkeycloakId */
|
||||
function convertKeycloakId(id: any) {
|
||||
const filterName = mainData.value.find((e: any) => e.keycloakId === id)
|
||||
return filterName?.fullName
|
||||
const filterName = mainData.value.find((e: any) => e.keycloakId === id);
|
||||
return filterName?.fullName;
|
||||
}
|
||||
|
||||
const leaveType = ref<LeaveType[]>([])
|
||||
/** function เรียกประเภทการลา */
|
||||
const leaveType = ref<LeaveType[]>([]);
|
||||
async function fectOptionType() {
|
||||
await http
|
||||
.get(config.API.leaveType())
|
||||
.then(async res => {
|
||||
leaveType.value = res.data.result
|
||||
})
|
||||
.catch(err => {
|
||||
messageError($q, err)
|
||||
.then(async (res) => {
|
||||
leaveType.value = res.data.result;
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -187,66 +209,72 @@ async function fectOptionType() {
|
|||
* @param val datepicker แบบเลือกปีและเดือน
|
||||
*/
|
||||
function monthYearThai(val: DataDateMonthObject) {
|
||||
if (val == null) return ""
|
||||
else return monthYear2Thai(val.month, val.year)
|
||||
if (val == null) return "";
|
||||
else return monthYear2Thai(val.month, val.year);
|
||||
}
|
||||
|
||||
/** function อัปเดท Calendar */
|
||||
async function updateMonth() {
|
||||
await fetchDataCalendar()
|
||||
await fetchData()
|
||||
const calen = fullCalendar.value.getApi()
|
||||
const date = new Date(dateMonth.value.year, dateMonth.value.month)
|
||||
calen.gotoDate(date)
|
||||
await fetchDataCalendar();
|
||||
await fetchData();
|
||||
const calen = fullCalendar.value.getApi();
|
||||
const date = new Date(dateMonth.value.year, dateMonth.value.month);
|
||||
calen.gotoDate(date);
|
||||
}
|
||||
|
||||
const modal = ref<boolean>(false)
|
||||
const leaveId = ref<string>("")
|
||||
|
||||
/**
|
||||
* function openPopupDateail
|
||||
* @param id การลา
|
||||
*/
|
||||
async function onCilckview(id: string) {
|
||||
modal.value = true
|
||||
leaveId.value = id
|
||||
modal.value = true;
|
||||
leaveId.value = id;
|
||||
}
|
||||
|
||||
/** function closePopup*/
|
||||
async function onClickClose() {
|
||||
modal.value = false
|
||||
modal.value = false;
|
||||
}
|
||||
|
||||
/** filter calendar left */
|
||||
const filterLists = ref<any>([])
|
||||
const filterVal = ref<any>([])
|
||||
const filterLists = ref<any>([]);
|
||||
const filterVal = ref<any>([]);
|
||||
|
||||
/**** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่Calendar */
|
||||
watch(
|
||||
() => filterVal.value,
|
||||
() => {
|
||||
const eventData = filterVal.value.map((item: any) => {
|
||||
return mainData.value
|
||||
.filter((e: DataCalendar) => e.keycloakId === item && e.status != "REJECT" && e.status != "DELETE")
|
||||
.map(e => ({
|
||||
.filter(
|
||||
(e: DataCalendar) =>
|
||||
e.keycloakId === item &&
|
||||
e.status != "REJECT" &&
|
||||
e.status != "DELETE"
|
||||
)
|
||||
.map((e) => ({
|
||||
id: e.id,
|
||||
title: `${e.fullName} (${e.leaveTypeName})`,
|
||||
start: e.leaveStartDate,
|
||||
end: new Date(new Date(e.leaveEndDate).setHours(23, 59, 59)).toISOString(),
|
||||
end: new Date(
|
||||
new Date(e.leaveEndDate).setHours(23, 59, 59)
|
||||
).toISOString(),
|
||||
allDay: e.leaveStartDate === e.leaveEndDate ? true : false,
|
||||
color: e.keycloakId === keycloakId.value ? "#DCEDC8" : "#CFD8DC",
|
||||
textColor: "black",
|
||||
}))
|
||||
})
|
||||
const allEventData = [].concat(...eventData)
|
||||
calendarOptions.value.events = allEventData
|
||||
}));
|
||||
});
|
||||
const allEventData = [].concat(...eventData);
|
||||
calendarOptions.value.events = allEventData;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
/**Hook */
|
||||
onMounted(async () => {
|
||||
filterVal.value.push(keycloakId.value)
|
||||
await fetchDataCalendar()
|
||||
await fectOptionType()
|
||||
})
|
||||
filterVal.value.push(keycloakId.value);
|
||||
await fetchDataCalendar();
|
||||
await fectOptionType();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -255,8 +283,18 @@ onMounted(async () => {
|
|||
<q-card class="col-12" flat bordered>
|
||||
<div class="q-gutter-sm col-12">
|
||||
<q-list class="rounded-borders q-pt-sm" dense>
|
||||
<q-item v-for="(item, i) in filterLists" :key="i" tag="label" v-ripple>
|
||||
<q-checkbox size="sm" v-model="filterVal" :val="item.id" :color="item.color" />
|
||||
<q-item
|
||||
v-for="(item, i) in filterLists"
|
||||
:key="i"
|
||||
tag="label"
|
||||
v-ripple
|
||||
>
|
||||
<q-checkbox
|
||||
size="sm"
|
||||
v-model="filterVal"
|
||||
:val="item.id"
|
||||
:color="item.color"
|
||||
/>
|
||||
<q-item-section>
|
||||
<q-item-label>{{ item.name }}</q-item-label>
|
||||
</q-item-section>
|
||||
|
|
@ -270,16 +308,40 @@ onMounted(async () => {
|
|||
<div class="q-mt-sm col-12">
|
||||
<div class="row col-12 q-gutter-sm">
|
||||
<div class="demo-app-main">
|
||||
<q-card bordered flat class="q-pa-sm q-mb-sm col-12 row bg-grey-1 shadow-0">
|
||||
<q-card
|
||||
bordered
|
||||
flat
|
||||
class="q-pa-sm q-mb-sm col-12 row bg-grey-1 shadow-0"
|
||||
>
|
||||
<div class="items-center col-12 row q-col-gutter-sm">
|
||||
<!-- filter เลือกเดือนปี -->
|
||||
<datepicker v-model="dateMonth" :locale="'th'" autoApply month-picker :enableTimePicker="false" @update:modelValue="updateMonth">
|
||||
<datepicker
|
||||
v-model="dateMonth"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
month-picker
|
||||
:enableTimePicker="false"
|
||||
@update:modelValue="updateMonth"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{ parseInt(value + 543) }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input :model-value="monthYearThai(dateMonth)" dense outlined bg-color="white" style="width: 130px">
|
||||
<q-input
|
||||
:model-value="monthYearThai(dateMonth)"
|
||||
dense
|
||||
outlined
|
||||
bg-color="white"
|
||||
style="width: 130px"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)"> </q-icon>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
|
|
@ -288,14 +350,29 @@ onMounted(async () => {
|
|||
</q-card>
|
||||
|
||||
<div class="main-content">
|
||||
<FullCalendar ref="fullCalendar" class="demo-app-calendar" :options="calendarOptions">
|
||||
<FullCalendar
|
||||
ref="fullCalendar"
|
||||
class="demo-app-calendar"
|
||||
:options="calendarOptions"
|
||||
>
|
||||
<template v-slot:eventContent="arg">
|
||||
<div v-if="arg.event.textColor == 'black'" class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`">
|
||||
<div class="textHover col-10" @click="onCilckview(arg.event.id)">
|
||||
<div
|
||||
v-if="arg.event.textColor == 'black'"
|
||||
class="row col-12 items-center no-wrap"
|
||||
:style="`background: + ${arg.event.color}`"
|
||||
>
|
||||
<div
|
||||
class="textHover col-10"
|
||||
@click="onCilckview(arg.event.id)"
|
||||
>
|
||||
{{ arg.event.title }}
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`">
|
||||
<div
|
||||
v-else
|
||||
class="row col-12 items-center no-wrap"
|
||||
:style="`background: + ${arg.event.color}`"
|
||||
>
|
||||
<div class="textHover col-10">
|
||||
{{ arg.event.title }}
|
||||
</div>
|
||||
|
|
@ -307,15 +384,30 @@ onMounted(async () => {
|
|||
</div>
|
||||
<div class="row q-col-gutter-lg justify-end">
|
||||
<div class="items-center row">
|
||||
<q-icon size="10px" color="blue" name="mdi-circle" class="q-mr-sm" />
|
||||
<q-icon
|
||||
size="10px"
|
||||
color="blue"
|
||||
name="mdi-circle"
|
||||
class="q-mr-sm"
|
||||
/>
|
||||
<span class="text-caption text-grey-8">วันหยุด</span>
|
||||
</div>
|
||||
<div class="items-center row">
|
||||
<q-icon size="10px" color="green-7" name="mdi-circle" class="q-mr-sm" />
|
||||
<q-icon
|
||||
size="10px"
|
||||
color="green-7"
|
||||
name="mdi-circle"
|
||||
class="q-mr-sm"
|
||||
/>
|
||||
<span class="text-caption text-grey-8">การลาของฉัน</span>
|
||||
</div>
|
||||
<div class="items-center row">
|
||||
<q-icon size="10px" color="grey-6" name="mdi-circle" class="q-mr-sm" />
|
||||
<q-icon
|
||||
size="10px"
|
||||
color="grey-6"
|
||||
name="mdi-circle"
|
||||
class="q-mr-sm"
|
||||
/>
|
||||
<span class="text-caption text-grey-8">การลาของบุคคลอื่น</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -323,7 +415,12 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<DialogDetail :modal="modal" :leaveId="leaveId" :onClickClose="onClickClose" :leaveType="leaveType" />
|
||||
<DialogDetail
|
||||
:modal="modal"
|
||||
:leaveId="leaveId"
|
||||
:onClickClose="onClickClose"
|
||||
:leaveType="leaveType"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style scope lang="scss">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue