From 267648074c7fe0823cf1314044b8bcce8efeb7f0 Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Tue, 13 Jan 2026 14:24:04 +0100 Subject: [PATCH] Fix #53 --- backend/src/routes/staff/time.ts | 8 +++----- frontend/components/StaffTimeEntryModal.vue | 5 ++++- frontend/composables/useStaffTime.ts | 11 ++++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/backend/src/routes/staff/time.ts b/backend/src/routes/staff/time.ts index e2a3d93..edaddbc 100644 --- a/backend/src/routes/staff/time.ts +++ b/backend/src/routes/staff/time.ts @@ -22,7 +22,7 @@ export default async function staffTimeRoutes(server: FastifyInstance) { server.post("/staff/time/event", async (req, reply) => { try { - const userId = req.user.user_id + const actorId = req.user.user_id; const tenantId = req.user.tenant_id const body = req.body as any @@ -35,17 +35,15 @@ export default async function staffTimeRoutes(server: FastifyInstance) { const dataToInsert = { tenant_id: tenantId, - user_id: userId, + user_id: body.user_id, actortype: "user", - actoruser_id: userId, + actoruser_id: actorId, eventtime: normalizeDate(body.eventtime), eventtype: body.eventtype, source: "WEB", payload: body.payload // Payload (z.B. Description) mit speichern } - console.log(dataToInsert) - const [created] = await server.db .insert(stafftimeevents) //@ts-ignore diff --git a/frontend/components/StaffTimeEntryModal.vue b/frontend/components/StaffTimeEntryModal.vue index dcf370f..e250a2a 100644 --- a/frontend/components/StaffTimeEntryModal.vue +++ b/frontend/components/StaffTimeEntryModal.vue @@ -103,7 +103,8 @@ async function onSubmit(event: FormSubmitEvent) { start: startIso, // Die eingegebene Startzeit end: endIso, // Die eingegebene Endzeit (oder null) type: state.type, - description: state.description + description: state.description, + user_id: props.defaultUserId }) toast.add({ title: 'Zeit manuell erfasst', color: 'green' }) @@ -131,6 +132,8 @@ async function onSubmit(event: FormSubmitEvent) { + {{props}} + diff --git a/frontend/composables/useStaffTime.ts b/frontend/composables/useStaffTime.ts index 791c0a0..a986a00 100644 --- a/frontend/composables/useStaffTime.ts +++ b/frontend/composables/useStaffTime.ts @@ -91,15 +91,18 @@ export const useStaffTime = () => { } // 🆕 NEU: Manuellen Eintrag erstellen (Vergangenheit oder Zeitraum) - const createEntry = async (data: { start: string, end: string | null, type: string, description: string }) => { + const createEntry = async (data: { start: string, end: string | null, type: string, description: string, user_id: string }) => { // 1. Start Event senden // Wir nutzen den dynamischen Typ (work_start, vacation_start etc.) + console.log(data) + await $api('/api/staff/time/event', { method: 'POST', body: { eventtype: `${data.type}_start`, eventtime: data.start, - payload: { description: data.description } + payload: { description: data.description }, + user_id: data.user_id, } }) @@ -109,7 +112,9 @@ export const useStaffTime = () => { method: 'POST', body: { eventtype: `${data.type}_end`, - eventtime: data.end + eventtime: data.end, + payload: { description: data.description }, + user_id: data.user_id, } }) }