diff --git a/frontend/components/displayRunningTime.vue b/frontend/components/displayRunningTime.vue
index 277ac86..df84f2e 100644
--- a/frontend/components/displayRunningTime.vue
+++ b/frontend/components/displayRunningTime.vue
@@ -2,8 +2,8 @@
 import dayjs from "dayjs";
 
 const profileStore = useProfileStore();
-const supabase = useSupabaseClient()
 const toast = useToast()
+const staffTime = useStaffTime()
 
 const runningTimeInfo = ref({})
 
@@ -11,12 +11,9 @@ const projects = ref([])
 const platform = ref("default")
 
 const setupPage = async () => {
-    runningTimeInfo.value = (await supabase.from("times").select().eq("profile", profileStore.activeProfile.id).is("endDate", null).single()).data || {}
-
-    //projects.value = (await useSupabaseSelect("projects"))
-
-
-
+    const rows = await staffTime.list({ user_id: profileStore.activeProfile?.user_id || profileStore.activeProfile?.id })
+    runningTimeInfo.value = rows.find((r) => !r.stopped_at && r.type === "work") || {}
+    projects.value = await useEntities("projects").select("*")
 }
 
 setupPage()
@@ -26,47 +23,25 @@ setupPage()
 }*/
 
 const startTime = async () => {
-  console.log("started")
-  runningTimeInfo.value = {
-    profile: profileStore.activeProfile.id,
-    startDate: dayjs(),
-    tenant: profileStore.currentTenant,
-    state: platform.value === "mobile" ? "In der App gestartet" : "Im Web gestartet",
-    source: "Dashboard"
-  }
-
-  const {data,error} = await supabase
-      .from("times")
-      .insert([runningTimeInfo.value])
-      .select()
-  if(error) {
+  try {
+    await staffTime.start("Arbeitszeit")
+    toast.add({title: "Projektzeit erfolgreich gestartet"})
+    await setupPage()
+  } catch (error) {
     console.log(error)
     toast.add({title: "Fehler beim starten der Projektzeit",color:"rose"})
-  } else if(data) {
-    toast.add({title: "Projektzeit erfolgreich gestartet"})
-    runningTimeInfo.value = data[0]
-    //console.log(runningTimeInfo.value)
   }
 }
 
 const stopStartedTime = async () => {
-  runningTimeInfo.value.endDate = dayjs()
-  runningTimeInfo.value.state = platform.value === "mobile" ? "In der App gestoppt" : "Im Web gestoppt"
-
-  const {error,status} = await supabase
-      .from("times")
-      .update(runningTimeInfo.value)
-      .eq('id',runningTimeInfo.value.id)
-
-  if(error) {
-    console.log(error)
-    let errorId = await useError().logError(`${status} - ${JSON.stringify(error)}`)
-    toast.add({title: errorId ? `Fehler beim stoppen der Projektzeit (Fehler ID: ${errorId})` : `Fehler beim stoppen der Projektzeit`,color:"rose"})
-
-
-  } else {
+  try {
+    await staffTime.stop()
     toast.add({title: "Projektzeit erfolgreich gestoppt"})
     runningTimeInfo.value = {}
+  } catch (error) {
+    console.log(error)
+    let errorId = await useError().logError(`${JSON.stringify(error)}`)
+    toast.add({title: errorId ? `Fehler beim stoppen der Projektzeit (Fehler ID: ${errorId})` : `Fehler beim stoppen der Projektzeit`,color:"rose"})
   }
 }
 
@@ -74,9 +49,9 @@ const stopStartedTime = async () => {
 </script>
 
 <template>
-  <div v-if="runningTimeInfo.startDate">
-    <p>Start: {{dayjs(runningTimeInfo.startDate).format("HH:mm")}}</p>
-    <p>Dauer: {{dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') > 59 ? `${Math.floor(dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') / 60)}:${dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') % 60} h` : dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') + ' min' }}</p>
+  <div v-if="runningTimeInfo.started_at">
+    <p>Start: {{dayjs(runningTimeInfo.started_at).format("HH:mm")}}</p>
+    <p>Dauer: {{dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') > 59 ? `${Math.floor(dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') / 60)}:${dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') % 60} h` : dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') + ' min' }}</p>
 
     <UFormGroup
         class="mt-2"
@@ -119,4 +94,4 @@ const stopStartedTime = async () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/components/displayRunningWorkingTime.vue b/frontend/components/displayRunningWorkingTime.vue
index b6f986c..f104292 100644
--- a/frontend/components/displayRunningWorkingTime.vue
+++ b/frontend/components/displayRunningWorkingTime.vue
@@ -2,14 +2,14 @@
 import dayjs from "dayjs";
 
 const profileStore = useProfileStore();
-const supabase = useSupabaseClient()
 const toast = useToast()
+const staffTime = useStaffTime()
 
 const runningTimeInfo = ref({})
 
 const setupPage = async () => {
-    runningTimeInfo.value = (await supabase.from("workingtimes").select().eq("profile", profileStore.activeProfile.id).is("endDate", null).single()).data || {}
-  console.log(runningTimeInfo.value)
+    const rows = await staffTime.list({ user_id: profileStore.activeProfile?.user_id || profileStore.activeProfile?.id })
+    runningTimeInfo.value = rows.find((r) => !r.stopped_at && r.type === "work") || {}
 }
 
 setupPage()
@@ -19,47 +19,25 @@ setupPage()
 }*/
 
 const startTime = async () => {
-  console.log("started")
-  runningTimeInfo.value = {
-    profile: profileStore.activeProfile.id,
-    startDate: dayjs(),
-    tenant: profileStore.currentTenant,
-    state: "Im Web gestartet",
-    source: "Dashboard"
-  }
-
-  const {data,error} = await supabase
-      .from("workingtimes")
-      .insert([runningTimeInfo.value])
-      .select()
-  if(error) {
+  try {
+    await staffTime.start("Arbeitszeit")
+    toast.add({title: "Anwesenheit erfolgreich gestartet"})
+    await setupPage()
+  } catch (error) {
     console.log(error)
     toast.add({title: "Fehler beim starten der Zeit",color:"rose"})
-  } else if(data) {
-    toast.add({title: "Anwesenheit erfolgreich gestartet"})
-    runningTimeInfo.value = data[0]
-    console.log(runningTimeInfo.value)
   }
 }
 
 const stopStartedTime = async () => {
-  runningTimeInfo.value.endDate = dayjs()
-  runningTimeInfo.value.state = "Im Web gestoppt"
-
-  const {error,status} = await supabase
-      .from("workingtimes")
-      .update(runningTimeInfo.value)
-      .eq('id',runningTimeInfo.value.id)
-
-  if(error) {
-    console.log(error)
-    let errorId = await useError().logError(`${status} - ${JSON.stringify(error)}`)
-    toast.add({title: errorId ? `Fehler beim stoppen der Anwesenheit (Fehler ID: ${errorId})` : `Fehler beim stoppen der Anwesenheit`,color:"rose"})
-
-
-  } else {
+  try {
+    await staffTime.stop()
     toast.add({title: "Anwesenheit erfolgreich gestoppt"})
     runningTimeInfo.value = {}
+  } catch (error) {
+    console.log(error)
+    let errorId = await useError().logError(`${JSON.stringify(error)}`)
+    toast.add({title: errorId ? `Fehler beim stoppen der Anwesenheit (Fehler ID: ${errorId})` : `Fehler beim stoppen der Anwesenheit`,color:"rose"})
   }
 }
 
@@ -67,9 +45,9 @@ const stopStartedTime = async () => {
 </script>
 
 <template>
-  <div v-if="runningTimeInfo.startDate">
-    <p>Start: {{dayjs(runningTimeInfo.startDate).format("HH:mm")}}</p>
-    <p>Dauer: {{dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') > 59 ? `${Math.floor(dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') / 60)}:${dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') % 60} h` : dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') + ' min' }}</p>
+  <div v-if="runningTimeInfo.started_at">
+    <p>Start: {{dayjs(runningTimeInfo.started_at).format("HH:mm")}}</p>
+    <p>Dauer: {{dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') > 59 ? `${Math.floor(dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') / 60)}:${dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') % 60} h` : dayjs().diff(dayjs(runningTimeInfo.started_at),'minutes') + ' min' }}</p>
 
     <UFormGroup
         class="mt-2"
@@ -98,4 +76,4 @@ const stopStartedTime = async () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/composables/useStaffTime.ts b/frontend/composables/useStaffTime.ts
index a986a00..b6e6d67 100644
--- a/frontend/composables/useStaffTime.ts
+++ b/frontend/composables/useStaffTime.ts
@@ -41,18 +41,23 @@ export const useStaffTime = () => {
      * aber wir nutzen dafür besser die createEntry Funktion unten.
      */
     const start = async (description = "Arbeitszeit", time?: string) => {
+
+        console.log(auth.user)
+
         await $api('/api/staff/time/event', {
             method: 'POST',
             body: {
                 eventtype: 'work_start',
                 eventtime: time || new Date().toISOString(), // 💡 Fix: Zeit akzeptieren
-                payload: { description }
+                payload: { description },
+                user_id: auth.user?.id
             }
         })
     }
 
     const stop = async () => {
-        await $api('/api/staff/time/event', { method: 'POST', body: { eventtype: 'work_end', eventtime: new Date().toISOString() } })
+        await $api('/api/staff/time/event', { method: 'POST', body: { eventtype: 'work_end', eventtime: new Date().toISOString(),
+                user_id: auth.user?.id } })
     }
 
     const submit = async (entry: any) => {
diff --git a/frontend/pages/times/index.vue b/frontend/pages/times/index.vue
deleted file mode 100644
index 3fc10b9..0000000
--- a/frontend/pages/times/index.vue
+++ /dev/null
@@ -1,500 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-import VueDatePicker from '@vuepic/vue-datepicker'
-import '@vuepic/vue-datepicker/dist/main.css'
-import {setPageLayout} from "#app";
-
-
-
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-const toast = useToast()
-
-
-const timeTypes = profileStore.ownTenant.timeConfig.timeTypes
-const timeInfo = ref({
-  profile: "",
-  startDate: "",
-  endDate: null,
-  notes: null,
-  project: null,
-  type: null
-})
-
-const filterUser = ref(profileStore.activeProfile.id || "")
-
-const times = ref([])
-const runningTimeInfo = ref({})
-const showConfigTimeModal = ref(false)
-const configTimeMode = ref("create")
-
-const platform = ref("default")
-
-const projects = ref([])
-
-const setup = async () => {
-  times.value = await useSupabaseSelect("times","*, profile(*), project(id, name)")
-  projects.value = await useSupabaseSelect("projects","*")
-
-
-
-  runningTimeInfo.value = (await supabase
-      .from("times")
-      .select()
-      .eq("tenant", profileStore.currentTenant)
-      .eq("profile", profileStore.activeProfile.id)
-      .is("endDate",null)
-      .single()).data
-
-}
-
-setup()
-
-const filteredRows = computed(() => {
-
-  //let times = times.value
-
-  /*if(dataStore.hasRight('viewTimes')) {
-    if(filterUser.value !== "") {
-      times = times.filter(i => i.user === filterUser.value)
-    }
-  } else if(dataStore.hasRight('viewOwnTimes')) {
-    times = times.filter(i => i.user === user.value.id)
-  } else {
-    times  = []
-  }*/
-
-  return times.value
-
-})
-
-
-
-const itemInfo = ref({
-  user: "",
-  notes: null,
-  project: null,
-  type: null,
-  state: "Entwurf"
-})
-
-
-const columns = [
-  {
-    key:"state",
-    label: "Status",
-  },
-  {
-    key: "user",
-    label: "Benutzer",
-  },
-  {
-    key:"startDate",
-    label:"Start",
-  },
-  {
-    key: "endDate",
-    label: "Ende",
-  },
-  {
-    key:"type",
-    label:"Typ",
-  },
-  {
-    key: "project",
-    label: "Projekt",
-  },
-  {
-    key: "notes",
-    label: "Notizen",
-  }
-]
-
-
-
-
-
-const startTime = async () => {
-  console.log("started")
-  timeInfo.value.profile = profileStore.activeProfile.id
-  timeInfo.value.startDate = dayjs()
-  timeInfo.value.tenant = profileStore.currentTenant
-
-  const {data,error} = await supabase
-      .from("times")
-      .insert([timeInfo.value])
-      .select()
-
-  if(error) {
-    console.log(error)
-    toast.add({title: "Fehler beim starten der Zeit",color:"rose"})
-  } else if(data) {
-    toast.add({title: "Zeit erfolgreich gestartet"})
-    runningTimeInfo.value = data[0]
-  }
-
-}
-
-const stopStartedTime = async () => {
-  runningTimeInfo.value.endDate = dayjs()
-  runningTimeInfo.value.state = "Im Web gestoppt"
-
-
-  const {data,error} = await supabase
-      .from("times")
-      .update(runningTimeInfo.value)
-      .eq('id',runningTimeInfo.value.id)
-      .select()
-
-  if(error) {
-    console.log(error)
-  } else {
-    toast.add({title: "Zeit erfolgreich gestoppt"})
-    runningTimeInfo.value = null
-    setup()
-  }
-}
-
-const createTime = async () => {
-  const {data,error} = await supabase
-      .from("times")
-      .insert({...itemInfo.value, tenant: profileStore.currentTenant})
-      .select()
-
-  if(error) {
-    console.log(error)
-  } else if(data) {
-    itemInfo.value = {}
-    toast.add({title: "Zeit erfolgreich erstellt"})
-    showConfigTimeModal.value = false
-    setup()
-  }
-}
-
-const openTime = (row) => {
-  itemInfo.value = row
-
-  itemInfo.value.project = itemInfo.value.project.id
-  itemInfo.value.profile = itemInfo.value.profile.id
-
-  showConfigTimeModal.value = true
-  configTimeMode.value = "edit"
-
-
-}
-
-const updateTime = async () => {
-  let data = itemInfo.value
-
-  data.profile = data.profile.id
-  data.project = data.project.id
-
-  const {error} = await supabase
-      .from("times")
-      .update(data)
-      .eq('id',itemInfo.value.id)
-
-  if(error) {
-    console.log(error)
-  }
-
-  toast.add({title: "Zeit erfolgreich gespeichert"})
-  showConfigTimeModal.value = false
-  setup()
-}
-
-const format = (date) => {
-  let dateFormat = dayjs(date).format("DD.MM.YY HH:mm")
-
-  return `${dateFormat}`;
-}
-
-/*const getDuration = (time) => {
-  const dez = dayjs(time.end).diff(time.start,'hour',true).toFixed(2)
-  const hours = Math.floor(dez)
-  const minutes = Math.floor((dez - hours) * 60)
-  return {
-    dezimal: dez,
-    hours: hours,
-    minutes: minutes,
-    composed: `${hours}:${minutes}`
-  }
-}*/
-
-const setState = async (newState) => {
-  itemInfo.value.state = newState
-  await updateTime()
-}
-
-const getSecondInfo = (item) => {
-  let returnArray = []
-
-  if(item.type) returnArray.push(item.type)
-  if(item.project) returnArray.push(item.project.name)
-  if(item.notes) returnArray.push(item.notes)
-
-  return returnArray
-}
-
-</script>
-
-<template>
-  <UDashboardNavbar title="Projektzeiten">
-    <template #toggle>
-      <div v-if="platform === 'mobile'"></div>
-    </template>
-  </UDashboardNavbar>
-  <UDashboardToolbar>
-    <template #left>
-      <UButton
-          @click="startTime"
-          :disabled="runningTimeInfo "
-      >
-        Start
-      </UButton>
-      <UButton
-          @click="stopStartedTime"
-          :disabled="!runningTimeInfo"
-      >
-        Stop
-      </UButton>
-      <UButton
-          v-if="platform !== 'mobile'"
-          @click="configTimeMode = 'create'; itemInfo = {startDate: new Date(), endDate: new Date()}; showConfigTimeModal = true"
-      >
-        Erstellen
-      </UButton>
-      <USelectMenu
-          v-if="platform !== 'mobile'"
-          :options="profileStore.profiles"
-          option-attribute="fullName"
-          value-attribute="id"
-          v-model="filterUser"
-      >
-        <template #label>
-          {{profileStore.getProfileById(filterUser) ? profileStore.getProfileById(filterUser).fullName : "Kein Benutzer ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-  <div v-if="runningTimeInfo" class="m-3">
-
-    Start: {{dayjs(runningTimeInfo.startDate).format("DD.MM.YY HH:mm")}}
-
-    <UFormGroup
-        label="Notizen:"
-    >
-      <UTextarea
-          v-model="runningTimeInfo.notes"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Projekt:"
-    >
-      <USelectMenu
-          :options="dataStore.projects"
-          option-attribute="name"
-          value-attribute="id"
-          v-model="runningTimeInfo.project"
-      >
-        <template #label>
-          {{ dataStore.projects.find(project => project.id === runningTimeInfo.project) ? dataStore.projects.find(project => project.id === runningTimeInfo.project).name : "Projekt auswählen" }}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-
-
-    <UFormGroup
-        label="Kategorie:"
-    >
-      <USelectMenu
-          v-model="runningTimeInfo.type"
-          :options="timeTypes"
-          option-attribute="label"
-          value-attribute="label"
-      >
-        <template #label>
-          {{runningTimeInfo.type ? runningTimeInfo.type : "Kategorie auswählen"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-  </div>
-
-  <UModal
-      v-model="showConfigTimeModal"
-  >
-    <UCard>
-      <template #header>
-        Projektzeit {{configTimeMode === 'create' ?  "erstellen" : "bearbeiten"}}
-      </template>
-      <UFormGroup
-          label="Start:"
-      >
-        <UPopover :popper="{ placement: 'bottom-start' }">
-          <UButton
-              icon="i-heroicons-calendar-days-20-solid"
-              :label="itemInfo.startDate ? dayjs(itemInfo.startDate).format('DD.MM.YYYY HH:mm') : 'Datum auswählen'"
-              variant="outline"
-          />
-
-          <template #panel="{ close }">
-            <LazyDatePicker v-model="itemInfo.startDate" @close="close" mode="dateTime" />
-          </template>
-        </UPopover>
-      </UFormGroup>
-      <UFormGroup
-          label="Ende:"
-      >
-        <UPopover :popper="{ placement: 'bottom-start' }">
-          <UButton
-              icon="i-heroicons-calendar-days-20-solid"
-              :label="itemInfo.endDate ? dayjs(itemInfo.endDate).format('DD.MM.YYYY HH:mm') : 'Datum auswählen'"
-              variant="outline"
-          />
-
-          <template #panel="{ close }">
-            <LazyDatePicker v-model="itemInfo.endDate" @close="close" mode="dateTime" />
-          </template>
-        </UPopover>
-      </UFormGroup>
-      <UFormGroup
-          label="Benutzer:"
-      >
-        <USelectMenu
-            :options="profileStore.profiles"
-            v-model="itemInfo.profile"
-            option-attribute="fullName"
-            value-attribute="id"
-        >
-          <template #label>
-            {{profileStore.profiles.find(profile => profile.id === itemInfo.profile) ? profileStore.profiles.find(profile => profile.id === itemInfo.profile).fullName : "Benutzer auswählen"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-      <UFormGroup
-          label="Projekt:"
-      >
-        <USelectMenu
-            :options="projects"
-            v-model="itemInfo.project"
-            option-attribute="name"
-            value-attribute="id"
-            searchable
-            searchable-placeholder="Suche..."
-            :search-attributes="['name']"
-        >
-          <template #label>
-            {{dataStore.projects.find(project => project.id === itemInfo.project) ? dataStore.projects.find(project => project.id === itemInfo.project).name : "Projekt auswählen"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-      <UFormGroup
-          label="Typ:"
-      >
-        <USelectMenu
-            v-model="itemInfo.type"
-            :options="timeTypes"
-            option-attribute="label"
-            value-attribute="label"
-        >
-          <template #label>
-            {{itemInfo.type ? itemInfo.type : "Kategorie auswählen"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-      <UFormGroup
-          label="Notizen:"
-      >
-        <UTextarea
-            v-model="itemInfo.notes"
-        />
-      </UFormGroup>
-
-
-      <template #footer>
-        <InputGroup>
-          <UButton
-              @click="createTime"
-              v-if="configTimeMode === 'create'"
-          >
-            Erstellen
-          </UButton>
-          <UButton
-              @click="updateTime"
-              v-else-if="configTimeMode === 'edit'"
-          >
-            Speichern
-          </UButton>
-          <UButton
-              @click="setState('Eingereicht')"
-              v-if="itemInfo.state === 'Entwurf'"
-          >
-            Einreichen
-          </UButton>
-        </InputGroup>
-
-      </template>
-    </UCard>
-  </UModal>
-
-  <UDashboardPanelContent class="w-full" v-if="platform === 'mobile'">
-    <a
-        v-for="item in filteredRows"
-        class="my-1"
-    >
-      <p class="truncate text-left text-primary text-xl">{{dayjs(item.startDate).format("DD.MM.YYYY HH:mm")}} - {{dayjs(item.endDate).format("HH:mm")}}</p>
-      <p class="text-sm">
-        <span v-for="(i,index) in getSecondInfo(item)">
-          {{i}}{{index < getSecondInfo(item).length - 1 ? " - " : ""}}
-        </span>
-
-      </p>
-    </a>
-  </UDashboardPanelContent>
-
-
-  <UTable
-      v-else
-      class="mt-3"
-      :columns="columns"
-      :rows="filteredRows"
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
-      @select="(row) => openTime(row)"
-  >
-    <template #state-data="{row}">
-                <span
-                    v-if="row.state === 'Entwurf'"
-                    class="text-rose-500"
-                >{{row.state}}</span>
-      <span
-          v-if="row.state === 'Eingereicht'"
-          class="text-cyan-500"
-      >{{row.state}}</span>
-      <span
-          v-if="row.state === 'Bestätigt'"
-          class="text-primary-500"
-      >{{row.state}}</span>
-    </template>
-    <template #user-data="{row}">
-      {{row.profile ? row.profile.fullName : "" }}
-    </template>
-
-    <template #startDate-data="{row}">
-      {{dayjs(row.startDate).format("DD.MM.YY HH:mm")}}
-    </template>
-    <template #endDate-data="{row}">
-      {{dayjs(row.endDate).format("DD.MM.YY HH:mm")}}
-    </template>
-    <template #project-data="{row}">
-      {{row.project ? row.project.name : "" }}
-    </template>
-  </UTable>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file