bump

ADD zurück button auf firmen admin eintrag seite
FIX delete buchung call
2026-05-06 11:21:11 +02:00 · 2026-05-06 11:16:26 +02:00 · 2026-05-06 11:14:38 +02:00 · 2026-05-06 11:05:34 +02:00 · 2026-05-06 11:04:45 +02:00 · 2026-04-28 14:38:51 +02:00
9 changed files with 341 additions and 85 deletions
--- a/backend/src/main/java/de/strichliste/dto/TallyEntryDto.java
+++ b/backend/src/main/java/de/strichliste/dto/TallyEntryDto.java
@@ -0,0 +1,13 @@
+package de.strichliste.dto;
+
+import java.time.LocalDateTime;
+
+public record TallyEntryDto(
+        Long id,
+        Long employeeId,
+        String employeeFirstName,
+        String employeeLastName,
+        String productName,
+        int priceCents,
+        LocalDateTime createdAt
+) {}
--- a/backend/src/main/java/de/strichliste/resource/CompanyAdminResource.java
+++ b/backend/src/main/java/de/strichliste/resource/CompanyAdminResource.java
@@ -187,6 +187,53 @@ public class CompanyAdminResource {
        return Response.ok(line).build();
    }

+    @GET
+    @Path("/entries")
+    public Response getTallyEntries(@QueryParam("token") String token, @QueryParam("month") String month) {
+        AccessLink link = AccessLink.findByToken(token).orElse(null);
+        if (link == null || link.company == null) {
+            return Response.status(Response.Status.FORBIDDEN).build();
+        }
+
+        String monthKey = month != null ? month : LocalDateTime.now().format(MONTH_FORMAT);
+
+        List<TallyEntry> entries = TallyEntry.find(
+                "SELECT t FROM TallyEntry t JOIN FETCH t.employee JOIN FETCH t.product " +
+                "WHERE t.employee.company.id = ?1 AND t.monthKey = ?2 ORDER BY t.createdAt DESC",
+                link.company.id, monthKey).list();
+
+        List<TallyEntryDto> dtos = entries.stream()
+                .map(t -> new TallyEntryDto(
+                        t.id,
+                        t.employee.id,
+                        t.employee.firstName,
+                        t.employee.lastName,
+                        t.product.name,
+                        t.priceCentsAtBooking,
+                        t.createdAt))
+                .toList();
+
+        return Response.ok(dtos).build();
+    }
+
+    @DELETE
+    @Path("/entries/{id}")
+    @Transactional
+    public Response deleteTallyEntry(@QueryParam("token") String token, @PathParam("id") Long id) {
+        AccessLink link = AccessLink.findByToken(token).orElse(null);
+        if (link == null || link.company == null) {
+            return Response.status(Response.Status.FORBIDDEN).build();
+        }
+
+        TallyEntry entry = TallyEntry.findById(id);
+        if (entry == null || !entry.employee.company.id.equals(link.company.id)) {
+            return Response.status(Response.Status.NOT_FOUND).build();
+        }
+
+        entry.delete();
+        return Response.noContent().build();
+    }
+
    static MonthlyReportDto buildCompanyReport(Long companyId, String monthKey) {
        Company company = Company.findById(companyId);
        List<Employee> employees = Employee.findAllByCompany(companyId);
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -4,6 +4,11 @@ quarkus.datasource.username=strichliste
 quarkus.datasource.password=strichliste
 quarkus.datasource.jdbc.url=jdbc:mariadb://localhost:3306/strichliste

+# Agroal connection pool – evict stale connections after a DB restart
+quarkus.datasource.jdbc.background-validation-interval=30S
+quarkus.datasource.jdbc.idle-removal-interval=5M
+quarkus.datasource.jdbc.max-lifetime=10M
+
 # Hibernate
 quarkus.hibernate-orm.database.generation=none

--- a/build.sh
+++ b/build.sh
@@ -1,35 +1,44 @@
-#set -euo pipefail
-set -u
+#!/bin/bash

 # ---------------------------------------------------------------------------
-# build.sh – Build and push Docker images for Strichliste
+# build.sh – Build and push Docker images
 #
 # Usage:
 #   ./build.sh [OPTIONS]
 #
 # Options:
-#   -v, --version VERSION     Image tag / version  (default: git short SHA)
-#   -r, --registry REGISTRY   Registry prefix       (default: "")
+#   -s, --snapshot            Version from git ref for prototyping
+#   -r, --release             Version from .env for releases
+#   -v, --version VERSION     Custom version
 #   -p, --push                Push images after build
-#   --backend-only            Only build backend
-#   --frontend-only           Only build frontend
+#   -o, --only SERVICE        Only build this service (repeatable)
 #   -h, --help                Show this help
 #
 # Examples:
-#   ./build.sh -v 1.2.3 -r ghcr.io/aquantico --push
-#   ./build.sh --version latest --registry registry.example.com --push
-#   ./build.sh -v dev                          # build only, no push
+#   ./build.sh -r -p
+#   ./build.sh -s -o frontend
+#   ./build.sh -v dev -o backend -o frontend
 # ---------------------------------------------------------------------------

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source ".env"
+# -e: Exit immediately if any command returns a non-zero exit code
+# -u: Treat unset variables as errors
+# -o pipefail: Make pipelines fail if any command in the pipe fails, not just the last one
+set -euo pipefail

-#default: snapshot
-VERSION=$(git rev-parse --short HEAD 2>/dev/null || echo "local")
+#cd to script dir
+pushd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null
+SCRIPT_DIR="$(pwd)"
+source "${SCRIPT_DIR}/.env"
+# read from .env: 
+#   REGISTRY, IMAGE_NAME, IMAGE_VERSION, SNAPSHOT_TAG
+#   SERVICES (subfolder name = image suffix)
+popd > /dev/null
+
+#default: build snapshot
+VERSION="${IMAGE_VERSION}-${SNAPSHOT_TAG}" # read from .env

 PUSH=false
-BUILD_BACKEND=true
-BUILD_FRONTEND=true
+ONLY=()

 usage() {
  sed -n '/^# Usage:/,/^# ---/p' "$0" | sed 's/^# //' | sed 's/^#//'
@@ -39,69 +48,54 @@ usage() {
 # --- parse arguments -------------------------------------------------------
 while [[ $# -gt 0 ]]; do
  case $1 in
-    -s|--snapshot)   VERSION=$(git rev-parse --short HEAD 2>/dev/null || echo "local"); shift ;;
-    -r|--release)    VERSION=${IMAGE_TAG}; shift ;;
-    -v|--version)    VERSION=$2; shift 2 ;;
-    -p|--push)       PUSH=true; shift ;;
-    -b|--backend-only)  BUILD_FRONTEND=false; shift ;;
-    -f|--frontend-only) BUILD_BACKEND=false; shift ;;
-    -h|--help)       usage ;;
+    -s|--snapshot)  VERSION="${IMAGE_TAG}-SNAPSHOT$(git rev-parse --short HEAD 2>/dev/null || echo "local")"; shift ;;
+    -r|--release)   VERSION="${IMAGE_TAG}"; shift ;;
+    -v|--version)   VERSION="$2"; shift 2 ;;
+    -p|--push)      PUSH=true; shift ;;
+    -o|--only)      ONLY+=("$2"); shift 2 ;;
+    -h|--help)      usage ;;
    *) echo "Unknown option: $1" >&2; exit 1 ;;
  esac
 done

-# --- derive image names -----------------------------------------------------
-registry_prefix="${REGISTRY}/"
-BACKEND_IMAGE="${registry_prefix}${IMAGE_NAME}-backend:${VERSION}"
-FRONTEND_IMAGE="${registry_prefix}${IMAGE_NAME}-frontend:${VERSION}"
-
-#SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# if --only was given, filter SERVICES down to those entries
+if [[ ${#ONLY[@]} -gt 0 ]]; then
+  SERVICES=("${ONLY[@]}")
+fi

 echo "============================================"
-echo "  ${IMAGE_NAME} - Docker Build"
+echo "  Docker Build - ${IMAGE_NAME}"
+echo ""
+echo "  Services : ${SERVICES[*]}"
 echo "  Version  : ${VERSION}"
 echo "  Registry : ${REGISTRY}"
 echo "  Push     : ${PUSH}"
 echo "============================================"

 # --- build ------------------------------------------------------------------
-if $BUILD_BACKEND; then
+for SERVICE in "${SERVICES[@]}"; do
+  IMAGE="${REGISTRY}/${IMAGE_NAME}-${SERVICE}:${VERSION}"
  echo ""
-  echo ">>> Building backend: ${BACKEND_IMAGE}"
-  docker build \
-    --tag "${BACKEND_IMAGE}" \
-    "${SCRIPT_DIR}/backend"
-  echo "    Backend built successfully."
-fi
-
-if $BUILD_FRONTEND; then
-  echo ""
-  echo ">>> Building frontend: ${FRONTEND_IMAGE}"
-  docker build \
-    --tag "${FRONTEND_IMAGE}" \
-    "${SCRIPT_DIR}/frontend"
-  echo "    Frontend built successfully."
-fi
+  echo ">>> Building ${SERVICE}: ${IMAGE}"
+  docker build --tag "${IMAGE}" "${SCRIPT_DIR}/${SERVICE}"
+  echo "    ${SERVICE} built successfully."
+done

 # --- push -------------------------------------------------------------------
 if $PUSH; then
-  docker login ${REGISTRY}
-
-  if $BUILD_BACKEND; then
+  docker login "${REGISTRY}" # read from .env
+  for SERVICE in "${SERVICES[@]}"; do
+    IMAGE="${REGISTRY}/${IMAGE_NAME}-${SERVICE}:${VERSION}"
    echo ""
-    echo ">>> Pushing ${BACKEND_IMAGE}"
-    docker push "${BACKEND_IMAGE}"
-  fi
-  if $BUILD_FRONTEND; then
-    echo ""
-    echo ">>> Pushing ${FRONTEND_IMAGE}"
-    docker push "${FRONTEND_IMAGE}"
-  fi
+    echo ">>> Pushing ${IMAGE}"
+    docker push "${IMAGE}"
+  done
  echo ""
  echo "Images pushed successfully."
 fi

 echo ""
 echo "Done."
-if $BUILD_BACKEND;  then echo "  Backend  → ${BACKEND_IMAGE}"; fi
-if $BUILD_FRONTEND; then echo "  Frontend → ${FRONTEND_IMAGE}"; fi
+for SERVICE in "${SERVICES[@]}"; do
+  echo "  ${SERVICE} → ${REGISTRY}/${IMAGE_NAME}-${SERVICE}:${VERSION}"
+done
--- a/db/backup.sh
+++ b/db/backup.sh
@@ -8,7 +8,7 @@ while true; do
    FILENAME="${BACKUP_DIR}/strichliste_${TIMESTAMP}.sql.gz"

    echo "[$(date)] Starting backup..."
-    mariadb-dump -h db -u strichliste -pstrichliste strichliste | gzip > "${FILENAME}"
+    mariadb-dump -h db -u strichliste -pstrichliste --single-transaction --skip-lock-tables strichliste | gzip > "${FILENAME}"

    if [ $? -eq 0 ]; then
        echo "[$(date)] Backup saved: ${FILENAME}"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,50 +1,73 @@
+version: "3"
+volumes:
+  db-data:
 services:
  db:
-    image: mariadb:11.4
+    image: mariadb:11.4.4
+    container_name: qaffee-db
+    restart: always
+    command: --log-warnings=3
    environment:
-      MARIADB_ROOT_PASSWORD: rootpassword
-      MARIADB_DATABASE: strichliste
-      MARIADB_USER: strichliste
-      MARIADB_PASSWORD: strichliste
-    ports:
-      - "3306:3306"
+      - "MARIADB_ROOT_PASSWORD=rootpassword"
+      - "MARIADB_DATABASE=strichliste"
+      - "MARIADB_USER=strichliste"
+      - "MARIADB_PASSWORD=strichliste"
    volumes:
      - db-data:/var/lib/mysql
-      - ./db/seed.sql:/docker-entrypoint-initdb.d/seed.sql
    healthcheck:
      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
      interval: 10s
      timeout: 5s
      retries: 5
-
+    networks:
+      - traefik-net
  backend:
    build: ./backend
+    container_name: qaffee-backend
    environment:
-      QUARKUS_DATASOURCE_JDBC_URL: jdbc:mariadb://db:3306/strichliste
-      QUARKUS_DATASOURCE_USERNAME: strichliste
-      QUARKUS_DATASOURCE_PASSWORD: strichliste
-      QUARKUS_HTTP_CORS_ORIGINS: http://localhost:5173,http://localhost:4173
-    ports:
-      - "8080:8080"
+      - "QUARKUS_DATASOURCE_JDBC_URL=jdbc:mariadb://db:3306/strichliste"
+      - "QUARKUS_DATASOURCE_USERNAME=strichliste"
+      - "QUARKUS_DATASOURCE_PASSWORD=strichliste"
+      - "QUARKUS_HTTP_CORS_ORIGINS=https://qaffee.cloud.aquantico.de"
+    labels:
+      traefik.enable: "true"
+      traefik.docker.network: "traefik-net"
+      traefik.http.routers.qaffee-backend.entrypoints: "websecure"
+      traefik.http.routers.qaffee-backend.rule: "Host(`qaffee-api.cloud.aquantico.de`)"
+      traefik.http.routers.qaffee-backend.tls: "true"
+      traefik.http.routers.qaffee-backend.tls.certresolver: "myresolver"
+      traefik.http.services.qaffee-backend.loadbalancer.server.port: 8080
    depends_on:
      db:
        condition: service_healthy
-
+    networks:
+      - traefik-net
  frontend:
    build: ./frontend
+    container_name: qaffee-frontend
    environment:
-      API_URL: http://backend:8080
+      - "API_URL=http://backend:8080"
    ports:
      - "3000:3000"
+    labels:
+      traefik.enable: "true"
+      traefik.docker.network: "traefik-net"
+      traefik.http.routers.qaffee-frontend.entrypoints: "websecure"
+      traefik.http.routers.qaffee-frontend.rule: "Host(`qaffee.cloud.aquantico.de`)"
+      traefik.http.routers.qaffee-frontend.tls: "true"
+      traefik.http.routers.qaffee-frontend.tls.certresolver: "myresolver"
+      traefik.http.services.qaffee-frontend.loadbalancer.server.port: 3000
    depends_on:
      - backend
-
+    networks:
+      - traefik-net
  backup:
    image: mariadb:11.4.4
+    container_name: qaffee-backup
    environment:
-      MARIADB_HOST: db
-      MARIADB_USER: strichliste
-      MARIADB_PASSWORD: strichliste
+      - "MARIADB_HOST=db"
+      - "MARIADB_USER=strichliste"
+      - "MARIADB_PASSWORD=strichliste"
    volumes:
      - ./backups:/backups
      - ./db/backup.sh:/backup.sh
@@ -52,6 +75,8 @@ services:
    depends_on:
      db:
        condition: service_healthy
-
-volumes:
-  db-data:
+    networks:
+      - traefik-net
+networks:
+  traefik-net:
+    external: false
--- a/frontend/src/lib/api/client.ts
+++ b/frontend/src/lib/api/client.ts
@@ -44,6 +44,16 @@ export interface MonthlyTally {
 	totalCents: number;
 }

+export interface TallyEntry {
+	id: number;
+	employeeId: number;
+	employeeFirstName: string;
+	employeeLastName: string;
+	productName: string;
+	priceCents: number;
+	createdAt: string;
+}
+
 export interface EmployeeReportLine {
 	employeeId: number;
 	firstName: string;
@@ -119,7 +129,11 @@ export const api = {
 		getReport: (token: string, month?: string) =>
 			request<MonthlyReport>(`/admin/company/report?token=${token}${month ? `&month=${month}` : ''}`),
 		getEmployeeReport: (token: string, employeeId: number, month?: string) =>
-			request<EmployeeReportLine>(`/admin/company/report/employee/${employeeId}?token=${token}${month ? `&month=${month}` : ''}`)
+			request<EmployeeReportLine>(`/admin/company/report/employee/${employeeId}?token=${token}${month ? `&month=${month}` : ''}`),
+		getTallyEntries: (token: string, month?: string) =>
+			request<TallyEntry[]>(`/admin/company/entries?token=${token}${month ? `&month=${month}` : ''}`),
+		deleteTallyEntry: (token: string, id: number) =>
+			request<void>(`/admin/company/entries/${id}?token=${token}`, { method: 'DELETE' })
 	},

 	// --- Provider Admin ---
--- a/frontend/src/routes/admin/company/+page.svelte
+++ b/frontend/src/routes/admin/company/+page.svelte
@@ -179,6 +179,17 @@
 			</table>
 		</section>

+		<!-- Einträge verwalten -->
+		<section style="margin-bottom: 40px;">
+			<h2 style="margin-bottom: 12px;">Einträge verwalten</h2>
+			<p style="color: var(--color-text-muted); margin-bottom: 12px; font-size: 0.9rem;">
+				Einzelne Produktbuchungen einsehen und bei Bedarf löschen.
+			</p>
+			<a class="btn btn-secondary" href="/admin/company/entries?token={token}">
+				Einträge anzeigen &amp; löschen
+			</a>
+		</section>
+
 		<!-- Monatsauswertung -->
 		<section>
 			<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px;">
--- a/frontend/src/routes/admin/company/entries/+page.svelte
+++ b/frontend/src/routes/admin/company/entries/+page.svelte
@@ -0,0 +1,147 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { page } from '$app/stores';
+	import { api, type TallyEntry } from '$lib/api/client';
+	import Header from '$lib/components/Header.svelte';
+	import MonthPicker from '$lib/components/MonthPicker.svelte';
+
+	let token = '';
+	let entries: TallyEntry[] = [];
+	let loading = true;
+	let selectedMonth = new Date().toISOString().slice(0, 7);
+	let deletingId: number | null = null;
+	let confirmId: number | null = null;
+
+	$: token = $page.url.searchParams.get('token') ?? '';
+
+	onMount(async () => {
+		if (!token) return;
+		await loadEntries();
+	});
+
+	async function loadEntries() {
+		loading = true;
+		entries = await api.companyAdmin.getTallyEntries(token, selectedMonth);
+		loading = false;
+	}
+
+	async function changeMonth(e: CustomEvent<string>) {
+		selectedMonth = e.detail;
+		await loadEntries();
+	}
+
+	function askConfirm(id: number) {
+		confirmId = id;
+	}
+
+	async function confirmDelete() {
+		if (confirmId === null) return;
+		const idToDelete = confirmId;
+		deletingId = idToDelete;
+		confirmId = null;
+		await api.companyAdmin.deleteTallyEntry(token, idToDelete);
+		deletingId = null;
+		await loadEntries();
+	}
+
+	function formatPrice(cents: number): string {
+		return (cents / 100).toFixed(2).replace('.', ',') + ' €';
+	}
+
+	function formatDateTime(iso: string): string {
+		const d = new Date(iso);
+		return d.toLocaleDateString('de-DE') + ' ' + d.toLocaleTimeString('de-DE', { hour: '2-digit', minute: '2-digit' });
+	}
+</script>
+
+<svelte:head>
+	<title>Einträge löschen – Qaffee</title>
+</svelte:head>
+
+<Header title="Einträge verwalten" backHref="/admin/company?token={token}" />
+
+<div class="admin-container">
+	{#if !token}
+		<p>Kein Zugangstoken angegeben.</p>
+	{:else}
+		<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 24px;">
+			<h2>Produkteinträge</h2>
+			<MonthPicker bind:value={selectedMonth} on:change={changeMonth} />
+		</div>
+
+		{#if loading}
+			<p>Laden...</p>
+		{:else if entries.length === 0}
+			<p style="color: var(--color-text-muted); text-align: center; margin-top: 40px;">
+				Keine Einträge in diesem Monat.
+			</p>
+		{:else}
+			<p style="color: var(--color-text-muted); margin-bottom: 12px; font-size: 0.9rem;">
+				{entries.length} Einträge · {formatPrice(entries.reduce((s, e) => s + e.priceCents, 0))} gesamt
+			</p>
+			<table class="admin-table">
+				<thead>
+					<tr>
+						<th>Zeitpunkt</th>
+						<th>Mitarbeiter</th>
+						<th>Produkt</th>
+						<th style="text-align: right;">Preis</th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
+					{#each entries as entry}
+						<tr>
+							<td style="color: var(--color-text-muted); font-size: 0.85rem; white-space: nowrap;">
+								{formatDateTime(entry.createdAt)}
+							</td>
+							<td>{entry.employeeFirstName} {entry.employeeLastName}</td>
+							<td>{entry.productName}</td>
+							<td style="text-align: right;" class="price">{formatPrice(entry.priceCents)}</td>
+							<td>
+								{#if deletingId === entry.id}
+									<span style="font-size: 0.85rem; color: var(--color-text-muted);">Löschen...</span>
+								{:else}
+									<button
+										class="btn btn-secondary"
+										style="padding: 5px 10px; font-size: 0.8rem; color: #e05555; border-color: #e05555;"
+										on:click={() => askConfirm(entry.id)}
+									>
+										Löschen
+									</button>
+								{/if}
+							</td>
+						</tr>
+					{/each}
+				</tbody>
+			</table>
+		{/if}
+	{/if}
+</div>
+
+{#if confirmId !== null}
+	{@const confirmEntry = entries.find(e => e.id === confirmId)}
+	<div class="modal-overlay" on:click|self={() => confirmId = null}>
+		<div class="modal">
+			<h2>Eintrag löschen?</h2>
+			{#if confirmEntry}
+				<p style="margin: 16px 0; color: var(--color-text-muted);">
+					<strong style="color: var(--color-text-muted);">{confirmEntry.employeeFirstName} {confirmEntry.employeeLastName}</strong>
+					– {confirmEntry.productName} ({formatPrice(confirmEntry.priceCents)})
+					am {formatDateTime(confirmEntry.createdAt)}
+				</p>
+			{/if}
+			<p style="margin-bottom: 20px; font-size: 0.9rem;">Dieser Eintrag wird unwiderruflich gelöscht.</p>
+			<div class="modal-actions">
+				<button class="btn btn-secondary" on:click={() => confirmId = null}>Abbrechen</button>
+				<button
+					class="btn btn-primary"
+					style="background: #e05555; border-color: #e05555;"
+					on:click={confirmDelete}
+				>
+					Löschen
+				</button>
+			</div>
+		</div>
+	</div>
+{/if}
Author	SHA1	Message	Date
Markus	00585653c7	bump	2026-05-06 11:21:11 +02:00
Markus	9b85476c2b	ADD zurück button auf firmen admin eintrag seite	2026-05-06 11:16:26 +02:00
Markus	a0cceeef78	FIX delete buchung call	2026-05-06 11:14:38 +02:00
Markus	e57eb7277f	CHANGE docker-compose to use the portainer stack definition	2026-05-06 11:05:34 +02:00
Markus	57c075eb25	CHANGE evict stale connections after a DB restart	2026-05-06 11:04:45 +02:00
Markus	12b84ec6be	ADD neue seite für firmen admins auf der sie die produkteinträge einzeln löschen können	2026-04-28 14:38:51 +02:00
Markus	fa3dbe180a	change build.sh better comments	2026-04-28 14:28:59 +02:00
Markus	3047e89326	change build.sh to get SNAPSHOT_TAG from .env	2026-04-28 13:52:36 +02:00
Markus	ea3efd3767	update build.sh to accept generic services	2026-04-28 13:38:55 +02:00
Markus	56cc400d8f	update documentation	2026-04-28 13:22:26 +02:00