flfeders/FEDEO
2
1
Fork 0
Code Issues 63 Pull Requests Actions Packages Projects 21 Releases Wiki Activity

Corrected absencerequests

Browse Source 
Corrected RecreationDays to 2025
This commit is contained in:
florianfederspiel
2025-01-07 10:17:03 +01:00
parent 5ee5e671e7
commit 778308940a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/workingtimes/evaluate/[id].vue
View File

@@ -31,7 +31,7 @@ const setupPage = async () => {
if(route.params.id) itemInfo.value = profileStore.getProfileById(route.params.id) if(route.params.id) itemInfo.value = profileStore.getProfileById(route.params.id)
if(itemInfo.value.id) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value)) if(itemInfo.value.id) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
workingtimes.value = (await supabase.from("workingtimes").select().eq("profile",itemInfo.value.id).order("startDate",{ascending:false})).data workingtimes.value = (await supabase.from("workingtimes").select().eq("profile",itemInfo.value.id).order("startDate",{ascending:false})).data
absencerequests.value = (await supabase.from("absencerequests").select().eq("user",itemInfo.value.id).order("start",{ascending: false})).data absencerequests.value = (await supabase.from("absencerequests").select().eq("profile",itemInfo.value.id).order("startDate",{ascending: false})).data
} }
const selectedPresetRange = ref("Dieser Monat") const selectedPresetRange = ref("Dieser Monat")
@@ -103,13 +103,13 @@ const workingTimeInfo = computed(() => {
//console.log(times.filter(i => i.approved).length) //console.log(times.filter(i => i.approved).length)
//console.log(sumWorkingMinutesApproved) //console.log(sumWorkingMinutesApproved)
let recreationDays = ["2024-01-01","2024-05-01","2024-10-03","2024-10-31","2024-12-25","2024-12-26"] let recreationDays = ["2025-01-01","2025-04-18","2025-04-21","2025-05-01","2025-05-29","2025-06-09","2024-10-03","2024-10-31","2024-12-25","2024-12-26"]
//Feiertagsausgleich //Feiertagsausgleich
let sumWorkingMinutesRecreationDays = 0 let sumWorkingMinutesRecreationDays = 0
let sumRecreationDays = 0 let sumRecreationDays = 0
recreationDays.filter(i => dayjs(i).isSameOrAfter(selectedStartDay.value) && dayjs(i).isSameOrBefore(selectedEndDay.value)).forEach(day => { recreationDays.filter(i => dayjs(i).isSameOrAfter(selectedStartDay.value) && dayjs(i).isSameOrBefore(selectedEndDay.value)).forEach(day => {
let compensationTime = itemInfo.value.weeklyRegularWorkingHours[dayjs(day).day()] let compensationTime = itemInfo.value.weeklyRegularWorkingHours[dayjs(day).day()] || 0
sumWorkingMinutesRecreationDays += compensationTime * 60 sumWorkingMinutesRecreationDays += compensationTime * 60
sumRecreationDays++ sumRecreationDays++
}) })