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

Merge branch 'devCorrected' into 'beta'

Browse Source 
Fixed Phase Change

See merge request fedeo/software!35
This commit is contained in:
Florian Federspiel
2025-11-11 08:00:28 +00:00
parent 7cd9a3e074 57abbe8534
commit e0638b5a98
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/EntityShowSubPhases.vue
View File

@@ -75,7 +75,7 @@ const changeActivePhase = async (key) => {
return p
})
const res = await useEntities("projects").update(item.id, {phases:item.phases})
const res = await useEntities("projects").update(item.id, {phases:item.phases,active_phase: item.phases.find(i => i.active).label})
//const {error:updateError} = await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)

4
pages/staff/time/[id]/evaluate.vue
View File

@@ -208,11 +208,11 @@ changeRange()
</template>
<template #start-data="{ row }">
{{ $dayjs(row.startDate).format('HH:mm DD.MM.YY') }} Uhr
{{ $dayjs(row.started_at).format('HH:mm DD.MM.YY') }} Uhr
</template>
<template #end-data="{ row }">
{{ $dayjs(row.endDate).format('HH:mm DD.MM.YY') }} Uhr
{{ $dayjs(row.stopped_at).format('HH:mm DD.MM.YY') }} Uhr
</template>
<template #duration-data="{ row }">