From 94d8bb69f7e05868f84411b1291e8f9aec1d33f5 Mon Sep 17 00:00:00 2001 From: watcharanondh Date: Tue, 13 Jun 2023 15:42:55 +0700 Subject: [PATCH] Edit isExpired in Vuex => Done --- .../05_placement/components/exams_korkor/Main.vue | 5 +++-- .../components/exams_sorkorcho/Main.vue | 5 +++-- src/modules/05_placement/store.ts | 13 +++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/modules/05_placement/components/exams_korkor/Main.vue b/src/modules/05_placement/components/exams_korkor/Main.vue index 95eb35ecc..92f8ea3b1 100644 --- a/src/modules/05_placement/components/exams_korkor/Main.vue +++ b/src/modules/05_placement/components/exams_korkor/Main.vue @@ -165,7 +165,8 @@ onMounted(async () => { fiscalYearFilter() examTimeFilter() examTypeFilter() - expiredAccountFilter() + await expiredAccountFilter() + searchFilterTable() }) // ดูรายการสอบแข่งขัน หน้าต่อไป @@ -276,7 +277,7 @@ const expiredAccountFilter = async () => { const currentDate = new Date(); const updatedRows = OriginalData.value.map((data) => { let expirationDate = new Date(data.accountExpirationDate); - let isExpired = expirationDate < currentDate; + let isExpired = expirationDate < currentDate return { ...data, isExpired }; }); diff --git a/src/modules/05_placement/components/exams_sorkorcho/Main.vue b/src/modules/05_placement/components/exams_sorkorcho/Main.vue index 95eb35ecc..92f8ea3b1 100644 --- a/src/modules/05_placement/components/exams_sorkorcho/Main.vue +++ b/src/modules/05_placement/components/exams_sorkorcho/Main.vue @@ -165,7 +165,8 @@ onMounted(async () => { fiscalYearFilter() examTimeFilter() examTypeFilter() - expiredAccountFilter() + await expiredAccountFilter() + searchFilterTable() }) // ดูรายการสอบแข่งขัน หน้าต่อไป @@ -276,7 +277,7 @@ const expiredAccountFilter = async () => { const currentDate = new Date(); const updatedRows = OriginalData.value.map((data) => { let expirationDate = new Date(data.accountExpirationDate); - let isExpired = expirationDate < currentDate; + let isExpired = expirationDate < currentDate return { ...data, isExpired }; }); diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index 9f3d9137d..cbe54a598 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -35,22 +35,23 @@ export const usePlacementDataStore = defineStore("placement", () => { DataMainUpdate.value = []; if (filter_1 === null && filter_2 === 0 && filter_3 === false) { // console.log('case 1'); - return DataMainUpdate.value = DataMainOrig.value; + // return DataMainUpdate.value = DataMainOrig.value; อันเก่า + return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.isExpired === filter_3); } else if (filter_1 === null && filter_2 === null && filter_3 === false) { // console.log('case 1.1'); - return DataMainUpdate.value = DataMainOrig.value; + return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.isExpired === filter_3); } else if (filter_1 !== null && filter_2 === 0 && filter_3 === false) { // console.log('case 2'); - return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1); + return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1 && item.isExpired === filter_3); } else if (filter_1 !== null && filter_2 === null && filter_3 === false) { // console.log('case 2.1'); - return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1); + return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1 && item.isExpired === filter_3); } else if (filter_1 !== null && filter_2 !== 0 && filter_3 === false) { // console.log('case 2.2'); - return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1 && item.examType === filter_2); + return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examOrder === filter_1 && item.examType === filter_2 && item.isExpired === filter_3); } else if (filter_1 === null && filter_2 !== 0 && filter_3 === false) { // console.log('case 3'); - return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examType === filter_2); + return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.examType === filter_2 && item.isExpired === filter_3); } else if (filter_1 === null && filter_2 === 0 && filter_3 === true) { // console.log('case 3.1'); return DataMainUpdate.value = DataMainOrig.value.filter((item) => item.isExpired === filter_3);