.gitea/ISSUE_TEMPLATE/feature_request.md aktualisiert

Reviewed-on: #62

.gitea/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,19 @@
+---
+name: 🐛 Bug Report
+about: Erstelle einen Bericht, um uns zu helfen, das Projekt zu verbessern.
+title: '[BUG] '
+labels: Problem
+assignees: ''
+
+---
+
+**Beschreibung**
+
+
+**Reproduktion**
+
+
+**Screenshots**
+
+
+**Achtung: Achte bitte auf Datenschutz deiner Daten sowie der Daten deiner Kunden. Sollten ein Screenshot nur mit Daten möglich sein, schwärze diese bitte vor dem Upload.**

.gitea/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: ✨ Feature Request
+about: Schlage eine Idee für dieses Projekt vor.
+title: '[FEATURE] '
+labels: Funktionswunsch
+assignees: ''
+
+---
+
+**Ist dein Feature-Wunsch mit einem Problem verbunden?**
+
+
+**Lösungsvorschlag**
+
+
+**Alternativen**
+

backend/db/schema/projects.ts

@@ -71,7 +71,7 @@ export const projects = pgTable("projects", {
     updatedAt: timestamp("updated_at", { withTimezone: true }),
     updatedBy: uuid("updated_by").references(() => authUsers.id),
 
-    active_phase: text("active_phase"),
+    active_phase: text("active_phase").default("Erstkontakt"),
 })
 
 export type Project = typeof projects.$inferSelect

backend/src/routes/resources/main.ts

@@ -461,10 +461,9 @@ export default async function resourceRoutes(server: FastifyInstance) {
             }
 
             Object.keys(createData).forEach((key) => {
-                if(key.toLowerCase().includes("date")) createData[key] = normalizeDate(createData[key])
+                if(key.toLowerCase().includes("date") && key !== "deliveryDateType") createData[key] = normalizeDate(createData[key])
             })
 
-
             const [created] = await server.db
                 .insert(table)
                 .values(createData)
@@ -513,8 +512,17 @@ export default async function resourceRoutes(server: FastifyInstance) {
 
             let data = {...body, updated_at: new Date().toISOString(), updated_by: userId}
 
+            //@ts-ignore
+            delete data.updatedBy
+            //@ts-ignore
+            delete data.updatedAt
+
+            console.log(data)
+
             Object.keys(data).forEach((key) => {
-                if(key.includes("_at") || key.includes("At")) {
+                console.log(key)
+
+                if(key.includes("_at") || key.includes("At") || key.toLowerCase().includes("date")) {
                     data[key] = normalizeDate(data[key])
                 }
             })

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
@@ -390,7 +388,9 @@ export default async function staffTimeRoutes(server: FastifyInstance) {
             const evaluatedUserId = targetUserId || actingUserId;
 
             const startDate = new Date(from);
-            const endDate = new Date(to);
+            let endDateQuery = new Date(to);
+            endDateQuery.setDate(endDateQuery.getDate() + 1);
+            const endDate = endDateQuery;
 
             if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
                 return reply.code(400).send({ error: "Ungültiges Datumsformat." });

backend/src/utils/resource.config.ts

@@ -57,6 +57,7 @@ export const resourceConfig = {
         table: contracts,
         searchColumns: ["name", "notes", "contractNumber", "paymentType", "sepaRef", "bankingName"],
         numberRangeHolder: "contractNumber",
+        mtoLoad: ["customer"],
     },
     plants: {
         table: plants,

frontend/Dockerfile

@@ -1,15 +1,31 @@
-FROM node:20-alpine
+# --- Stage 1: Build ---
+FROM node:20-alpine AS builder
 
-RUN mkdir -p /usr/src/nuxt-app
 WORKDIR /usr/src/nuxt-app
-COPY . .
 
-RUN npm i
+# Nur Files kopieren, die für die Installation nötig sind (besseres Caching)
+COPY package*.json ./
+RUN npm install
+
+# Restlichen Code kopieren und bauen
+COPY . .
 RUN npm run build
 
+# --- Stage 2: Runtime ---
+FROM node:20-alpine AS runner
+
+WORKDIR /usr/src/nuxt-app
+
+# Von der Build-Stage NUR den fertigen .output Ordner kopieren
+COPY --from=builder /usr/src/nuxt-app/.output ./.output
+
+# Optional: Falls du statische Dateien aus public brauchst, 
+# sind diese normalerweise bereits in .output/public enthalten.
+
 ENV NUXT_HOST=0.0.0.0
 ENV NUXT_PORT=3000
+ENV NODE_ENV=production
 
 EXPOSE 3000
 
-ENTRYPOINT ["node", ".output/server/index.mjs"]
+ENTRYPOINT ["node", ".output/server/index.mjs"]

frontend/components/DocumentDisplayModal.vue

@@ -55,7 +55,7 @@ const setup = async () => {
   })
 
   filetypes.value = await useEntities("filetags").select()
-  documentboxes.value = await useEntities("documentboxes").select()
+  //documentboxes.value = await useEntities("documentboxes").select()
 }
 
 setup()

frontend/components/LabelPrinterButton.vue

@@ -37,7 +37,7 @@ const handleClick = async () => {
 
   <UButton
       :icon="labelPrinter.connected ? 'i-heroicons-printer' : 'i-heroicons-printer'"
-      :color="labelPrinter.connected ? 'green' : 'gray'"
+      :color="labelPrinter.connected ? 'green' : ''"
       variant="soft"
       class="w-full justify-start"
       :loading="labelPrinter.connectLoading"

frontend/components/MainNav.vue

@@ -152,7 +152,7 @@ const links = computed(() => {
       icon: "i-heroicons-user-group",
       children: [
         ... true ? [{
-          label: "Anwesenheiten",
+          label: "Zeiten",
           to: "/staff/time",
           icon: "i-heroicons-clock",
         }] : [],

frontend/components/PageLeaveGuard.vue

@@ -2,22 +2,19 @@
 import { ref, onMounted, onBeforeUnmount } from 'vue'
 import { onBeforeRouteLeave } from 'vue-router'
 
-// Wir erwarten eine Prop, die sagt, ob geschützt werden soll
 const props = defineProps<{
-  when: boolean // z.B. true, wenn Formular dirty ist
+  when: boolean
 }>()
 
 const showModal = ref(false)
 const pendingNext = ref<null | ((val?: boolean) => void)>(null)
 
-// --- 1. Interne Navigation (Nuxt) ---
+// --- 1. Interne Navigation ---
 onBeforeRouteLeave((to, from, next) => {
   if (!props.when) {
     next()
     return
   }
-
-  // Navigation pausieren & Modal zeigen
   pendingNext.value = next
   showModal.value = true
 })
@@ -29,10 +26,10 @@ const confirmLeave = () => {
 
 const cancelLeave = () => {
   showModal.value = false
-  // Navigation wird implizit abgebrochen
+  // Navigation abbrechen (pendingNext verfällt)
 }
 
-// --- 2. Externe Navigation (Browser Tab schließen) ---
+// --- 2. Browser Tab schließen ---
 const handleBeforeUnload = (e: BeforeUnloadEvent) => {
   if (props.when) {
     e.preventDefault()
@@ -50,12 +47,12 @@ onBeforeUnmount(() => window.removeEventListener('beforeunload', handleBeforeUnl
       <div class="guard-modal">
 
         <div class="guard-header">
-          <slot name="title">Seite wirklich verlassen?</slot>
+          <slot name="title">Seite verlassen?</slot>
         </div>
 
         <div class="guard-body">
           <slot>
-            Du hast ungespeicherte Änderungen. Diese gehen verloren, wenn du die Seite verlässt.
+            Du hast ungespeicherte Änderungen. Wenn du die Seite verlässt, gehen diese verloren.
           </slot>
         </div>
 
@@ -64,7 +61,7 @@ onBeforeUnmount(() => window.removeEventListener('beforeunload', handleBeforeUnl
             Nein, bleiben
           </button>
           <button @click="confirmLeave" class="btn-confirm">
-            Ja, verlassen
+            Ja, verwerfen
           </button>
         </div>
 
@@ -74,25 +71,65 @@ onBeforeUnmount(() => window.removeEventListener('beforeunload', handleBeforeUnl
 </template>
 
 <style scoped>
-/* Basis-Styling - passe dies an dein Design System an */
+/* --- Layout & Animation --- */
 .guard-overlay {
-  position: fixed; inset: 0; background: rgba(0,0,0,0.6);
+  position: fixed; inset: 0;
+  background: rgba(0,0,0,0.5);
   display: flex; align-items: center; justify-content: center;
-  z-index: 9999; backdrop-filter: blur(2px);
+  z-index: 9999; backdrop-filter: blur(4px);
+  transition: opacity 0.2s;
 }
-.guard-modal {
-  background: white; padding: 24px; border-radius: 12px;
-  width: 90%; max-width: 400px; box-shadow: 0 10px 25px rgba(0,0,0,0.2);
-  font-family: sans-serif;
-}
-.guard-header { font-size: 1.25rem; font-weight: bold; margin-bottom: 1rem; }
-.guard-body { margin-bottom: 1.5rem; color: #4a5568; }
-.guard-actions { display: flex; justify-content: flex-end; gap: 12px; }
 
-/* Buttons */
-button { padding: 8px 16px; border-radius: 6px; cursor: pointer; border: none; font-weight: 600;}
-.btn-cancel { background: #edf2f7; color: #2d3748; }
-.btn-cancel:hover { background: #e2e8f0; }
-.btn-confirm { background: #e53e3e; color: white; }
-.btn-confirm:hover { background: #c53030; }
+.guard-modal {
+  width: 90%; max-width: 420px;
+  border-radius: 12px;
+  padding: 24px;
+  box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
+  font-family: ui-sans-serif, system-ui, -apple-system, sans-serif;
+}
+
+.guard-header {
+  font-size: 1.125rem; font-weight: 600; margin-bottom: 0.75rem;
+}
+
+.guard-body {
+  margin-bottom: 1.5rem; font-size: 0.95rem; line-height: 1.5;
+}
+
+.guard-actions {
+  display: flex; justify-content: flex-end; gap: 12px;
+}
+
+/* --- Buttons Basis --- */
+button {
+  padding: 8px 16px; border-radius: 6px; cursor: pointer; border: none; font-weight: 500; font-size: 0.9rem;
+  transition: background-color 0.2s;
+}
+
+/* --------------------------------------------------------- */
+/* LIGHT MODE (Default) */
+/* --------------------------------------------------------- */
+.guard-modal {
+  background: white;
+  color: #1f2937; /* gray-800 */
+}
+
+.guard-body {
+  color: #4b5563; /* gray-600 */
+}
+
+.btn-cancel {
+  background: #f3f4f6; /* gray-100 */
+  color: #374151;      /* gray-700 */
+}
+.btn-cancel:hover { background: #e5e7eb; }
+
+.btn-confirm {
+  background: #ef4444; /* red-500 */
+  color: white;
+}
+.btn-confirm:hover { background: #dc2626; }
+
+
+
 </style>

frontend/components/PublicDynamicForm.vue

@@ -159,7 +159,16 @@ const submit = async () => {
               @input="e => form.startDate = new Date(e.target.value)"
           />
         </UFormGroup>
-        <UFormGroup label="Ende">
+        <UFormGroup label="Dauer (Stunden)">
+          <input
+              type="number"
+              step="0.25"
+              placeholder="z.B. 1.5"
+              class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-primary-600 sm:text-sm sm:leading-6 px-2"
+              @input="e => form.endDate = dayjs(form.startDate).add(parseFloat(e.target.value), 'hour').toDate()"
+          />
+        </UFormGroup>
+        <UFormGroup label="Ende" class="col-span-2">
           <input
               type="datetime-local"
               class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-primary-600 sm:text-sm sm:leading-6 px-2"

frontend/components/StaffTimeEntryModal.vue

@@ -103,7 +103,8 @@ async function onSubmit(event: FormSubmitEvent<any>) {
         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' })

frontend/components/displayOpenBalances.vue

@@ -42,9 +42,7 @@ const setupPage = async () => {
   })
   draftInvoicesCount.value = draftDocuments.length
 
-  countPreparedOpenIncomingInvoices.value = (await useEntities("incominginvoices").select("id, state")).filter(i => i.state === "Vorbereitet").length
-
-
+  countPreparedOpenIncomingInvoices.value = (await useEntities("incominginvoices").select("id, state")).filter(i => i.state === "Vorbereitet" && !i.archived).length
 }
 
 setupPage()
@@ -78,10 +76,10 @@ setupPage()
       <td v-else class="text-primary-500 font-bold text-no-wrap">0 Stk / 0,00€</td>
     </tr>
     <tr>
-      <td class="break-all">ToDo Eingangsrechnungsrechnungen:</td>
+      <td class="break-all">Vorbereitete Eingangsrechnungen:</td>
       <td
           v-if="countPreparedOpenIncomingInvoices > 0"
-          class="text-orange-500 font-bold text-nowrap"
+          class="text-orange-500 font-bold text-wrap"
       >{{countPreparedOpenIncomingInvoices}} Stk </td>
       <td v-else class="text-primary-500 font-bold text-no-wrap">0 Stk</td>
     </tr>

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,
                 }
             })
         }

frontend/layouts/default.vue

@@ -236,11 +236,17 @@ const footerLinks = [
           <template #footer>
             <div class="flex flex-col gap-3 w-full">
 
+
+              <UColorModeButton />
               <LabelPrinterButton/>
 
+
+
               <!-- Footer Links -->
               <UDashboardSidebarLinks :links="footerLinks" />
 
+
+
               <UDivider class="sticky bottom-0" />
               <UserDropdown style="margin-bottom: env(safe-area-inset-bottom, 10px) !important;"/>
             </div>

frontend/pages/createDocument/edit/[[id]].vue

@@ -204,7 +204,8 @@ const setupPage = async () => {
           processDieselPosition()
         }
 
-      } else if (route.query.loadMode === "finalInvoice") {
+      }
+      else if (route.query.loadMode === "finalInvoice") {
         let linkedDocuments = (await useEntities("createddocuments").select()).filter(i => JSON.parse(route.query.linkedDocuments).includes(i.id))
 
         //TODO: Implement Checking for Same Customer, Contact and Project
@@ -355,6 +356,8 @@ const setupPage = async () => {
 
       }
 
+      await setCustomerData(null, true)
+
 
     }
 
@@ -459,7 +462,11 @@ const setCustomerData = async (customerId, loadOnlyAdress = false) => {
 
   let customer = customers.value.find(i => i.id === itemInfo.value.customer)
   console.log(customer)
-  itemInfo.value.contact = null
+  if(!loadOnlyAdress) {
+    itemInfo.value.contact = null
+  }
+
+
   if (customer) {
     itemInfo.value.address.street = customer.infoData.street
     itemInfo.value.address.zip = customer.infoData.zip
@@ -1824,7 +1831,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
               >
                 <InputGroup>
                   <USelectMenu
-                      :options="contacts.filter(i => i.customer === itemInfo.customer)"
+                      :options="contacts.filter(i => i.customer?.id === itemInfo.customer)"
                       option-attribute="fullName"
                       value-attribute="id"
                       :search-attributes="['name']"
@@ -2057,7 +2064,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
               >
                 <InputGroup>
                   <USelectMenu
-                      :options="plants.filter(i => i.customer === itemInfo.customer)"
+                      :options="plants.filter(i => i.customer?.id === itemInfo.customer)"
                       v-model="itemInfo.plant"
                       value-attribute="id"
                       option-attribute="name"
@@ -2095,7 +2102,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
               >
                 <InputGroup>
                   <USelectMenu
-                      :options="projects.filter(i => i.customer === itemInfo.customer && (itemInfo.plant ? itemInfo.plant === i.plant : true))"
+                      :options="projects.filter(i => i.customer?.id === itemInfo.customer && (itemInfo.plant ? itemInfo.plant === i.plant : true))"
                       v-model="itemInfo.project"
                       value-attribute="id"
                       option-attribute="name"
@@ -2134,7 +2141,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
               >
                 <InputGroup>
                   <USelectMenu
-                      :options="contracts.filter(i => i.customer === itemInfo.customer && (itemInfo.plant ? itemInfo.plant === i.plant : true))"
+                      :options="contracts.filter(i => i.customer?.id === itemInfo.customer && (itemInfo.plant ? itemInfo.plant === i.plant : true))"
                       v-model="itemInfo.contract"
                       value-attribute="id"
                       option-attribute="name"

frontend/pages/createDocument/show/[id].vue

@@ -81,7 +81,7 @@ const openBankstatements = () => {
         E-Mail
       </UButton>
       <UButton
-          @click="router.push(`/createDocument/edit/?linkedDocument=${itemInfo.id}&loadMode=storno`)"
+          @click="router.push(`/createDocument/edit/?createddocument=${itemInfo.id}&loadMode=storno`)"
           variant="outline"
           color="rose"
           v-if="itemInfo.type === 'invoices' || itemInfo.type === 'advanceInvoices'"

frontend/pages/incomingInvoices/[mode]/[id].vue

@@ -147,7 +147,7 @@ const updateIncomingInvoice = async (setBooked = false) => {
   } else {
     item.state = "Entwurf"
   }
-  const data = await useEntities('incominginvoices').update(itemInfo.value.id,item)
+  const data = await useEntities('incominginvoices').update(itemInfo.value.id,item,true)
 }
 
 const findIncomingInvoiceErrors = computed(() => {

frontend/pages/staff/time/[id]/evaluate.vue

@@ -119,8 +119,8 @@ async function loadWorkingTimeInfo() {
 
   // Erstellt Query-Parameter für den neuen Backend-Endpunkt
   const queryParams = new URLSearchParams({
-    from: selectedStartDay.value,
-    to: selectedEndDay.value,
+    from: $dayjs(selectedStartDay.value).format("YYYY-MM-DD"),
+    to: $dayjs(selectedEndDay.value).format("YYYY-MM-DD"),
     targetUserId: evaluatedUserId.value,
   });
 

frontend/plugins/api.ts

@@ -1,31 +1,86 @@
 
 export default defineNuxtPlugin(() => {
     const config = useRuntimeConfig()
+    const toast = useToast()
 
     const api = $fetch.create({
         baseURL: config.public.apiBase,
         credentials: "include",
-        async onRequest({options}) {
-            // Token aus Cookie holen
-            let token: string | null | undefined = ""
 
-            token = useCookie("token").value
+        async onRequest({ options }) {
+            const token = useCookie("token").value
 
-
-
-            // Falls im Request explizit ein anderer JWT übergeben wird → diesen verwenden
-            if (options.context && (options.context as any).jwt) {
-                token = (options.context as any).jwt
-            }
-
-            if (token) {
+            // Falls im Request explizit ein anderer JWT übergeben wird
+            if (options.context?.jwt) {
+                options.headers = {
+                    ...options.headers,
+                    Authorization: `Bearer ${options.context.jwt}`,
+                }
+            } else if (token) {
                 options.headers = {
                     ...options.headers,
                     Authorization: `Bearer ${token}`,
                 }
             }
+        },
+
+        async onRequestError({error}) {
+            toast.add({
+                title: "Fehler",
+                description: "Eine Anfrage konnte nicht ausgeführt werden.",
+                color: 'red',
+                icon: 'i-heroicons-exclamation-triangle-20-solid',
+                timeout: 5000 // Bleibt 5 Sekunden sichtbar
+            })
+        },
+
+        async onResponseError({ response }) {
+            // Toasts nur im Client anzeigen
+            console.log(response)
+            if (!process.client) return
+
+            const status = response.status
+            let title = "Fehler"
+            let description = "Ein unerwarteter Fehler ist aufgetreten."
+
+            switch (status) {
+                case 400:
+                    title = "Anfrage fehlerhaft"
+                    description = "Die Daten konnten nicht korrekt verarbeitet werden."
+                    break
+                case 401:
+                    title = "Nicht angemeldet"
+                    description = "Deine Sitzung ist abgelaufen oder ungültig."
+                    // Optional: useCookie('token').value = null
+                    break
+                case 403:
+                    title = "Zugriff verweigert"
+                    description = "Du hast keine Berechtigung für diesen Bereich."
+                    break
+                case 404:
+                    title = "Nicht gefunden"
+                    description = "Die gesuchte Ressource wurde nicht gefunden."
+                    break
+                case 500:
+                    title = "Server-Fehler"
+                    description = "Internes Problem. Bitte versuche es später erneut."
+                    break
+            }
+
+            // Nuxt UI Toast Notification
+            toast.add({
+                title: title,
+                description: description,
+                color: 'red',
+                icon: 'i-heroicons-exclamation-triangle-20-solid',
+                timeout: 5000 // Bleibt 5 Sekunden sichtbar
+            })
         }
     })
 
-    return { provide: { api } }
+    return {
+        provide: {
+            api
+        }
+    }
 })

frontend/stores/data.js

@@ -2499,8 +2499,8 @@ export const useDataStore = defineStore('data', () => {
                     component: vehicle,
                     inputType: "select",
                     selectDataType: "vehicles",
-                    selectOptionAttribute: "licensePlate",
-                    selectSearchAttributes: ['licensePlate'],
+                    selectOptionAttribute: "license_plate",
+                    selectSearchAttributes: ['license_plate','vin'],
                 },
                 {
                     key: "inventoryitem",