hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Edit isExpired in Vuex => Done

Browse source
This commit is contained in:
watcharanondh 2023-06-13 15:42:55 +07:00
parent b5069d1991
commit 94d8bb69f7
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/05_placement/components/exams_korkor/Main.vue
View file

@ -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 };
});

5
src/modules/05_placement/components/exams_sorkorcho/Main.vue
View file

@ -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 };
});

13
src/modules/05_placement/store.ts
View file

@ -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);