added install script + reworked pipeline

.gitea/workflows/build.yaml

@@ -4,14 +4,55 @@ on:
   push:
     tags:
       - "*"
-    branches:
-      - main
-      - dev/main
 
 jobs:
-  webserver:
+  testing:
-    name: Build Webserver
+    name: Run Go Tests
     runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_USER: root
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: arbeitszeitmessung
+    env:
+      POSTGRES_HOST: postgres
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: arbeitszeitmessung
+      POSTGRES_PORT: 5432
+      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: Backend/go.mod
+      - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
+        id: hash-go
+        with:
+          patterns: |
+            go.mod
+            go.sum
+      - name: cache go
+        id: cache-go
+        uses: actions/cache@v4
+        with:
+          path: |-
+            /go_path
+            /go_cache
+          key: arbeitszeitmessung-${{ steps.hash-go.outputs.hash }}
+          restore-keys: |-
+            arbeitszeitmessung-
+      - name: Run Go Tests
+        run: cd Backend && go test ./...
+  build:
+    name: Build Go Image and Upload
+    runs-on: ubuntu-latest
+    needs: [testing]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,49 +66,12 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: git.letsstein.de/tom/arbeitszeitmessung-webserver
-          tags: |
-            type=raw,value=latest
-            type=pep440,pattern={{version}}
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           push: true
           context: Backend
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: |
-  # document-creator:
+            git.letsstein.de/tom/arbeitszeitmessung:latest
-  #   name: Build Document Creator
+            git.letsstein.de/tom/arbeitszeitmessung:${{  github.ref_name }}
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-  #     - name: Login to GitHub Container Registry
-  #       uses: docker/login-action@v3
-  #       with:
-  #         registry: git.letsstein.de
-  #         username: ${{ gitea.actor }}
-  #         password: ${{ secrets.REGISTRY_TOKEN }}
-  #     - name: Set up QEMU
-  #       uses: docker/setup-qemu-action@v3
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v3
-  #     - name: Extract metadata (tags, labels) for Docker
-  #       id: meta
-  #       uses: docker/metadata-action@v5
-  #       with:
-  #         images: git.letsstein.de/tom/arbeitszeitmessung-doc-creator
-  #         tags: |
-  #           type=raw,value=latest
-  #           type=pep440,pattern={{version}}
-  #     - name: Build and push
-  #       uses: docker/build-push-action@v6
-  #       with:
-  #         platforms: linux/amd64,linux/arm64
-  #         push: true
-  #         context: DocumentCreator
-  #         tags: ${{ steps.meta.outputs.tags }}

.gitea/workflows/test.yaml

@@ -26,10 +26,7 @@ jobs:
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
-      - name: Setup go
+
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: Backend/go.mod
       - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
         id: hash-go
         with:
@@ -46,8 +43,10 @@ jobs:
           key: arbeitszeitmessung-${{ steps.hash-go.outputs.hash }}
           restore-keys: |-
             arbeitszeitmessung-
-      - name: Render Templ files
+      - name: Setup go
-        run: cd Backend && go install github.com/a-h/templ/cmd/templ@v0.3.977 && templ generate
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: Backend/go.mod
       - name: Run Go Tests
         run: cd Backend && mkdir .test && go test ./... -coverprofile=.test/coverage.out -json > .test/report.json
       - name: Verify coverage report exists

.gitignore

@@ -30,8 +30,7 @@ DB/pg_data
 
 .env.*
 .env
-
+!.env.example
-Docker/config
 
 .idea
 .vscode
@@ -40,6 +39,3 @@ node_modules
 atlas.hcl
 .scannerwork
 Backend/logs
-.worktime.txt
-
-*_templ.go

Backend/.dockerignore

@@ -1,3 +1,2 @@
 db
 Dockerfile
-*_templ.go

Backend/Dockerfile

@@ -1,34 +1,22 @@
 # syntax=docker/dockerfile:1
-FROM --platform=$BUILDPLATFORM golang:alpine AS base
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
 ARG TARGETOS
 ARG TARGETARCH
 ENV CGO_ENABLED=0 \
     GOOS=$TARGETOS \
     GOARCH=$TARGETARCH
 
-FROM base AS fetch-stage
 WORKDIR /app
 COPY go.mod go.sum /app/
 RUN go mod download && go mod verify
 
-FROM ghcr.io/a-h/templ:v0.3.977 AS generate-stage
+COPY . .
-COPY --chown=65532:65532 --chmod=755 . /app
-WORKDIR /app
-RUN ["templ", "generate"]
-
-FROM base AS build
-COPY --from=generate-stage /app /app
-WORKDIR /app
 RUN go build -o server .
 
 FROM alpine:3.22
-RUN apk add --no-cache tzdata typst
+RUN apk add --no-cache tzdata
 WORKDIR /app
 COPY --from=build /app/server /app/server
 
-COPY migrations /app/migrations
-
-COPY doc /doc
-
 COPY /static /app/static
 ENTRYPOINT ["./server"]

Backend/Makefile

@@ -2,16 +2,5 @@ test:
 	mkdir -p .test
 	go test ./... -coverprofile=.test/coverage.out -json > .test/report.json
 
-# scan:
+scan:
-# 	sonar-scanner -Dsonar.token=sqa_ca8394c93a728d6cff96703955288d8902c15200
+	sonar-scanner -Dsonar.token=sqa_ca8394c93a728d6cff96703955288d8902c15200
-
-# complete live run
-live:
-	make -j2 live/templ live/tailwindcss
-
-live/templ:
-	templ generate --watch --proxy="http://localhost:8080" --cmd="go run ." --open-browser=false
-
-live/tailwindcss:
-	npx --yes tailwindcss -i ./src/main.css -o ./static/css/styles.css  --watch
-#--minify

Backend/database.go

@@ -1,19 +1,11 @@
 package main
 
-// this file handles the db connection and the
-// db migration
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"database/sql"
 	"fmt"
-	"log/slog"
 
-	"github.com/golang-migrate/migrate/v4"
-	"github.com/golang-migrate/migrate/v4/database/postgres"
-	_ "github.com/golang-migrate/migrate/v4/database/postgres"
-	_ "github.com/golang-migrate/migrate/v4/source/file"
 	_ "github.com/lib/pq"
 )
 
@@ -24,45 +16,6 @@ func OpenDatabase() (models.IDatabase, error) {
 	dbPassword := helper.GetEnv("POSTGRES_API_PASS", "password")
 	dbTz := helper.GetEnv("TZ", "Europe/Berlin")
 
-	connStr := fmt.Sprintf(
+	connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=%s", dbUser, dbPassword, dbHost, dbName, dbTz)
-		"host=%s user=%s dbname=%s password=%s sslmode=disable TimeZone=%s",
-		dbHost, dbUser, dbName, dbPassword, dbTz)
-
 	return sql.Open("postgres", connStr)
 }
-
-func Migrate() error {
-	dbHost := helper.GetEnv("POSTGRES_HOST", "localhost")
-	dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung")
-	dbPassword := helper.GetEnv("POSTGRES_PASSWORD", "password")
-	dbTz := helper.GetEnv("TZ", "Europe/Berlin")
-
-	connStr := fmt.Sprintf(
-		"host=%s user=%s dbname=%s password=%s sslmode=disable TimeZone=%s",
-		dbHost, "migrate", dbName, dbPassword, dbTz)
-
-	db, err := sql.Open("postgres", connStr)
-	if err != nil {
-		return err
-	}
-
-	driver, err := postgres.WithInstance(db, &postgres.Config{})
-	if err != nil {
-		return err
-	}
-
-	m, err := migrate.NewWithDatabaseInstance("file:///app/migrations", "postgres", driver)
-	if err != nil {
-		return err
-	}
-
-	slog.Info("Connected to database. Running migrations now.")
-
-	// Migrate all the way up ...
-	if err := m.Up(); err != nil && err != migrate.ErrNoChange {
-		return err
-	}
-
-	slog.Info("Finished migrations starting webserver.")
-	return nil
-}

Backend/endpoints/auto-feiertage.go

@@ -1,53 +0,0 @@
-// endpoints contains all http endpoints
-// for more complex endpoints the *Handler function is executed first
-// by the main programm and it will then run other functions as needed
-//
-// the filenames represent the route/url for the given endpoint
-// when "-" is a "/" so this file is server at "/auto/feiertage"
-
-package endpoints
-
-// this endpoint will be called by crontab and generates the public holidays for a given year
-// after that manually added holidays with a "wiederholen" flag are copied over to the new year
-
-import (
-	"arbeitszeitmessung/helper/paramParser"
-	"arbeitszeitmessung/models"
-	"log/slog"
-	"net/http"
-	"time"
-
-	"github.com/wlbr/feiertage"
-)
-
-func FeiertagsHandler(w http.ResponseWriter, r *http.Request) {
-	pp := paramParser.New(r.URL.Query())
-	slog.Debug("Generating Holidays")
-	from := pp.ParseTimestampFallback("from", "2006", time.Now().AddDate(-1, 0, -time.Now().YearDay()))
-	to := pp.ParseTimestampFallback("to", "2006", time.Now().AddDate(0, 0, -time.Now().YearDay()+1))
-
-	var publicHolidays map[string]models.PublicHoliday = make(map[string]models.PublicHoliday)
-
-	yearDelta := to.Year() - from.Year()
-	var holidays = feiertage.Sachsen(to.Year(), true)
-	for _, f := range holidays.Feiertage {
-		publicHolidays[f.Time.Format(time.DateOnly)] = models.NewHolidayFromFeiertag(f)
-	}
-
-	repeatingHolidays, err := models.GetRepeatingHolidays(from, to.AddDate(0, 0, -1))
-	if err != nil {
-		slog.Warn("Error getting holidays", slog.Any("Error", err))
-	}
-	slog.Debug("Found repeating Holidays", "num", len(repeatingHolidays), "from", from, "to", to, "yeardelta", yearDelta)
-	for _, day := range repeatingHolidays {
-		day.Time = day.Time.AddDate(yearDelta, 0, 0)
-		publicHolidays[day.Date().Format(time.DateOnly)] = day
-	}
-	slog.Debug("Added repeating holidays", "num", len(holidays.Feiertage))
-	for _, feiertag := range publicHolidays {
-		slog.Debug("Found holiday", "holiday", feiertag)
-		if err := feiertag.Insert(); err != nil {
-			slog.Warn("Error inserting Feiertag", slog.Any("Error", err))
-		}
-	}
-}

Backend/endpoints/auto-kurzarbeit.go

@@ -1,87 +0,0 @@
-package endpoints
-
-// this served as "/auto/kurzarbeit" will add a booking to every kurzarbeitstag
-// to make them reach the full lenght of workday.
-//
-// right now this is not in use because the time is calculated
-
-import (
-	"arbeitszeitmessung/helper"
-	"arbeitszeitmessung/helper/paramParser"
-	"arbeitszeitmessung/models"
-	"encoding/json"
-	"errors"
-	"log/slog"
-	"net/http"
-	"time"
-)
-
-func KurzarbeitFillHandler(w http.ResponseWriter, r *http.Request) {
-	helper.SetCors(w)
-	switch r.Method {
-	case "GET":
-		fillKurzarbeit(r, w)
-	default:
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-	}
-}
-
-func fillKurzarbeit(r *http.Request, w http.ResponseWriter) {
-	bookingTypeKurzarbeit, err := getKurzarbeitBookingType()
-	if err != nil {
-		slog.Info("Error getting BookingType Kurzarbeit %v\n", slog.Any("Error", err))
-	}
-	users, err := models.GetAllUsers()
-	if err != nil {
-		slog.Info("Error getting user list %v\n", slog.Any("Error", err))
-	}
-
-	pp := paramParser.New(r.URL.Query())
-	startDate := pp.ParseTimestampFallback("date", time.DateOnly, time.Now())
-
-	var kurzarbeitAdded int
-
-	for _, user := range users {
-		days := models.GetDays(user, startDate, startDate.AddDate(0, 0, 1), false)
-		if len(days) == 0 {
-			continue
-		}
-
-		day := days[len(days)-1]
-		if !day.IsKurzArbeit() || !day.IsWorkDay() {
-			continue
-		}
-		if day.GetWorktime(user, models.WorktimeBaseDay, false) >= day.GetWorktime(user, models.WorktimeBaseDay, true) {
-			continue
-		}
-
-		worktimeKurzarbeit := day.GetWorktime(user, models.WorktimeBaseDay, true) - day.GetWorktime(user, models.WorktimeBaseDay, false)
-
-		if wDay, ok := day.(*models.WorkDay); !ok || len(wDay.Bookings) == 0 {
-			continue
-		}
-		workday, _ := day.(*models.WorkDay)
-
-		lastBookingTime := workday.Bookings[len(workday.Bookings)-1].Timestamp
-		kurzarbeitBegin := (*models.Booking).NewBooking(nil, user.CardUID, 0, 1, bookingTypeKurzarbeit.Id)
-		kurzarbeitEnd := (*models.Booking).NewBooking(nil, user.CardUID, 0, 2, bookingTypeKurzarbeit.Id)
-		kurzarbeitBegin.Timestamp = lastBookingTime.Add(time.Minute)
-		kurzarbeitEnd.Timestamp = lastBookingTime.Add(worktimeKurzarbeit)
-
-		kurzarbeitBegin.InsertWithTimestamp()
-		kurzarbeitEnd.InsertWithTimestamp()
-		kurzarbeitAdded += 1
-	}
-
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(kurzarbeitAdded)
-}
-
-func getKurzarbeitBookingType() (models.BookingType, error) {
-	for _, bookingType := range models.GetBookingTypesCached() {
-		if bookingType.Name == "Kurzarbeit" {
-			return bookingType, nil
-		}
-	}
-	return models.BookingType{}, errors.New("No Booking Type found")
-}

Backend/endpoints/auto_logout.go

@@ -1,8 +1,5 @@
 package endpoints
 
-// this endpoint served at "/auto/logout" will be executed by crontab
-// and will log out all users that are currently still logged in
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
@@ -23,8 +20,8 @@ func LogoutHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func autoLogout(w http.ResponseWriter) {
-	users, err := models.GetAllUsers()
+	users, err := (*models.User).GetAll(nil)
-	var loggedOutUsers []models.User
+	var logged_out_users []models.User
 	if err != nil {
 		fmt.Printf("Error getting user list %v\n", err)
 	}
@@ -34,14 +31,14 @@ func autoLogout(w http.ResponseWriter) {
 			if err != nil {
 				fmt.Printf("Error logging out user %v\n", err)
 			} else {
-				loggedOutUsers = append(loggedOutUsers, user)
+				logged_out_users = append(logged_out_users, user)
-				log.Printf("Automaticaly logged out user %d ", user.PersonalNummer)
+				log.Printf("Automaticaly logged out user %s, %s ", user.Name, user.Vorname)
 			}
 		}
 
 	}
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(loggedOutUsers)
+	json.NewEncoder(w).Encode(logged_out_users)
 
 }

Backend/endpoints/pdf-create.go

@@ -1,13 +1,9 @@
 package endpoints
 
-// this endpoint served at "/pdf/create" accepts the contents from the pdf form
-// and renders a pdf according to this form
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/helper/paramParser"
 	"arbeitszeitmessung/models"
-	"archive/zip"
 	"bytes"
 	"fmt"
 	"log"
@@ -19,9 +15,81 @@ import (
 )
 
 const DE_DATE string = "02.01.2006"
-const FILE_YEAR_MONTH string = "2006_01"
 
-var PDF_DIRECTORY = helper.GetEnv("PDF_PATH", "/doc/")
+func convertDaysToTypst(days []models.IWorkDay, u models.User) ([]typstDay, error) {
+	var typstDays []typstDay
+	for _, day := range days {
+		var thisTypstDay typstDay
+		work, pause, overtime := day.GetTimesVirtual(u, models.WorktimeBaseWeek)
+		thisTypstDay.Date = day.Date().Format(DE_DATE)
+		thisTypstDay.Worktime = helper.FormatDurationFill(work, true)
+		thisTypstDay.Pausetime = helper.FormatDurationFill(pause, true)
+		thisTypstDay.Overtime = helper.FormatDurationFill(overtime, true)
+		thisTypstDay.IsFriday = day.Date().Weekday() == time.Friday
+
+		thisTypstDay.DayParts = convertDayToTypstDayParts(day, u)
+		typstDays = append(typstDays, thisTypstDay)
+	}
+	return typstDays, nil
+}
+
+func convertDayToTypstDayParts(day models.IWorkDay, user models.User) []typstDayPart {
+	var typstDayParts []typstDayPart
+	if day.IsWorkDay() {
+		workDay, _ := day.(*models.WorkDay)
+		for i := 0; i < len(workDay.Bookings); i += 2 {
+			var typstDayPart typstDayPart
+			typstDayPart.BookingFrom = workDay.Bookings[i].Timestamp.Format("15:04")
+			typstDayPart.BookingTo = workDay.Bookings[i+1].Timestamp.Format("15:04")
+			typstDayPart.WorkType = workDay.Bookings[i].BookingType.Name
+			typstDayPart.IsWorkDay = true
+			typstDayParts = append(typstDayParts, typstDayPart)
+		}
+		if day.IsKurzArbeit() {
+			tsFrom, tsTo := workDay.GenerateKurzArbeitBookings(user)
+			typstDayParts = append(typstDayParts, typstDayPart{
+				BookingFrom: tsFrom.Format("15:04"),
+				BookingTo:   tsTo.Format("15:04"),
+				WorkType:    "Kurzarbeit",
+				IsWorkDay:   true,
+			})
+		}
+	} else {
+		absentDay, _ := day.(*models.Absence)
+		typstDayParts = append(typstDayParts, typstDayPart{IsWorkDay: false, WorkType: absentDay.AbwesenheitTyp.Name})
+	}
+	return typstDayParts
+}
+
+func renderPDF(days []typstDay, metadata typstMetadata) (bytes.Buffer, error) {
+	var markup bytes.Buffer
+	var output bytes.Buffer
+
+	if err := typst.InjectValues(&markup, map[string]any{"meta": metadata, "days": days}); err != nil {
+		return output, err
+	}
+
+	// Import the template and invoke the template function with the custom data.
+	// Show is used to replace the current document with whatever content the template function in `template.typ` returns.
+	markup.WriteString(`
+		#import "template.typ": abrechnung
+		#show: doc => abrechnung(meta, days)
+		`)
+
+	// Compile the prepared markup with Typst and write the result it into `output.pdf`.
+	// f, err := os.Create("output.pdf")
+	// if err != nil {
+	// 	log.Panicf("Failed to create output file: %v.", err)
+	// }
+	// defer f.Close()
+	//
+
+	typstCLI := typst.CLI{}
+	if err := typstCLI.Compile(&markup, &output, nil); err != nil {
+		return output, err
+	}
+	return output, nil
+}
 
 func PDFCreateController(w http.ResponseWriter, r *http.Request) {
 	helper.RequiresLogin(Session, w, r)
@@ -34,284 +102,108 @@ func PDFCreateController(w http.ResponseWriter, r *http.Request) {
 		}
 		pp := paramParser.New(r.URL.Query())
 		startDate := pp.ParseTimestampFallback("start_date", time.DateOnly, time.Now())
-		personalNumbers := pp.ParseIntListFallback("employe_list", ",", make([]int, 0))
+		var members []models.User = make([]models.User, 0)
-
+		output, err := createReports(user, members, startDate)
-		employes, err := models.GetUserByPersonalNrMulti(personalNumbers)
-		if err != nil {
-			slog.Warn("Error getting employes!", slog.Any("Error", err))
-			return
-		}
-
-		if !helper.IsDebug() {
-			n := 0
-			for _, e := range employes {
-				if user.IsSuperior(e) {
-					employes[n] = e
-					n++
-				}
-			}
-			employes = employes[:n]
-		}
-
-		reportData := createReports(employes, startDate)
-
-		switch pp.ParseStringFallback("output", "render") {
-		case "render":
-			output, err := renderPDFSingle(reportData)
 		if err != nil {
 			slog.Warn("Could not create pdf report", slog.Any("Error", err))
-				w.WriteHeader(http.StatusInternalServerError)
 		}
 
 		w.Header().Set("Content-type", "application/pdf")
-			w.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=Monatsabrechnung_%s.pdf", startDate.Format(FILE_YEAR_MONTH)))
 		output.WriteTo(w)
-			w.WriteHeader(http.StatusOK)
+		w.WriteHeader(200)
-		case "download":
-			pdfReports, err := renderPDFMulti(reportData)
-			if err != nil {
-				slog.Warn("Could not create pdf report", slog.Any("Error", err))
-				w.WriteHeader(http.StatusInternalServerError)
-			}
-			output, err := zipPfd(pdfReports, &reportData)
-			if err != nil {
-				slog.Warn("Could not zip pdf reports", slog.Any("Error", err))
-				w.WriteHeader(http.StatusInternalServerError)
-			}
-
-			w.Header().Set("Content-type", "application/zip")
-			w.Header().Set("Content-Disposition", fmt.Sprintf("attachement; filename=Monatsabrechnung_%s.zip", startDate.Format(FILE_YEAR_MONTH)))
-			output.WriteTo(w)
-			w.WriteHeader(http.StatusOK)
-		}
 
 	default:
 		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
 	}
 }
 
-func convertDaysToTypst(days []models.IWorkDay, u models.User, weekbase models.WorktimeBase) ([]typstDay, error) {
+func createReports(user models.User, employes []models.User, startDate time.Time) (bytes.Buffer, error) {
-	var typstDays []typstDay
+	if startDate.Day() > 1 {
-	for i, day := range days {
+		startDate = startDate.AddDate(0, 0, -(startDate.Day() - 1))
-		if !day.IsSubmittedAndAccepted() && !helper.IsDebug() {
-			continue
 	}
-
-		var thisTypstDay typstDay
-		workVirtual, pause, overtime := day.GetTimes(u, weekbase, true)
-		overtime = workVirtual - u.ArbeitszeitProWocheFrac(0.2)
-
-		if day.Type() == models.DayTypeHoliday {
-			// workVirtual = 0
-			overtime = 0
-		}
-		thisTypstDay.Date = day.Date().Format(DE_DATE)
-		thisTypstDay.Worktime = helper.FormatDurationFill(workVirtual, true)
-		thisTypstDay.Pausetime = helper.FormatDurationFill(pause, true)
-		thisTypstDay.Overtime = helper.FormatDurationFill(overtime, true)
-		thisTypstDay.IsFriday = i == len(days)-1
-
-		if work := day.GetWorktime(u, weekbase, false); workVirtual > work {
-			thisTypstDay.Kurzarbeit = helper.FormatDurationFill(workVirtual-work, true)
-		} else {
-			thisTypstDay.Kurzarbeit = helper.FormatDurationFill(0, true)
-		}
-
-		thisTypstDay.DayParts = convertDayToTypstDayParts(day, u, weekbase)
-		typstDays = append(typstDays, thisTypstDay)
-	}
-	return typstDays, nil
-}
-
-func convertDayToTypstDayParts(day models.IWorkDay, user models.User, weekBase models.WorktimeBase) []typstDayPart {
-	var typstDayParts []typstDayPart
-	switch day.Type() {
-	case models.DayTypeWorkday:
-		workDay, _ := day.(*models.WorkDay)
-		for i := 0; i < len(workDay.Bookings); i += 2 {
-			var typstDayPart typstDayPart
-			typstDayPart.BookingFrom = workDay.Bookings[i].Timestamp.Format("15:04")
-			if i+1 < len(workDay.Bookings) {
-				typstDayPart.BookingTo = workDay.Bookings[i+1].Timestamp.Format("15:04")
-			} else {
-				typstDayPart.BookingTo = workDay.Bookings[i].Timestamp.Format("15:04")
-			}
-			typstDayPart.WorkType = workDay.Bookings[i].BookingType.Name
-			typstDayPart.IsWorkDay = true
-			typstDayParts = append(typstDayParts, typstDayPart)
-		}
-		if day.IsKurzArbeit() {
-			tsFrom, tsTo := workDay.GenerateKurzArbeitBookings(user, weekBase)
-			typstDayParts = append(typstDayParts, typstDayPart{
-				BookingFrom: tsFrom.Format("15:04"),
-				BookingTo:   tsTo.Format("15:04"),
-				WorkType:    "Kurzarbeit",
-				IsWorkDay:   true,
-			})
-		}
-	case models.DayTypeCompound:
-		for _, c := range day.(*models.CompoundDay).DayParts {
-			typstDayParts = append(typstDayParts, convertDayToTypstDayParts(c, user, weekBase)...)
-		}
-	default:
-		typstDayParts = append(typstDayParts, typstDayPart{IsWorkDay: false, WorkType: day.ToString()})
-	}
-	return typstDayParts
-}
-
-func createReports(employes []models.User, startDate time.Time) []typstData {
-	startDate = helper.GetFirstOfMonth(startDate)
 	endDate := startDate.AddDate(0, 1, -1)
-
+	return createEmployeReport(user, startDate, endDate)
-	var employeData []typstData
-	for _, employee := range employes {
-		if data, err := createEmployeReport(employee, startDate, endDate); err != nil {
-			slog.Warn("Error when creating employeReport", slog.Any("user", employee), slog.Any("error", err))
-		} else {
-			employeData = append(employeData, data)
-		}
-	}
-	return employeData
 }
 
-func createEmployeReport(employee models.User, startDate, endDate time.Time) (typstData, error) {
+func createEmployeReport(employee models.User, startDate, endDate time.Time) (bytes.Buffer, error) {
-	// publicHolidays, _ := models.GetHolidaysFromTo(startDate, endDate)
+	targetHours := (employee.ArbeitszeitProWoche() / 5) * time.Duration(helper.GetWorkingDays(startDate, endDate))
-	targetHoursThisMonth := employee.ArbeitszeitProWocheFrac(.2) * time.Duration(helper.GetWorkingDays(startDate, endDate)) //-len(publicHolidays)
+	workingDays := models.GetDays(employee, startDate, endDate, false)
-	mondaysThisMonth := helper.GetMondays(helper.GenerateDateRange(startDate, endDate), false)
 
-	var weeks []models.WorkWeek
+	slog.Debug("Baseline Working hours", "targetHours", targetHours.Hours())
-	var workHours, kurzarbeitHours time.Duration
 
-	for _, monday := range mondaysThisMonth {
+	var actualHours time.Duration
-		var week models.WorkWeek
+	for _, day := range workingDays {
-		if monday.After(startDate) {
+		actualHours += day.TimeWorkVirtual(employee)
-			week = models.NewWorkWeekSimple(employee, monday, true)
-		} else if startDate.Sub(monday) < time.Hour*24*6 {
-			week = models.NewWorkWeek(employee, startDate, monday.Add(6*24*time.Hour), true)
-		}
-		workHours += week.WorktimeVirtual
-		kurzarbeitHours += week.Kurzarbeit
-		weeks = append(weeks, week)
 	}
+	worktimeBalance := actualHours - targetHours
 
-	monthOvertime := workHours - targetHoursThisMonth
+	typstDays, err := convertDaysToTypst(workingDays, employee)
-	totalOvertime, err := employee.GetReportedOvertime(endDate)
-
-	var typstDays []typstDay
-	for _, week := range weeks {
-		weekTypstDays, err := convertDaysToTypst(week.Days, employee, week.WeekBase)
 	if err != nil {
-			slog.Error("Error converting days into typst", "error", err)
+		log.Panicf("Failed to convert days!")
-			continue
-		}
-		typstDays = append(typstDays, weekTypstDays...)
-	}
-
-	if err != nil {
-		slog.Error("Cannot retrieve total Overtime", "Error", err)
 	}
 
 	metadata := typstMetadata{
 		EmployeeName:     fmt.Sprintf("%s %s", employee.Vorname, employee.Name),
 		TimeRange:        fmt.Sprintf("%s - %s", startDate.Format(DE_DATE), endDate.Format(DE_DATE)),
-		Overtime:         helper.FormatDurationFill(monthOvertime, true),
+		Overtime:         helper.FormatDurationFill(worktimeBalance, true),
-		WorkTime:         helper.FormatDurationFill(workHours, true),
+		WorkTime:         helper.FormatDurationFill(actualHours, true),
-		Kurzarbeit:       helper.FormatDurationFill(kurzarbeitHours, true),
+		OvertimeTotal:    "",
-		OvertimeTotal:    helper.FormatDurationFill(totalOvertime+monthOvertime, true),
 		CurrentTimestamp: time.Now().Format("02.01.2006 - 15:04 Uhr"),
 	}
-	return typstData{Meta: metadata, Days: typstDays, FileName: fmt.Sprintf("%s_%s.pdf", startDate.Format(FILE_YEAR_MONTH), employee.Name)}, nil
+
+	return renderPDF(typstDays, metadata)
 }
 
-func renderPDFSingle(data []typstData) (bytes.Buffer, error) {
+func PDFHandler(w http.ResponseWriter, r *http.Request) {
-	var markup bytes.Buffer
+	helper.RequiresLogin(Session, w, r)
-	var output bytes.Buffer
+	startDate := time.Now()
 
-	typstCLI := typst.CLI{
+	if startDate.Day() > 1 {
-		WorkingDirectory: PDF_DIRECTORY,
+		startDate = startDate.AddDate(0, 0, -(startDate.Day() - 1))
 	}
+	endDate := startDate.AddDate(0, 1, -1)
 
-	if err := typst.InjectValues(&markup, map[string]any{"data": data}); err != nil {
+	user, err := models.GetUserFromSession(Session, r.Context())
-		return output, err
-	}
-
-	// Import the template and invoke the template function with the custom data.
-	// Show is used to replace the current document with whatever content the template function in `template.typ` returns.
-	markup.WriteString(`
-		#import "templates/abrechnung.typ": abrechnung
-		#for d in data {
-  			abrechnung(d.Meta, d.Days)
-     	}
-		`)
-
-	// Compile the prepared markup with Typst and write the result it into `output.pdf`.
-	if err := typstCLI.Compile(&markup, &output, nil); err != nil {
-		return output, err
-	}
-	return output, nil
-}
-
-func renderPDFMulti(data []typstData) ([]bytes.Buffer, error) {
-	var outputMulti []bytes.Buffer
-
-	typstRender := typst.CLI{
-		WorkingDirectory: PDF_DIRECTORY,
-	}
-
-	for _, d := range data {
-		var markup bytes.Buffer
-		var outputSingle bytes.Buffer
-		if err := typst.InjectValues(&markup, map[string]any{"meta": d.Meta, "days": d.Days}); err != nil {
-			return outputMulti, err
-		}
-		markup.WriteString(`
-			#import "templates/abrechnung.typ": abrechnung
-			#abrechnung(meta, days)
-			`)
-
-		if err := typstRender.Compile(&markup, &outputSingle, nil); err != nil {
-			return outputMulti, err
-		}
-		outputMulti = append(outputMulti, outputSingle)
-	}
-	return outputMulti, nil
-}
-
-func zipPfd(pdfReports []bytes.Buffer, reportData *[]typstData) (bytes.Buffer, error) {
-	var zipOutput bytes.Buffer
-
-	zipWriter := zip.NewWriter(&zipOutput)
-	for index, report := range pdfReports {
-		zipFile, err := zipWriter.Create((*reportData)[index].FileName)
 	if err != nil {
-			fmt.Println(err)
+		log.Println("Error getting user!")
 	}
-		_, err = zipFile.Write(report.Bytes())
+
+	//TODO: only accepted weeks
+
+	weeks := models.GetDays(user, startDate, endDate, false)
+	var aggregatedOvertime, aggregatedWorkTime time.Duration
+	for _, day := range weeks {
+		aggregatedOvertime += day.TimeOvertimeReal(user)
+		aggregatedWorkTime += day.TimeWorkVirtual(user)
+	}
+
+	typstDays, err := convertDaysToTypst(weeks, user)
 	if err != nil {
-			fmt.Println(err)
+		log.Panicf("Failed to convert days!")
 	}
+	metadata := typstMetadata{
+		EmployeeName:     fmt.Sprintf("%s %s", user.Vorname, user.Name),
+		TimeRange:        fmt.Sprintf("%s - %s", startDate.Format(DE_DATE), endDate.Format(DE_DATE)),
+		Overtime:         helper.FormatDurationFill(aggregatedOvertime, true),
+		WorkTime:         helper.FormatDurationFill(aggregatedWorkTime, true),
+		OvertimeTotal:    "",
+		CurrentTimestamp: time.Now().Format("02.01.2006 - 15:04 Uhr"),
 	}
 
-	// Make sure to check the error on Close.
+	output, err := renderPDF(typstDays, metadata)
-	err := zipWriter.Close()
+	if err != nil {
-	return zipOutput, err
+		slog.Warn("Could not create pdf report", slog.Any("Error", err))
 	}
 
-func lenWorkDays(workDays []models.IWorkDay) int {
+	w.Header().Set("Content-type", "application/pdf")
-	var lenght int
+	output.WriteTo(w)
-	for _, day := range workDays {
+	w.WriteHeader(200)
-		if !day.IsEmpty() || day.IsKurzArbeit() {
-			lenght += 1
-		}
-	}
-	return lenght
 }
 
 type typstMetadata struct {
 	TimeRange        string `json:"time-range"`
 	EmployeeName     string `json:"employee-name"`
 	WorkTime         string `json:"worktime"`
-	Kurzarbeit       string `json:"kurzarbeit"`
 	Overtime         string `json:"overtime"`
 	OvertimeTotal    string `json:"overtime-total"`
 	CurrentTimestamp string `json:"current-timestamp"`
@@ -330,12 +222,5 @@ type typstDay struct {
 	Worktime  string         `json:"worktime"`
 	Pausetime string         `json:"pausetime"`
 	Overtime  string         `json:"overtime"`
-	Kurzarbeit string         `json:"kurzarbeit"`
 	IsFriday  bool           `json:"is-weekend"`
 }
-
-type typstData struct {
-	Meta     typstMetadata `json:"meta"`
-	Days     []typstDay    `json:"days"`
-	FileName string
-}

Backend/endpoints/pdf.go

@@ -1,7 +1,5 @@
 package endpoints
 
-// this endpoint served at "/pdf" handles the rendering of the pdf form
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"

Backend/endpoints/team.go

@@ -1,8 +1,5 @@
 package endpoints
 
-// this endpoint served at "/team/report" handles the report page
-// and also the submission/change of reports
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/helper/paramParser"
@@ -15,7 +12,7 @@ import (
 	"time"
 )
 
-func ReportHandler(w http.ResponseWriter, r *http.Request) {
+func TeamHandler(w http.ResponseWriter, r *http.Request) {
 	helper.RequiresLogin(Session, w, r)
 	switch r.Method {
 	case http.MethodPost:
@@ -42,7 +39,7 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	workWeek := models.NewWorkWeekSimple(user, weekTs, true)
+	workWeek := models.NewWorkWeek(user, weekTs, true)
 
 	switch r.FormValue("method") {
 	case "send":
@@ -70,7 +67,7 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
 	submissionDate := pp.ParseTimestampFallback("submission_date", time.DateOnly, user.GetLastWorkWeekSubmission())
 	lastSub := helper.GetMonday(submissionDate)
 
-	userWeek := models.NewWorkWeekSimple(user, lastSub, true)
+	userWeek := models.NewWorkWeek(user, lastSub, true)
 
 	var workWeeks []models.WorkWeek
 	teamMembers, err := user.GetTeamMembers()
@@ -79,5 +76,5 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
 		workWeeks = append(workWeeks, weeks...)
 	}
 	// isRunningWeek := time.Since(lastSub) < 24*5*time.Hour //the last submission is this week and cannot be send yet
-	templates.ReportPage(workWeeks, userWeek).Render(r.Context(), w)
+	templates.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
 }

Backend/endpoints/team_presence.go

@@ -1,7 +1,5 @@
 package endpoints
 
-// this endpoint served at "/team/presence" shows the presence page
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
@@ -10,7 +8,7 @@ import (
 	"net/http"
 )
 
-func PresenceHandler(w http.ResponseWriter, r *http.Request) {
+func TeamPresenceHandler(w http.ResponseWriter, r *http.Request) {
 	helper.RequiresLogin(Session, w, r)
 	helper.SetCors(w)
 	switch r.Method {

Backend/endpoints/time-create.go

@@ -1,8 +1,5 @@
 package endpoints
 
-// this endpoint served at "/time/create" is for the esp api and creates bookings
-// either via HTTP GET or HTTP PUT
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
@@ -39,7 +36,6 @@ func createBooking(w http.ResponseWriter, r *http.Request) {
 	}
 
 	booking := (*models.Booking).FromUrlParams(nil, r.URL.Query())
-	// booking.Timestamp = time.Now()
 	if booking.Verify() {
 		err := booking.Insert()
 		if errors.Is(models.SameBookingError{}, err) {

Backend/endpoints/time.go

@@ -1,9 +1,5 @@
 package endpoints
 
-// this endpoint served at "/time" handles the time page
-// this includes normal show + creation of bookings from the webpage +
-// edit functionality
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/helper/paramParser"
@@ -41,18 +37,8 @@ func AbsencHandler(w http.ResponseWriter, r *http.Request) {
 	helper.SetCors(w)
 	switch r.Method {
 	case http.MethodPost:
-		r.ParseForm()
+		err := updateAbsence(r)
-		var err error
-		switch r.FormValue("action") {
-		case "insert":
-			err = updateAbsence(r)
-		case "delete":
-			err = deleteAbsence(r)
-		default:
-			slog.Warn("No action found!")
-		}
 		if err != nil {
-			slog.Warn("Error handling absence route ", "error", err)
 			http.Error(w, "Internal error", http.StatusInternalServerError)
 			return
 		}
@@ -98,9 +84,9 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 		if day.Date().Before(lastSub) {
 			continue
 		}
-		aggregatedOvertime += day.GetOvertime(user, models.WorktimeBaseDay, true)
+		aggregatedOvertime += day.TimeOvertimeReal(user)
 	}
-	if reportedOvertime, err := user.GetReportedOvertime(time.Now()); err == nil {
+	if reportedOvertime, err := user.GetReportedOvertime(); err == nil {
 		user.Overtime = (reportedOvertime + aggregatedOvertime).Round(time.Minute)
 	} else {
 		log.Println("Cannot calculate overtime: ", err)
@@ -118,21 +104,6 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 	templates.TimePage([]models.WorkDay{}, lastSub).Render(ctx, w)
 }
 
-func deleteAbsence(r *http.Request) error {
-	r.ParseForm()
-	pp := paramParser.New(r.Form)
-	counterId, err := pp.ParseInt("aw_id")
-
-	if err != nil {
-		return err
-	}
-	absence, err := models.GetAbsenceById(counterId)
-	if err != nil {
-		return err
-	}
-	return absence.Delete()
-}
-
 func updateBooking(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	pp := paramParser.New(r.Form)
@@ -162,15 +133,21 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		newBooking := (*models.Booking).NewBooking(nil, user.CardUID, 0, int16(check_in_out), 1)
+		newBooking := (*models.Booking).New(nil, user.CardUID, 0, int16(check_in_out), 1)
 		newBooking.Timestamp = timestamp
-		if newBooking.Verify() {
 		err = newBooking.InsertWithTimestamp()
 		if err != nil {
 			log.Printf("Error inserting booking %v -> %v\n", newBooking, err)
 		}
-		}
 	case "change":
+		// absenceType, err := strconv.Atoi(r.FormValue("absence"))
+		// if err != nil {
+		// 	log.Println("Error parsing absence type.", err)
+		// 	absenceType = 0
+		// }
+		// if absenceType != 0 {
+		// 	createAbsence(absenceType, user, loc, r)
+		// }
 		for index, possibleBooking := range r.PostForm {
 			if len(index) > 7 && index[:7] == "booking" {
 				booking_id, err := strconv.Atoi(index[8:])
@@ -257,6 +234,12 @@ func updateAbsence(r *http.Request) error {
 		log.Println("Cannot get Absence for id: ", absenceId, err)
 		return err
 	}
+	if r.FormValue("action") == "delete" {
+		log.Println("Deleting Absence!", "Not implemented")
+		// TODO
+		//absence.Delete()
+		return nil
+	}
 
 	if absence.Update(newAbsence) {
 		err = absence.Save()
@@ -266,4 +249,5 @@ func updateAbsence(r *http.Request) error {
 		}
 	}
 	return nil
+
 }

Backend/endpoints/user-login.go

@@ -1,17 +0,0 @@
-package endpoints
-
-// this endpoint server at "/user/login" will show the login page or
-// directly login the user based on the http method used
-
-import "net/http"
-
-func LoginHandler(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case http.MethodGet:
-		showLoginPage(w, r, true, "")
-	case http.MethodPost:
-		loginUser(w, r)
-	default:
-		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-	}
-}

Backend/endpoints/user-session.go

@@ -0,0 +1,74 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"context"
+	"log"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/alexedwards/scs/v2"
+)
+
+var Session *scs.SessionManager
+
+func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
+	Session = scs.New()
+	Session.Lifetime = lifetime
+	return Session
+}
+
+func showLoginPage(w http.ResponseWriter, r *http.Request, success bool, errorMsg string) {
+	r = r.WithContext(context.WithValue(r.Context(), "session", Session))
+	if Session.Exists(r.Context(), "user") {
+		http.Redirect(w, r, "/time", http.StatusSeeOther)
+	}
+	templates.LoginPage(success, errorMsg).Render(r.Context(), w)
+}
+
+func loginUser(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	if err != nil {
+		log.Println("Error parsing form!", err)
+		showLoginPage(w, r, false, "Internal error!")
+		return
+	}
+	_personal_nummer := r.FormValue("personal_nummer")
+	if _personal_nummer == "" {
+		log.Println("No personal_nummer provided!")
+		showLoginPage(w, r, false, "Keine Personalnummer gesetzt.")
+		return
+	}
+	personal_nummer, err := strconv.Atoi(_personal_nummer)
+	if err != nil {
+		log.Println("Cannot parse personal nubmer!")
+		showLoginPage(w, r, false, "Personalnummer ist nicht valide gesetzt.")
+		return
+	}
+	user, err := models.GetUserByPersonalNr(personal_nummer)
+	if err != nil {
+		log.Println("No user found under this personal number!", err)
+		showLoginPage(w, r, false, "Nutzer unter dieser Personalnummer nicht gefunden.")
+		return
+	}
+
+	password := r.FormValue("password")
+	if user.Login(password) {
+		log.Printf("New succesfull user login from %s %s (%d)!\n", user.Vorname, user.Name, user.PersonalNummer)
+		Session.Put(r.Context(), "user", user.PersonalNummer)
+		Session.Commit(r.Context())
+		http.Redirect(w, r, "/time", http.StatusSeeOther) //with this browser always uses GET
+	}
+	showLoginPage(w, r, false, "")
+}
+
+func logoutUser(w http.ResponseWriter, r *http.Request) {
+	log.Println("Loggin out user!")
+	err := Session.Destroy(r.Context())
+	if err != nil {
+		log.Println("Error destroying session!", err)
+	}
+	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+}

Backend/endpoints/user-settings.go

@@ -1,11 +1,6 @@
 package endpoints
 
-// this endpoint server at "/user/settings" will show the settings page
-// depeding on which action is taken the user will be logged out or
-// the password will be changed
-
 import (
-	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"context"
@@ -13,23 +8,6 @@ import (
 	"net/http"
 )
 
-func UserSettingsHandler(w http.ResponseWriter, r *http.Request) {
-	helper.RequiresLogin(Session, w, r)
-	switch r.Method {
-	case http.MethodGet:
-		showUserPage(w, r, 0)
-	case http.MethodPost:
-		switch r.FormValue("action") {
-		case "change-pass":
-			changePassword(w, r)
-		case "logout-user":
-			logoutUser(w, r)
-		}
-	default:
-		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-	}
-}
-
 // change user password and store salted hash in db
 func changePassword(w http.ResponseWriter, r *http.Request) {
 	err := r.ParseForm()

Backend/endpoints/user.go

@@ -1,18 +1,8 @@
 package endpoints
 
-// this is not directly an endpoint as it servers all requests for "/user"
-// and routes the furter to "login", "logout", and "settings"
-
 import (
-	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/helper"
-	"arbeitszeitmessung/templates"
-	"context"
-	"log"
 	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/alexedwards/scs/v2"
 )
 
 func UserHandler(w http.ResponseWriter, r *http.Request) {
@@ -26,63 +16,31 @@ func UserHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-var Session *scs.SessionManager
+func LoginHandler(w http.ResponseWriter, r *http.Request) {
-
+	switch r.Method {
-func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
+	case http.MethodGet:
-	Session = scs.New()
+		showLoginPage(w, r, true, "")
-	Session.Lifetime = lifetime
+	case http.MethodPost:
-	return Session
+		loginUser(w, r)
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+	}
 }
 
-func showLoginPage(w http.ResponseWriter, r *http.Request, success bool, errorMsg string) {
+func UserSettingsHandler(w http.ResponseWriter, r *http.Request) {
-	r = r.WithContext(context.WithValue(r.Context(), "session", Session))
+	helper.RequiresLogin(Session, w, r)
-	if Session.Exists(r.Context(), "user") {
-		http.Redirect(w, r, "/time", http.StatusSeeOther)
-	}
-	templates.LoginPage(success, errorMsg).Render(r.Context(), w)
-}
 
-func loginUser(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
-	err := r.ParseForm()
+	case http.MethodGet:
-	if err != nil {
+		showUserPage(w, r, 0)
-		log.Println("Error parsing form!", err)
+	case http.MethodPost:
-		showLoginPage(w, r, false, "Internal error!")
+		switch r.FormValue("action") {
-		return
+		case "change-pass":
+			changePassword(w, r)
+		case "logout-user":
+			logoutUser(w, r)
 		}
-	_personal_nummer := r.FormValue("personal_nummer")
+	default:
-	if _personal_nummer == "" {
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		log.Println("No personal_nummer provided!")
-		showLoginPage(w, r, false, "Keine Personalnummer gesetzt.")
-		return
 	}
-	personal_nummer, err := strconv.Atoi(_personal_nummer)
-	if err != nil {
-		log.Println("Cannot parse personal nubmer!")
-		showLoginPage(w, r, false, "Personalnummer ist nicht valide gesetzt.")
-		return
-	}
-	user, err := models.GetUserByPersonalNr(personal_nummer)
-	if err != nil {
-		log.Println("No user found under this personal number!", err)
-		showLoginPage(w, r, false, "Nutzer unter dieser Personalnummer nicht gefunden.")
-		return
-	}
-
-	password := r.FormValue("password")
-	if user.Login(password) {
-		log.Printf("New succesfull user login from %s %s (%d)!\n", user.Vorname, user.Name, user.PersonalNummer)
-		Session.Put(r.Context(), "user", user.PersonalNummer)
-		Session.Commit(r.Context())
-		http.Redirect(w, r, "/time", http.StatusSeeOther) //with this browser always uses GET
-	}
-	showLoginPage(w, r, false, "")
-}
-
-func logoutUser(w http.ResponseWriter, r *http.Request) {
-	log.Println("Loggin out user!")
-	err := Session.Destroy(r.Context())
-	if err != nil {
-		log.Println("Error destroying session!", err)
-	}
-	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
 }

Backend/go.mod

@@ -4,14 +4,12 @@ go 1.24.7
 
 require github.com/lib/pq v1.10.9
 
-require github.com/a-h/templ v0.3.960
+require github.com/a-h/templ v0.3.943
 
 require github.com/alexedwards/scs/v2 v2.8.0
 
-require github.com/wlbr/feiertage v1.17.0
-
 require (
-	github.com/Dadido3/go-typst v0.8.0
+	github.com/Dadido3/go-typst v0.3.0
 	github.com/golang-migrate/migrate/v4 v4.18.3
 	github.com/joho/godotenv v1.5.1
 )

Backend/go.sum

@@ -1,17 +1,13 @@
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/Dadido3/go-typst v0.8.0 h1:uTLYprhkrBjwsCXRRuyYUFL0fpYHa2kIYoOB/CGqVNs=
+github.com/Dadido3/go-typst v0.3.0 h1:Itix2FtQgBiOuHUNqgGUAK11Oo2WMlZGGGpCiQNK1IA=
-github.com/Dadido3/go-typst v0.8.0/go.mod h1:QYis9sT70u65kn1SkFfyPRmHsPxgoxWbAixwfPReOZA=
+github.com/Dadido3/go-typst v0.3.0/go.mod h1:QYis9sT70u65kn1SkFfyPRmHsPxgoxWbAixwfPReOZA=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/a-h/templ v0.3.960 h1:trshEpGa8clF5cdI39iY4ZrZG8Z/QixyzEyUnA7feTM=
+github.com/a-h/templ v0.3.943 h1:o+mT/4yqhZ33F3ootBiHwaY4HM5EVaOJfIshvd5UNTY=
-github.com/a-h/templ v0.3.960/go.mod h1:oCZcnKRf5jjsGpf2yELzQfodLphd2mwecwG4Crk5HBo=
+github.com/a-h/templ v0.3.943/go.mod h1:oCZcnKRf5jjsGpf2yELzQfodLphd2mwecwG4Crk5HBo=
 github.com/alexedwards/scs/v2 v2.8.0 h1:h31yUYoycPuL0zt14c0gd+oqxfRwIj6SOjHdKRZxhEw=
 github.com/alexedwards/scs/v2 v2.8.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8=
-github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
-github.com/bytedance/sonic v1.14.1/go.mod h1:gi6uhQLMbTdeP0muCnrjHLeCUPyb70ujhnNlhOylAFc=
-github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
-github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -37,8 +33,6 @@ github.com/golang-migrate/migrate/v4 v4.18.3 h1:EYGkoOsvgHHfm5U/naS1RP/6PL/Xv3S4
 github.com/golang-migrate/migrate/v4 v4.18.3/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
-github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -46,7 +40,6 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
@@ -66,21 +59,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/smasher164/xid v0.1.2 h1:erplXSdBRIIw+MrwjJ/m8sLN2XY16UGzpTA0E2Ru6HA=
 github.com/smasher164/xid v0.1.2/go.mod h1:tgivm8CQl19fH1c5y+8F4mA+qY6n2i6qDRBlY/6nm+I=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/wlbr/feiertage v1.17.0 h1:AEck/iUQu19iU0xNEoSQTeSTGXF1Ju0tbAwEi/Lmwqk=
-github.com/wlbr/feiertage v1.17.0/go.mod h1:TVZgmSZgGW/jSxexZ56qdlR6cDj+F/FO8bkw8U6kYxM=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
 go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
@@ -91,65 +72,19 @@ go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt3
 go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
 golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
 golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
 golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
 golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
 golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

Backend/helper/logs/main.go

@@ -1,6 +1,3 @@
-// Helper package to create audit logs in the logs folder
-// these are by the time only generated, when a booking is
-// changed on the /time page
 package logs
 
 import (
@@ -17,8 +14,8 @@ type FileLog struct {
 var Logs map[string]FileLog = make(map[string]FileLog)
 
 func NewAudit() (i *log.Logger, close func() error) {
-	logName := "logs/" + time.Now().Format(time.DateOnly) + ".log"
+	LOG_FILE := "logs/" + time.Now().Format(time.DateOnly) + ".log"
-	logFile, err := os.OpenFile(logName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	logFile, err := os.OpenFile(LOG_FILE, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
 		log.Panic(err)
 	}

Backend/helper/paramParser/main.go

@@ -1,7 +1,3 @@
-// this package contains different functions to parse URL.Values or Form.Values
-// into other datatypes see functionname
-// on fail the funktions either return a fallback or error
-
 package paramParser
 
 import (
@@ -9,7 +5,6 @@ import (
 	"log/slog"
 	"net/url"
 	"strconv"
-	"strings"
 	"time"
 )
 
@@ -17,29 +12,6 @@ type ParamsParser struct {
 	urlParams url.Values
 }
 
-func (p ParamsParser) ParseStringListFallback(key string, delimiter string, fallback []string) []string {
-	if !p.urlParams.Has(key) {
-		return fallback
-	}
-	paramList := p.urlParams.Get(key)
-	list := strings.Split(paramList, delimiter)
-	return list
-}
-
-func (p ParamsParser) ParseIntListFallback(key string, delimiter string, fallback []int) []int {
-	if !p.urlParams.Has(key) {
-		return fallback
-	}
-	paramList := p.urlParams[key]
-	parsedList := make([]int, 0)
-	for _, item := range paramList {
-		if parsedItem, err := strconv.Atoi(item); err == nil {
-			parsedList = append(parsedList, parsedItem)
-		}
-	}
-	return parsedList
-}
-
 type NoValueError struct {
 	Key string
 }
@@ -87,7 +59,7 @@ func (p *ParamsParser) ParseStringFallback(key string, fallback string) string {
 	return p.urlParams.Get(key)
 }
 
-func (p *ParamsParser) ParseString(key string) (string, error) {
+func (p *ParamsParser) ParseString(key string, fallback string) (string, error) {
 	if !p.urlParams.Has(key) {
 		return "", &NoValueError{Key: key}
 	}

Backend/helper/strings.go

@@ -0,0 +1,9 @@
+package helper
+
+func GetFirst[T, U any](val T, _ U) T {
+	return val
+}
+
+func GetSecond[T, U any](_ T, val U) U {
+	return val
+}

Backend/helper/system.go

@@ -1,7 +1,5 @@
 package helper
 
-// different system helpers for environment variables + cache
-
 import (
 	"os"
 	"time"
@@ -20,10 +18,6 @@ func GetEnv(key, fallback string) string {
 	return fallback
 }
 
-func IsDebug() bool {
-	return GetEnv("GO_ENV", "production") == "debug"
-}
-
 type CacheItem struct {
 	value      any
 	expiration time.Time

Backend/helper/time.go

@@ -1,10 +1,7 @@
 package helper
 
-// time helpers
-
 import (
 	"fmt"
-	"slices"
 	"time"
 )
 
@@ -19,81 +16,22 @@ func GetMonday(ts time.Time) time.Time {
 	return ts
 }
 
-func GetMondays(allDays []time.Time, onlyInRange bool) []time.Time {
-	var mondays []time.Time
-	var start, end time.Time
-
-	for _, day := range allDays {
-		mondays = append(mondays, GetMonday(day))
-
-		if start.IsZero() || day.Before(start) {
-			start = day
-		}
-		if end.IsZero() || day.After(end) {
-			end = day
-		}
-	}
-	mondays = slices.Compact(mondays)
-	if onlyInRange {
-		return DaysInRange(mondays, start, end)
-	}
-	return mondays
-}
-
-func DaysInRange(days []time.Time, startDate, endDate time.Time) []time.Time {
-	filtered := []time.Time{}
-	startDate = startDate.Add(-time.Minute)
-	endDate = endDate.Add(time.Minute)
-
-	for _, day := range days {
-		if day.After(startDate) && day.Before(endDate) {
-			filtered = append(filtered, day)
-		}
-	}
-	return filtered
-}
-
-func IsMonday(day time.Time) bool {
-	return day.Weekday() == time.Monday
-}
-
-// GenerateDateRange returns a slice of all dates between start and end (inclusive).
-func GenerateDateRange(start, end time.Time) []time.Time {
-	var dates []time.Time
-
-	// Ensure start is before or equal to end
-	if start.After(end) {
-		return dates
-	}
-
-	// Normalize times to midnight
-	current := start.Truncate(time.Hour * 24)
-	end = end.Truncate(time.Hour * 24)
-
-	for !current.After(end) {
-		dates = append(dates, current)
-		current = current.AddDate(0, 0, 1) // Add one day
-	}
-	return dates
-}
-
-func GetFirstOfMonth(ts time.Time) time.Time {
-	if ts.Day() > 1 {
-		return ts.AddDate(0, 0, -(ts.Day() - 1))
-	}
-	return ts
-}
-
 func IsWeekend(ts time.Time) bool {
 	return ts.Weekday() == time.Saturday || ts.Weekday() == time.Sunday
 }
 
+func GetKW(t time.Time) int {
+	_, kw := t.ISOWeek()
+	return kw
+}
+
 func FormatDuration(d time.Duration) string {
 	return FormatDurationFill(d, false)
 }
 
 // Converts duration to string
 func FormatDurationFill(d time.Duration, fill bool) string {
+	return fmt.Sprintf("%.1f", d.Hours())
 	hours := int(d.Abs().Hours())
 	minutes := int(d.Abs().Minutes()) % 60
 	sign := ""
@@ -131,10 +69,3 @@ func GetWorkingDays(startDate, endDate time.Time) int {
 	}
 	return count
 }
-
-func FormatGermanDayOfWeek(t time.Time) string {
-	return days[t.Weekday()][:2]
-}
-
-var days = [...]string{
-	"Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"}

Backend/helper/time_test.go

@@ -8,180 +8,35 @@ import (
 
 func TestGetMonday(t *testing.T) {
 	isMonday, err := time.Parse(time.DateOnly, "2025-07-14")
-	isSunday, err := time.Parse(time.DateOnly, "2025-07-20")
 	notMonday, err := time.Parse(time.DateOnly, "2025-07-16")
 	if err != nil || isMonday.Equal(notMonday) {
 		t.Errorf("U stupid? %e", err)
 	}
-	if GetMonday(isMonday) != isMonday {
+	if GetMonday(isMonday) != isMonday || GetMonday(notMonday) != isMonday {
 		t.Error("Wrong date conversion!")
 	}
-
-	if GetMonday(notMonday) != isMonday {
-		t.Error("Wrong date conversion (notMonday)!")
-	}
-
-	if GetMonday(isSunday) != isMonday {
-		t.Error("Wrong date conversion (isSunday)!")
-	}
-}
-
-func TestIsMonday_ReturnsTrueForMonday(t *testing.T) {
-	monday := time.Date(2023, 4, 3, 0, 0, 0, 0, time.UTC)
-
-	if !IsMonday(monday) {
-		t.Errorf("Expected IsMonday to return true for Monday, got false")
-	}
-}
-
-func TestIsMonday_ReturnsFalseForNonMonday(t *testing.T) {
-	tuesday := time.Date(2023, 4, 4, 0, 0, 0, 0, time.UTC)
-
-	if IsMonday(tuesday) {
-		t.Errorf("Expected IsMonday to return false for Tuesday, got true")
-	}
-}
-
-func TestGenerateDateRange(t *testing.T) {
-	start := time.Date(2026, 2, 9, 0, 0, 0, 0, time.UTC)
-	end := time.Date(2026, 2, 11, 0, 0, 0, 0, time.UTC)
-
-	dates := GenerateDateRange(start, end)
-
-	if len(dates) != 3 {
-		t.Fatalf("expected 3 dates, got %d", len(dates))
-	}
-
-	expected := []string{"2026-02-09", "2026-02-10", "2026-02-11"}
-	for i, d := range dates {
-		got := d.Format("2006-01-02")
-		if got != expected[i] {
-			t.Errorf("expected %s, got %s", expected[i], got)
-		}
-	}
-}
-
-func TestGetMondays_ReturnsOnlyMondays(t *testing.T) {
-	startDate := time.Date(2026, 01, 01, 0, 0, 0, 0, time.UTC)
-	endDate := time.Date(2026, 01, 31, 0, 0, 0, 0, time.UTC)
-
-	daysInMonth := GenerateDateRange(startDate, endDate)
-	result := GetMondays(daysInMonth, false)
-	if len(result) < 5 {
-		t.Errorf("Expected 5 monday, got %d", len(result))
-	} else if len(result) > 5 {
-		t.Errorf("Expected 5 monday, got %d", len(result))
-	}
-
-	if result[0] != time.Date(2025, 12, 29, 0, 0, 0, 0, time.UTC) {
-		t.Errorf("Expected first monday to be %v, got %v", "2025-12-29", result[0])
-	}
-}
-
-func TestGetMondays_ReturnsOnlyMondaysInRange(t *testing.T) {
-	startDate := time.Date(2026, 01, 01, 0, 0, 0, 0, time.UTC)
-	endDate := time.Date(2026, 01, 31, 0, 0, 0, 0, time.UTC)
-
-	daysInMonth := GenerateDateRange(startDate, endDate)
-	result := GetMondays(daysInMonth, true)
-	if len(result) < 4 {
-		t.Errorf("Expected 4 monday, got %d", len(result))
-	} else if len(result) > 4 {
-		t.Errorf("Expected 4 monday, got %d", len(result))
-	}
-
-	if result[0] != time.Date(2026, 1, 5, 0, 0, 0, 0, time.UTC) {
-		t.Errorf("Expected first monday to be %v, got %v", "2026-01-05", result[0])
-	}
-}
-
-func TestDaysInRange(t *testing.T) {
-	days := []time.Time{
-		time.Date(2023, 4, 3, 0, 0, 0, 0, time.UTC), // Tuesday
-		time.Date(2023, 4, 4, 0, 0, 0, 0, time.UTC), // Wednesday
-		time.Date(2023, 4, 5, 0, 0, 0, 0, time.UTC), // Thursday
-		time.Date(2023, 4, 6, 0, 0, 0, 0, time.UTC), // Friday
-	}
-
-	start := time.Date(2023, 4, 3, 0, 0, 0, 0, time.UTC)
-	end := time.Date(2023, 4, 5, 0, 0, 0, 0, time.UTC)
-
-	daysInRange := DaysInRange(days, start, end)
-
-	if len(daysInRange) != 3 {
-		t.Errorf("Expected 3 days in range, got %d", len(daysInRange))
-	}
-
-	if daysInRange[0] != days[0] {
-		t.Errorf("Expected first day in range to be %v, got %v", days[0], daysInRange[0])
-	}
-
-	if daysInRange[2] != days[2] {
-		t.Errorf("Expected third day in range to be %v, got %v", days[2], daysInRange[2])
-	}
-}
-
-func TestFormatDurationFill(t *testing.T) {
-	testCases := []struct {
-		name     string
-		duration time.Duration
-		fill     bool
-	}{
-		{"2h", time.Duration(120 * time.Minute), true},
-		{"30min", time.Duration(30 * time.Minute), true},
-		{"1h 30min", time.Duration(90 * time.Minute), true},
-		{"-1h 30min", time.Duration(-90 * time.Minute), true},
-		{"0min", 0, true},
-		{"", 0, false},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			if FormatDurationFill(tc.duration, tc.fill) != tc.name {
-				t.Error("Format missmatch in Formatduration.")
-			}
-		})
-	}
 }
 
 func TestFormatDuration(t *testing.T) {
-	testCases := []struct {
+	durations := []struct {
 		name     string
 		duration time.Duration
 	}{
+		{"2h", time.Duration(120 * time.Minute)},
+		{"30min", time.Duration(30 * time.Minute)},
+		{"1h 30min", time.Duration(90 * time.Minute)},
+		{"-1h 30min", time.Duration(-90 * time.Minute)},
 		{"", 0},
 	}
-	for _, tc := range testCases {
+	for _, d := range durations {
-		t.Run(tc.name, func(t *testing.T) {
+		t.Run(d.name, func(t *testing.T) {
-			if FormatDuration(tc.duration) != tc.name {
+			if FormatDuration(d.duration) != d.name {
 				t.Error("Format missmatch in Formatduration.")
 			}
 		})
 	}
 }
 
-func TestIsSameDate(t *testing.T) {
-	testCases := []struct {
-		dateA  string
-		dateB  string
-		result bool
-	}{
-		{"2025-12-01 00:00:00", "2025-12-01 00:00:00", true},
-		{"2025-12-03 00:00:00", "2025-12-02 00:00:00", false},
-		{"2025-12-03 23:45:00", "2025-12-03 00:00:00", true},
-		{"2025-12-04 24:12:00", "2025-12-04 00:12:00", false},
-	}
-
-	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("IsSameDateTest: %s date", tc.dateA), func(t *testing.T) {
-			dateA, _ := time.Parse(time.DateTime, tc.dateA)
-			dateB, _ := time.Parse(time.DateTime, tc.dateB)
-			if IsSameDate(dateA, dateB) != tc.result {
-				t.Errorf("Is SameDate did not match! Result %t", IsSameDate(dateA, dateB))
-			}
-		})
-	}
-}
-
 func TestGetWorkingDays(t *testing.T) {
 	testCases := []struct {
 		start string
@@ -203,27 +58,3 @@ func TestGetWorkingDays(t *testing.T) {
 		})
 	}
 }
-
-func TestFormatGermanDayOfWeek(t *testing.T) {
-	testCases := []struct {
-		date   string
-		result string
-	}{
-		{"2025-12-01", "Mo"},
-		{"2025-12-02", "Di"},
-		{"2025-12-03", "Mi"},
-		{"2025-12-04", "Do"},
-		{"2025-12-05", "Fr"},
-		{"2025-12-06", "Sa"},
-		{"2025-12-07", "So"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("FormatWeekDayTest: %s date", tc.date), func(t *testing.T) {
-			date, _ := time.Parse(time.DateOnly, tc.date)
-			if FormatGermanDayOfWeek(date) != tc.result {
-				t.Error("Formatted workday did not match!")
-			}
-		})
-	}
-}

Backend/helper/types.go

@@ -1,6 +1,12 @@
 package helper
 
-// type conversion
+import "time"
+
+type TimeFormValue struct {
+	TsFrom  time.Time
+	TsTo    time.Time
+	CardUID string
+}
 
 func BoolToInt(b bool) int {
 	var i int = 0

Backend/helper/types_test.go

@@ -1,26 +0,0 @@
-package helper
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestBoolToInt(t *testing.T) {
-	testCases := []struct {
-		value bool
-		res   int
-		res8  int8
-	}{
-		{true, 1, 1},
-		{false, 0, 0},
-	}
-
-	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("BoolToInt value: %t", tc.value), func(t *testing.T) {
-			if BoolToInt(tc.value) != tc.res || BoolToInt8(tc.value) != tc.res8 {
-				t.Error("How could you... mess up bool to int")
-			}
-		})
-	}
-
-}

Backend/helper/web.go

@@ -1,7 +1,5 @@
 package helper
 
-// web helpers to either set Cross Origin Request Security or block all requests without a user
-
 import (
 	"context"
 	"net/http"
@@ -24,7 +22,7 @@ func SetCors(w http.ResponseWriter) {
 
 func RequiresLogin(session *scs.SessionManager, w http.ResponseWriter, r *http.Request) {
 	r = r.WithContext(context.WithValue(r.Context(), "session", session))
-	if IsDebug() {
+	if GetEnv("GO_ENV", "production") == "debug" {
 		return
 	}
 	if session.Exists(r.Context(), "user") {

Backend/helper/web_test.go

@@ -1,112 +0,0 @@
-package helper
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"testing"
-
-	"github.com/alexedwards/scs/v2"
-)
-
-func TestSetCors_WhenNoCorsTrue(t *testing.T) {
-	os.Setenv("NO_CORS", "true")
-	defer os.Unsetenv("NO_CORS")
-
-	rr := httptest.NewRecorder()
-
-	SetCors(rr)
-
-	h := rr.Header()
-
-	if h.Get("Access-Control-Allow-Origin") != "*" {
-		t.Errorf("expected Access-Control-Allow-Origin to be '*', got %q", h.Get("Access-Control-Allow-Origin"))
-	}
-
-	if h.Get("Access-Control-Allow-Methods") != "*" {
-		t.Errorf("expected Access-Control-Allow-Methods to be '*', got %q", h.Get("Access-Control-Allow-Methods"))
-	}
-
-	if h.Get("Access-Control-Allow-Headers") != "*" {
-		t.Errorf("expected Access-Control-Allow-Headers to be '*', got %q", h.Get("Access-Control-Allow-Headers"))
-	}
-}
-
-func TestSetCors_WhenNoCorsFalse(t *testing.T) {
-	os.Setenv("NO_CORS", "false")
-	defer os.Unsetenv("NO_CORS")
-
-	rr := httptest.NewRecorder()
-
-	SetCors(rr)
-
-	h := rr.Header()
-	if h.Get("Access-Control-Allow-Origin") != "" ||
-		h.Get("Access-Control-Allow-Methods") != "" ||
-		h.Get("Access-Control-Allow-Headers") != "" {
-		t.Errorf("CORS headers should not be set when NO_CORS=false")
-	}
-}
-
-func TestRequiresLogin_DebugMode_NoRedirect(t *testing.T) {
-	os.Setenv("GO_ENV", "debug")
-	defer os.Unsetenv("GO_ENV")
-
-	session := scs.New()
-
-	req := httptest.NewRequest("GET", "/", nil)
-	rr := httptest.NewRecorder()
-
-	RequiresLogin(session, rr, req)
-
-	if rr.Result().StatusCode == http.StatusSeeOther {
-		t.Errorf("expected no redirect in debug mode")
-	}
-}
-
-// func TestRequiresLogin_UserExists_NoRedirect(t *testing.T) {
-// 	os.Setenv("GO_ENV", "production")
-// 	defer os.Unsetenv("GO_ENV")
-
-// 	session := scs.New()
-
-// 	req := httptest.NewRequest("GET", "/", nil)
-// 	ctx, err := session.Load(req.Context(), "")
-// 	if err != nil {
-// 		t.Fatalf("session load error: %v", err)
-// 	}
-
-// 	ctx = session.Put(ctx, "user", "123")
-// 	req = req.WithContext(context.WithValue(ctx, "session", session))
-
-// 	rr := httptest.NewRecorder()
-
-// 	yourpkg.RequiresLogin(session, rr, req)
-
-// 	if rr.Result().StatusCode == http.StatusSeeOther {
-// 		t.Errorf("expected no redirect when user exists")
-// 	}
-// }
-
-// func TestRequiresLogin_NoUser_Redirects(t *testing.T) {
-// 	os.Setenv("GO_ENV", "production")
-// 	defer os.Unsetenv("GO_ENV")
-
-// 	session := scs.New()
-
-// 	req := httptest.NewRequest("GET", "/", nil)
-// 	req = req.WithContext(context.WithValue(req.Context(), "session", session))
-
-// 	rr := httptest.NewRecorder()
-
-// 	RequiresLogin(session, rr, req)
-
-// 	if rr.Result().StatusCode != http.StatusSeeOther {
-// 		t.Errorf("expected redirect when user does not exist, got %d", rr.Result().StatusCode)
-// 	}
-
-// 	location := rr.Result().Header.Get("Location")
-// 	if location != "/user/login" {
-// 		t.Errorf("expected redirect to /user/login, got %q", location)
-// 	}
-// }

Backend/main.go

@@ -1,13 +1,10 @@
 package main
 
-// this is the main file where the webserver is configured and all endpoints are added with their routes
-
 import (
 	"arbeitszeitmessung/endpoints"
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"context"
-	"database/sql"
 	"log/slog"
 	"net/http"
 	"os"
@@ -20,16 +17,7 @@ import (
 func main() {
 	var err error
 	var logLevel slog.LevelVar
-	switch helper.GetEnv("LOG_LEVEL", "warn") {
-	case "debug":
-		logLevel.Set(slog.LevelDebug)
-	case "info":
-		logLevel.Set(slog.LevelInfo)
-	case "warn":
 	logLevel.Set(slog.LevelWarn)
-	case "error":
-		logLevel.Set(slog.LevelError)
-	}
 
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: &logLevel}))
 	slog.SetDefault(logger)
@@ -38,7 +26,7 @@ func main() {
 	if err != nil {
 		slog.Info("No .env file found in directory!")
 	}
-	if helper.IsDebug() {
+	if helper.GetEnv("GO_ENV", "production") == "debug" {
 		logLevel.Set(slog.LevelDebug)
 		envs := os.Environ()
 		slog.Debug("Debug mode enabled", "Environment Variables", envs)
@@ -47,19 +35,6 @@ func main() {
 	models.DB, err = OpenDatabase()
 	if err != nil {
 		slog.Error("Error while opening the database", "Error", err)
-		return
-	}
-
-	defer models.DB.(*sql.DB).Close()
-
-	models.Options = configure()
-
-	if helper.GetEnv("GO_ENV", "production") != "debug" {
-		err = Migrate()
-		if err != nil {
-			slog.Error("Failed to migrate the database to newest version", "Error", err)
-			return
-		}
 	}
 
 	fs := http.FileServer(http.Dir("./static"))
@@ -69,57 +44,31 @@ func main() {
 
 	// handles the different http routes
 	server.HandleFunc("/time/new", endpoints.TimeCreateHandler)
-	server.Handle("/absence", paramsMiddleware(endpoints.AbsencHandler))
+	server.Handle("/absence", ParamsMiddleware(endpoints.AbsencHandler))
-	server.Handle("/time", paramsMiddleware(endpoints.TimeHandler))
+	server.Handle("/time", ParamsMiddleware(endpoints.TimeHandler))
-	server.HandleFunc("/auto/logout", endpoints.LogoutHandler)
+	server.HandleFunc("/logout", endpoints.LogoutHandler)
-	server.HandleFunc("/auto/kurzarbeit", endpoints.KurzarbeitFillHandler)
-	server.HandleFunc("/auto/feiertage", endpoints.FeiertagsHandler)
 	server.HandleFunc("/user/{action}", endpoints.UserHandler)
-	server.HandleFunc("/team/report", endpoints.ReportHandler)
+	// server.HandleFunc("/user/login", endpoints.LoginHandler)
-	server.HandleFunc("/team/presence", endpoints.PresenceHandler)
+	// server.HandleFunc("/user/settings", endpoints.UserSettingsHandler)
-	server.Handle("/pdf", paramsMiddleware(endpoints.PDFFormHandler))
+	server.HandleFunc("/team", endpoints.TeamHandler)
+	server.HandleFunc("/presence", endpoints.TeamPresenceHandler)
+	server.Handle("/pdf", ParamsMiddleware(endpoints.PDFFormHandler))
 	server.HandleFunc("/pdf/generate", endpoints.PDFCreateController)
 	server.Handle("/", http.RedirectHandler("/time", http.StatusPermanentRedirect))
 	server.Handle("/static/", http.StripPrefix("/static/", fs))
 
 	serverSessionMiddleware := endpoints.Session.LoadAndSave(server)
 
-	serverSessionMiddleware = loggingMiddleware(serverSessionMiddleware)
-
 	// starting the http server
 	slog.Info("Server is running at http://localhost:8080")
 	slog.Error("Error starting Server", "Error", http.ListenAndServe(":8080", serverSessionMiddleware))
 }
 
-func paramsMiddleware(next http.HandlerFunc) http.Handler {
+func ParamsMiddleware(next http.HandlerFunc) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		queryParams := r.URL.Query()
 		ctx := context.WithValue(r.Context(), "urlParams", queryParams)
-		if len(queryParams) > 0 {
 		slog.Debug("ParamsMiddleware added urlParams", slog.Any("urlParams", queryParams))
-		}
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})
 }
-
-func loggingMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		start := time.Now()
-
-		// Log the method and the requested URL
-		slog.Info("Started request", slog.String("Method", r.Method), slog.String("Path", r.URL.Path))
-
-		// Call the next handler in the chain
-		next.ServeHTTP(w, r)
-
-		// Log how long it took
-		slog.Info("Completet Request", slog.String("Time", time.Since(start).String()))
-	})
-}
-
-func configure() models.BookingOptions {
-	return models.BookingOptions{
-		AllowOutOfBounds: helper.GetEnv("BOOKING_OUT_OF_BOUNDS", "false") == "true",
-		AllowUnknownUser: helper.GetEnv("BOOKING_FOR_UNKNOWN_USER", "false") == "true",
-	}
-}

Backend/migrations/20251217215955_feiertage.down.sql

@@ -1,6 +0,0 @@
--- reverse: create index "feiertage_unique_pro_jahr" to table: "s_feiertage"
-DROP INDEX "feiertage_unique_pro_jahr";
--- reverse: create "s_feiertage" table
-DROP TABLE "s_feiertage";
--- reverse: set comment to column: "arbeitszeit_equivalent" on table: "s_abwesenheit_typen"
-COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS '0=keine Arbeitszeit; 1=Arbeitszeit auffüllen; 2=Arbeitszeit austauschen';

Backend/migrations/20251217215955_feiertage.up.sql

@@ -1,15 +0,0 @@
--- set comment to column: "arbeitszeit_equivalent" on table: "s_abwesenheit_typen"
-COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS '0=keine Arbeitszeit; -1=Arbeitszeit auffüllen; <=1 - 100 => Arbeitszeit pro Tag prozentual';
--- create "s_feiertage" table
-CREATE TABLE "s_feiertage" (
-  "counter_id" serial NOT NULL,
-  "datum" date NOT NULL,
-  "name" character varying(100) NOT NULL,
-  "wiederholen" smallint NOT NULL DEFAULT 0,
-  "arbeitszeit_equivalent" smallint NOT NULL DEFAULT 100,
-  PRIMARY KEY ("counter_id")
-);
--- create index "feiertage_unique_pro_jahr" to table: "s_feiertage"
-CREATE UNIQUE INDEX "feiertage_unique_pro_jahr" ON "s_feiertage" ((EXTRACT(year FROM datum)), "name");
-
-GRANT INSERT, UPDATE ON s_feiertage TO app_base;

Backend/models/absence.go

@@ -1,22 +1,9 @@
-// the models package contains the datamodels for the whole webserver
-// most of them are also in the DB
-//
-// in the future it would be good to change it to create a repository structure,
-// so that there would be a second pacakge handling db requests
-
 package models
 
-// this file has all functions and types to handle absences
-// the absence type implements the iWorkDay interface so that
-// it can be used as one workday
-//
-// the absence data is based on the entries in the "abwesenheit" database table
-
 import (
-	"database/sql"
 	"encoding/json"
+	"errors"
 	"log"
-	"log/slog"
 	"time"
 )
 
@@ -35,66 +22,106 @@ type Absence struct {
 	DateTo         time.Time
 }
 
-// IsEmpty implements [IWorkDay].
+func NewAbsence(card_uid string, abwesenheit_typ int, datum time.Time) (Absence, error) {
-func (a *Absence) IsEmpty() bool {
+	if abwesenheit_typ < 0 {
-	return false
+		return Absence{
+			CardUID:        card_uid,
+			AbwesenheitTyp: AbsenceType{0, "Custom absence", 100},
+			DateFrom:       datum,
+		}, nil
+	}
+	_absenceType, ok := GetAbsenceTypesCached()[int8(abwesenheit_typ)]
+	if !ok {
+		return Absence{}, errors.New("Invalid absencetype")
+	}
+	return Absence{
+		CardUID:        card_uid,
+		AbwesenheitTyp: _absenceType,
+		DateFrom:       datum,
+	}, nil
 }
 
 func (a *Absence) Date() time.Time {
 	return a.Day.Truncate(24 * time.Hour)
 }
 
-func (a *Absence) Type() DayType {
-	return DayTypeAbsence
-}
-
 func (a *Absence) IsMultiDay() bool {
 	return !a.DateFrom.Equal(a.DateTo)
 }
 
-func (a *Absence) GetWorktime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
+func (a *Absence) GetWorktimeReal(u User, base WorktimeBase) time.Duration {
-	switch base {
+	if a.AbwesenheitTyp.WorkTime <= 1 {
-	case WorktimeBaseDay:
-		if a.AbwesenheitTyp.WorkTime <= 0 && includeKurzarbeit {
-			return u.ArbeitszeitProTagFrac(1)
-		} else if a.AbwesenheitTyp.WorkTime <= 0 {
-			return 0
-		}
-		return u.ArbeitszeitProTagFrac(float32(a.AbwesenheitTyp.WorkTime) / 100)
-	case WorktimeBaseWeek:
-		if a.AbwesenheitTyp.WorkTime <= 0 && includeKurzarbeit {
-			return u.ArbeitszeitProWocheFrac(0.2)
-		} else if a.AbwesenheitTyp.WorkTime <= 0 {
-			return 0
-		}
-		return u.ArbeitszeitProWocheFrac(0.2 * float32(a.AbwesenheitTyp.WorkTime) / 100)
-	}
-	return 0
-}
-
-func (a *Absence) GetPausetime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	return 0
-}
-
-func (a *Absence) GetOvertime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	if a.AbwesenheitTyp.WorkTime > 0 {
 		return 0
 	}
 	switch base {
 	case WorktimeBaseDay:
-		return -u.ArbeitszeitProTagFrac(1)
+		return u.ArbeitszeitProTag()
 	case WorktimeBaseWeek:
-		return -u.ArbeitszeitProWocheFrac(0.2)
+		return u.ArbeitszeitProWoche() / 5
+	}
+	return 0
+}
+func (a *Absence) GetPausetimeReal(u User, base WorktimeBase) time.Duration {
+	return 0
+}
+
+func (a *Absence) GetOvertimeReal(u User, base WorktimeBase) time.Duration {
+	if a.AbwesenheitTyp.WorkTime > 1 {
+		return 0
+	}
+	switch base {
+	case WorktimeBaseDay:
+		return -u.ArbeitszeitProTag()
+	case WorktimeBaseWeek:
+		return -u.ArbeitszeitProWoche() / 5
 	}
 	return 0
 }
 
-func (a *Absence) GetTimes(u User, base WorktimeBase, includeKurzarbeit bool) (work, pause, overtime time.Duration) {
+func (a *Absence) GetWorktimeVirtual(u User, base WorktimeBase) time.Duration {
-	return a.GetWorktime(u, base, includeKurzarbeit), a.GetPausetime(u, base, includeKurzarbeit), a.GetOvertime(u, base, includeKurzarbeit)
+	return a.GetWorktimeReal(u, base)
+}
+
+func (a *Absence) GetPausetimeVirtual(u User, base WorktimeBase) time.Duration {
+	return a.GetPausetimeReal(u, base)
+}
+
+func (a *Absence) GetOvertimeVirtual(u User, base WorktimeBase) time.Duration {
+	return a.GetOvertimeReal(u, base)
+}
+
+func (a *Absence) GetTimesReal(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
+	return a.GetWorktimeReal(u, base), a.GetPausetimeReal(u, base), a.GetOvertimeReal(u, base)
+}
+
+func (a *Absence) GetTimesVirtual(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
+	return a.GetWorktimeVirtual(u, base), a.GetPausetimeVirtual(u, base), a.GetOvertimeVirtual(u, base)
+}
+
+func (a *Absence) TimeWorkVirtual(u User) time.Duration {
+	return a.TimeWorkReal(u)
+}
+
+func (a *Absence) TimeWorkReal(u User) time.Duration {
+	if a.AbwesenheitTyp.WorkTime > 1 {
+		return time.Duration(u.ArbeitszeitPerTag * float32(time.Hour)).Round(time.Minute)
+	}
+	return 0
+}
+
+func (a *Absence) TimePauseReal(u User) (work, pause time.Duration) {
+	return 0, 0
+}
+
+func (a *Absence) TimeOvertimeReal(u User) time.Duration {
+	if a.AbwesenheitTyp.WorkTime > 1 {
+		return 0
+	}
+	return -u.ArbeitszeitProTag()
 }
 
 func (a *Absence) ToString() string {
-	return a.AbwesenheitTyp.Name
+	return "Abwesenheit"
 }
 
 func (a *Absence) IsWorkDay() bool {
@@ -106,7 +133,7 @@ func (a *Absence) IsKurzArbeit() bool {
 }
 
 func (a *Absence) GetDayProgress(u User) int8 {
-	return a.AbwesenheitTyp.WorkTime
+	return 100
 }
 
 func (a *Absence) RequiresAction() bool {
@@ -288,33 +315,3 @@ func GetAbsenceTypeById(absenceTypeId int8) (AbsenceType, error) {
 	}
 	return absenceType, nil
 }
-
-func (a *Absence) Delete() error {
-	qStr, err := DB.Prepare("DELETE from abwesenheit WHERE counter_id = $1;")
-	if err != nil {
-		return err
-	}
-	_, err = qStr.Exec(a.CounterId)
-	return err
-}
-
-func (a *Absence) IsSubmittedAndAccepted() bool {
-	qStr, err := DB.Prepare(`SELECT bestaetigt from wochen_report WHERE $1 = ANY(abwesenheiten) AND $2 >= woche_start AND $2 <  woche_start + INTERVAL '1 week';`) // @> array contains
-	if err != nil {
-		slog.Warn("Error when preparing SQL Statement", "error", err)
-		return false
-	}
-	defer qStr.Close()
-	var isSubmittedAndChecked bool = false
-
-	err = qStr.QueryRow(a.CounterId, a.Date()).Scan(&isSubmittedAndChecked)
-	if err == sql.ErrNoRows {
-		// No rows found ==> not even submitted
-		return false
-	}
-
-	if err != nil {
-		slog.Warn("Unexpected error when executing SQL Statement", "error", err)
-	}
-	return isSubmittedAndChecked
-}

Backend/models/absence_test.go

@@ -1,95 +0,0 @@
-package models_test
-
-// all the files with *_test.go are used to test the functions inside the respective file
-// the tests are partially complete
-
-import (
-	"arbeitszeitmessung/helper"
-	"arbeitszeitmessung/models"
-	"testing"
-	"time"
-)
-
-var testAbsence = models.Absence{
-	Day:            CatchError(time.Parse(time.DateOnly, "2025-01-01")),
-	AbwesenheitTyp: models.AbsenceType{},
-	DateFrom:       CatchError(time.Parse(time.DateOnly, "2025-01-01")),
-	DateTo:         CatchError(time.Parse(time.DateOnly, "2025-01-03")),
-}
-
-var testKurzarbeit = models.AbsenceType{
-	Name:     "Kurzarbeit",
-	WorkTime: -1,
-}
-
-var testUrlaub = models.AbsenceType{
-	Name:     "Urlaub",
-	WorkTime: 100,
-}
-
-var testUrlaubUntertags = models.AbsenceType{
-	Name:     "Urlaub untertags",
-	WorkTime: 50,
-}
-
-func TestCalcRealWorkTimeDayAbsence(t *testing.T) {
-	testCases := []struct {
-		absenceType  models.AbsenceType
-		expectedTime time.Duration
-	}{
-		{
-			absenceType:  testUrlaub,
-			expectedTime: time.Hour * 8,
-		},
-		{
-			absenceType:  testUrlaubUntertags,
-			expectedTime: time.Hour * 4,
-		},
-		{
-			absenceType:  testKurzarbeit,
-			expectedTime: 0,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run("Calc Absence Worktime: "+tc.absenceType.Name, func(t *testing.T) {
-			var testCase = testAbsence
-			testCase.AbwesenheitTyp = tc.absenceType
-			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseDay, false)
-			if workTime != tc.expectedTime {
-				t.Errorf("Calc Worktime Default not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
-			}
-		})
-	}
-}
-
-func TestCalcRealWorkTimeWeekAbsence(t *testing.T) {
-	testCases := []struct {
-		absenceType  models.AbsenceType
-		expectedTime time.Duration
-	}{
-		{
-			absenceType:  testUrlaub,
-			expectedTime: time.Hour * 7,
-		},
-		{
-			absenceType:  testUrlaubUntertags,
-			expectedTime: time.Hour*3 + time.Minute*30,
-		},
-		{
-			absenceType:  testKurzarbeit,
-			expectedTime: 0,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run("Calc Absence Worktime: "+tc.absenceType.Name, func(t *testing.T) {
-			var testCase = testAbsence
-			testCase.AbwesenheitTyp = tc.absenceType
-			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseWeek, false)
-			if workTime != tc.expectedTime {
-				t.Errorf("Calc Worktime Default not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
-			}
-		})
-	}
-}

Backend/models/booking.go

@@ -1,11 +1,5 @@
 package models
 
-// this file has all functions and types to handle bookings
-// the bookings itself are later combined to a workday to save on
-// db requests and computation
-//
-// the booking data is based on the entries in the "anwesenheit" database table
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/helper/logs"
@@ -36,12 +30,6 @@ type Booking struct {
 	Timestamp   time.Time   `json:"timestamp"`
 	CounterId   int         `json:"counter_id"`
 	BookingType BookingType `json:"anwesenheit_typ"`
-	Valid       bool        `json:"valid"`
-}
-
-type BookingOptions struct {
-	AllowOutOfBounds bool
-	AllowUnknownUser bool
 }
 
 type IDatabase interface {
@@ -51,9 +39,7 @@ type IDatabase interface {
 
 var DB IDatabase
 
-var Options BookingOptions
+func (b *Booking) New(cardUid string, gereatId int16, checkInOut int16, typeId int8) Booking {
-
-func (b *Booking) NewBooking(cardUid string, gereatId int16, checkInOut int16, typeId int8) Booking {
 	bookingType, err := GetBookingTypeById(typeId)
 	if err != nil {
 		log.Printf("Cannot get booking type %d, from database!", typeId)
@@ -99,44 +85,31 @@ func (b *Booking) Verify() bool {
 	} else {
 		b.BookingType.Name = bookingType.Name
 	}
-
-	user, err := GetUserByCardUID(b.CardUID)
-	if err == sql.ErrNoRows {
-		log.Println("Cannot find user with given CardUID")
-		return Options.AllowUnknownUser // if allow do not fail verify if not allow fail verify
-	}
-
-	if err != nil {
-		slog.Error("Cannot get user from CardUID", "error", err)
-		return false
-	}
-
-	if bookingOutOfBounds(b, &user) {
-		auditLog, closeLog := logs.NewAudit()
-		defer closeLog()
-		if !Options.AllowOutOfBounds {
-			return false
-		}
-
-		oldTime := b.Timestamp
-		if oldTime.IsZero() {
-			oldTime = time.Now()
-		}
-		if b.CheckInOut%2 == 1 && b.CheckInOut < 200 { //kommen Booking
-			b.Timestamp = user.ArbeitMinStartTime(oldTime)
-		} else {
-			b.Timestamp = user.ArbeitMaxEndeTime(oldTime)
-		}
-		auditLog.Printf("Buchung (%s) von '%s' außerhalb der regulaeren Zeit. Verschieben der Zeit %s -> %s", b.GetBookingType(), user.CardUID, oldTime.Format(time.TimeOnly), b.Timestamp.Format(time.TimeOnly))
-		slog.Info("Booking is out of work time bounds, setting time to match worktime bounds", "new_time", b.Timestamp.String(), "old_time", oldTime)
-	}
 	return true
 }
 
-func (b *Booking) Insert() error {
+func (b *Booking) IsSubmittedAndChecked() bool {
-	if !b.Timestamp.IsZero() {
+	qStr, err := DB.Prepare(`SELECT bestaetigt from wochen_report WHERE $1 = ANY(anwesenheiten);`)
-		return b.InsertWithTimestamp()
+	if err != nil {
+		slog.Warn("Error when preparing SQL Statement", "error", err)
+		return false
 	}
+	defer qStr.Close()
+	var isSubmittedAndChecked bool = false
+
+	err = qStr.QueryRow(b.CounterId).Scan(&isSubmittedAndChecked)
+	if err == sql.ErrNoRows {
+		// No rows found ==> not even submitted
+		return false
+	}
+
+	if err != nil {
+		slog.Warn("Unexpected error when executing SQL Statement", "error", err)
+	}
+	return isSubmittedAndChecked
+}
+
+func (b *Booking) Insert() error {
 	if !checkLastBooking(*b) {
 		return SameBookingError{}
 	}
@@ -155,9 +128,6 @@ func (b *Booking) InsertWithTimestamp() error {
 	if b.Timestamp.IsZero() {
 		return b.Insert()
 	}
-	if !checkLastBooking(*b) {
-		return SameBookingError{}
-	}
 	stmt, err := DB.Prepare((`INSERT INTO anwesenheit (card_uid, geraet_id, check_in_out, anwesenheit_typ, timestamp) VALUES ($1, $2, $3, $4, $5) RETURNING counter_id`))
 	if err != nil {
 		return err
@@ -229,7 +199,7 @@ func (b Booking) Save() {
 }
 
 func (b *Booking) GetBookingType() string {
-	debug := helper.IsDebug()
+	debug := (helper.GetEnv("GO_ENV", "production") == "debug")
 	switch b.CheckInOut {
 	case 1: //manuelle Änderung
 		return "kommen"
@@ -265,22 +235,19 @@ func (b *Booking) Update(nb Booking) {
 		b.GeraetID = nb.GeraetID
 	}
 	if b.Timestamp != nb.Timestamp {
-		auditLog.Printf("Änderung in Buchung %d von '%s': Buchungszeit (%s -> %s).", b.CounterId, b.CardUID, b.Timestamp.Format(time.TimeOnly), nb.Timestamp.Format(time.TimeOnly))
+		auditLog.Printf("Änderung in Buchung %d von '%s': Buchungszeit (%s -> %s).", b.CounterId, b.CardUID, b.Timestamp.Format("15:04"), nb.Timestamp.Format("15:04)"))
 		b.Timestamp = nb.Timestamp
 	}
 }
 
 func checkLastBooking(b Booking) bool {
 	var check_in_out int
-	var timestamp time.Time
+	stmt, err := DB.Prepare((`SELECT check_in_out FROM "anwesenheit" WHERE "card_uid" = $1 ORDER BY "timestamp" DESC LIMIT 1;`))
-	slog.Debug("Checking with timestamp:", "timestamp", b.Timestamp)
-	stmt, err := DB.Prepare((`SELECT check_in_out, timestamp FROM "anwesenheit" WHERE "card_uid" = $1 AND "timestamp" <= $2 ORDER BY "timestamp" DESC LIMIT 1;`))
 	if err != nil {
 		log.Fatalf("Error preparing query: %v", err)
 		return false
 	}
-	err = stmt.QueryRow(b.CardUID, b.Timestamp).Scan(&check_in_out, &timestamp)
+	err = stmt.QueryRow(b.CardUID).Scan(&check_in_out)
-	slog.Info("Checking last bookings check_in_out", "Check", check_in_out)
 	if err == sql.ErrNoRows {
 		return true
 	}
@@ -288,13 +255,9 @@ func checkLastBooking(b Booking) bool {
 		log.Println("Error checking last booking: ", err)
 		return false
 	}
-
 	if int16(check_in_out)%2 == b.CheckInOut%2 {
 		return false
 	}
-	if timestamp.Equal(b.Timestamp) {
-		return false
-	}
 	return true
 }
 
@@ -303,6 +266,8 @@ func (b *Booking) UpdateTime(newTime time.Time) {
 	if hour == b.Timestamp.Hour() && minute == b.Timestamp.Minute() {
 		return
 	}
+	// TODO: add check for time overlap
+
 	var newBooking Booking
 	newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, b.Timestamp.Location())
 	if b.CheckInOut < 3 {
@@ -312,11 +277,14 @@ func (b *Booking) UpdateTime(newTime time.Time) {
 		newBooking.CheckInOut = 4
 	}
 	b.Update(newBooking)
+	// TODO Check verify
 	if b.Verify() {
 		b.Save()
 	} else {
 		log.Println("Cannot save updated booking!", b.ToString())
 	}
+	// b.Verify()
+	// b.Save()
 }
 
 func (b *Booking) ToString() string {
@@ -368,12 +336,3 @@ func GetBookingTypesCached() []BookingType {
 	}
 	return types.([]BookingType)
 }
-
-func bookingOutOfBounds(b *Booking, u *User) bool {
-	bookingTime := b.Timestamp
-	if b.Timestamp.IsZero() {
-		bookingTime = time.Now()
-	}
-	res := bookingTime.Before(u.ArbeitMinStartTime(bookingTime)) || bookingTime.After(u.ArbeitMaxEndeTime(bookingTime))
-	return res
-}

Backend/models/booking_test.go

@@ -10,253 +10,38 @@ var testBookingType = models.BookingType{
 	Name: "Büro",
 }
 
-var testBookings8hrs = []models.Booking{{
+var testBookings8hrs = []models.Booking{models.Booking{
 	CardUID:     "aaaa-aaaa",
 	CheckInOut:  1,
-	Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
 	BookingType: testBookingType,
-}, {
+}, models.Booking{
 	CardUID:     "aaaa-aaaa",
 	CheckInOut:  2,
-	Timestamp:   time.Date(2025, 01, 01, 16, 0, 0, 0, time.UTC),
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 16:00")),
 	BookingType: testBookingType,
 }}
 
-var testBookings6hrs = []models.Booking{{
+var testBookings6hrs = []models.Booking{models.Booking{
 	CardUID:     "aaaa-aaaa",
 	CheckInOut:  1,
-	Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
 	BookingType: testBookingType,
-}, {
+}, models.Booking{
 	CardUID:     "aaaa-aaaa",
 	CheckInOut:  2,
-	Timestamp:   time.Date(2025, 01, 01, 14, 0, 0, 0, time.UTC),
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 14:00")),
 	BookingType: testBookingType,
 }}
 
-var testBookings10hrs = []models.Booking{{
+var testBookings10hrs = []models.Booking{models.Booking{
 	CardUID:     "aaaa-aaaa",
 	CheckInOut:  1,
-	Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
 	BookingType: testBookingType,
-}, {
+}, models.Booking{
 	CardUID:     "aaaa-aaaa",
 	CheckInOut:  2,
-	Timestamp:   time.Date(2025, 01, 01, 18, 0, 0, 0, time.UTC),
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 18:00")),
 	BookingType: testBookingType,
 }}
-
-var testBookings6hrsBreak30min = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 9, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 9, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 14, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	}}
-
-var testBookings610hrsBreak30min = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 9, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 9, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 14, 40, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	}}
-
-var testBookings9hrsBreak30min = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 9, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 9, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 17, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	}}
-
-var testBookings930hrs = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 17, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	}}
-
-var testBookings910hrsBreak30min = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 9, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 9, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 17, 40, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-}
-
-var testBookings910hrsBreak35min = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 9, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 9, 35, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 17, 45, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-}
-
-var testBookings945hrs = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 17, 45, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-}
-
-var testBookings10hrsBreak45min = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 9, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 9, 45, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 18, 00, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-}
-
-var testBookings1030hrsBreak45min = []models.Booking{
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 8, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 9, 0, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  1,
-		Timestamp:   time.Date(2025, 01, 01, 9, 45, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-	{
-		CardUID:     "aaaa-aaaa",
-		CheckInOut:  2,
-		Timestamp:   time.Date(2025, 01, 01, 18, 30, 0, 0, time.UTC),
-		BookingType: testBookingType,
-	},
-}

Backend/models/compoundDay.go

@@ -1,125 +0,0 @@
-package models
-
-// this file contains all functions for the compound day class
-// the compound can merge all kinds of daytypes together, as long as they
-// implement the IWorkDay interface. This is used to have an absence + bookings
-// in one day
-//
-// the compound day is a meta type, which means its not in the database
-
-import (
-	"log/slog"
-	"time"
-)
-
-type CompoundDay struct {
-	Day      time.Time
-	DayParts []IWorkDay
-}
-
-// IsSubmittedAndAccepted implements IWorkDay.
-func (c *CompoundDay) IsSubmittedAndAccepted() bool {
-	var isSubmittedAndAccepted = true
-	for _, day := range c.DayParts {
-		isSubmittedAndAccepted = isSubmittedAndAccepted && day.IsSubmittedAndAccepted()
-	}
-	return isSubmittedAndAccepted
-}
-
-func NewCompondDay(date time.Time, dayParts ...IWorkDay) *CompoundDay {
-	return &CompoundDay{Day: date, DayParts: dayParts}
-}
-
-func (c *CompoundDay) AddDayPart(dayPart IWorkDay) {
-	c.DayParts = append(c.DayParts, dayPart)
-}
-
-func (c *CompoundDay) GetWorkDay() WorkDay {
-	workday, ok := c.DayParts[0].(*WorkDay)
-	if ok {
-		return *workday
-	}
-	return WorkDay{}
-}
-
-// IsEmpty implements [IWorkDay].
-func (c *CompoundDay) IsEmpty() bool {
-	return len(c.DayParts) == 0
-}
-
-// Date implements [IWorkDay].
-func (c *CompoundDay) Date() time.Time {
-	return c.Day
-}
-
-// GetDayProgress implements [IWorkDay].
-func (c *CompoundDay) GetDayProgress(u User) int8 {
-	var dayProcess int8
-	for _, day := range c.DayParts {
-		dayProcess += day.GetDayProgress(u)
-	}
-	return dayProcess
-}
-
-// GetOvertime implements [IWorkDay].
-func (c *CompoundDay) GetOvertime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	work := c.GetWorktime(u, base, includeKurzarbeit)
-	var targetHours time.Duration
-
-	switch base {
-	case WorktimeBaseDay:
-		targetHours = u.ArbeitszeitProTagFrac(1)
-	case WorktimeBaseWeek:
-		targetHours = u.ArbeitszeitProWocheFrac(.2)
-	}
-	return (work - targetHours).Round(time.Minute)
-}
-
-// GetPausetime implements [IWorkDay].
-func (c *CompoundDay) GetPausetime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	var pausetime time.Duration
-	for _, day := range c.DayParts {
-		pausetime += day.GetPausetime(u, base, includeKurzarbeit)
-	}
-	return pausetime
-}
-
-// GetTimes implements [IWorkDay].
-func (c *CompoundDay) GetTimes(u User, base WorktimeBase, includeKurzarbeit bool) (work time.Duration, pause time.Duration, overtime time.Duration) {
-	return c.GetWorktime(u, base, includeKurzarbeit), c.GetPausetime(u, base, includeKurzarbeit), c.GetOvertime(u, base, includeKurzarbeit)
-}
-
-// GetWorktime implements [IWorkDay].
-func (c *CompoundDay) GetWorktime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	var worktime time.Duration
-	for _, day := range c.DayParts {
-		worktime += day.GetWorktime(u, base, includeKurzarbeit)
-		slog.Info("Calc worktime for day", "day", day, "worktime", worktime.String())
-	}
-	return worktime
-}
-
-// IsKurzArbeit implements [IWorkDay].
-func (c *CompoundDay) IsKurzArbeit() bool {
-	return false
-}
-
-// IsWorkDay implements [IWorkDay].
-func (c *CompoundDay) IsWorkDay() bool {
-	return true
-}
-
-// RequiresAction implements [IWorkDay].
-func (c *CompoundDay) RequiresAction() bool {
-	return false
-}
-
-// ToString implements [IWorkDay].
-func (c *CompoundDay) ToString() string {
-	return "Compound Day"
-}
-
-// Type implements [IWorkDay].
-func (c *CompoundDay) Type() DayType {
-	return DayTypeCompound
-}

Backend/models/database.go

@@ -1,8 +1,5 @@
 package models
 
-// this file is only used as cache for the diffenrent absence and booking types,
-// in the future this should be two chaching variables each in their own place
-
 import (
 	"arbeitszeitmessung/helper"
 )

Backend/models/iworkday.go

@@ -1,96 +0,0 @@
-package models
-
-// this file desribes the IWorkDay interface which is used, to combine the diffent kinds
-// of day types (absence, holidy, workday) and make them more compatimble with the rest
-//
-// the IWorkDay as an interface is not in the database
-
-import (
-	"log/slog"
-	"time"
-)
-
-type IWorkDay interface {
-	Date() time.Time
-	ToString() string
-	Type() DayType
-	IsWorkDay() bool
-	IsKurzArbeit() bool
-	GetDayProgress(User) int8
-	RequiresAction() bool
-	GetWorktime(User, WorktimeBase, bool) time.Duration
-	GetPausetime(User, WorktimeBase, bool) time.Duration
-	GetTimes(User, WorktimeBase, bool) (work, pause, overtime time.Duration)
-	GetOvertime(User, WorktimeBase, bool) time.Duration
-	IsEmpty() bool
-	IsSubmittedAndAccepted() bool
-}
-
-type DayType int
-
-const (
-	DayTypeWorkday  DayType = 1
-	DayTypeAbsence  DayType = 2
-	DayTypeHoliday  DayType = 3
-	DayTypeCompound DayType = 4
-)
-
-func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay {
-	var allDays map[string]IWorkDay = make(map[string]IWorkDay)
-
-	workdays := GetWorkDays(user, tsFrom, tsTo)
-	absences, err := GetAbsencesByCardUID(user.CardUID, tsFrom, tsTo)
-	if err != nil {
-		slog.Warn("Error gettings absences!", slog.Any("Error", err))
-		return nil
-	}
-	holidays, err := GetHolidaysFromTo(tsFrom, tsTo)
-	if err != nil {
-		slog.Warn("Error getting holidays!", slog.Any("Error", err))
-		return nil
-	}
-
-	for _, day := range workdays {
-		allDays[day.Date().Format(time.DateOnly)] = &day
-	}
-
-	for _, absentDay := range absences {
-		if weekDay := absentDay.Date().Weekday(); weekDay == time.Saturday || weekDay == time.Sunday {
-			continue
-		}
-		// Check if there is already a day
-		existingDay, ok := allDays[absentDay.Date().Format(time.DateOnly)]
-		switch {
-		case absentDay.AbwesenheitTyp.WorkTime < 0:
-			if workDay, ok := allDays[absentDay.Date().Format(time.DateOnly)].(*WorkDay); ok {
-				workDay.kurzArbeit = true
-				workDay.kurzArbeitAbsence = absentDay
-			}
-		case ok && !existingDay.IsEmpty():
-			allDays[absentDay.Date().Format(time.DateOnly)] = NewCompondDay(absentDay.Date(), existingDay, &absentDay)
-		default:
-			allDays[absentDay.Date().Format(time.DateOnly)] = &absentDay
-		}
-	}
-
-	for _, holiday := range holidays {
-		existingDay, ok := allDays[holiday.Date().Format(time.DateOnly)]
-		if !ok {
-			allDays[holiday.Date().Format(time.DateOnly)] = &holiday
-			continue
-		}
-		slog.Info("Existing Day", "day", existingDay)
-		switch {
-		case existingDay.Type() == DayTypeCompound:
-			allDays[holiday.Date().Format(time.DateOnly)].(*CompoundDay).AddDayPart(&holiday)
-		case existingDay.Type() != DayTypeCompound && !existingDay.IsEmpty():
-			allDays[holiday.Date().Format(time.DateOnly)] = NewCompondDay(holiday.Date(), existingDay, &holiday)
-		default:
-			allDays[holiday.Date().Format(time.DateOnly)] = &holiday
-		}
-		slog.Debug("Logging Holiday: ", slog.String("HolidayName", allDays[holiday.Date().Format(time.DateOnly)].ToString()), slog.Any("Overtime", holiday.GetOvertime(user, WorktimeBaseDay, false).String()), "wokrtie", float32(holiday.worktime)/100)
-	}
-
-	sortedDays := sortDays(allDays, orderedForward)
-	return sortedDays
-}

Backend/models/publicHoliday.go

@@ -1,147 +0,0 @@
-package models
-
-// the public holiday is used the describe all holidays
-// the publicholiday implements the IWorkDay interface
-//
-// the PublicHoliday data is based on the entries in the "s_feiertage" database table
-
-import (
-	"time"
-
-	"github.com/wlbr/feiertage"
-)
-
-// type PublicHoliday feiertage.Feiertag
-
-type PublicHoliday struct {
-	feiertage.Feiertag
-	repeat   int8
-	worktime int8
-}
-
-// IsSubmittedAndAccepted implements IWorkDay.
-func (p *PublicHoliday) IsSubmittedAndAccepted() bool {
-	return true
-}
-
-// IsEmpty implements [IWorkDay].
-func (p *PublicHoliday) IsEmpty() bool {
-	return false
-}
-
-func NewHolidayFromFeiertag(f feiertage.Feiertag) PublicHoliday {
-	return PublicHoliday{
-		Feiertag: f,
-		repeat:   0,
-		worktime: 100,
-	}
-}
-
-func GetHolidaysFromTo(tsFrom, tsTo time.Time) ([]PublicHoliday, error) {
-	var publicHolidays []PublicHoliday
-	qStr, err := DB.Prepare(`SELECT datum, name, wiederholen, arbeitszeit_equivalent FROM s_feiertage WHERE datum::DATE >= $1::DATE AND datum::DATE <= $2::DATE;`)
-	if err != nil {
-		return publicHolidays, err
-	}
-
-	rows, err := qStr.Query(tsFrom, tsTo)
-	if err != nil {
-		return publicHolidays, err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var publicHoliday PublicHoliday
-		if err := rows.Scan(&publicHoliday.Time, &publicHoliday.Text, &publicHoliday.repeat, &publicHoliday.worktime); err != nil {
-			return publicHolidays, err
-		}
-		publicHolidays = append(publicHolidays, publicHoliday)
-	}
-	return publicHolidays, nil
-}
-
-func GetRepeatingHolidays(tsFrom, tsTo time.Time) ([]PublicHoliday, error) {
-	var publicHolidays []PublicHoliday
-	qStr, err := DB.Prepare(`SELECT datum, name, wiederholen, arbeitszeit_equivalent FROM s_feiertage WHERE wiederholen = 1 AND datum::DATE >= $1::DATE AND datum::DATE <= $2::DATE;`)
-	if err != nil {
-		return publicHolidays, err
-	}
-	rows, err := qStr.Query(tsFrom, tsTo)
-	if err != nil {
-		return publicHolidays, err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var publicHoliday PublicHoliday
-		if err := rows.Scan(&publicHoliday.Time, &publicHoliday.Text, &publicHoliday.repeat, &publicHoliday.worktime); err != nil {
-			return publicHolidays, err
-		}
-		publicHolidays = append(publicHolidays, publicHoliday)
-	}
-	return publicHolidays, nil
-
-}
-func (p *PublicHoliday) Insert() error {
-	qStr, err := DB.Prepare(`INSERT INTO s_feiertage(name, datum, wiederholen, arbeitszeit_equivalent) VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING;`)
-	if err != nil {
-		return err
-	}
-	_, err = qStr.Exec(p.Text, p.Time, p.repeat, p.worktime)
-	return err
-}
-
-func (p *PublicHoliday) Type() DayType {
-	return DayTypeHoliday
-}
-
-// Interface implementation
-func (p *PublicHoliday) Date() time.Time {
-	return p.Time
-}
-
-func (p *PublicHoliday) ToString() string {
-	return p.Text
-}
-
-func (p *PublicHoliday) IsWorkDay() bool {
-	return false
-}
-
-func (p *PublicHoliday) IsKurzArbeit() bool {
-	return false
-}
-
-func (p *PublicHoliday) GetDayProgress(User) int8 {
-	return p.worktime
-}
-
-func (p *PublicHoliday) RequiresAction() bool {
-	return false
-}
-
-func (p *PublicHoliday) GetWorktime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	switch base {
-	case WorktimeBaseDay:
-		return u.ArbeitszeitProTagFrac(float32(p.worktime) / 100)
-	case WorktimeBaseWeek:
-		return u.ArbeitszeitProWocheFrac(float32(p.worktime) / 500)
-	}
-	return 0
-}
-
-func (p *PublicHoliday) GetPausetime(User, WorktimeBase, bool) time.Duration {
-	return 0
-}
-
-func (p *PublicHoliday) GetOvertime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
-	switch base {
-	case WorktimeBaseDay:
-		return u.ArbeitszeitProTagFrac(float32(p.worktime)/100) - u.ArbeitszeitProTagFrac(1)
-	case WorktimeBaseWeek:
-		return u.ArbeitszeitProWocheFrac(float32(p.worktime)/500) - u.ArbeitszeitProWocheFrac(0.2)
-	}
-	return 0
-}
-
-func (p *PublicHoliday) GetTimes(u User, base WorktimeBase, includeKurzarbeit bool) (work, pause, overtime time.Duration) {
-	return p.GetWorktime(u, base, includeKurzarbeit), 0, 0
-}

Backend/models/user.go

@@ -1,11 +1,5 @@
 package models
 
-// the user type represents the user of the software
-// it has functions to request the bookings and other data based
-// on either the "PersonalNummer" or "CardUID"
-//
-// users and their passwords are stored in the "s_personal_daten" and "user_pass" tables
-
 import (
 	"arbeitszeitmessung/helper"
 	"context"
@@ -13,11 +7,9 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"log/slog"
 	"time"
 
 	"github.com/alexedwards/scs/v2"
-	"github.com/lib/pq"
 )
 
 type User struct {
@@ -28,14 +20,12 @@ type User struct {
 	ArbeitszeitPerTag   float32 //`json:"arbeitszeit_per_tag"`
 	ArbeitszeitPerWoche float32 //`json:"arbeitszeit_per_woche"`
 	Overtime            time.Duration
-	ArbeitMinStart      time.Time
-	ArbeitMaxEnde       time.Time
 }
 
 func GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) {
 	var user User
 	var err error
-	if helper.IsDebug() {
+	if helper.GetEnv("GO_ENV", "production") == "debug" {
 		user, err = GetUserByPersonalNr(123)
 	} else {
 		if !Session.Exists(ctx, "user") {
@@ -52,58 +42,26 @@ func GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User,
 }
 
 // Returns the actual overtime for this moment
-func (u *User) GetReportedOvertime(startDate time.Time) (time.Duration, error) {
+func (u *User) GetReportedOvertime() (time.Duration, error) {
 	var overtime time.Duration
 
-	qStr, err := DB.Prepare("SELECT COALESCE(SUM(EXTRACT(EPOCH FROM ueberstunden) * 1000000000)::BIGINT, 0) AS total_ueberstunden_ns FROM wochen_report WHERE personal_nummer = $1 AND woche_start::DATE <= $2::DATE;")
+	qStr, err := DB.Prepare("SELECT COALESCE(SUM(EXTRACT(EPOCH FROM ueberstunden) * 1000000000)::BIGINT, 0) AS total_ueberstunden_ns FROM wochen_report WHERE personal_nummer = $1;")
 	if err != nil {
 		return 0, err
 	}
 	defer qStr.Close()
-	err = qStr.QueryRow(u.PersonalNummer, startDate).Scan(&overtime)
+	err = qStr.QueryRow(u.PersonalNummer).Scan(&overtime)
 	if err != nil {
 		return 0, err
 	}
 	return overtime, nil
 }
 
-func GetUserByCardUID(cardUid string) (User, error) {
+func (u *User) GetAll() ([]User, error) {
-	var user User
+	qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname FROM s_personal_daten;`))
-
-	qStr, err := DB.Prepare((`SELECT personal_nummer, vorname, nachname, card_uid, arbeitszeit_per_tag, arbeitszeit_per_woche, arbeitszeit_min_start, arbeitszeit_max_ende FROM s_personal_daten WHERE card_uid = $1;`))
-	if err != nil {
-		return user, err
-	}
-	err = qStr.QueryRow(cardUid).Scan(&user.PersonalNummer, &user.Vorname, &user.Name, &user.CardUID, &user.ArbeitszeitPerTag, &user.ArbeitszeitPerWoche, &user.ArbeitMinStart, &user.ArbeitMaxEnde)
-
-	if err != nil {
-		return user, err
-	}
-	return user, nil
-}
-
-func (u *User) ArbeitMinStartTime(date time.Time) time.Time {
-	if date.Hour() > 0 {
-		date = date.Truncate(24 * time.Hour).Add(-time.Hour)
-	}
-	date = date.Truncate(time.Hour)
-	slog.Info("Date truncate", "date", date)
-	return date.Add(time.Hour*time.Duration(u.ArbeitMinStart.Hour()) + time.Minute*time.Duration(u.ArbeitMinStart.Minute()))
-}
-
-func (u *User) ArbeitMaxEndeTime(date time.Time) time.Time {
-	if date.Hour() > 0 {
-		date = date.Truncate(24 * time.Hour).Add(-time.Hour)
-	}
-	date = date.Truncate(time.Hour)
-	slog.Info("Date truncate", "date", date)
-	return date.Add(time.Hour*time.Duration(u.ArbeitMaxEnde.Hour()) + time.Minute*time.Duration(u.ArbeitMaxEnde.Minute()))
-}
-
-func GetAllUsers() ([]User, error) {
-	qStr, err := DB.Prepare((`SELECT personal_nummer, vorname, nachname, card_uid, arbeitszeit_per_tag, arbeitszeit_per_woche, arbeitszeit_min_start, arbeitszeit_max_ende FROM s_personal_daten;`))
 	var users []User
 	if err != nil {
+		fmt.Printf("Error preparing query statement %v\n", err)
 		return users, err
 	}
 	defer qStr.Close()
@@ -115,7 +73,7 @@ func GetAllUsers() ([]User, error) {
 	for rows.Next() {
 
 		var user User
-		if err := rows.Scan(&user.PersonalNummer, &user.Vorname, &user.Name, &user.CardUID, &user.ArbeitszeitPerTag, &user.ArbeitszeitPerWoche, &user.ArbeitMinStart, &user.ArbeitMaxEnde); err != nil {
+		if err := rows.Scan(&user.CardUID, &user.Vorname, &user.Name); err != nil {
 			log.Println("Error creating user!", err)
 			continue
 		}
@@ -127,21 +85,13 @@ func GetAllUsers() ([]User, error) {
 	return users, nil
 }
 
-func (u *User) ArbeitszeitProTag() time.Duration {
-	return u.ArbeitszeitProTagFrac(1)
-}
-
 // Returns the worktime per day rounded to minutes
-func (u *User) ArbeitszeitProTagFrac(fraction float32) time.Duration {
+func (u *User) ArbeitszeitProTag() time.Duration {
-	return time.Duration(u.ArbeitszeitPerTag * float32(time.Hour) * fraction).Round(time.Minute)
+	return time.Duration(u.ArbeitszeitPerTag * float32(time.Hour)).Round(time.Minute)
 }
 
 func (u *User) ArbeitszeitProWoche() time.Duration {
-	return u.ArbeitszeitProWocheFrac(1)
+	return time.Duration(u.ArbeitszeitPerWoche * float32(time.Hour)).Round(time.Minute)
-}
-
-func (u *User) ArbeitszeitProWocheFrac(fraction float32) time.Duration {
-	return time.Duration(u.ArbeitszeitPerWoche * float32(time.Hour) * fraction).Round(time.Minute)
 }
 
 // Returns true if there is a booking 1 for today -> meaning the user is at work
@@ -149,7 +99,7 @@ func (u *User) ArbeitszeitProWocheFrac(fraction float32) time.Duration {
 func (u *User) CheckAnwesenheit() bool {
 	qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp"::date = now()::date ORDER BY "timestamp" DESC LIMIT 1;`))
 	if err != nil {
-		slog.Debug("Error preparing query statement.", "error", err)
+		fmt.Printf("Error preparing query statement %v\n", err)
 		return false
 	}
 	defer qStr.Close()
@@ -163,7 +113,7 @@ func (u *User) CheckAnwesenheit() bool {
 
 // Creates a new booking for the user -> check_in_out will be 254 for automatic check out
 func (u *User) CheckOut() error {
-	booking := (*Booking).NewBooking(nil, u.CardUID, 0, 254, 1)
+	booking := (*Booking).New(nil, u.CardUID, 0, 254, 1)
 	err := booking.Insert()
 	if err != nil {
 		fmt.Printf("Error inserting booking %v -> %v\n", booking, err)
@@ -175,11 +125,11 @@ func (u *User) CheckOut() error {
 func GetUserByPersonalNr(personalNummer int) (User, error) {
 	var user User
 
-	qStr, err := DB.Prepare((`SELECT personal_nummer, vorname, nachname, card_uid, arbeitszeit_per_tag, arbeitszeit_per_woche, arbeitszeit_min_start, arbeitszeit_max_ende FROM s_personal_daten WHERE personal_nummer = $1;`))
+	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag, arbeitszeit_per_woche FROM s_personal_daten WHERE personal_nummer = $1;`))
 	if err != nil {
 		return user, err
 	}
-	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.Vorname, &user.Name, &user.CardUID, &user.ArbeitszeitPerTag, &user.ArbeitszeitPerWoche, &user.ArbeitMinStart, &user.ArbeitMaxEnde)
+	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag, &user.ArbeitszeitPerWoche)
 
 	if err != nil {
 		return user, err
@@ -187,43 +137,11 @@ func GetUserByPersonalNr(personalNummer int) (User, error) {
 	return user, nil
 }
 
-func GetUserByPersonalNrMulti(personalNummerMulti []int) ([]User, error) {
-	var users []User
-	if len(personalNummerMulti) == 0 {
-		return users, errors.New("No personalNumbers provided")
-	}
-
-	qStr, err := DB.Prepare((`SELECT personal_nummer, vorname, nachname, card_uid, arbeitszeit_per_tag, arbeitszeit_per_woche, arbeitszeit_min_start, arbeitszeit_max_ende FROM s_personal_daten WHERE personal_nummer = ANY($1::int[]);`))
-	if err != nil {
-		return users, err
-	}
-
-	rows, err := qStr.Query(pq.Array(personalNummerMulti))
-	if err == sql.ErrNoRows {
-		return users, err
-	}
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var user User
-		if err := rows.Scan(&user.PersonalNummer, &user.Vorname, &user.Name, &user.CardUID, &user.ArbeitszeitPerTag, &user.ArbeitszeitPerWoche, &user.ArbeitMinStart, &user.ArbeitMaxEnde); err != nil {
-			return users, err
-		}
-		users = append(users, user)
-	}
-	if err = rows.Err(); err != nil {
-		return users, err
-	}
-	return users, nil
-}
-
 func (u *User) Login(password string) bool {
 	var loginSuccess bool
 	qStr, err := DB.Prepare((`SELECT (pass_hash = crypt($2, pass_hash)) AS pass_hash FROM user_password WHERE personal_nummer = $1;`))
 	if err != nil {
-		slog.Debug("Error preparing query statement.", "error", err)
+		log.Println("Error preparing db statement", err)
 		return false
 	}
 	defer qStr.Close()
@@ -254,7 +172,6 @@ func (u *User) ChangePass(password, newPassword string) (bool, error) {
 }
 
 func (u *User) GetTeamMembers() ([]User, error) {
-	var teamMemberPNrs []int
 	var teamMembers []User
 	qStr, err := DB.Prepare(`SELECT personal_nummer FROM s_personal_daten WHERE vorgesetzter_pers_nr = $1 ORDER BY "nachname";`)
 	if err != nil {
@@ -270,16 +187,12 @@ func (u *User) GetTeamMembers() ([]User, error) {
 	for rows.Next() {
 		var personalNr int
 		err := rows.Scan(&personalNr)
-		teamMemberPNrs = append(teamMemberPNrs, personalNr)
+		user, err := GetUserByPersonalNr(personalNr)
 		if err != nil {
 			log.Println("Error getting user!")
 			return teamMembers, err
 		}
-	}
+		teamMembers = append(teamMembers, user)
-	teamMembers, err = GetUserByPersonalNrMulti(teamMemberPNrs)
-	if err != nil {
-		log.Println("Error getting users!")
-		return teamMembers, err
 	}
 
 	return teamMembers, nil
@@ -301,49 +214,26 @@ func (u *User) GetNextWeek() WorkWeek {
 
 }
 
+func parseUser(rows *sql.Rows) (User, error) {
+	var user User
+	if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag); err != nil {
+		log.Println("Error scanning row!", err)
+		return user, err
+	}
+	return user, nil
+}
+
 // returns the start of the week, the last submission was made, submission == first booking or last send wochen_report to team leader
 func (u *User) GetLastWorkWeekSubmission() time.Time {
 	var lastSub time.Time
 	qStr, err := DB.Prepare(`
-		SELECT new_week
+	SELECT COALESCE(
-FROM (
+	    (SELECT woche_start + INTERVAL '1 week' FROM wochen_report WHERE personal_nummer = $1 ORDER BY woche_start DESC LIMIT 1),
-    -- Highest priority
+	    (SELECT timestamp FROM anwesenheit WHERE card_uid = $2 ORDER BY timestamp LIMIT 1)
-    SELECT
+    ) AS letzte_buchung;
-        woche_start AS new_week,
-        1 AS priority
-    FROM wochen_report
-    WHERE personal_nummer = $1
-      AND bestaetigt IS NULL
-
-    UNION ALL
-
-    -- Fallback if #1 returns nothing
-    SELECT
-        woche_start + INTERVAL '1 week' AS new_week,
-        2 AS priority
-    FROM wochen_report wo
-    WHERE personal_nummer = $1
-      AND NOT EXISTS (
-          SELECT 1
-          FROM wochen_report wi
-          WHERE wi.woche_start = wo.woche_start + INTERVAL '1 week'
-            AND wi.personal_nummer = wo.personal_nummer
-      )
-
-    UNION ALL
-
-    -- Final fallback
-    SELECT
-        timestamp AS new_week,
-        3 AS priority
-    FROM anwesenheit
-    WHERE card_uid = $2
-) t
-ORDER BY priority, new_week
-LIMIT 1;
 `)
 	if err != nil {
-		slog.Debug("Error preparing query statement.", "error", err)
+		log.Println("Error preparing statement!", err)
 		return lastSub
 	}
 	err = qStr.QueryRow(u.PersonalNummer, u.CardUID).Scan(&lastSub)
@@ -356,19 +246,20 @@ LIMIT 1;
 	return lastSub
 }
 
-func (u *User) IsSuperior(e User) bool {
+func (u *User) GetFromCardUID(card_uid string) (User, error) {
-	var isSuperior int
+	user := User{}
-	qStr, err := DB.Prepare(`SELECT COUNT(1) FROM s_personal_daten WHERE personal_nummer = $1 AND vorgesetzter_pers_nr = $2`)
+	var err error
+
+	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM s_personal_daten WHERE card_uid = $1;`))
 	if err != nil {
-		slog.Debug("Error preparing query", "error", err)
+		return user, err
-		return false
 	}
-	err = qStr.QueryRow(e.PersonalNummer, u.PersonalNummer).Scan(&isSuperior)
+	err = qStr.QueryRow(card_uid).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag)
+
 	if err != nil {
-		slog.Debug("Error executing query", "error", err)
+		return user, err
-		return false
 	}
-	return isSuperior == 1
+	return user, nil
 }
 
 func getMonday(ts time.Time) time.Time {

Backend/models/user_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 )
 
-var testUser models.User = models.User{Vorname: "Kim", Name: "Mustermensch", PersonalNummer: 456, CardUID: "aaaa-aaaa", ArbeitszeitPerTag: 8, ArbeitszeitPerWoche: 35}
+var testUser models.User = models.User{Vorname: "Kim", Name: "Mustermensch", PersonalNummer: 456, CardUID: "aaaa-aaaa", ArbeitszeitPerTag: 8, ArbeitszeitPerWoche: 40}
 
 func SetupUserFixture(t *testing.T, db models.IDatabase) {
 	t.Helper()

Backend/models/workDay.go

@@ -1,95 +1,152 @@
 package models
 
-// the workday combines all bookings of a day into a single type and is the third
-// type of workday which implements the IWorkDay interface
-//
-// this is a meta type and not present in the db
-
 import (
 	"arbeitszeitmessung/helper"
-	"database/sql"
 	"encoding/json"
 	"fmt"
 	"log"
 	"log/slog"
 	"sort"
 	"time"
-
-	"github.com/lib/pq"
 )
 
+type IWorkDay interface {
+	Date() time.Time
+	TimeWorkVirtual(User) time.Duration
+	TimeWorkReal(User) time.Duration
+	TimePauseReal(User) (work, pause time.Duration)
+	TimeOvertimeReal(User) time.Duration
+	GetAllWorkTimesVirtual(User) (work, pause, overtime time.Duration)
+	ToString() string
+	IsWorkDay() bool
+	IsKurzArbeit() bool
+	GetDayProgress(User) int8
+	RequiresAction() bool
+	GetWorktimeReal(User, WorktimeBase) time.Duration
+	GetPausetimeReal(User, WorktimeBase) time.Duration
+	GetOvertimeReal(User, WorktimeBase) time.Duration
+	GetWorktimeVirtual(User, WorktimeBase) time.Duration
+	GetPausetimeVirtual(User, WorktimeBase) time.Duration
+	GetOvertimeVirtual(User, WorktimeBase) time.Duration
+	GetTimesReal(User, WorktimeBase) (work, pause, overtime time.Duration)
+	GetTimesVirtual(User, WorktimeBase) (work, pause, overtime time.Duration)
+}
+
 type WorkDay struct {
 	Day               time.Time `json:"day"`
 	Bookings          []Booking `json:"bookings"`
 	workTime          time.Duration
 	pauseTime         time.Duration
+	realWorkTime      time.Duration
+	realPauseTime     time.Duration
 	TimeFrom          time.Time
 	TimeTo            time.Time
 	kurzArbeit        bool
 	kurzArbeitAbsence Absence
-	// Urlaub untertags
-	worktimeAbsece Absence
 }
 
-// IsEmpty implements [IWorkDay].
+type WorktimeBase string
-func (d *WorkDay) IsEmpty() bool {
-	return len(d.Bookings) == 0
-}
-
-type WorktimeBase int
 
 const (
-	WorktimeBaseWeek WorktimeBase = 5
+	WorktimeBaseWeek WorktimeBase = "week"
-	WorktimeBaseDay  WorktimeBase = 1
+	WorktimeBaseDay  WorktimeBase = "day"
 )
 
-func (d *WorkDay) GetWorktimeAbsence() Absence {
+func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay {
-	return d.worktimeAbsece
+	var allDays map[string]IWorkDay = make(map[string]IWorkDay)
+
+	for _, day := range GetWorkDays(user, tsFrom, tsTo) {
+		allDays[day.Date().Format(time.DateOnly)] = &day
+	}
+	absences, err := GetAbsencesByCardUID(user.CardUID, tsFrom, tsTo)
+	if err != nil {
+		log.Println("Error gettings absences for all Days!", err)
+		return nil
+	}
+	for _, day := range absences {
+		if helper.IsWeekend(day.Date()) {
+			continue
+		}
+		if day.AbwesenheitTyp.WorkTime == 1 {
+			if workDay, ok := allDays[day.Date().Format(time.DateOnly)].(*WorkDay); ok && len(workDay.Bookings) > 0 {
+				workDay.kurzArbeit = true
+				workDay.kurzArbeitAbsence = day
+			}
+		} else {
+			allDays[day.Date().Format(time.DateOnly)] = &day
+		}
+	}
+
+	sortedDays := sortDays(allDays, orderedForward)
+	return sortedDays
 }
 
 // Gets the time as is in the db (with corrected pause times)
-func (d *WorkDay) GetWorktime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
+func (d *WorkDay) GetWorktimeReal(u User, base WorktimeBase) time.Duration {
-	if includeKurzarbeit && d.IsKurzArbeit() { //&& len(d.Bookings) > 0
+	work, pause := calcWorkPause(d.Bookings)
-		return d.kurzArbeitAbsence.GetWorktime(u, base, true)
+	work, pause = correctWorkPause(work, pause)
-	}
+	return work
-	work, _ := correctWorkPause(getWorkPause(d))
-	if (d.worktimeAbsece != Absence{}) {
-		work += d.worktimeAbsece.GetWorktime(u, base, false)
-	}
-	return work.Round(time.Minute)
 }
 
 // Gets the corrected pause times based on db entries
-func (d *WorkDay) GetPausetime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
+func (d *WorkDay) GetPausetimeReal(u User, base WorktimeBase) time.Duration {
-	work, pause := getWorkPause(d)
+	work, pause := calcWorkPause(d.Bookings)
 	work, pause = correctWorkPause(work, pause)
-	return pause.Round(time.Minute)
+	return pause
 }
 
 // Returns the overtime based on the db entries
-func (d *WorkDay) GetOvertime(u User, base WorktimeBase, includeKurzarbeit bool) time.Duration {
+func (d *WorkDay) GetOvertimeReal(u User, base WorktimeBase) time.Duration {
-	work := d.GetWorktime(u, base, includeKurzarbeit)
+	work, pause := calcWorkPause(d.Bookings)
+	work, pause = correctWorkPause(work, pause)
+
 	var targetHours time.Duration
 	switch base {
 	case WorktimeBaseDay:
 		targetHours = u.ArbeitszeitProTag()
 	case WorktimeBaseWeek:
-		targetHours = u.ArbeitszeitProWocheFrac(0.2)
+		targetHours = u.ArbeitszeitProWoche() / 5
 	}
-	return (work - targetHours).Round(time.Minute)
+	return work - targetHours
 }
 
-func (d *WorkDay) GetTimes(u User, base WorktimeBase, includeKurzarbeit bool) (work, pause, overtime time.Duration) {
+// Returns the worktime based on absence or kurzarbeit
-	return d.GetWorktime(u, base, includeKurzarbeit), d.GetPausetime(u, base, includeKurzarbeit), d.GetOvertime(u, base, includeKurzarbeit)
+func (d *WorkDay) GetWorktimeVirtual(u User, base WorktimeBase) time.Duration {
+	if !d.IsKurzArbeit() {
+		return d.GetWorktimeReal(u, base)
+	}
+	switch base {
+	case WorktimeBaseDay:
+		return u.ArbeitszeitProTag()
+	case WorktimeBaseWeek:
+		return u.ArbeitszeitProWoche() / 5
+	}
+	return 0
 }
 
-func getWorkPause(d *WorkDay) (work, pause time.Duration) {
+func (d *WorkDay) GetPausetimeVirtual(u User, base WorktimeBase) time.Duration {
-	//if today calc, else take from db
+	return d.GetPausetimeReal(u, base)
-	if d.workTime == 0 && d.pauseTime == 0 && len(d.Bookings) > 0 {
-		return calcWorkPause(d.Bookings)
-	} else {
-		return d.workTime, d.pauseTime
 }
+
+func (d *WorkDay) GetOvertimeVirtual(u User, base WorktimeBase) time.Duration {
+	work := d.GetWorktimeVirtual(u, base)
+
+	var targetHours time.Duration
+	switch base {
+	case WorktimeBaseDay:
+		targetHours = u.ArbeitszeitProTag()
+	case WorktimeBaseWeek:
+		targetHours = u.ArbeitszeitProWoche() / 5
+	}
+	return work - targetHours
+}
+
+func (d *WorkDay) GetTimesReal(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
+	return d.GetWorktimeReal(u, base), d.GetPausetimeReal(u, base), d.GetOvertimeReal(u, base)
+}
+
+func (d *WorkDay) GetTimesVirtual(u User, base WorktimeBase) (work, pause, overtime time.Duration) {
+	return d.GetWorktimeVirtual(u, base), d.GetPausetimeVirtual(u, base), d.GetOvertimeVirtual(u, base)
 }
 
 func calcWorkPause(bookings []Booking) (work, pause time.Duration) {
@@ -116,8 +173,7 @@ func correctWorkPause(workIn, pauseIn time.Duration) (work, pause time.Duration)
 	}
 
 	var diff time.Duration
-
+	if workIn <= (9*time.Hour) && pauseIn < 30*time.Minute {
-	if (workIn+pauseIn) <= (9*time.Hour+30*time.Minute) && pauseIn <= 30*time.Minute {
 		diff = 30*time.Minute - pauseIn
 	} else if pauseIn < 45*time.Minute {
 		diff = 45*time.Minute - pauseIn
@@ -148,38 +204,85 @@ func (d *WorkDay) Date() time.Time {
 	return d.Day
 }
 
-func (d *WorkDay) Type() DayType {
+func (d *WorkDay) GenerateKurzArbeitBookings(u User) (time.Time, time.Time) {
-	return DayTypeWorkday
-}
-
-func (d *WorkDay) GenerateKurzArbeitBookings(u User, weekBase WorktimeBase) (time.Time, time.Time) {
 	var timeFrom, timeTo time.Time
-	if d.GetWorktime(u, WorktimeBaseDay, false) >= u.ArbeitszeitProTag() {
+	if d.workTime >= u.ArbeitszeitProTag() {
 		return timeFrom, timeTo
 	}
 
-	if d.IsEmpty() {
-		switch weekBase {
-		case WorktimeBaseDay:
-			return d.Day.Add(time.Hour * 8), d.Day.Add(time.Hour * 8).Add(u.ArbeitszeitProTag())
-		case WorktimeBaseWeek:
-			return d.Day.Add(time.Hour * 8), d.Day.Add(time.Hour * 8).Add(u.ArbeitszeitProWocheFrac(0.2))
-		}
-	}
-
 	timeFrom = d.Bookings[len(d.Bookings)-1].Timestamp.Add(time.Minute)
-	timeTo = timeFrom.Add(u.ArbeitszeitProTag() - d.GetWorktime(u, WorktimeBaseDay, false))
+	timeTo = timeFrom.Add(u.ArbeitszeitProTag() - d.workTime)
 	slog.Debug("Added duration as Kurzarbeit", "date", d.Date().String(), "duration", timeTo.Sub(timeFrom).String())
 
 	return timeFrom, timeTo
 }
 
+func (d *WorkDay) TimeWorkVirtual(u User) time.Duration {
+	if d.IsKurzArbeit() {
+		return u.ArbeitszeitProTag()
+	}
+	return d.workTime
+}
+
 func (d *WorkDay) GetKurzArbeit() *Absence {
 	return &d.kurzArbeitAbsence
 }
 
+func (d *WorkDay) TimeWorkReal(u User) time.Duration {
+	d.realWorkTime, d.realPauseTime = 0, 0
+	var lastBooking Booking
+	for _, booking := range d.Bookings {
+		if booking.CheckInOut%2 == 1 {
+			if !lastBooking.Timestamp.IsZero() {
+				d.realPauseTime += booking.Timestamp.Sub(lastBooking.Timestamp)
+			}
+		} else {
+			d.realWorkTime += booking.Timestamp.Sub(lastBooking.Timestamp)
+		}
+		lastBooking = booking
+	}
+	if helper.IsSameDate(d.Date(), time.Now()) && len(d.Bookings)%2 == 1 {
+		d.realWorkTime += time.Since(lastBooking.Timestamp.Local())
+	}
+	// slog.Debug("Calculated RealWorkTime for user", "user", u, slog.String("worktime", d.realWorkTime.String()))
+	return d.realWorkTime
+}
+
+func (d *WorkDay) TimeOvertimeReal(u User) time.Duration {
+	workTime := d.TimeWorkVirtual(u)
+	if workTime == 0 {
+		workTime, _ = d.TimePauseReal(u)
+	}
+	if helper.IsWeekend(d.Day) && len(d.Bookings) == 0 {
+		return 0
+	}
+	var overtime time.Duration
+	overtime = workTime - u.ArbeitszeitProTag()
+	return overtime
+}
+
+func (d *WorkDay) TimePauseReal(u User) (work, pause time.Duration) {
+	if d.realWorkTime == 0 {
+		d.TimeWorkReal(u)
+	}
+	d.workTime, d.pauseTime = d.realWorkTime, d.realPauseTime
+	if d.realWorkTime <= 6*time.Hour || d.realPauseTime > 45*time.Minute {
+		return d.realWorkTime, d.realPauseTime
+	}
+	if d.realWorkTime <= (9*time.Hour) && d.realPauseTime < 30*time.Minute {
+		diff := 30*time.Minute - d.pauseTime
+		d.workTime -= diff
+		d.pauseTime += diff
+	} else if d.realPauseTime < 45*time.Minute {
+		diff := 45*time.Minute - d.pauseTime
+		d.workTime -= diff
+		d.pauseTime += diff
+	}
+	return d.workTime, d.pauseTime
+}
+
 func (d *WorkDay) ToString() string {
-	return fmt.Sprintf("WorkDay: %s with %d bookings and worktime: %s. Is KurzArbeit %v", d.Date().Format(time.DateOnly), len(d.Bookings), helper.FormatDuration(d.workTime), d.IsKurzArbeit())
+	return fmt.Sprintf("WorkDay: %s with %d bookings and worktime: %s", d.Date().Format(time.DateOnly), len(d.Bookings), helper.FormatDuration(d.workTime))
 }
 
 func (d *WorkDay) IsWorkDay() bool {
@@ -199,184 +302,60 @@ func GetWorkDays(user User, tsFrom, tsTo time.Time) []WorkDay {
 	var workSec, pauseSec float64
 
 	qStr, err := DB.Prepare(`
-		WITH
+	WITH all_days AS (
-  all_days AS (
+    	SELECT generate_series($2::DATE, $3::DATE - INTERVAL '1 day', INTERVAL '1 day')::DATE AS work_date),
+    ordered_bookings AS (
 	    SELECT
-      generate_series(
-        $2 ::DATE,
-        $3 ::DATE - INTERVAL '1 day',
-        INTERVAL '1 day'
-      )::DATE AS work_date
-  ),
-  all_bookings AS (
-    SELECT
-      a.card_uid,
-      a.timestamp,
 	        a.timestamp::DATE AS work_date,
+	        a.timestamp,
 	        a.check_in_out,
 	        a.counter_id,
 	        a.anwesenheit_typ,
 	        sat.anwesenheit_name AS anwesenheit_typ_name,
-      LAG(a.check_in_out) OVER (
+	        LAG(a.timestamp) OVER (PARTITION BY a.card_uid, a.timestamp::DATE ORDER BY a.timestamp) AS prev_timestamp,
-        PARTITION BY
+	        LAG(a.check_in_out) OVER (PARTITION BY a.card_uid, a.timestamp::DATE ORDER BY a.timestamp) AS prev_check
-          a.card_uid,
+	    FROM anwesenheit a
-          a.timestamp::DATE
-        ORDER BY
-          a.timestamp
-      ) AS prev_check,
-      LAG(a.timestamp) OVER (
-        PARTITION BY
-          a.card_uid,
-          a.timestamp::DATE
-        ORDER BY
-          a.timestamp
-      ) AS prev_timestamp
-    FROM
-      anwesenheit a
 	    LEFT JOIN s_anwesenheit_typen sat ON a.anwesenheit_typ = sat.anwesenheit_id
-    WHERE
+	    WHERE a.card_uid = $1
-      a.card_uid = $1
+	      AND a.timestamp::DATE >= $2
-      AND a.timestamp::DATE >= $2::DATE
+	      AND a.timestamp::DATE <= $3
-      AND a.timestamp::DATE <= $3::DATE
-  ),
-  normalized_bookings AS (
-    SELECT
-      *
-    FROM
-      all_bookings
-    WHERE
-      prev_check IS NULL
-      OR prev_check <> check_in_out
 	)
 	SELECT
 	    d.work_date,
 	    COALESCE(MIN(b.timestamp), NOW()) AS time_from,
 	    COALESCE(MAX(b.timestamp), NOW()) AS time_to,
-  EXTRACT(
+	    COALESCE(
-    EPOCH
+	        EXTRACT(EPOCH FROM SUM(
-    FROM
-      SUM(
 	            CASE
-          WHEN b.prev_check IN (1, 3)
+	                WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 254)
-          AND b.check_in_out IN (2, 4, 254) THEN b.timestamp - b.prev_timestamp
+	                THEN b.timestamp - b.prev_timestamp
 	                ELSE INTERVAL '0'
 	            END
-      )
+	        )), 0
 	    ) AS total_work_seconds,
-  EXTRACT(
+	    COALESCE(
-    EPOCH
+	        EXTRACT(EPOCH FROM SUM(
-    FROM
-      SUM(
 	            CASE
-          WHEN b.prev_check IN (2, 4, 254)
+	                WHEN b.prev_check IN (2, 4, 254) AND b.check_in_out IN (1, 3)
-          AND b.check_in_out IN (1, 3) THEN b.timestamp - b.prev_timestamp
+	                THEN b.timestamp - b.prev_timestamp
 	                ELSE INTERVAL '0'
 	            END
-      )
+	        )), 0
 	    ) AS total_pause_seconds,
-  jsonb_agg(
+	    COALESCE(jsonb_agg(jsonb_build_object(
-    jsonb_build_object(
+	        'check_in_out', b.check_in_out,
-      'check_in_out',
+	        'timestamp', b.timestamp,
-      b.check_in_out,
+	        'counter_id', b.counter_id,
-      'valid',
+	        'anwesenheit_typ', b.anwesenheit_typ,
-      coalesce(b.check_in_out != b.prev_check, true),
+	        'anwesenheit_typ', jsonb_build_object(
-      'timestamp',
+	            'anwesenheit_id', b.anwesenheit_typ,
-      b.timestamp,
+	            'anwesenheit_name', b.anwesenheit_typ_name
-      'counter_id',
-      b.counter_id,
-      'anwesenheit_typ',
-      jsonb_build_object(
-        'anwesenheit_id',
-        b.anwesenheit_typ,
-        'anwesenheit_name',
-        b.anwesenheit_typ_name
 	        )
-    )
+	    ) ORDER BY b.timestamp), '[]'::jsonb) AS bookings
-    ORDER BY
+	FROM all_days d
-      b.timestamp
+	LEFT JOIN ordered_bookings b ON d.work_date = b.work_date
-  ) FILTER (
+	GROUP BY d.work_date
-    WHERE
+	ORDER BY d.work_date ASC;`)
-      b.card_uid IS NOT NULL
-  ) AS bookings
-FROM
-  all_days d
-  LEFT JOIN all_bookings b ON b.work_date = d.work_date
-GROUP BY
-  d.work_date;
-	`)
-
-	// qStr, err := DB.Prepare(`
-	// WITH all_days AS (
-	//    	SELECT generate_series($2::DATE, $3::DATE - INTERVAL '1 day', INTERVAL '1 day')::DATE AS work_date),
-	//     normalized_bookings AS (
-	//         SELECT *
-	//         FROM (
-	//             SELECT
-	//                 a.card_uid,
-	//                 a.timestamp,
-	//                 a.timestamp::DATE AS work_date,
-	//                 a.check_in_out,
-	//                 a.counter_id,
-	//                 a.anwesenheit_typ,
-	//                 sat.anwesenheit_name AS anwesenheit_typ_name,
-	//                 LAG(a.check_in_out) OVER (
-	//                     PARTITION BY a.card_uid, a.timestamp::DATE
-	//                     ORDER BY a.timestamp
-	//                 ) AS prev_check
-	//             FROM anwesenheit a
-	//             LEFT JOIN s_anwesenheit_typen sat
-	//                 ON a.anwesenheit_typ = sat.anwesenheit_id
-	//             WHERE a.card_uid = $1
-	//               AND a.timestamp::DATE >= $2
-	//               AND a.timestamp::DATE <= $3
-	//         ) t
-	//         WHERE prev_check IS NULL OR prev_check <> check_in_out
-	//     ),
-	//     ordered_bookings AS (
-	//         SELECT
-	//             *,
-	//             LAG(timestamp) OVER (
-	//                 PARTITION BY card_uid, work_date
-	//                 ORDER BY timestamp
-	//             ) AS prev_timestamp
-	//         FROM normalized_bookings
-	//     )
-	// SELECT
-	//     d.work_date,
-	//     COALESCE(MIN(b.timestamp), NOW()) AS time_from,
-	//     COALESCE(MAX(b.timestamp), NOW()) AS time_to,
-	//     COALESCE(
-	//         EXTRACT(EPOCH FROM SUM(
-	//             CASE
-	//                 WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 254)
-	//                 THEN b.timestamp - b.prev_timestamp
-	//                 ELSE INTERVAL '0'
-	//             END
-	//         )), 0
-	//     ) AS total_work_seconds,
-	//     COALESCE(
-	//         EXTRACT(EPOCH FROM SUM(
-	//             CASE
-	//                 WHEN b.prev_check IN (2, 4, 254) AND b.check_in_out IN (1, 3)
-	//                 THEN b.timestamp - b.prev_timestamp
-	//                 ELSE INTERVAL '0'
-	//             END
-	//         )), 0
-	//     ) AS total_pause_seconds,
-	//     COALESCE(jsonb_agg(jsonb_build_object(
-	//         'check_in_out', b.check_in_out,
-	//         'timestamp', b.timestamp,
-	//         'counter_id', b.counter_id,
-	//         'anwesenheit_typ', b.anwesenheit_typ,
-	//         'anwesenheit_typ', jsonb_build_object(
-	//             'anwesenheit_id', b.anwesenheit_typ,
-	//             'anwesenheit_name', b.anwesenheit_typ_name
-	//         )
-	//     ) ORDER BY b.timestamp), '[]'::jsonb) AS bookings
-	// FROM all_days d
-	// LEFT JOIN ordered_bookings b ON d.work_date = b.work_date
-	// GROUP BY d.work_date
-	// ORDER BY d.work_date ASC;`)
 
 	if err != nil {
 		log.Println("Error preparing SQL statement", err)
@@ -390,88 +369,74 @@ GROUP BY
 		return workDays
 	}
 	defer rows.Close()
+	// emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false"))
 	for rows.Next() {
 		var workDay WorkDay
 		var bookings []byte
 		if err := rows.Scan(&workDay.Day, &workDay.TimeFrom, &workDay.TimeTo, &workSec, &pauseSec, &bookings); err != nil {
-			slog.Error("Error scanning row!", "Error", err)
+			log.Println("Error scanning row!", err)
 			return workDays
 		}
 		workDay.workTime = time.Duration(workSec * float64(time.Second))
 		workDay.pauseTime = time.Duration(pauseSec * float64(time.Second))
-		if bookings != nil {
 		err = json.Unmarshal(bookings, &workDay.Bookings)
 		if err != nil {
-				slog.Error("Error parsing bookings JSON!", "Error", err, "Json", bookings)
+			log.Println("Error parsing bookings JSON!", err)
 			return nil
 		}
-		}
-
 		// better empty day handling
-		// if len(workDay.Bookings) == 1 && workDay.Bookings[0].CounterId == 0 {
+		if len(workDay.Bookings) == 1 && workDay.Bookings[0].CounterId == 0 {
-		// 	workDay.Bookings = []Booking{}
+			workDay.Bookings = []Booking{}
-		// }
+		}
-		if len(workDay.Bookings) >= 1 || !helper.IsWeekend(workDay.Date()) {
+		workDay.TimePauseReal(user)
+		if len(workDay.Bookings) > 1 || !helper.IsWeekend(workDay.Date()) {
 			workDays = append(workDays, workDay)
 		}
 	}
 	if err = rows.Err(); err != nil {
-		slog.Error("Error in workday rows!", "Error", err)
+		log.Println("Error in workday rows!", err)
 		return workDays
 	}
 	return workDays
 }
 
+func (d *WorkDay) GetAllWorkTimesReal(user User) (work, pause, overtime time.Duration) {
+	if d.pauseTime == 0 || d.workTime == 0 {
+		d.TimePauseReal(user)
+	}
+	return d.workTime.Round(time.Minute), d.pauseTime.Round(time.Minute), d.TimeOvertimeReal(user)
+}
+
+func (d *WorkDay) GetAllWorkTimesVirtual(user User) (work, pause, overtime time.Duration) {
+	_, pause, overtime = d.GetAllWorkTimesReal(user)
+	return d.TimeWorkVirtual(user), pause, overtime
+}
+
 // returns bool wheter the workday was ended with an automatic logout
 func (d *WorkDay) RequiresAction() bool {
-	for i := range d.Bookings {
+	if len(d.Bookings) == 0 {
-		if d.Bookings[i].CheckInOut > 250 {
-			return true
-		}
-	}
 		return false
 	}
+	return d.Bookings[len(d.Bookings)-1].CheckInOut == 254
+}
 
 func (d *WorkDay) GetDayProgress(u User) int8 {
 	if d.RequiresAction() {
 		return -1
 	}
-	workTime := d.GetWorktime(u, WorktimeBaseDay, true)
+	workTime := d.TimeWorkVirtual(u)
 	progress := (workTime.Seconds() / u.ArbeitszeitProTag().Seconds()) * 100
 	return int8(progress)
 }
 
-func (d *WorkDay) IsSubmittedAndAccepted() bool {
+// func (d *WorkDay) CalcOvertime(user User) time.Duration {
-	var isKurzArbeitAccepted bool
+// 	if d.workTime == 0 {
-	if d.IsKurzArbeit() {
+// 		d.TimePauseReal(user)
-		isKurzArbeitAccepted = d.kurzArbeitAbsence.IsSubmittedAndAccepted()
+// 	}
-	}
+// 	if helper.IsWeekend(d.Day) && len(d.Bookings) == 0 {
-
+// 		return 0
-	if d.IsEmpty() {
+// 	}
-		return isKurzArbeitAccepted
+// 	var overtime time.Duration
-	}
+// 	overtime = d.workTime - user.ArbeitszeitProTag()
-
+// 	return overtime
-	qStr, err := DB.Prepare(`SELECT bestaetigt from wochen_report WHERE anwesenheiten @> $1 AND $2 >= woche_start AND $2 <  woche_start + INTERVAL '1 week';`) // @> array contains
+// }
-	if err != nil {
-		slog.Warn("Error when preparing SQL Statement", "error", err)
-		return false
-	}
-
-	defer qStr.Close()
-	var isSubmittedAndChecked bool = false
-
-	var bookingsIds []int
-	for _, booking := range d.Bookings {
-		bookingsIds = append(bookingsIds, booking.CounterId)
-	}
-
-	err = qStr.QueryRow(pq.Array(bookingsIds), d.Date()).Scan(&isSubmittedAndChecked)
-	if err == sql.ErrNoRows {
-		return false
-	}
-
-	if err != nil {
-		slog.Warn("Unexpected error when executing SQL Statement", "error", err, "BookingsIds", bookingsIds)
-	}
-	return isSubmittedAndChecked
-}

Backend/models/workDay_test.go

@@ -16,237 +16,65 @@ func CatchError[T any](val T, err error) T {
 }
 
 var testWorkDay = models.WorkDay{
-	Day:      time.Date(2025, 01, 01, 0, 0, 0, 0, time.Local),
+	Day:      CatchError(time.Parse(time.DateOnly, "2025-01-01")),
 	Bookings: testBookings8hrs,
-	TimeFrom: time.Date(2025, 01, 01, 8, 0, 0, 0, time.Local),
+	TimeFrom: CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
-	TimeTo:   time.Date(2025, 01, 01, 16, 30, 0, 0, time.Local),
+	TimeTo:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 16:30")),
 }
 
-func TestWorkdayWorktimeDay(t *testing.T) {
+func TestCalcRealWorkTime(t *testing.T) {
-	testCases := []struct {
+	workTime := testWorkDay.TimeWorkReal(testUser)
-		testName     string
+	if workTime != time.Hour*8 {
+		t.Errorf("Calc Worktime Default not working, time should be 8h, but was %s", helper.FormatDuration(workTime))
+	}
+}
+
+func TestCalcWorkPauseDiff(t *testing.T) {
+	type testCase struct {
+		Name              string
 		bookings          []models.Booking
-		expectedTime time.Duration
+		expectedWorkTime  time.Duration
-	}{
+		expectedPauseTime time.Duration
-		{
+		expectedOvertime  time.Duration
-			testName:     "Bookings6hrs",
-			bookings:     testBookings6hrs, //work 6h
-			expectedTime: time.Hour * 6,    //pause 0
-		},
-		{
-			testName:     "Bookings8hrs",
-			bookings:     testBookings8hrs,             //work 8 pause 0
-			expectedTime: time.Hour*7 + time.Minute*30, //pause 30 --> corrected
-		},
-		{
-			testName:     "Bookings10hrs",
-			bookings:     testBookings10hrs,            //work 10 pause 0
-			expectedTime: time.Hour*9 + time.Minute*15, //pause 45 --> corrected
-		},
-		{
-			testName:     "Booking 6h with 30 min Break",
-			bookings:     testBookings6hrsBreak30min, //work 6 pause 30
-			expectedTime: time.Hour * 6,              //pause 30 --> bc real pause
-		},
-		{
-			testName:     "Booking 6h 10min with 30 min Break",
-			bookings:     testBookings610hrsBreak30min, //work 6 10 pause 30
-			expectedTime: time.Hour*6 + time.Minute*10, //pause 30 --> real pause
-		},
-		{
-			testName:     "Booking 9h with 30 min Break",
-			bookings:     testBookings9hrsBreak30min, //work 9 pause 30
-			expectedTime: time.Hour * 9,              //pause 30 --> real pause
-		},
-		{
-			testName:     "Booking 9h 30min",
-			bookings:     testBookings930hrs, //work 9 30 pause 0
-			expectedTime: time.Hour * 9,      //pause 30 --> corrected
-		},
-		{
-			testName:     "Booking 9h 40min with 30min Break",
-			bookings:     testBookings910hrsBreak30min, //work 9 10 pause 30
-			expectedTime: time.Hour*8 + time.Minute*55, //pause 45 --> real + corrected
-		},
-		{
-			testName:     "Booking 9h 40min with 35min Break",
-			bookings:     testBookings910hrsBreak35min, //work 9 10 pause 35
-			expectedTime: time.Hour * 9,                //pause 45 --> real + corrected
-		},
-		{
-			testName:     "Booking 9h 45min",
-			bookings:     testBookings945hrs, //work 9 45 pause 0
-			expectedTime: time.Hour * 9,      //pause 45 --> corrected
-		},
-		{
-			testName:     "Booking 10h Break 45min",
-			bookings:     testBookings10hrsBreak45min,  //work 9 15 pause 45
-			expectedTime: time.Hour*9 + time.Minute*15, //pause 45 --> real
-		},
-		{
-			testName:     "Booking 10h 30min Break 45min",
-			bookings:     testBookings1030hrsBreak45min, //work 9 45 pause 45
-			expectedTime: time.Hour*9 + time.Minute*45,  //pause 45 --> real
-		},
 	}
 
-	for _, tc := range testCases {
+	testCases := []testCase{testCase{
-		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
+		Name:              "6hrs no pause",
-			var testCase = testWorkDay
-			testCase.Bookings = tc.bookings
-			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseDay, false)
-			if workTime != tc.expectedTime {
-				t.Errorf("GetWorktimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
-			}
-		})
-	}
-}
-
-func TestWorkdayWorktimeWeek(t *testing.T) {
-	testCases := []struct {
-		testName     string
-		bookings     []models.Booking
-		expectedTime time.Duration
-	}{
-		{
-			testName:     "Bookings6hrs",
 		bookings:          testBookings6hrs,
-			expectedTime: time.Hour * 6,
+		expectedWorkTime:  6 * time.Hour,
+		expectedPauseTime: 0,
+		expectedOvertime:  -2 * time.Hour,
 	},
-		{
+		testCase{
-			testName:     "Bookings8hrs",
+			Name:              "8hrs - 30min pause",
 			bookings:          testBookings8hrs,
-			expectedTime: time.Hour*7 + time.Minute*30,
+			expectedWorkTime:  7*time.Hour + 30*time.Minute,
+			expectedPauseTime: 30 * time.Minute,
+			expectedOvertime:  -30 * time.Minute,
 		},
-		{
+		testCase{
-			testName:     "Bookings10hrs",
+			Name:              "10hrs - 45min pause",
 			bookings:          testBookings10hrs,
-			expectedTime: time.Hour*9 + time.Minute*15,
+			expectedWorkTime:  9*time.Hour + 15*time.Minute,
-		},
+			expectedPauseTime: 45 * time.Minute,
-	}
+			expectedOvertime:  1*time.Hour + 15*time.Minute,
+		}}
 
-	for _, tc := range testCases {
+	for _, test := range testCases {
-		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
+		t.Run(test.Name, func(t *testing.T) {
-			var testCase = testWorkDay
+			testWorkDay.Bookings = test.bookings
-			testCase.Bookings = tc.bookings
+			testWorkDay.TimeWorkReal(testUser)
-			workTime := testCase.GetWorktime(testUser, models.WorktimeBaseWeek, false)
+			testWorkDay.TimePauseReal(testUser)
-			if workTime != tc.expectedTime {
+			testWorkDay.TimeOvertimeReal(testUser)
-				t.Errorf("GetWorktimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
+			workTime, pauseTime, overTime := testWorkDay.GetAllWorkTimesReal(testUser)
-			}
+			if workTime != test.expectedWorkTime {
-		})
+				t.Errorf("Calculated wrong workTime: should be %s, but was %s", helper.FormatDuration(test.expectedWorkTime), helper.FormatDuration(workTime))
-	}
+			}
-}
+			if pauseTime != test.expectedPauseTime {
-
+				t.Errorf("Calculated wrong pauseTime: should be %s, but was %s", helper.FormatDuration(test.expectedPauseTime), helper.FormatDuration(pauseTime))
-func TestWorkdayPausetimeDay(t *testing.T) {
+			}
-	testCases := []struct {
+			if overTime != test.expectedOvertime {
-		testName     string
+				t.Errorf("Calculated wrong overtime: should be %s, but was %s", helper.FormatDuration(test.expectedOvertime), helper.FormatDuration(overTime))
-		bookings     []models.Booking
-		expectedTime time.Duration
-	}{
-		{
-			testName:     "Bookings6hrs",
-			bookings:     testBookings6hrs,
-			expectedTime: 0,
-		},
-		{
-			testName:     "Bookings8hrs",
-			bookings:     testBookings8hrs,
-			expectedTime: time.Minute * 30,
-		},
-		{
-			testName:     "Bookings10hrs",
-			bookings:     testBookings10hrs,
-			expectedTime: time.Minute * 45,
-		},
-		{
-			testName:     "Booking 6h with 30 min Break",
-			bookings:     testBookings6hrsBreak30min, //work 6 pause 30
-			expectedTime: time.Minute * 30,           //pause 30 --> bc real pause
-		},
-		{
-			testName:     "Booking 6h 10min with 30 min Break",
-			bookings:     testBookings610hrsBreak30min, //work 6 10 pause 30
-			expectedTime: time.Minute * 30,             //pause 30 --> real pause
-		},
-		{
-			testName:     "Booking 9h with 30 min Break",
-			bookings:     testBookings9hrsBreak30min, //work 9 pause 30
-			expectedTime: time.Minute * 30,           //pause 30 --> real pause
-		},
-		{
-			testName:     "Booking 9h 30min",
-			bookings:     testBookings930hrs, //work 9 30 pause 0
-			expectedTime: time.Minute * 30,   //pause 30 --> corrected
-		},
-		{
-			testName:     "Booking 9h 40min with 30min Break",
-			bookings:     testBookings910hrsBreak30min, //work 9 10 pause 30
-			expectedTime: time.Minute * 45,             //pause 45 --> real + corrected
-		},
-		{
-			testName:     "Booking 9h 40min with 35min Break",
-			bookings:     testBookings910hrsBreak35min, //work 9 10 pause 35
-			expectedTime: time.Minute * 45,             //pause 45 --> real + corrected
-		},
-		{
-			testName:     "Booking 9h 45min",
-			bookings:     testBookings945hrs, //work 9 45 pause 0
-			expectedTime: time.Minute * 45,   //pause 45 --> corrected
-		},
-		{
-			testName:     "Booking 10h Break 45min",
-			bookings:     testBookings10hrsBreak45min, //work 9 15 pause 45
-			expectedTime: time.Minute * 45,            //pause 45 --> real
-		},
-		{
-			testName:     "Booking 10h 30min Break 45min",
-			bookings:     testBookings1030hrsBreak45min, //work 9 45 pause 45
-			expectedTime: time.Minute * 45,              //pause 45 --> real
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
-			var testCase = testWorkDay
-			testCase.Bookings = tc.bookings
-			workTime := testCase.GetPausetime(testUser, models.WorktimeBaseDay, false)
-			if workTime != tc.expectedTime {
-				t.Errorf("GetPausetimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
-			}
-		})
-	}
-}
-
-func TestWorkdayPausetimeWeek(t *testing.T) {
-	testCases := []struct {
-		testName     string
-		bookings     []models.Booking
-		expectedTime time.Duration
-	}{
-		{
-			testName:     "Bookings6hrs",
-			bookings:     testBookings6hrs,
-			expectedTime: 0,
-		},
-		{
-			testName:     "Bookings8hrs",
-			bookings:     testBookings8hrs,
-			expectedTime: time.Minute * 30,
-		},
-		{
-			testName:     "Bookings10hrs",
-			bookings:     testBookings10hrs,
-			expectedTime: time.Minute * 45,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run("Calc Absence Worktime: "+tc.testName, func(t *testing.T) {
-			var testCase = testWorkDay
-			testCase.Bookings = tc.bookings
-			workTime := testCase.GetPausetime(testUser, models.WorktimeBaseWeek, false)
-			if workTime != tc.expectedTime {
-				t.Errorf("GetPausetimeReal not working, time should be %s, but was %s", helper.FormatDurationFill(tc.expectedTime, true), helper.FormatDurationFill(workTime, true))
 			}
 		})
 	}

Backend/models/workWeek.go

@@ -1,12 +1,6 @@
 package models
 
-// the WorkWeek describes the weekly reports used the check on worktimes and
-// calculate the running overtime
-//
-// this type is based on the "wochen_report" table
-
 import (
-	"arbeitszeitmessung/helper"
 	"database/sql"
 	"errors"
 	"log"
@@ -25,34 +19,25 @@ type WorkWeek struct {
 	Days            []IWorkDay
 	User            User
 	WeekStart       time.Time
-	weekEnd         time.Time
 	Worktime        time.Duration
-	WorktimeVirtual time.Duration
+	WorkTimeVirtual time.Duration
 	Overtime        time.Duration
 	Status          WeekStatus
-	WeekBase        WorktimeBase
-	Kurzarbeit      time.Duration
 }
 
 type WeekStatus int8
 
 const (
 	WeekStatusNone WeekStatus = iota
-	WeekStatusCorrected
 	WeekStatusSent
 	WeekStatusAccepted
 	WeekStatusDifferences
 )
 
-func NewWorkWeekSimple(user User, tsMonday time.Time, populate bool) WorkWeek {
+func NewWorkWeek(user User, tsMonday time.Time, populate bool) WorkWeek {
-	return NewWorkWeek(user, tsMonday, tsMonday.Add(6*24*time.Hour), populate)
-}
-
-func NewWorkWeek(user User, tsStart, tsEnd time.Time, populate bool) WorkWeek {
 	var week WorkWeek = WorkWeek{
 		User:      user,
-		WeekStart: tsStart,
+		WeekStart: tsMonday,
-		weekEnd:   tsEnd,
 		Status:    WeekStatusNone,
 	}
 	if populate {
@@ -63,30 +48,16 @@ func NewWorkWeek(user User, tsStart, tsEnd time.Time, populate bool) WorkWeek {
 
 func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Duration) {
 	slog.Debug("Got Days with overtime and worktime", slog.String("worktime", worktime.String()), slog.String("overtime", overtime.String()))
-	w.Days = GetDays(w.User, w.WeekStart, w.weekEnd, false)
+	w.Days = GetDays(w.User, w.WeekStart, w.WeekStart.Add(6*24*time.Hour), false)
-	slog.Debug("Populating Workweek for user", "user", w.User.Name, "Days", lenWorkDays(w.Days), "Start", w.WeekStart, "End", w.weekEnd, "workdays", helper.GetWorkingDays(w.WeekStart, w.weekEnd))
-
-	if lenWorkDays(w.Days) == helper.GetWorkingDays(w.WeekStart, w.weekEnd) {
-		w.WeekBase = WorktimeBaseWeek
-	} else {
-		w.WeekBase = WorktimeBaseDay
-	}
 
 	for _, day := range w.Days {
-		dWorkTime := day.GetWorktime(w.User, w.WeekBase, false)
+		work, _ := day.TimePauseReal(w.User)
-		dWorkTimeVirtual := day.GetWorktime(w.User, w.WeekBase, true)
+		w.Worktime += work
-		if dWorkTime < dWorkTimeVirtual {
+		w.WorkTimeVirtual += day.TimeWorkVirtual(w.User)
-			w.Kurzarbeit += dWorkTimeVirtual - dWorkTime
 	}
-		w.Worktime += dWorkTime
+	slog.Debug("Got worktime for user", "user", w.User, "worktime", w.Worktime.String(), "virtualWorkTime", w.WorkTimeVirtual.String())
-		w.WorktimeVirtual += dWorkTimeVirtual
-		slog.Debug("Calculated Worktime", "Day", day.ToString(), "worktime", w.Worktime.String())
-	}
-	slog.Debug("Got worktime for user", "worktime", w.Worktime.String(), "virtualWorkTime", w.WorktimeVirtual.String())
 
-	w.Overtime = w.WorktimeVirtual - w.User.ArbeitszeitProWoche()
+	w.Overtime = w.WorkTimeVirtual - w.User.ArbeitszeitProWoche()
-
-	slog.Debug("Calculated overtime", "worktime", w.Worktime.String(), "virtualWorkTime", w.WorktimeVirtual.String())
 
 	w.Worktime = w.Worktime.Round(time.Minute)
 	w.Overtime = w.Overtime.Round(time.Minute)
@@ -100,16 +71,6 @@ func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Durati
 	}
 }
 
-func lenWorkDays(workDays []IWorkDay) int {
-	var lenght int
-	for _, day := range workDays {
-		if !day.IsEmpty() || day.IsKurzArbeit() {
-			lenght += 1
-		}
-	}
-	return lenght
-}
-
 func (w *WorkWeek) CheckStatus() WeekStatus {
 	if w.Status != WeekStatusNone {
 		return w.Status
@@ -118,31 +79,25 @@ func (w *WorkWeek) CheckStatus() WeekStatus {
 		log.Println("Cannot access Database!")
 		return w.Status
 	}
-	qStr, err := DB.Prepare(`SELECT bestaetigt, id FROM wochen_report WHERE woche_start = $1::DATE AND personal_nummer = $2;`)
+	qStr, err := DB.Prepare(`SELECT bestaetigt FROM wochen_report WHERE woche_start = $1::DATE AND personal_nummer = $2;`)
 	if err != nil {
 		log.Println("Error preparing SQL statement", err)
 		return w.Status
 	}
-
 	defer qStr.Close()
-	var beastatigt sql.NullBool
+	var beastatigt bool
-	err = qStr.QueryRow(w.WeekStart, w.User.PersonalNummer).Scan(&beastatigt, &w.Id)
+	err = qStr.QueryRow(w.WeekStart, w.User.PersonalNummer).Scan(&beastatigt)
 	if err == sql.ErrNoRows {
 		return w.Status
 	}
-	slog.Info("Bestätigt query res", "Best", beastatigt, "week", w.Id)
 	if err != nil {
 		log.Println("Error querying database", err)
 		return w.Status
 	}
-	switch {
+	if beastatigt {
-	case beastatigt.Bool:
 		w.Status = WeekStatusAccepted
-	case beastatigt.Valid:
+	} else {
 		w.Status = WeekStatusSent
-	default:
-		w.Status = WeekStatusCorrected
-
 	}
 	return w.Status
 }
@@ -244,33 +199,23 @@ func (w *WorkWeek) SendWeek() error {
 		return ErrRunningWeek
 	}
 
-	switch w.CheckStatus() {
+	if w.CheckStatus() != WeekStatusNone {
-	case WeekStatusNone:
-		qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start, arbeitszeit, ueberstunden, anwesenheiten, abwesenheiten) VALUES ($1, $2, make_interval(secs => $3::numeric / 1000000000), make_interval(secs => $4::numeric / 1000000000), $5, $6);`)
-		if err != nil {
-			slog.Warn("Error preparing SQL statement", "error", err)
-			return err
-		}
-
-	case WeekStatusCorrected:
 		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE, arbeitszeit = make_interval(secs => $3::numeric / 1000000000), ueberstunden = make_interval(secs => $4::numeric / 1000000000), anwesenheiten=$5, abwesenheiten=$6 WHERE personal_nummer = $1 AND woche_start = $2;`)
 		if err != nil {
 			slog.Warn("Error preparing SQL statement", "error", err)
 			return err
 		}
-
+	} else {
-	case WeekStatusSent, WeekStatusAccepted:
+		qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start, arbeitszeit, ueberstunden, anwesenheiten, abwesenheiten) VALUES ($1, $2, make_interval(secs => $3::numeric / 1000000000), make_interval(secs => $4::numeric / 1000000000), $5, $6);`)
-		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = null WHERE personal_nummer = $1 AND woche_start = $2 AND ($3::numeric IS NULL OR TRUE) AND ($4::numeric IS NULL OR TRUE) AND ($5::int[] IS NULL OR TRUE) AND ($6::int[] IS NULL OR TRUE);`)
 		if err != nil {
 			slog.Warn("Error preparing SQL statement", "error", err)
 			return err
 		}
-
 	}
 
 	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart, int64(w.Worktime), int64(w.Overtime), pq.Array(anwBookings), pq.Array(awBookings))
 	if err != nil {
-		slog.Error("Error executing query!", "error", err)
+		log.Println("Error executing query!", err)
 		return err
 	}
 	return nil

Backend/models/workWeek_test.go

@@ -20,7 +20,7 @@ func TestNewWorkWeekNoPopulate(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	workWeek := models.NewWorkWeekSimple(testUser, monday, false)
+	workWeek := models.NewWorkWeek(testUser, monday, false)
 
 	if workWeek.User != testUser || workWeek.WeekStart != monday {
 		t.Error("No populate workweek does not have right values!")

Backend/src/main.css

@@ -78,8 +78,14 @@
     border-style: var(--tw-border-style);
     border-width: 1px;
     border-color: var(--color-neutral-800);
-        transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
+    transition-property:
-        transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+      color, background-color, border-color, outline-color,
+      text-decoration-color, fill, stroke, --tw-gradient-from,
+      --tw-gradient-via, --tw-gradient-to;
+    transition-timing-function: var(
+      --tw-ease,
+      var(--default-transition-timing-function)
+    );
     transition-duration: var(--tw-duration, var(--default-transition-duration));
   }
 

Backend/static/css/styles.css

@@ -12,6 +12,7 @@
     --color-red-700: oklch(50.5% 0.213 27.518);
     --color-orange-500: oklch(70.5% 0.213 47.604);
     --color-purple-600: oklch(55.8% 0.288 302.321);
+    --color-slate-300: oklch(86.9% 0.022 252.894);
     --color-slate-600: oklch(44.6% 0.043 257.281);
     --color-slate-700: oklch(37.2% 0.044 257.287);
     --color-slate-800: oklch(27.9% 0.041 260.031);
@@ -20,6 +21,7 @@
     --color-neutral-300: oklch(87% 0 0);
     --color-neutral-400: oklch(70.8% 0 0);
     --color-neutral-500: oklch(55.6% 0 0);
+    --color-neutral-600: oklch(43.9% 0 0);
     --color-neutral-700: oklch(37.1% 0 0);
     --color-neutral-800: oklch(26.9% 0 0);
     --color-black: #000;
@@ -29,6 +31,8 @@
     --text-sm--line-height: calc(1.25 / 0.875);
     --text-xl: 1.25rem;
     --text-xl--line-height: calc(1.75 / 1.25);
+    --text-2xl: 1.5rem;
+    --text-2xl--line-height: calc(2 / 1.5);
     --font-weight-bold: 700;
     --radius-md: 0.375rem;
     --default-transition-duration: 150ms;
@@ -196,15 +200,15 @@
   .relative {
     position: relative;
   }
-  .sticky {
+  .top-1 {
-    position: sticky;
+    top: calc(var(--spacing) * 1);
-  }
-  .top-0 {
-    top: calc(var(--spacing) * 0);
   }
   .top-1\/2 {
     top: calc(1/2 * 100%);
   }
+  .top-2 {
+    top: calc(var(--spacing) * 2);
+  }
   .top-2\.5 {
     top: calc(var(--spacing) * 2.5);
   }
@@ -214,15 +218,18 @@
   .right-1 {
     right: calc(var(--spacing) * 1);
   }
+  .right-2 {
+    right: calc(var(--spacing) * 2);
+  }
   .right-2\.5 {
     right: calc(var(--spacing) * 2.5);
   }
+  .left-1 {
+    left: calc(var(--spacing) * 1);
+  }
   .left-1\/2 {
     left: calc(1/2 * 100%);
   }
-  .z-100 {
-    z-index: 100;
-  }
   .col-span-2 {
     grid-column: span 2 / span 2;
   }
@@ -238,9 +245,6 @@
   .-my-1 {
     margin-block: calc(var(--spacing) * -1);
   }
-  .my-2 {
-    margin-block: calc(var(--spacing) * 2);
-  }
   .mt-1 {
     margin-top: calc(var(--spacing) * 1);
   }
@@ -308,32 +312,6 @@
     mask-size: 100% 100%;
     --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M7.616 20q-.672 0-1.144-.472T6 18.385V6H5V5h4v-.77h6V5h4v1h-1v12.385q0 .69-.462 1.153T16.384 20zM17 6H7v12.385q0 .269.173.442t.443.173h8.769q.23 0 .423-.192t.192-.424zM9.808 17h1V8h-1zm3.384 0h1V8h-1zM7 6v13z'/%3E%3C/svg%3E");
   }
-  .icon-\[material-symbols-light--edit-calendar-rounded\] {
-    display: inline-block;
-    width: 1.25em;
-    height: 1.25em;
-    background-color: currentColor;
-    -webkit-mask-image: var(--svg);
-    mask-image: var(--svg);
-    -webkit-mask-repeat: no-repeat;
-    mask-repeat: no-repeat;
-    -webkit-mask-size: 100% 100%;
-    mask-size: 100% 100%;
-    --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M5.616 21q-.691 0-1.153-.462T4 19.385V6.615q0-.69.463-1.152T5.616 5h1.769V3.308q0-.23.155-.384q.156-.155.386-.155t.383.155t.153.384V5h7.154V3.27q0-.213.143-.357q.144-.144.357-.144t.356.144t.144.356V5h1.769q.69 0 1.153.463T20 6.616v4.601q0 .213-.144.356t-.357.144t-.356-.144t-.143-.356v-.602H5v8.77q0 .23.192.423t.423.192h5.731q.213 0 .357.144t.143.357t-.143.356t-.357.143zm8.615-.808V19.12q0-.153.056-.296q.055-.144.186-.275l5.09-5.065q.149-.13.306-.19t.315-.062q.172 0 .338.064q.166.065.301.194l.925.944q.123.148.188.308q.064.159.064.319t-.052.322t-.2.31l-5.065 5.066q-.131.13-.275.186q-.143.056-.297.056h-1.073q-.343 0-.575-.232t-.232-.576m5.96-4.177l.925-.956l-.925-.944l-.95.95z'/%3E%3C/svg%3E");
-  }
-  .icon-\[material-symbols-light--lock\] {
-    display: inline-block;
-    width: 1.25em;
-    height: 1.25em;
-    background-color: currentColor;
-    -webkit-mask-image: var(--svg);
-    mask-image: var(--svg);
-    -webkit-mask-repeat: no-repeat;
-    mask-repeat: no-repeat;
-    -webkit-mask-size: 100% 100%;
-    mask-size: 100% 100%;
-    --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M6.616 21q-.667 0-1.141-.475T5 19.386v-8.77q0-.666.475-1.14T6.615 9H8V7q0-1.671 1.165-2.835Q10.329 3 12 3t2.836 1.165T16 7v2h1.385q.666 0 1.14.475t.475 1.14v8.77q0 .666-.475 1.14t-1.14.475zM12 16.5q.633 0 1.066-.434q.434-.433.434-1.066t-.434-1.066T12 13.5t-1.066.434Q10.5 14.367 10.5 15t.434 1.066q.433.434 1.066.434M9 9h6V7q0-1.25-.875-2.125T12 4t-2.125.875T9 7z'/%3E%3C/svg%3E");
-  }
   .icon-\[material-symbols-light--more-time\] {
     display: inline-block;
     width: 1.25em;
@@ -376,9 +354,6 @@
   .block {
     display: block;
   }
-  .contents {
-    display: contents;
-  }
   .flex {
     display: flex;
   }
@@ -409,13 +384,12 @@
     width: calc(var(--spacing) * 5);
     height: calc(var(--spacing) * 5);
   }
-  .size-6 {
-    width: calc(var(--spacing) * 6);
-    height: calc(var(--spacing) * 6);
-  }
   .h-2 {
     height: calc(var(--spacing) * 2);
   }
+  .h-3 {
+    height: calc(var(--spacing) * 3);
+  }
   .h-3\.5 {
     height: calc(var(--spacing) * 3.5);
   }
@@ -428,9 +402,6 @@
   .h-8 {
     height: calc(var(--spacing) * 8);
   }
-  .h-10 {
-    height: calc(var(--spacing) * 10);
-  }
   .h-\[100vh\] {
     height: 100vh;
   }
@@ -440,6 +411,9 @@
   .w-2 {
     width: calc(var(--spacing) * 2);
   }
+  .w-3 {
+    width: calc(var(--spacing) * 3);
+  }
   .w-3\.5 {
     width: calc(var(--spacing) * 3.5);
   }
@@ -449,6 +423,9 @@
   .w-5 {
     width: calc(var(--spacing) * 5);
   }
+  .w-9 {
+    width: calc(var(--spacing) * 9);
+  }
   .w-9\/10 {
     width: calc(9/10 * 100%);
   }
@@ -461,6 +438,9 @@
   .w-full {
     width: 100%;
   }
+  .flex-shrink {
+    flex-shrink: 1;
+  }
   .flex-shrink-0 {
     flex-shrink: 0;
   }
@@ -476,10 +456,21 @@
   .basis-\[content\] {
     flex-basis: content;
   }
+  .border-collapse {
+    border-collapse: collapse;
+  }
+  .-translate-x-1 {
+    --tw-translate-x: calc(var(--spacing) * -1);
+    translate: var(--tw-translate-x) var(--tw-translate-y);
+  }
   .-translate-x-1\/2 {
     --tw-translate-x: calc(calc(1/2 * 100%) * -1);
     translate: var(--tw-translate-x) var(--tw-translate-y);
   }
+  .-translate-y-1 {
+    --tw-translate-y: calc(var(--spacing) * -1);
+    translate: var(--tw-translate-x) var(--tw-translate-y);
+  }
   .-translate-y-1\/2 {
     --tw-translate-y: calc(calc(1/2 * 100%) * -1);
     translate: var(--tw-translate-x) var(--tw-translate-y);
@@ -490,18 +481,36 @@
   .cursor-pointer {
     cursor: pointer;
   }
+  .resize {
+    resize: both;
+  }
   .scroll-m-2 {
     scroll-margin: calc(var(--spacing) * 2);
   }
   .appearance-none {
     appearance: none;
   }
+  .break-after-page {
+    break-after: page;
+  }
+  .auto-rows-min {
+    grid-auto-rows: min-content;
+  }
   .grid-cols-2 {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
   .grid-cols-5 {
     grid-template-columns: repeat(5, minmax(0, 1fr));
   }
+  .grid-cols-\[3fr_2fr_2fr_2fr_3fr_3fr_3fr\] {
+    grid-template-columns: 3fr 2fr 2fr 2fr 3fr 3fr 3fr;
+  }
+  .grid-cols-subgrid {
+    grid-template-columns: subgrid;
+  }
+  .grid-rows-6 {
+    grid-template-rows: repeat(6, minmax(0, 1fr));
+  }
   .flex-col {
     flex-direction: column;
   }
@@ -552,6 +561,11 @@
       border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
     }
   }
+  .divide-neutral-300 {
+    :where(& > :not(:last-child)) {
+      border-color: var(--color-neutral-300);
+    }
+  }
   .justify-self-end {
     justify-self: flex-end;
   }
@@ -578,10 +592,18 @@
     border-style: var(--tw-border-style);
     border-width: 0px;
   }
+  .border-r-0 {
+    border-right-style: var(--tw-border-style);
+    border-right-width: 0px;
+  }
   .border-r-1 {
     border-right-style: var(--tw-border-style);
     border-right-width: 1px;
   }
+  .border-b-0 {
+    border-bottom-style: var(--tw-border-style);
+    border-bottom-width: 0px;
+  }
   .border-dashed {
     --tw-border-style: dashed;
     border-style: dashed;
@@ -592,6 +614,15 @@
   .border-neutral-500 {
     border-color: var(--color-neutral-500);
   }
+  .border-neutral-600 {
+    border-color: var(--color-neutral-600);
+  }
+  .border-slate-300 {
+    border-color: var(--color-slate-300);
+  }
+  .border-slate-700 {
+    border-color: var(--color-slate-700);
+  }
   .border-slate-800 {
     border-color: var(--color-slate-800);
   }
@@ -616,12 +647,18 @@
   .bg-red-600 {
     background-color: var(--color-red-600);
   }
+  .mask-repeat {
+    mask-repeat: repeat;
+  }
   .p-1 {
     padding: calc(var(--spacing) * 1);
   }
   .p-2 {
     padding: calc(var(--spacing) * 2);
   }
+  .p-8 {
+    padding: calc(var(--spacing) * 8);
+  }
   .px-3 {
     padding-inline: calc(var(--spacing) * 3);
   }
@@ -634,6 +671,10 @@
   .text-center {
     text-align: center;
   }
+  .text-2xl {
+    font-size: var(--text-2xl);
+    line-height: var(--tw-leading, var(--text-2xl--line-height));
+  }
   .text-sm {
     font-size: var(--text-sm);
     line-height: var(--tw-leading, var(--text-sm--line-height));
@@ -655,6 +696,9 @@
   .text-black {
     color: var(--color-black);
   }
+  .text-neutral-300 {
+    color: var(--color-neutral-300);
+  }
   .text-neutral-500 {
     color: var(--color-neutral-500);
   }
@@ -682,9 +726,16 @@
   .uppercase {
     text-transform: uppercase;
   }
+  .underline {
+    text-decoration-line: underline;
+  }
   .opacity-0 {
     opacity: 0%;
   }
+  .outline {
+    outline-style: var(--tw-outline-style);
+    outline-width: 1px;
+  }
   .filter {
     filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
   }
@@ -711,6 +762,18 @@
     -webkit-user-select: none;
     user-select: none;
   }
+  .\*\:text-center {
+    :is(& > *) {
+      text-align: center;
+    }
+  }
+  .\*\:not-print\:p-2 {
+    :is(& > *) {
+      @media not print {
+        padding: calc(var(--spacing) * 2);
+      }
+    }
+  }
   .group-hover\:text-black {
     &:is(:where(.group):hover *) {
       @media (hover: hover) {
@@ -1118,6 +1181,11 @@
   syntax: "*";
   inherits: false;
 }
+@property --tw-outline-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
 @property --tw-blur {
   syntax: "*";
   inherits: false;
@@ -1190,6 +1258,7 @@
       --tw-border-style: solid;
       --tw-divide-y-reverse: 0;
       --tw-font-weight: initial;
+      --tw-outline-style: solid;
       --tw-blur: initial;
       --tw-brightness: initial;
       --tw-contrast: initial;

Backend/static/script.js

@@ -15,9 +15,7 @@ function editWorkday(element, event, id, isWorkDay) {
   event.preventDefault();
   let form = document.getElementById(id);
   if (form == null) {
-    form = element
+    form = element.closest(".grid-sub").querySelector(".all-booking-component > form");
-      .closest(".grid-sub")
-      .querySelector(".all-booking-component > form");
   }
 
   clearEditState();
@@ -39,21 +37,10 @@ function editWorkday(element, event, id, isWorkDay) {
     const absenceForm = document.getElementById("absence_form");
 
     if (id == 0) {
-      absenceForm.querySelector("[name=date_from]").value = form.id.replace(
+      absenceForm.querySelector("[name=date_from]").value = form.id.replace("time-", "");
-        "time-",
+      absenceForm.querySelector("[name=date_to]").value = form.id.replace("time-", "");
-        "",
-      );
-      absenceForm.querySelector("[name=date_to]").value = form.id.replace(
-        "time-",
-        "",
-      );
     } else {
-      syncFields(form, absenceForm, [
+      syncFields(form, absenceForm, ["date_from", "date_to", "aw_type", "aw_id"]);
-        "date_from",
-        "date_to",
-        "aw_type",
-        "aw_id",
-      ]);
     }
   }
 }
@@ -62,6 +49,11 @@ function toggleAbsenceEdit(state) {
   const form = document.getElementById("absence_form");
   if (state) {
     form.classList.remove("hidden");
+    form.scrollIntoView({
+      behavior: "smooth",
+      block: "start",
+      inline: "nearest",
+    });
   } else {
     form.classList.add("hidden");
   }
@@ -93,12 +85,3 @@ function checkAll(pattern, state) {
     input.checked = state;
   }
 }
-
-const bookingForms = document.querySelectorAll("form.bookings");
-for (let form of bookingForms) {
-  let selectKommenInput = form.querySelector("input[name='select_kommen']");
-  let kommenGehenSelector = form.querySelector("select");
-  if (selectKommenInput) {
-    kommenGehenSelector.value = selectKommenInput.value == "true" ? 3 : 4;
-  }
-}

Backend/template.typ

@@ -11,7 +11,7 @@
       columns: (3fr,  .65fr),
       align: left + horizon,
       inset: .5em,
-      [#meta.EmployeeName -- #meta.TimeRange], grid.cell(rowspan: 2)[#image("/static/logo.png")],
+      [#meta.EmployeeName -- #meta.TimeRange], grid.cell(rowspan: 2)[#image("static/logo.png")],
       [Arbeitszeitrechnung maschinell erstellt am #meta.CurrentTimestamp],
     )
       ])
@@ -37,47 +37,42 @@
   [Zeitraum: #meta.TimeRange]
 
   table(
-  columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, .875fr, 1.25fr),
+  columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, 1.25fr),
   fill: (x, y) =>
     if y == 0 { oklch(87%, 0, 0deg) },
   table-header(
-    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Kurzarbeit], [Pause], [Überstunden]
+    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Pause], [Überstunden]
   ),
   .. for day in days {
     (
     [#day.Date],
     if day.DayParts.len() == 0{
         table.cell(colspan: 3)[Keine Buchungen]
-    }else if day.DayParts.len() == 1 and not day.DayParts.first().IsWorkDay{
+    }else if not day.DayParts.first().IsWorkDay{
       table.cell(colspan: 3)[#day.DayParts.first().WorkType]
     }
     else {
+
     table.cell(colspan: 3, inset: 0em)[
+
       #table(
         columns: (1fr, 1fr, 1fr),
         .. for Zeit in day.DayParts {
       (
-        if Zeit.IsWorkDay{
+      [#Zeit.BookingFrom],
-        (
+      [#Zeit.BookingTo],
-          table.cell()[#Zeit.BookingFrom],
+      [#Zeit.WorkType],
-          table.cell()[#Zeit.BookingTo],
-          table.cell()[#Zeit.WorkType],
-        )
-        }else{
-          (table.cell(colspan: 3)[#Zeit.WorkType],)
-        }
       )
     },
       )
     ]
     },
     [#day.Worktime],
-    [#day.Kurzarbeit],
     [#day.Pausetime],
     [#day.Overtime],
     )
     if day.IsFriday {
-      ( table.cell(colspan: 8, fill: oklch(87%, 0, 0deg))[Wochenende], )   // note the trailing comma
+      ( table.cell(colspan: 7, fill: oklch(87%, 0, 0deg))[Wochenende], )   // note the trailing comma
     }
   }
   )
@@ -89,9 +84,9 @@
     stroke: none,
     table.hline(start: 0, end: 2, stroke: stroke(dash:"dashed", thickness:.5pt)),
   [Arbeitszeit :], table.cell(align: left)[#meta.WorkTime],
-  [Kurzarbeit :], table.cell(align: left)[#meta.Kurzarbeit],
   [Überstunden :], table.cell(align: left)[#meta.Overtime],
-  [Überstunden lfd. :],table.cell(align: left)[#meta.OvertimeTotal],
+  [Überstunden :],table.cell(align: left)[#meta.OvertimeTotal],
   table.hline(start: 0, end: 2),
+
 )
 }

Backend/templates/baseComponents.templ

@@ -1,97 +0,0 @@
-// templates are used for the templ templates
-// these will render the html page with data from the webserver
-package templates
-
-import (
-	"arbeitszeitmessung/models"
-	"fmt"
-)
-
-// this file includes the basic components, which are used in many other components and pages
-templ headerComponent() {
-	// {{ user := ctx.Value("user").(models.User) }}
-	<div class="flex flex-row justify-between md:mx-[10%] py-2 items-center">
-		<a href="/time">Zeitverwaltung</a>
-		<a href="/team/report">Abrechnung</a>
-		if true {
-			<a href="/pdf">Monatsabrechnung</a>
-			<a href="/team/presence">Anwesenheit</a>
-		}
-		<a href="/user/settings">Einstellungen</a>
-		<button onclick="logoutUser()" type="button" class="cursor-pointer">Abmelden</button>
-	</div>
-}
-
-templ statusCheckMark(status models.WeekStatus, target models.WeekStatus) {
-	if status >= target {
-		<div class="icon-[material-symbols-light--check-circle-outline]"></div>
-	} else {
-		<div class="icon-[material-symbols-light--circle-outline]"></div>
-	}
-}
-
-templ lineComponent() {
-	<div class="flex flex-col w-2 py-2 items-center text-accent print:hidden">
-		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
-			<polygon points="12,2 22,12 12,22 2,12"></polygon>
-		</svg>
-		<div class="w-[2px] bg-accent flex-grow -my-1"></div>
-		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
-			<polygon points="12,2 22,12 12,22 2,12"></polygon>
-		</svg>
-	</div>
-}
-
-templ timeGaugeComponent(progress int8, today bool) {
-	{{
-		var bgColor string
-		switch {
-		case (0 > progress):
-			bgColor = "bg-red-600"
-			break
-		case (progress > 0 && progress < 95):
-			bgColor = "bg-orange-500"
-			break
-		case (95 <= progress && progress <= 105):
-			bgColor = "bg-accent"
-			break
-		case (progress > 105):
-			bgColor = "bg-purple-600"
-			break
-		default:
-			bgColor = "bg-neutral-400"
-			break
-		}
-	}}
-	if today {
-		<div class="flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden">
-			<div class={ "flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor } style={ fmt.Sprintf("height: %d%%", int(progress)) }></div>
-		</div>
-	} else {
-		<div class={ "w-2 h-full bg-accent rounded-md flex-shrink-0", bgColor }></div>
-	}
-}
-
-templ legendComponent() {
-	<div class="flex flex-row gap-4 md:mx-[10%] print:hidden">
-		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-red-600"></div><span>Fehler</span></div>
-		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-orange-500"></div><span>Arbeitszeit unter regulär</span></div>
-		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-accent"></div><span>Arbeitszeit vollständig</span></div>
-		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-purple-600"></div><span>Überstunden</span></div>
-		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-neutral-400"></div><span>Keine Buchungen</span></div>
-	</div>
-}
-
-templ CheckboxComponent(pNr int, label string) {
-	{{ id := fmt.Sprintf("pdf-%d", pNr) }}
-	<div class="inline-flex items-center">
-		<label class="flex items-center cursor-pointer relative" for={ id }>
-			<input type="checkbox" name="employe_list" value={ pNr } id={ id } class="peer h-5 w-5 cursor-pointer transition-all appearance-none rounded border border-slate-800 checked:bg-slate-800 checked:border-slate-800"/>
-			<span class="absolute text-white opacity-0 peer-checked:opacity-100 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
-				<svg xmlns="http://www.w3.org/2000/svg" class="h-3.5 w-3.5" viewBox="0 0 20 20" fill="currentColor" stroke="currentColor" stroke-width="1">
-					<path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
-				</svg>
-			</span>
-		</label> <label class="cursor-pointer ml-2 text-slate-600 select-none" for={ id }>{ label }</label>
-	</div>
-}

Backend/templates/headerComponent.templ

@@ -0,0 +1,14 @@
+package templates
+
+templ headerComponent() {
+	<div class="flex flex-row justify-between md:mx-[10%] py-2 items-center">
+		<a href="/time">Zeitverwaltung</a>
+		<a href="/team">Abrechnung</a>
+		<a href="/pdf">PDF</a>
+		if true {
+			<a href="/presence">Anwesenheit</a>
+		}
+		<a href="/user/settings">Einstellungen</a>
+		@LogoutButton()
+	</div>
+}

Backend/templates/headerComponent_templ.go

@@ -0,0 +1,58 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+func headerComponent() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-row justify-between md:mx-[10%] py-2 items-center\"><a href=\"/time\">Zeitverwaltung</a> <a href=\"/team\">Abrechnung</a> <a href=\"/pdf\">PDF</a> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if true {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<a href=\"/presence\">Anwesenheit</a> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<a href=\"/user/settings\">Einstellungen</a>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = LogoutButton().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/pages.templ

@@ -1,12 +1,8 @@
 package templates
 
-// this file includes the basic pages, that have no further complexity,
-// like the login and settings page, the more complex pages have their own files
-
 import "arbeitszeitmessung/models"
-import "arbeitszeitmessung/helper"
 
-templ BasePage() {
+templ Base() {
 	<!DOCTYPE html>
 	<head>
 		<title>Arbeitszeit</title>
@@ -17,7 +13,7 @@ templ BasePage() {
 }
 
 templ LoginPage(success bool, errorMsg string) {
-	@BasePage()
+	@Base()
 	<div class="w-full h-[100vh] flex flex-col justify-center items-center">
 		<form method="POST" class="w-9/10 md:w-1/2 flex flex-col gap-4 p-2 mb-2">
 			<h1 class="font-bold uppercase text-xl text-center mb-2">Benutzer Anmelden</h1>
@@ -33,8 +29,10 @@ templ LoginPage(success bool, errorMsg string) {
 }
 
 templ SettingsPage(status int) {
-	{{ user := ctx.Value("user").(models.User) }}
+	{{
-	@BasePage()
+		user := ctx.Value("user").(models.User)
+	}}
+	@Base()
 	@headerComponent()
 	<div class="grid-main divide-y-1">
 		<form method="POST" class="grid-sub responsive lg:divide-x-1">
@@ -61,10 +59,6 @@ templ SettingsPage(status int) {
 			<div class="grid-cell col-span-3">
 				<p>Nutzername: <span class="text-neutral-500">{ user.Vorname } { user.Name }</span></p>
 				<p>Personalnummer: <span class="text-neutral-500">{ user.PersonalNummer }</span></p>
-				<p>Frühester Arbeitsbegin: <span class="text-neutral-500">{ user.ArbeitMinStart.Format("15:06") } Uhr</span></p>
-				<p>Spätester Arbeitsende: <span class="text-neutral-500">{ user.ArbeitMaxEnde.Format("15:06") } Uhr</span></p>
-				<p>Arbeitszeit pro Tag: <span class="text-neutral-500">{ helper.FormatDuration(user.ArbeitszeitProTag()) }</span></p>
-				<p>Arbeitszeit pro Woche: <span class="text-neutral-500">{ helper.FormatDuration(user.ArbeitszeitProWoche()) }</span></p>
 			</div>
 			<div></div>
 		</div>
@@ -79,3 +73,36 @@ templ SettingsPage(status int) {
 		</div>
 	</div>
 }
+
+templ statusCheckMark(status models.WeekStatus, target models.WeekStatus) {
+	if status >= target {
+		<div class="icon-[material-symbols-light--check-circle-outline]"></div>
+	} else {
+		<div class="icon-[material-symbols-light--circle-outline]"></div>
+	}
+}
+
+templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		<div class="grid-sub lg:divide-x-1 max-md:divide-y-1 responsive @container">
+			<div class="grid-cell col-span-full bg-neutral-300 lg:border-0">
+				<h2 class="text-xl uppercase font-bold">Eigene Abrechnung</h2>
+			</div>
+		</div>
+		@workWeekComponent(userWeek, false)
+		if len(weeks) > 0 {
+			<div class="grid-cell col-span-full bg-neutral-300">
+				<h2 class="text-xl uppercase font-bold">Abrechnung Mitarbeiter</h2>
+			</div>
+		}
+		for _, week := range weeks {
+			@workWeekComponent(week, true)
+		}
+	</div>
+}
+
+templ LogoutButton() {
+	<button onclick="logoutUser()" type="button" class="cursor-pointer">Abmelden</button>
+}

Backend/templates/pages_templ.go

@@ -0,0 +1,319 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import "arbeitszeitmessung/models"
+
+func Base() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><head><title>Arbeitszeit</title><link rel=\"stylesheet\" href=\"/static/css/styles.css\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><script src=\"/static/script.js\" defer></script></head>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func LoginPage(success bool, errorMsg string) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><form method=\"POST\" class=\"w-9/10 md:w-1/2 flex flex-col gap-4 p-2 mb-2\"><h1 class=\"font-bold uppercase text-xl text-center mb-2\">Benutzer Anmelden</h1><input name=\"personal_nummer\" placeholder=\"Personalnummer\" type=\"text\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"password\" placeholder=\"Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !success {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<p class=\"text-red-600 text-sm\">Login fehlgeschlagen, bitte erneut versuchen!</p><p class=\"text-red-600 text-sm\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var3 string
+			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(errorMsg)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 24, Col: 46}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<button type=\"submit\" class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Login</button></form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func SettingsPage(status int) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		user := ctx.Value("user").(models.User)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"grid-main divide-y-1\"><form method=\"POST\" class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Passwort ändern</h1><div class=\"grid-cell col-span-3 flex flex-col gap-2\"><input name=\"password\" placeholder=\"Aktuelles Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password\" placeholder=\"Neues Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password_repeat\" placeholder=\"Neues Passwort wiederholen\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		switch {
+		case status == 401:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<p class=\"text-red-600 text-sm\">Aktuelles Passwort nicht korrekt!</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		case status >= 400:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<p class=\"text-red-600 text-sm\">Passwortwechsel fehlgeschlagen, bitte erneut versuchen!</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		case status == 202:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<p class=\"text-accent text-sm\">Passwortänderung erfolgreich</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</div><div class=\"grid-cell\"><button name=\"action\" value=\"change-pass\" type=\"submit\" class=\"btn\">Ändern</button></div></form><div class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Nutzerdaten</h1><div class=\"grid-cell col-span-3\"><p>Nutzername: <span class=\"text-neutral-500\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 60, Col: 64}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 60, Col: 78}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</span></p><p>Personalnummer: <span class=\"text-neutral-500\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(user.PersonalNummer)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 61, Col: 75}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</span></p></div><div></div></div><div class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Nutzer abmelden</h1><div class=\"grid-cell col-span-3\"><p>Nutzer von Weboberfläche abmelden.</p></div><div class=\"grid-cell\"><button onclick=\"logoutUser\" type=\"button\" class=\"btn\">Abmelden</button></div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func statusCheckMark(status models.WeekStatus, target models.WeekStatus) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var8 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var8 == nil {
+			templ_7745c5c3_Var8 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if status >= target {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"icon-[material-symbols-light--check-circle-outline]\"></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"icon-[material-symbols-light--circle-outline]\"></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		return nil
+	})
+}
+
+func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var9 == nil {
+			templ_7745c5c3_Var9 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub lg:divide-x-1 max-md:divide-y-1 responsive @container\"><div class=\"grid-cell col-span-full bg-neutral-300 lg:border-0\"><h2 class=\"text-xl uppercase font-bold\">Eigene Abrechnung</h2></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = workWeekComponent(userWeek, false).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(weeks) > 0 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"grid-cell col-span-full bg-neutral-300\"><h2 class=\"text-xl uppercase font-bold\">Abrechnung Mitarbeiter</h2></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		for _, week := range weeks {
+			templ_7745c5c3_Err = workWeekComponent(week, true).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func LogoutButton() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var10 == nil {
+			templ_7745c5c3_Var10 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<button onclick=\"logoutUser()\" type=\"button\" class=\"cursor-pointer\">Abmelden</button>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/pdf.templ

@@ -0,0 +1,134 @@
+package templates
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"fmt"
+	"time"
+)
+
+templ PDFForm(teamMembers []models.User) {
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		<div class="grid-cell col-span-full bg-neutral-300">
+			<h1 class="text-xl uppercase font-bold">PDF Abrechnung erstellen</h1>
+		</div>
+		<div class="grid-sub divide-x-1 responsive">
+			<div class="grid-cell">Zeitraum wählen</div>
+			<div class="grid-cell col-span-3">
+				<label class="block mb-1 text-sm text-neutral-700">Abrechnungsmonat</label>
+				<input name="start_date" type="date" value="" class="btn bg-neutral-100"/>
+			</div>
+			<div></div>
+		</div>
+		<div class="grid-sub divide-x-1 responsive">
+			<div class="grid-cell">Mitarbeiter wählen</div>
+			<div class="grid-cell col-span-3 flex flex-col gap-2">
+				<div class="flex flex-row gap-2">
+					<button class="btn" type="button" onclick={ templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("true")) }>Alle</button>
+					<button class="btn" type="button" onclick={ templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("false")) }>Keine</button>
+				</div>
+				for _, member := range teamMembers {
+					@CheckboxComponent(fmt.Sprintf("pdf-%d", member.PersonalNummer), fmt.Sprintf("%s %s", member.Vorname, member.Name))
+				}
+			</div>
+			<div></div>
+		</div>
+		<div class="grid-sub divide-x-1 responsive">
+			<div class="grid-cell">PDFs Bündeln</div>
+			<div class="grid-cell col-span-3 flex gap-2 flex-col md:flex-row">
+				<button class="btn" type="button" name="action" value="download">Einzeln</button>
+				<button class="btn" type="button" name="action" value="preview" onclick="">Bündel</button>
+			</div>
+		</div>
+	</div>
+}
+
+templ CheckboxComponent(id, label string) {
+	<div class="inline-flex items-center">
+		<label class="flex items-center cursor-pointer relative" for={ id }>
+			<input type="checkbox" class="peer h-5 w-5 cursor-pointer transition-all appearance-none rounded border border-slate-800 checked:bg-slate-800 checked:border-slate-800" id={ id }/>
+			<span class="absolute text-white opacity-0 peer-checked:opacity-100 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-3.5 w-3.5" viewBox="0 0 20 20" fill="currentColor" stroke="currentColor" stroke-width="1">
+					<path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
+				</svg>
+			</span>
+		</label> <label class="cursor-pointer ml-2 text-slate-600 select-none" for={ id }>{ label }</label>
+	</div>
+}
+
+templ PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) {
+	{{
+		_, kw := tsStart.ISOWeek()
+		noBorder := ""
+	}}
+	@Base()
+	<content class="p-8 relative flex flex-col gap-4 break-after-page">
+		<div>
+			<h1 class="text-2xl font-bold">{ e.Vorname } { e.Name }</h1>
+			<p>Zeitraum: <span>{ tsStart.Format("02.01.2006") }</span> - <span>{ tsEnd.Format("02.01.2006") }</span></p>
+			<p>Arbeitszeit: <span>{ helper.FormatDuration(worktime) }</span></p>
+			<p>Überstunden: <span>{ helper.FormatDuration(overtime) }</span></p>
+		</div>
+		<div class="grid grid-rows-6 grid-cols-[3fr_2fr_2fr_2fr_3fr_3fr_3fr] *:not-print:p-2 *:text-center auto-rows-min divide-neutral-300 divide-x-1 divide-y-1">
+			<p class="bg-neutral-300 border-neutral-600">{ kw }</p>
+			<p class="bg-neutral-300 border-neutral-600">Kommen</p>
+			<p class="bg-neutral-300 border-neutral-600">Gehen</p>
+			<p class="bg-neutral-300 border-neutral-600">Arbeitsart</p>
+			<p class="bg-neutral-300 border-neutral-600">Stunden</p>
+			<p class="bg-neutral-300 border-neutral-600">Pause</p>
+			<p class="bg-neutral-300 border-neutral-600 border-r-0">Überstunden</p>
+			for index, day := range workDays {
+				{{
+					if index == len(workDays)-1 {
+						noBorder = "border-b-0"
+					}
+				}}
+				<p class={ noBorder }>{ day.Date().Format("02.01.2006") }</p>
+				<div class={ "grid grid-cols-subgrid col-span-3 " + noBorder }>
+					if day.IsWorkDay() {
+						{{
+						workDay, _ := day.(*models.WorkDay)
+						}}
+						for bookingI := 0; bookingI < len(workDay.Bookings); bookingI+= 2 {
+							<p>{ workDay.Bookings[bookingI].Timestamp.Format("15:04") }</p>
+							<p>{ workDay.Bookings[bookingI+1].Timestamp.Format("15:04") }</p>
+							<p>{ workDay.Bookings[bookingI].BookingType.Name } </p>
+						}
+						if workDay.IsKurzArbeit() {
+							{{
+								timeFrom, timeTo := workDay.GenerateKurzArbeitBookings(e)
+							}}
+							<p>{ timeFrom.Format("15:04") }</p>
+							<p>{ timeTo.Format("15:04") }</p>
+							<p>Kurzarbeit</p>
+						}
+					} else {
+						{{
+						absentDay, _ := day.(*models.Absence)
+						}}
+						<p class="col-span-full">{ absentDay.AbwesenheitTyp.Name }</p>
+					}
+				</div>
+				{{ work, pause, overtime := day.GetAllWorkTimesVirtual(e) }}
+				@ColorDuration(work, noBorder)
+				@ColorDuration(pause, noBorder)
+				@ColorDuration(overtime, noBorder+" border-r-0")
+				if day.Date().Weekday() == time.Friday {
+					<p class="col-span-full bg-neutral-300">Wochenende</p>
+				}
+			}
+		</div>
+	</content>
+}
+
+templ ColorDuration(d time.Duration, classes string) {
+	{{
+	color := ""
+	if d.Abs() < time.Minute {
+		color = "text-neutral-300"
+	}
+	}}
+	<p class={ color + " " + classes }>{ helper.FormatDurationFill(d, true) }</p>
+}

Backend/templates/pdfPage.templ

@@ -1,48 +0,0 @@
-package templates
-
-// this file has all templates for the /pdf page
-
-import (
-	"arbeitszeitmessung/helper"
-	"arbeitszeitmessung/models"
-	"fmt"
-	"time"
-)
-
-templ PDFForm(teamMembers []models.User) {
-	@BasePage()
-	@headerComponent()
-	<form class="grid-main divide-y-1" action="pdf/generate" method="get">
-		<div class="grid-cell col-span-full bg-neutral-300">
-			<h1 class="text-xl uppercase font-bold">Monatsabrechnung erstellen</h1>
-		</div>
-		<div class="grid-sub divide-x-1 responsive">
-			<div class="grid-cell">Zeitraum wählen</div>
-			<div class="grid-cell col-span-3">
-				<label class="block mb-1 text-sm text-neutral-700">Abrechnungsmonat</label>
-				<input name="start_date" type="date" value={ helper.GetFirstOfMonth(time.Now()).Format(time.DateOnly) } class="btn bg-neutral-100"/>
-			</div>
-			<div></div>
-		</div>
-		<div class="grid-sub divide-x-1 responsive">
-			<div class="grid-cell">Mitarbeiter wählen</div>
-			<div class="grid-cell col-span-3 flex flex-col gap-2">
-				<div class="flex flex-row gap-2">
-					<button class="btn" type="button" onclick={ templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("true")) }>Alle</button>
-					<button class="btn" type="button" onclick={ templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("false")) }>Keine</button>
-				</div>
-				for _, member := range teamMembers {
-					@CheckboxComponent(member.PersonalNummer, fmt.Sprintf("%s %s", member.Vorname, member.Name))
-				}
-			</div>
-			<div></div>
-		</div>
-		<div class="grid-sub divide-x-1 responsive">
-			<div class="grid-cell">PDFs Bündeln</div>
-			<div class="grid-cell col-span-3 flex gap-2 flex-col md:flex-row">
-				<button class="btn" type="submit" name="output" value="download">Einzeln</button>
-				<button class="btn" type="submit" name="output" value="render" onclick="">Bündel</button>
-			</div>
-		</div>
-	</form>
-}

Backend/templates/pdf_templ.go

@@ -0,0 +1,581 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"fmt"
+	"time"
+)
+
+func PDFForm(teamMembers []models.User) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-main divide-y-1\"><div class=\"grid-cell col-span-full bg-neutral-300\"><h1 class=\"text-xl uppercase font-bold\">PDF Abrechnung erstellen</h1></div><div class=\"grid-sub divide-x-1 responsive\"><div class=\"grid-cell\">Zeitraum wählen</div><div class=\"grid-cell col-span-3\"><label class=\"block mb-1 text-sm text-neutral-700\">Abrechnungsmonat</label> <input name=\"start_date\" type=\"date\" value=\"\" class=\"btn bg-neutral-100\"></div><div></div></div><div class=\"grid-sub divide-x-1 responsive\"><div class=\"grid-cell\">Mitarbeiter wählen</div><div class=\"grid-cell col-span-3 flex flex-col gap-2\"><div class=\"flex flex-row gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("true")))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<button class=\"btn\" type=\"button\" onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 templ.ComponentScript = templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("true"))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var2.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "\">Alle</button> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("false")))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<button class=\"btn\" type=\"button\" onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 templ.ComponentScript = templ.JSFuncCall("checkAll", "pdf-", templ.JSExpression("false"))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\">Keine</button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, member := range teamMembers {
+			templ_7745c5c3_Err = CheckboxComponent(fmt.Sprintf("pdf-%d", member.PersonalNummer), fmt.Sprintf("%s %s", member.Vorname, member.Name)).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</div><div></div></div><div class=\"grid-sub divide-x-1 responsive\"><div class=\"grid-cell\">PDFs Bündeln</div><div class=\"grid-cell col-span-3 flex gap-2 flex-col md:flex-row\"><button class=\"btn\" type=\"button\" name=\"action\" value=\"download\">Einzeln</button> <button class=\"btn\" type=\"button\" name=\"action\" value=\"preview\" onclick=\"\">Bündel</button></div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func CheckboxComponent(id, label string) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div class=\"inline-flex items-center\"><label class=\"flex items-center cursor-pointer relative\" for=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 50, Col: 67}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "\"><input type=\"checkbox\" class=\"peer h-5 w-5 cursor-pointer transition-all appearance-none rounded border border-slate-800 checked:bg-slate-800 checked:border-slate-800\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 51, Col: 178}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\"> <span class=\"absolute text-white opacity-0 peer-checked:opacity-100 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2\"><svg xmlns=\"http://www.w3.org/2000/svg\" class=\"h-3.5 w-3.5\" viewBox=\"0 0 20 20\" fill=\"currentColor\" stroke=\"currentColor\" stroke-width=\"1\"><path fill-rule=\"evenodd\" d=\"M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z\" clip-rule=\"evenodd\"></path></svg></span></label> <label class=\"cursor-pointer ml-2 text-slate-600 select-none\" for=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 57, Col: 81}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(label)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 57, Col: 91}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</label></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var9 == nil {
+			templ_7745c5c3_Var9 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		_, kw := tsStart.ISOWeek()
+		noBorder := ""
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<content class=\"p-8 relative flex flex-col gap-4 break-after-page\"><div><h1 class=\"text-2xl font-bold\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(e.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 69, Col: 45}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(e.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 69, Col: 56}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</h1><p>Zeitraum: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(tsStart.Format("02.01.2006"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 70, Col: 52}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</span> - <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(tsEnd.Format("02.01.2006"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 70, Col: 98}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</span></p><p>Arbeitszeit: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var14 string
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(worktime))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 71, Col: 58}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</span></p><p>Überstunden: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var15 string
+		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(overtime))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 72, Col: 59}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</span></p></div><div class=\"grid grid-rows-6 grid-cols-[3fr_2fr_2fr_2fr_3fr_3fr_3fr] *:not-print:p-2 *:text-center auto-rows-min divide-neutral-300 divide-x-1 divide-y-1\"><p class=\"bg-neutral-300 border-neutral-600\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(kw)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 75, Col: 52}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</p><p class=\"bg-neutral-300 border-neutral-600\">Kommen</p><p class=\"bg-neutral-300 border-neutral-600\">Gehen</p><p class=\"bg-neutral-300 border-neutral-600\">Arbeitsart</p><p class=\"bg-neutral-300 border-neutral-600\">Stunden</p><p class=\"bg-neutral-300 border-neutral-600\">Pause</p><p class=\"bg-neutral-300 border-neutral-600 border-r-0\">Überstunden</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for index, day := range workDays {
+
+			if index == len(workDays)-1 {
+				noBorder = "border-b-0"
+			}
+			var templ_7745c5c3_Var17 = []any{noBorder}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var17...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var18 string
+			templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var17).String())
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var19 string
+			templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("02.01.2006"))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 88, Col: 59}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var20 = []any{"grid grid-cols-subgrid col-span-3 " + noBorder}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var20...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<div class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var21 string
+			templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var20).String())
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if day.IsWorkDay() {
+
+				workDay, _ := day.(*models.WorkDay)
+				for bookingI := 0; bookingI < len(workDay.Bookings); bookingI += 2 {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var22 string
+					templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].Timestamp.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 95, Col: 64}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "</p><p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var23 string
+					templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI+1].Timestamp.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 96, Col: 66}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</p><p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var24 string
+					templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].BookingType.Name)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 97, Col: 55}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, " ")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				if workDay.IsKurzArbeit() {
+
+					timeFrom, timeTo := workDay.GenerateKurzArbeitBookings(e)
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var25 string
+					templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(timeFrom.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 103, Col: 36}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</p><p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var26 string
+					templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(timeTo.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 104, Col: 34}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</p><p>Kurzarbeit</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+			} else {
+
+				absentDay, _ := day.(*models.Absence)
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<p class=\"col-span-full\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var27 string
+				templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(absentDay.AbwesenheitTyp.Name)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 111, Col: 62}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			work, pause, overtime := day.GetAllWorkTimesVirtual(e)
+			templ_7745c5c3_Err = ColorDuration(work, noBorder).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ColorDuration(pause, noBorder).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ColorDuration(overtime, noBorder+" border-r-0").Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if day.Date().Weekday() == time.Friday {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "<p class=\"col-span-full bg-neutral-300\">Wochenende</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "</div></content>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func ColorDuration(d time.Duration, classes string) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var28 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var28 == nil {
+			templ_7745c5c3_Var28 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		color := ""
+		if d.Abs() < time.Minute {
+			color = "text-neutral-300"
+		}
+		var templ_7745c5c3_Var29 = []any{color + " " + classes}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var29...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "<p class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var30 string
+		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var29).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var31 string
+		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDurationFill(d, true))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 133, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/presencePage.templ

@@ -1,12 +1,10 @@
 package templates
 
-// this file has all the templates for the /team/presence page
-
 import "arbeitszeitmessung/models"
 import "arbeitszeitmessung/helper"
 
 templ TeamPresencePage(teamPresence map[models.User]bool) {
-	@BasePage()
+	@Base()
 	@headerComponent()
 	<div class="grid-main divide-y-1">
 		<div class="grid-sub divide-x-1 bg-neutral-300">
@@ -29,14 +27,3 @@ templ TeamPresencePage(teamPresence map[models.User]bool) {
 		}
 	</div>
 }
-
-templ userPresenceComponent(user models.User, present bool) {
-	<div class="grid-cell group flex flex-row gap-2">
-		if present {
-			<div class="h-8 bg-accent rounded-md group-hover:text-black md:text-transparent text-center p-1">Anwesend</div>
-		} else {
-			<div class="h-8 bg-red-600 rounded-md group-hover:text-white md:text-transparent text-center p-1">Abwesend</div>
-		}
-		<p>{ user.Vorname } { user.Name }</p>
-	</div>
-}

Backend/templates/presencePage_templ.go

@@ -0,0 +1,110 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import "arbeitszeitmessung/models"
+import "arbeitszeitmessung/helper"
+
+func TeamPresencePage(teamPresence map[models.User]bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1 bg-neutral-300\"><h2 class=\"grid-cell font-bold uppercase text-xl\">Mitarbeiter</h2></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for user, present := range teamPresence {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"grid-sub\"><div class=\"grid-cell flex flex-row gap-2 col-span-2 md:col-span-1\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = timeGaugeComponent(helper.BoolToInt8(present)*100-1, false).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var2 string
+			templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/presencePage.templ`, Line: 17, Col: 22}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var3 string
+			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/presencePage.templ`, Line: 17, Col: 36}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</p></div><div class=\"grid-cell col-span-2\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if present {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<span class=\"text-neutral-500\">Anwesend</span>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<span class=\"text-neutral-500\">Abwesend</span>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</div></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/teamComponents.templ

@@ -1,7 +1,5 @@
 package templates
 
-// this file has all the templates for the team/report page
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
@@ -10,33 +8,82 @@ import (
 	"time"
 )
 
-templ ReportPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
+templ weekPicker(weekStart time.Time) {
-	@BasePage()
+	{{
-	@headerComponent()
+		year, kw := weekStart.ISOWeek()
-	<div class="grid-main divide-y-1 @container">
+	}}
-		<div class="grid-sub lg:divide-x-1 max-md:divide-y-1 responsive">
+	<form method="get" class="flex flex-row gap-4 items-center justify-around">
-			<div class="grid-cell col-span-full bg-neutral-300 lg:border-0">
+		<input type="date" class="hidden" name="submission_date" value={ weekStart.Format(time.DateOnly) }/>
-				<h2 class="text-xl uppercase font-bold">Eigene Abrechnung</h2>
+		<button onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1") } class="btn">
+			<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="chevron-left size-4 mx-auto" viewBox="0 0 16 16">
+				<path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0"></path>
+			</svg>
+		</button>
+		<p class="whitespace-nowrap">KW { fmt.Sprintf("%02d, %d", kw, year) }</p>
+		<button disabled?={ time.Since(weekStart) < 24*7*time.Hour } onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1") } class="btn disabled:pointer-events-none disabled:opacity-50">
+			<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="chevron-right size-4 mx-auto" viewBox="0 0 16 16">
+				<path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708"></path>
+			</svg>
+		</button>
+	</form>
+}
+
+templ defaultWeekDayComponent(u models.User, day models.IWorkDay) {
+	<div class="flex flex-row gap-2">
+		@timeGaugeComponent(day.GetDayProgress(u), false)
+		<div class="flex flex-col">
+			<p class=""><span class="font-bold uppercase hidden md:inline">{ day.Date().Format("Mon") }:</span> { day.Date().Format("02.01.2006") }</p>
+			if day.IsWorkDay() {
+				{{
+				workDay, _ := day.(*models.WorkDay)
+				work, pause, _ := workDay.GetAllWorkTimesReal(u)
+				}}
+				if !workDay.RequiresAction() {
+					<div class="flex flex-row gap-2">
+						<span class="text-accent">{ helper.FormatDuration(work) }</span>
+						<span class="text-neutral-500">{ helper.FormatDuration(pause) }</span>
 					</div>
+					<div class="flex flex-row gap-2 items-center">
+						<span class="icon-[material-symbols-light--schedule-outline] flex-shrink-0"></span>
+						switch  {
+							case !workDay.TimeFrom.Equal(workDay.TimeTo):
+								<span>{ workDay.TimeFrom.Format("15:04") }</span>
+								<span>-</span>
+								<span>{ workDay.TimeTo.Format("15:04") }</span>
+							default:
+								<p>Keine Anwesenheit</p>
+						}
+					</div>
+				} else {
+					<p class="text-red-600">Bitte anpassen</p>
+				}
+			} else {
+				{{
+					absentDay, _ := day.(*models.Absence)
+				}}
+				<div>{ absentDay.AbwesenheitTyp.Name } </div>
+			}
 		</div>
-		@workWeekComponent(userWeek, false)
-		if len(weeks) > 0 {
-			<div class="grid-cell col-span-full bg-neutral-300">
-				<h2 class="text-xl uppercase font-bold">Abrechnung Mitarbeiter</h2>
 	</div>
 }
-		for _, week := range weeks {
+
-			@workWeekComponent(week, true)
+templ weekDayComponent(user models.User, day models.WorkDay) {
+	// {{ work, pause, _ := day.GetAllWorkTimesReal(user) }}
+	<div class="flex flex-row gap-2">
+		// @timeGaugeComponent(day.GetWorkDayProgress(user), false, day.RequiresAction())
+		<div class="flex flex-col">
+			if !day.RequiresAction() {
 			}
 		</div>
+	</div>
 }
 
 templ workWeekComponent(week models.WorkWeek, onlyAccept bool) {
 	{{
 		year, kw := week.WeekStart.ISOWeek()
-		progress := (float32(week.WorktimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
+		progress := (float32(week.WorkTimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
 	}}
-	<div class="employeComponent grid-sub responsive lg:divide-x-1 max-md:divide-y-1">
+	<div class="employeComponent grid-sub responsive lg:divide-x-1 max-md:divide-y-1 @container">
 		<div class="grid-cell flex flex-col max-md:bg-neutral-300 gap-2">
 			if !onlyAccept {
 				<div class="lg:hidden">
@@ -47,12 +94,6 @@ templ workWeekComponent(week models.WorkWeek, onlyAccept bool) {
 			<div class="grid grid-cols-5 gap-2 lg:grid-cols-1">
 				if !onlyAccept {
 					<div class="col-span-2">
-						if week.CheckStatus() == models.WeekStatusCorrected {
-							<span class="flex flex-row gap-2 items-center">
-								<div class="icon-[material-symbols-light--edit-calendar-rounded]"></div>
-								laufende Korrektur
-							</span>
-						}
 						<span class="flex flex-row gap-2 items-center">
 							@statusCheckMark(week.CheckStatus(), models.WeekStatusSent)
 							Gesendet
@@ -66,7 +107,7 @@ templ workWeekComponent(week models.WorkWeek, onlyAccept bool) {
 				<div class="flex flex-row gap-2 col-span-3">
 					@timeGaugeComponent(int8(progress), false)
 					<div>
-						<p>Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDurationFill(week.Worktime, true)) }</p>
+						<p>Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDuration(week.Worktime)) }</p>
 						<p>Überstunden: { fmt.Sprintf("%s", helper.FormatDurationFill(week.Overtime, true)) }</p>
 					</div>
 				</div>
@@ -122,71 +163,13 @@ templ workWeekComponent(week models.WorkWeek, onlyAccept bool) {
 	</div>
 }
 
-templ defaultWeekDayComponent(u models.User, day models.IWorkDay) {
+templ userPresenceComponent(user models.User, present bool) {
-	<div class="flex flex-row gap-2">
+	<div class="grid-cell group flex flex-row gap-2">
-		@timeGaugeComponent(day.GetDayProgress(u), false)
+		if present {
-		<div class="flex flex-col">
+			<div class="h-8 bg-accent rounded-md group-hover:text-black md:text-transparent text-center p-1">Anwesend</div>
-			<p class=""><span class="font-bold uppercase hidden md:inline">{ helper.FormatGermanDayOfWeek(day.Date()) }:</span> { day.Date().Format("02.01.2006") }</p>
-			{{ work, pause, _ := day.GetTimes(u, models.WorktimeBaseDay, false) }}
-			if day.IsWorkDay() || day.GetDayProgress(u) < 100 {
-				<div class="flex flex-row gap-2">
-					<span class="text-accent">{ helper.FormatDuration(work) }</span>
-					<span class="text-neutral-500">{ helper.FormatDuration(pause) }</span>
-				</div>
-			}
-			@weekDayTypeSwitcher(day)
-		</div>
-	</div>
-}
-
-templ weekDayTypeSwitcher(day models.IWorkDay) {
-	switch day.Type() {
-		case models.DayTypeWorkday:
-			{{ workDay, _ := day.(*models.WorkDay) }}
-			@workDayWeekComponent(workDay)
-		case models.DayTypeCompound:
-			for _, c :=  range day.(*models.CompoundDay).DayParts {
-				@weekDayTypeSwitcher(c)
-			}
-		default:
-			<div>{ day.ToString() }</div>
-	}
-}
-
-templ weekPicker(weekStart time.Time) {
-	{{ year, kw := weekStart.ISOWeek() }}
-	<form method="get" class="flex flex-row gap-4 items-center justify-around">
-		<input type="date" class="hidden" name="submission_date" value={ weekStart.Format(time.DateOnly) }/>
-		<button onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1") } class="btn">
-			<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="chevron-left size-4 mx-auto" viewBox="0 0 16 16">
-				<path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0"></path>
-			</svg>
-		</button>
-		<p class="whitespace-nowrap">KW { fmt.Sprintf("%02d, %d", kw, year) }</p>
-		<button disabled?={ time.Since(weekStart) < 24*7*time.Hour } onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1") } class="btn disabled:pointer-events-none disabled:opacity-50">
-			<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="chevron-right size-4 mx-auto" viewBox="0 0 16 16">
-				<path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708"></path>
-			</svg>
-		</button>
-	</form>
-}
-
-templ workDayWeekComponent(workDay *models.WorkDay) {
-	if !workDay.RequiresAction() {
-		<div class="flex flex-row gap-2 items-center">
-			<span class="icon-[material-symbols-light--schedule-outline] flex-shrink-0"></span>
-			switch  {
-				case !workDay.IsEmpty():
-					<span>{ workDay.TimeFrom.Format("15:04") }</span>
-					<span>-</span>
-					<span>{ workDay.TimeTo.Format("15:04") }</span>
-				case workDay.IsKurzArbeit():
-					<span>Kurzarbeit</span>
-				default:
-					<p>Keine Anwesenheit</p>
-			}
-		</div>
 		} else {
-		<p class="text-red-600">Bitte anpassen</p>
+			<div class="h-8 bg-red-600 rounded-md group-hover:text-white md:text-transparent text-center p-1">Abwesend</div>
 		}
+		<p>{ user.Vorname } { user.Name }</p>
+	</div>
 }

Backend/templates/teamComponents_templ.go

@@ -0,0 +1,705 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+func weekPicker(weekStart time.Time) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		year, kw := weekStart.ISOWeek()
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<form method=\"get\" class=\"flex flex-row gap-4 items-center justify-around\"><input type=\"date\" class=\"hidden\" name=\"submission_date\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(weekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 16, Col: 98}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1"))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<button onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 templ.ComponentScript = templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\" class=\"btn\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"chevron-left size-4 mx-auto\" viewBox=\"0 0 16 16\"><path fill-rule=\"evenodd\" d=\"M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0\"></path></svg></button><p class=\"whitespace-nowrap\">KW ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d, %d", kw, year))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 22, Col: 69}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1"))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<button")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if time.Since(weekStart) < 24*7*time.Hour {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, " disabled")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, " onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 templ.ComponentScript = templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\" class=\"btn disabled:pointer-events-none disabled:opacity-50\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"chevron-right size-4 mx-auto\" viewBox=\"0 0 16 16\"><path fill-rule=\"evenodd\" d=\"M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708\"></path></svg></button></form>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func defaultWeekDayComponent(u models.User, day models.IWorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var6 == nil {
+			templ_7745c5c3_Var6 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<div class=\"flex flex-row gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = timeGaugeComponent(day.GetDayProgress(u), false).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<div class=\"flex flex-col\"><p class=\"\"><span class=\"font-bold uppercase hidden md:inline\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("Mon"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 35, Col: 92}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, ":</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("02.01.2006"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 35, Col: 136}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if day.IsWorkDay() {
+
+			workDay, _ := day.(*models.WorkDay)
+			work, pause, _ := workDay.GetAllWorkTimesReal(u)
+			if !workDay.RequiresAction() {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"flex flex-row gap-2\"><span class=\"text-accent\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var9 string
+				templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(work))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 43, Col: 61}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</span> <span class=\"text-neutral-500\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var10 string
+				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(pause))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 44, Col: 67}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</span></div><div class=\"flex flex-row gap-2 items-center\"><span class=\"icon-[material-symbols-light--schedule-outline] flex-shrink-0\"></span> ")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				switch {
+				case !workDay.TimeFrom.Equal(workDay.TimeTo):
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<span>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var11 string
+					templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.TimeFrom.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 50, Col: 48}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</span> <span>-</span> <span>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var12 string
+					templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.TimeTo.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 52, Col: 46}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</span>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				default:
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p>Keine Anwesenheit</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<p class=\"text-red-600\">Bitte anpassen</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		} else {
+
+			absentDay, _ := day.(*models.Absence)
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var13 string
+			templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(absentDay.AbwesenheitTyp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 64, Col: 40}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func weekDayComponent(user models.User, day models.WorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var14 == nil {
+			templ_7745c5c3_Var14 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<div class=\"flex flex-row gap-2\"><div class=\"flex flex-col\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !day.RequiresAction() {
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func workWeekComponent(week models.WorkWeek, onlyAccept bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var15 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var15 == nil {
+			templ_7745c5c3_Var15 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		year, kw := week.WeekStart.ISOWeek()
+		progress := (float32(week.WorkTimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div class=\"employeComponent grid-sub responsive lg:divide-x-1 max-md:divide-y-1 @container\"><div class=\"grid-cell flex flex-col max-md:bg-neutral-300 gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !onlyAccept {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<div class=\"lg:hidden\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = weekPicker(week.WeekStart).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<p class=\"font-bold uppercase\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 93, Col: 53}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 93, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "</p><div class=\"grid grid-cols-5 gap-2 lg:grid-cols-1\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !onlyAccept {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"col-span-2\"><span class=\"flex flex-row gap-2 items-center\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = statusCheckMark(week.CheckStatus(), models.WeekStatusSent).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "Gesendet</span> <span class=\"flex flex-row gap-2 items-center\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = statusCheckMark(week.CheckStatus(), models.WeekStatusAccepted).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "Akzeptiert</span></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<div class=\"flex flex-row gap-2 col-span-3\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = timeGaugeComponent(int8(progress), false).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "<div><p>Arbeitszeit: ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s", helper.FormatDuration(week.Worktime)))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 110, Col: 79}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</p><p>Überstunden: ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s", helper.FormatDurationFill(week.Overtime, true)))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 111, Col: 90}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "</p></div></div></div></div><div class=\"grid-cell col-span-3 flex flex-col @7xl:grid @7xl:grid-cols-5 gap-2 py-4 content-baseline\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, day := range week.Days {
+			templ_7745c5c3_Err = defaultWeekDayComponent(week.User, day).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</div><div class=\"grid-cell flex flex-col gap-2 justify-between\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if onlyAccept {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "<p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var20 string
+			templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 123, Col: 86}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<div class=\"max-md:hidden\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = weekPicker(week.WeekStart).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "<form method=\"post\" class=\"flex flex-col gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+
+		week.CheckStatus()
+		method := "accept"
+		if !onlyAccept {
+			method = "send"
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "<input type=\"hidden\" name=\"method\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var21 string
+		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(method)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 137, Col: 53}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "\"> <input type=\"hidden\" name=\"user\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var22 string
+		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(week.User.PersonalNummer))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 138, Col: 83}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(week.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 139, Col: 81}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if onlyAccept {
+			if week.Status == models.WeekStatusDifferences {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "<p class=\"text-red-600 text-sm\">Unterschiedliche Arbeitszeit zwischen Abrechnung und individuellen Buchungen</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, " <button type=\"submit\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if week.Status == models.WeekStatusDifferences {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, " disabled")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, " class=\"btn\">Bestätigen</button>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			switch {
+			case week.RequiresAction():
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "<p class=\"text-sm text-red-500\">bitte zuerst Buchungen anpassen</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			case time.Since(week.WeekStart) < 24*7*time.Hour:
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "<p class=\"text-sm text-red-500\">Die Woche kann erst am nächsten Montag gesendet werden!</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			case week.Status == models.WeekStatusNone:
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "<p class=\"text-sm\">an Vorgesetzten senden</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			case week.Status == models.WeekStatusSent:
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 58, "<p class=\"text-sm\">an Vorgesetzten gesendet</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			case week.Status == models.WeekStatusAccepted:
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, "<p class=\"text-sm\">vom Vorgesetzten bestätigt</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 60, " <button")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if week.Status < models.WeekStatusSent {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 61, " disabled")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 62, " type=\"submit\" class=\"btn\">Korrigieren</button> <button")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if time.Since(week.WeekStart) < 24*7*time.Hour || week.Status >= models.WeekStatusSent || week.RequiresAction() {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, " disabled")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 64, " type=\"submit\" class=\"btn\">Senden</button>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, "</form></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func userPresenceComponent(user models.User, present bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var24 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var24 == nil {
+			templ_7745c5c3_Var24 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, "<div class=\"grid-cell group flex flex-row gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if present {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, "<div class=\"h-8 bg-accent rounded-md group-hover:text-black md:text-transparent text-center p-1\">Anwesend</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, "<div class=\"h-8 bg-red-600 rounded-md group-hover:text-white md:text-transparent text-center p-1\">Abwesend</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "<p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var25 string
+		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 173, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var26 string
+		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 173, Col: 33}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "</p></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/timeComponents.templ

@@ -2,25 +2,62 @@ package templates
 
 import (
 	"arbeitszeitmessung/models"
+	"fmt"
 	"strconv"
 	"time"
 )
 
-templ changeButtonComponent(id string, workDay bool, disabled bool) {
+templ lineComponent() {
-	if disabled {
+	<div class="flex flex-col w-2 py-2 items-center text-accent print:hidden">
-		<button class="h-10 change-button-component btn w-auto group/button" type="button" disabled>
+		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
+			<polygon points="12,2 22,12 12,22 2,12"></polygon>
+		</svg>
+		<div class="w-[2px] bg-accent flex-grow -my-1"></div>
+		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
+			<polygon points="12,2 22,12 12,22 2,12"></polygon>
+		</svg>
+	</div>
+}
+
+templ changeButtonComponent(id string, workDay bool) {
+	<button class="change-button-component btn w-auto group/button" type="button" onclick={ templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), id, workDay) }>
 		<p class="hidden md:block group-[.edit]/button:hidden">Ändern</p>
-		</button>
+		<p class="hidden group-[.edit]/button:md:block">Absenden</p>
-	} else {
-		<button class="h-10 change-button-component btn w-auto group/button" type="button" onclick={ templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), id, workDay) }>
-			<p class="hidden md:block group-[.edit]/button:hidden">Ändern</p>
-			<p class="hidden group-[.edit]/button:md:block">Speichern</p>
 		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4 md:hidden">
 			<path class="group-[.edit]/button:hidden md:hidden" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325"></path>
 			<path class="hidden group-[.edit]/button:block md:hidden" d="M12.736 3.97a.733.733 0 0 1 j1.047 0c.286.289.29.756.01 1.05L7.88 12.01a.733.733 0 0 1-1.065.02L3.217 8.384a.757.757 0 0 1 0-1.06.733.733 0 0 1 1.047 0l3.052 3.093 5.4-6.425z"></path>
 		</svg>
 	</button>
-		<button class="h-10 hidden group-[.edit]:flex btn  basis-[content] items-center" onclick={ templ.JSFuncCall("clearEditState") }><span class="size-5 icon-[material-symbols-light--cancel-outline]"></span></button>
+	<button class="hidden group-[.edit]:flex btn  basis-[content] items-center" onclick={ templ.JSFuncCall("clearEditState") }><span class="size-5 icon-[material-symbols-light--cancel-outline]"></span></button>
+}
+
+templ timeGaugeComponent(progress int8, today bool) {
+	{{
+		var bgColor string
+		switch {
+		case (0 > progress):
+			bgColor = "bg-red-600"
+			break
+		case (progress > 0 && progress < 95):
+			bgColor = "bg-orange-500"
+			break
+		case (95 <= progress && progress <= 105):
+			bgColor = "bg-accent"
+			break
+		case (progress > 105):
+			bgColor = "bg-purple-600"
+			break
+		default:
+			bgColor = "bg-neutral-400"
+			break
+		}
+	}}
+	if today {
+		<div class="flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden">
+			<div class={ "flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor } style={ fmt.Sprintf("height: %d%%", int(progress)) }></div>
+		</div>
+	} else {
+		<div class={ "w-2 h-full bg-accent rounded-md flex-shrink-0", bgColor }></div>
 	}
 }
 
@@ -40,9 +77,12 @@ templ absenceComponent(a *models.Absence, isKurzarbeit bool) {
 		}
 	}}
 	<div class={ "flex flex-row items-center gap-2", editBox }>
-		@absentInput(a)
+		<input type="hidden" name="date_from" value={ a.DateFrom.Format(time.DateOnly) }/>
+		<input type="hidden" name="date_to" value={ a.DateTo.Format(time.DateOnly) }/>
+		<input type="hidden" name="aw_type" value={ a.AbwesenheitTyp.Id }/>
+		<input type="hidden" name="aw_id" value={ a.CounterId }/>
 		<p class="whitespace-nowrap group-[.edit]:ml-2">
-			{ a.ToString() }
+			{ a.AbwesenheitTyp.Name }
 			if a.IsMultiDay() {
 				<span class="text-neutral-500">bis { a.DateTo.Format("02.01.2006") }</span>
 			}
@@ -54,23 +94,15 @@ templ absenceComponent(a *models.Absence, isKurzarbeit bool) {
 	</div>
 }
 
-templ absentInput(a *models.Absence) {
+templ newBookingComponent(d *models.WorkDay) {
-	<input type="hidden" name="date_from" value={ a.DateFrom.Format(time.DateOnly) }/>
+	<div class="new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center edit-box border-dashed">
-	<input type="hidden" name="date_to" value={ a.DateTo.Format(time.DateOnly) }/>
-	<input type="hidden" name="aw_type" value={ a.AbwesenheitTyp.Id }/>
-	<input type="hidden" name="aw_id" value={ a.CounterId }/>
-}
-
-//js function to select the right entry
-templ newBookingComponent(d models.IWorkDay) {
-	<div class="new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center edit-box border-dashed" id={ "nb" + d.Date().Format(time.DateOnly) }>
 		<input name="timestamp" type="time" value={ time.Now().Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm px-3 py-2 cursor-pointer"/>
-		<input name="date" type="hidden" value={ d.Date().Format(time.DateOnly) }/>
+		<input name="date" type="hidden" value={ d.Day.Format(time.DateOnly) }/>
 		<div class="relative">
 			<select class="cursor-pointer appearance-none" name="check_in_out">
 				<option value="0" disabled>Kommen/Gehen</option>
-				<option value="3">Kommen</option>
+				<option value="3" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 }>Kommen</option>
-				<option value="4">Gehen</option>
+				<option value="4" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 }>Gehen</option>
 			</select>
 			<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.2" stroke="currentColor" class="h-5 w-5 ml-1 absolute right-1 top-[0.125rem] text-slate-700">
 				<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 15 12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9"></path>
@@ -83,31 +115,23 @@ templ newBookingComponent(d models.IWorkDay) {
 
 templ bookingComponent(booking models.Booking) {
 	<div>
-		<p class={ "text-neutral-500 edit-box", templ.KV("text-red-500", !booking.Valid) }>
+		<p class="text-neutral-500 edit-box">
 			<span class="text-black group-[.edit]:hidden inline">{ booking.Timestamp.Format("15:04") }</span>
 			<input disabled name={ "booking_" + strconv.Itoa(booking.CounterId) } type="time" value={ booking.Timestamp.Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm px-3 py-2 cursor-pointer"/>
 			{ booking.GetBookingType() }
-			if !booking.Valid {
-				fehlerhafte Buchung, wird nicht zur Berechnung verwendet!
-			}
 		</p>
+		if booking.IsSubmittedAndChecked() {
+			<p>submitted</p>
+		}
 	</div>
 }
 
-templ workdayComponent(workDay *models.WorkDay) {
+templ LegendComponent() {
-	if workDay.IsEmpty() && !workDay.IsKurzArbeit() {
+	<div class="flex flex-row gap-4 md:mx-[10%] print:hidden">
-		<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-red-600"></div><span>Fehler</span></div>
-	} else {
+		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-orange-500"></div><span>Arbeitszeit unter regulär</span></div>
-		if workDay.IsKurzArbeit() {
+		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-accent"></div><span>Arbeitszeit vollständig</span></div>
-			@absenceComponent(workDay.GetKurzArbeit(), true)
+		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-purple-600"></div><span>Überstunden</span></div>
-		}
+		<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-neutral-400"></div><span>Keine Buchungen</span></div>
-		for _, booking := range workDay.Bookings {
+	</div>
-			@bookingComponent(booking)
-		}
-		<input type="hidden" name="select_kommen" value={ len(workDay.Bookings) > 0 && workDay.Bookings[len(workDay.Bookings)-1].CheckInOut%2 == 0 }/>
-	}
-}
-
-templ holidayComponent(d models.IWorkDay) {
-	<p>{ d.ToString() }</p>
 }

Backend/templates/timeComponents_templ.go

@@ -0,0 +1,618 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+func lineComponent() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-col w-2 py-2 items-center text-accent print:hidden\"><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg><div class=\"w-[2px] bg-accent flex-grow -my-1\"></div><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func changeButtonComponent(id string, workDay bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), id, workDay))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<button class=\"change-button-component btn w-auto group/button\" type=\"button\" onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 templ.ComponentScript = templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), id, workDay)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "\"><p class=\"hidden md:block group-[.edit]/button:hidden\">Ändern</p><p class=\"hidden group-[.edit]/button:md:block\">Absenden</p><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" fill=\"currentColor\" class=\"w-4 h-4 md:hidden\"><path class=\"group-[.edit]/button:hidden md:hidden\" d=\"M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325\"></path> <path class=\"hidden group-[.edit]/button:block md:hidden\" d=\"M12.736 3.97a.733.733 0 0 1 j1.047 0c.286.289.29.756.01 1.05L7.88 12.01a.733.733 0 0 1-1.065.02L3.217 8.384a.757.757 0 0 1 0-1.06.733.733 0 0 1 1.047 0l3.052 3.093 5.4-6.425z\"></path></svg></button> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("clearEditState"))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<button class=\"hidden group-[.edit]:flex btn  basis-[content] items-center\" onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 templ.ComponentScript = templ.JSFuncCall("clearEditState")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var4.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\"><span class=\"size-5 icon-[material-symbols-light--cancel-outline]\"></span></button>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func timeGaugeComponent(progress int8, today bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			templ_7745c5c3_Var5 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		var bgColor string
+		switch {
+		case (0 > progress):
+			bgColor = "bg-red-600"
+			break
+		case (progress > 0 && progress < 95):
+			bgColor = "bg-orange-500"
+			break
+		case (95 <= progress && progress <= 105):
+			bgColor = "bg-accent"
+			break
+		case (progress > 105):
+			bgColor = "bg-purple-600"
+			break
+		default:
+			bgColor = "bg-neutral-400"
+			break
+		}
+		if today {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var6...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var6).String())
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "\" style=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(fmt.Sprintf("height: %d%%", int(progress)))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 57, Col: 149}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\"></div></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			var templ_7745c5c3_Var9 = []any{"w-2 h-full bg-accent rounded-md flex-shrink-0", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var9...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<div class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var10 string
+			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var9).String())
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "\"></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		return nil
+	})
+}
+
+func newAbsenceComponent() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var11 == nil {
+			templ_7745c5c3_Var11 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<div class=\"no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center \">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), 0, false))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<button type=\"button\" name=\"absence\" onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 templ.ComponentScript = templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), 0, false)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\" class=\"btn border-neutral-500\">Neue Abwesenheit</button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func absenceComponent(a *models.Absence, isKurzarbeit bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var13 == nil {
+			templ_7745c5c3_Var13 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		editBox := ""
+		if isKurzarbeit {
+			editBox = "edit-box"
+		}
+		var templ_7745c5c3_Var14 = []any{"flex flex-row items-center gap-2", editBox}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var14...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var15 string
+		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var14).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"><input type=\"hidden\" name=\"date_from\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateFrom.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 80, Col: 80}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "\"> <input type=\"hidden\" name=\"date_to\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateTo.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 81, Col: 76}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\"> <input type=\"hidden\" name=\"aw_type\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(a.AbwesenheitTyp.Id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 82, Col: 65}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\"> <input type=\"hidden\" name=\"aw_id\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(a.CounterId)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 83, Col: 55}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\"><p class=\"whitespace-nowrap group-[.edit]:ml-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(a.AbwesenheitTyp.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 85, Col: 26}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if a.IsMultiDay() {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<span class=\"text-neutral-500\">bis ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var21 string
+			templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateTo.Format("02.01.2006"))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 87, Col: 70}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</span>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</p><div class=\"w-full\"></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if isKurzarbeit {
+			templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format(time.DateOnly), false))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<button type=\"button\" onclick=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var22 templ.ComponentScript = templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format(time.DateOnly), false)
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\" class=\"hidden btn border-0 rounded-none grow-0 w-auto group-[.edit]:inline\">Bearbeiten</button>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func newBookingComponent(d *models.WorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var23 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var23 == nil {
+			templ_7745c5c3_Var23 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div class=\"new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center edit-box border-dashed\"><input name=\"timestamp\" type=\"time\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(time.Now().Format("15:04"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 99, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm px-3 py-2 cursor-pointer\"> <input name=\"date\" type=\"hidden\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var25 string
+		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(d.Day.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 100, Col: 70}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "\"><div class=\"relative\"><select class=\"cursor-pointer appearance-none\" name=\"check_in_out\"><option value=\"0\" disabled>Kommen/Gehen</option> <option value=\"3\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, ">Kommen</option> <option value=\"4\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, ">Gehen</option></select> <svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke-width=\"1.2\" stroke=\"currentColor\" class=\"h-5 w-5 ml-1 absolute right-1 top-[0.125rem] text-slate-700\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M8.25 15 12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9\"></path></svg></div><div class=\"w-full\"></div><button name=\"action\" value=\"add\" type=\"submit\" class=\"hidden btn border-0 rounded-none grow-0 w-auto group-[.edit]:inline\"><span class=\"hidden md:inline\">Hinzufügen</span><span class=\"md:hidden\">+</span></button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func bookingComponent(booking models.Booking) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var26 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var26 == nil {
+			templ_7745c5c3_Var26 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<div><p class=\"text-neutral-500 edit-box\"><span class=\"text-black group-[.edit]:hidden inline\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var27 string
+		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 119, Col: 91}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</span> <input disabled name=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs("booking_" + strconv.Itoa(booking.CounterId))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 120, Col: 70}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "\" type=\"time\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var29 string
+		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 120, Col: 126}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm px-3 py-2 cursor-pointer\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var30 string
+		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 121, Col: 29}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if booking.IsSubmittedAndChecked() {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "<p>submitted</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func LegendComponent() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var31 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var31 == nil {
+			templ_7745c5c3_Var31 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "<div class=\"flex flex-row gap-4 md:mx-[10%] print:hidden\"><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-red-600\"></div><span>Fehler</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-orange-500\"></div><span>Arbeitszeit unter regulär</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-accent\"></div><span>Arbeitszeit vollständig</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-purple-600\"></div><span>Überstunden</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-neutral-400\"></div><span>Keine Buchungen</span></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/timePage.templ

@@ -1,9 +1,5 @@
 package templates
 
-// this files includes the largest templates from the time page,
-// because this page is so complex the smaller components are in
-// the timeComponents.templ file
-
 import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
@@ -13,8 +9,10 @@ import (
 )
 
 templ TimePage(workDays []models.WorkDay, lastSub time.Time) {
-	{{ allDays := ctx.Value("days").([]models.IWorkDay) }}
+	{{
-	@BasePage()
+		allDays := ctx.Value("days").([]models.IWorkDay)
+	}}
+	@Base()
 	@headerComponent()
 	<div class="grid-main divide-y-1">
 		@inputForm()
@@ -25,7 +23,7 @@ templ TimePage(workDays []models.WorkDay, lastSub time.Time) {
 			}
 		}
 	</div>
-	@legendComponent()
+	@LegendComponent()
 }
 
 templ inputForm() {
@@ -33,7 +31,6 @@ templ inputForm() {
 		urlParams := ctx.Value("urlParams").(url.Values)
 		user := ctx.Value("user").(models.User)
 	}}
-	<div class="sticky top-0 z-100 grid-sub divide-y-1">
 	<div class="grid-sub divide-x-1 bg-neutral-300 responsive">
 		<div class="grid-cell md:col-span-1 max-md:grid grid-cols-2">
 			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
@@ -86,14 +83,13 @@ templ inputForm() {
 			</div>
 		</div>
 	</form>
-	</div>
 }
 
 templ defaultDayComponent(day models.IWorkDay) {
 	{{
 		user := ctx.Value("user").(models.User)
 		justify := "justify-center"
-		if day.IsWorkDay() && !day.IsEmpty() {
+		if day.IsWorkDay() && len(day.(*models.WorkDay).Bookings) > 1 {
 			justify = "justify-between"
 		}
 	}}
@@ -102,12 +98,12 @@ templ defaultDayComponent(day models.IWorkDay) {
 			@timeGaugeComponent(day.GetDayProgress(user), day.Date().Equal(time.Now().Truncate(24*time.Hour)))
 			<div>
 				<p>
-					<span class="font-bold uppercase hidden md:inline">{ helper.FormatGermanDayOfWeek(day.Date()) }:</span> { day.Date().Format("02.01.2006") }
+					<span class="font-bold uppercase hidden md:inline">{ day.Date().Format("Mon") }:</span> { day.Date().Format("02.01.2006") }
 				</p>
 				if day.IsWorkDay() {
 					{{
-						work, pause, overtime := day.GetTimes(user, models.WorktimeBaseDay, true)
+						workDay, _ := day.(*models.WorkDay)
-						work = day.GetWorktime(user, models.WorktimeBaseDay, false)
+						work, pause, overtime := workDay.GetAllWorkTimesReal(user)
 					}}
 					if day.RequiresAction() {
 						<p class="text-red-600">Bitte anpassen</p>
@@ -119,7 +115,7 @@ templ defaultDayComponent(day models.IWorkDay) {
 						if pause > 0 {
 							<p class="text-neutral-500 flex flex-row items-center"><span class="icon-[material-symbols-light--motion-photos-paused-outline]"></span>{ helper.FormatDuration(pause) }</p>
 						}
-						if !day.IsEmpty() && overtime != 0 {
+						if overtime != 0 && len(workDay.Bookings) > 0 {
 							<p class="text-neutral-500 flex flex-row items-center">
 								<span class="icon-[material-symbols-light--more-time]"></span>
 								{ helper.FormatDuration(overtime) }
@@ -131,39 +127,40 @@ templ defaultDayComponent(day models.IWorkDay) {
 		</div>
 		<div class="all-booking-component grid-cell flex flex-row md:col-span-3 col-span-2 gap-2 w-full">
 			@lineComponent()
-			<form id={ "time-" + day.Date().Format(time.DateOnly) } class={ "bookings flex flex-col gap-2 w-full", justify } method="post">
+			<form id={ "time-" + day.Date().Format(time.DateOnly) } class={ "flex flex-col gap-2 w-full", justify } method="post">
-				if (day.GetDayProgress(user) < 100 || day.IsWorkDay()) {
+				if day.IsWorkDay() {
+					{{
+					workDay, _ := day.(*models.WorkDay)
+					}}
 					@newAbsenceComponent()
-					@timeDayTypeSwitch(day, true)
+					if len(workDay.Bookings) < 1 {
-					@newBookingComponent(day)
+						<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+					}
+					if workDay.IsKurzArbeit() {
+						@absenceComponent(workDay.GetKurzArbeit(), true)
+					}
+					for _, booking := range workDay.Bookings {
+						@bookingComponent(booking)
+					}
+					@newBookingComponent(workDay)
 				} else {
-					@timeDayTypeSwitch(day, true)
+					{{
+						absentDay, _ := day.(*models.Absence)
+					}}
+					@absenceComponent(absentDay, false)
 				}
 				<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
 			</form>
 		</div>
 		<div class="grid-cell flex flex-row gap-2 items-end">
-			@changeButtonComponent("time-"+day.Date().Format(time.DateOnly), true, day.IsSubmittedAndAccepted())
+			@changeButtonComponent("time-"+day.Date().Format(time.DateOnly), day.IsWorkDay())
-			if day.IsSubmittedAndAccepted() {
-				<span class="size-6 my-2  icon-[material-symbols-light--lock]"></span>
-			}
 		</div>
 	</div>
 }
 
-templ timeDayTypeSwitch(day models.IWorkDay, fromCompound bool) {
+templ absentInput(a models.Absence) {
-	switch day.Type() {
+	<input type="hidden" name="date_from" value={ a.DateFrom.Format(time.DateOnly) }/>
-		case models.DayTypeWorkday:
+	<input type="hidden" name="date_to" value={ a.DateTo.Format(time.DateOnly) }/>
-			{{ workDay, _ := day.(*models.WorkDay) }}
+	<input type="hidden" name="aw_type" value={ a.AbwesenheitTyp.Id }/>
-			@workdayComponent(workDay)
+	<input type="hidden" name="aw_id" value={ a.CounterId }/>
-		case models.DayTypeAbsence:
-			{{ absentDay, _ := day.(*models.Absence) }}
-			@absenceComponent(absentDay, fromCompound)
-		case models.DayTypeCompound:
-			for _, c :=  range day.(*models.CompoundDay).DayParts {
-				@timeDayTypeSwitch(c, true)
-			}
-		default:
-			<p>{ day.ToString() }</p>
-	}
 }

Backend/templates/timePage_templ.go

@@ -0,0 +1,563 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"net/url"
+	"strconv"
+	"time"
+)
+
+func TimePage(workDays []models.WorkDay, lastSub time.Time) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		allDays := ctx.Value("days").([]models.IWorkDay)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-main divide-y-1\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = inputForm().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, day := range allDays {
+			templ_7745c5c3_Err = defaultDayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if day.Date().Weekday() == time.Monday {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<div class=\"grid-sub responsive bg-neutral-300 h-2\"></div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = LegendComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func inputForm() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		urlParams := ctx.Value("urlParams").(url.Values)
+		user := ctx.Value("user").(models.User)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<div class=\"grid-sub divide-x-1 bg-neutral-300 responsive\"><div class=\"grid-cell md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname + " " + user.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 36, Col: 66}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</p><div class=\"justify-self-end\"><p class=\"text-sm\">Überstunden</p><p class=\"text-accent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(user.Overtime)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 39, Col: 42}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</p></div></div><form id=\"timeRangeForm\" method=\"GET\" class=\"grid-cell flex flex-row md:col-span-3 gap-2 \">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = lineComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"flex flex-col gap-2 justify-between grow-1\"><input type=\"date\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_from"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 45, Col: 57}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\" name=\"time_from\" class=\"btn bg-neutral-100\" placeholder=\"Zeitraum von...\"> <input type=\"date\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_to"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 46, Col: 55}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "\" name=\"time_to\" class=\"btn bg-neutral-100\" placeholder=\"Zeitraum bis...\"></div></form><div class=\"grid-cell content-end\"><button type=\"submit\" form=\"timeRangeForm\" class=\"btn bg-neutral-100 hover:bg-neutral-700 color-neutral-700\"><p class=\"\">Anzeigen</p></button></div></div><form id=\"absence_form\" method=\"POST\" action=\"/absence\" class=\"grid-sub responsive scroll-m-2 bg-neutral-300 hidden\"><input type=\"hidden\" name=\"aw_id\" value=\"\"><div class=\"grid-cell border-r-1\"><p class=\"font-bold uppercase\">Abwesenheit</p></div><div class=\"grid-cell\"><label class=\"block mb-1 text-sm text-neutral-700\">Abwesenheitsart</label><div class=\"relative\"><select name=\"aw_type\" class=\"btn appearance-none cursor-pointer bg-neutral-100\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, absence := range models.GetAbsenceTypesCached() {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<option value=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(absence.Id)))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 63, Col: 51}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(absence.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 63, Col: 68}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</option>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</select> <svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke-width=\"1.2\" stroke=\"currentColor\" class=\"h-5 w-5 ml-1 absolute top-2.5 right-2.5 text-slate-700\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M8.25 15 12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9\"></path></svg></div></div><div class=\"grid-cell\"><label class=\"block mb-1 text-sm text-neutral-700\">Abwesenheit ab</label> <input name=\"date_from\" type=\"date\" class=\"btn bg-neutral-100\"></div><div class=\"grid-cell border-r-1\"><label class=\"block mb-1 text-sm text-neutral-700\">Abwesenheit bis</label> <input name=\"date_to\" type=\"date\" class=\"btn bg-neutral-100\"></div><div class=\"grid-cell flex flex-row items-end\"><div class=\"flex flex-row gap-2 w-full\"><button name=\"action\" value=\"insert\" type=\"submit\" class=\"bg-neutral-100 btn hover:bg-neutral-700\">Speichern</button> <button name=\"action\" value=\"delete\" type=\"submit\" class=\"bg-neutral-100 btn hover:bg-red-700 flex basis-[content] items-center\"><span class=\"size-5 icon-[material-symbols-light--delete-outline]\"></span></button></div></div></form>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func defaultDayComponent(day models.IWorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var9 == nil {
+			templ_7745c5c3_Var9 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		user := ctx.Value("user").(models.User)
+		justify := "justify-center"
+		if day.IsWorkDay() && len(day.(*models.WorkDay).Bookings) > 1 {
+			justify = "justify-between"
+		}
+		var templ_7745c5c3_Var10 = []any{"grid-sub divide-x-1 hover:bg-neutral-200 transition-colors group"}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var10...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var10).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"><div class=\"grid-cell md:col-span-1 flex flex-row gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = timeGaugeComponent(day.GetDayProgress(user), day.Date().Equal(time.Now().Truncate(24*time.Hour))).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div><p><span class=\"font-bold uppercase hidden md:inline\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("Mon"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 101, Col: 82}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, ":</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("02.01.2006"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 101, Col: 126}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if day.IsWorkDay() {
+
+			workDay, _ := day.(*models.WorkDay)
+			work, pause, overtime := workDay.GetAllWorkTimesReal(user)
+			if day.RequiresAction() {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"text-red-600\">Bitte anpassen</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				if work > 0 {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<p class=\" text-sm mt-1\">Arbeitszeit:</p><p class=\"text-accent flex flex-row items-center\"><span class=\"icon-[material-symbols-light--schedule-outline]\"></span>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var14 string
+					templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(work))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 113, Col: 155}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, " ")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				if pause > 0 {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<p class=\"text-neutral-500 flex flex-row items-center\"><span class=\"icon-[material-symbols-light--motion-photos-paused-outline]\"></span>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var15 string
+					templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(pause))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 116, Col: 173}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " ")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				if overtime != 0 && len(workDay.Bookings) > 0 {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<p class=\"text-neutral-500 flex flex-row items-center\"><span class=\"icon-[material-symbols-light--more-time]\"></span> ")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var16 string
+					templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(overtime))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 121, Col: 41}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</div></div><div class=\"all-booking-component grid-cell flex flex-row md:col-span-3 col-span-2 gap-2 w-full\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = lineComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 = []any{"flex flex-col gap-2 w-full", justify}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var17...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<form id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs("time-" + day.Date().Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 130, Col: 56}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\" class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var17).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "\" method=\"post\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if day.IsWorkDay() {
+
+			workDay, _ := day.(*models.WorkDay)
+			templ_7745c5c3_Err = newAbsenceComponent().Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if len(workDay.Bookings) < 1 {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<p class=\"text group-[.edit]:hidden\">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if workDay.IsKurzArbeit() {
+				templ_7745c5c3_Err = absenceComponent(workDay.GetKurzArbeit(), true).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			for _, booking := range workDay.Bookings {
+				templ_7745c5c3_Err = bookingComponent(booking).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+
+			absentDay, _ := day.(*models.Absence)
+			templ_7745c5c3_Err = absenceComponent(absentDay, false).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<input type=\"hidden\" name=\"action\" value=\"change\"><!-- default action value for ändern button --></form></div><div class=\"grid-cell flex flex-row gap-2 items-end\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = changeButtonComponent("time-"+day.Date().Format(time.DateOnly), day.IsWorkDay()).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func absentInput(a models.Absence) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var20 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var20 == nil {
+			templ_7745c5c3_Var20 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "<input type=\"hidden\" name=\"date_from\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var21 string
+		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateFrom.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 162, Col: 79}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\"> <input type=\"hidden\" name=\"date_to\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var22 string
+		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateTo.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 163, Col: 75}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "\"> <input type=\"hidden\" name=\"aw_type\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(a.AbwesenheitTyp.Id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 164, Col: 64}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "\"> <input type=\"hidden\" name=\"aw_id\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(a.CounterId)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 165, Col: 54}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Cron/autoBackup.sh

@@ -1,7 +0,0 @@
-# cron-timing: 05 01  *   *   1
-container_name="arbeitszeitmessung-main-db-1"
-filename=backup-$(date '+%Y%m%d').sql
-backup_folder=__BACKUP_FOLDER__
-database_name=__DATABASE__
-docker exec $container_name pg_dump $database_name > $backup_folder/$filename
-echo "created backup file: "$filename

Cron/autoHolidays.sh

@@ -1,4 +0,0 @@
-# cron-timing: 01 00  01   01   *
-# Calls endpoint to write all public Holidays for the current year inside a database.
-port=__PORT__
-curl localhost:$port/auto/feiertage

Cron/autoLogout.sh

@@ -1,4 +0,0 @@
-# cron-timing: 55 23  *   *   *
-# Calls endpoint to log out all users, still logged in for today
-port=__PORT__
-curl localhost:$port/auto/logout

DB/initdb/01_create_user.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-set -e  # Exit on error
-
-echo "Creating PostgreSQL user and setting permissions... $POSTGRES_USER for API user $POSTGRES_API_USER"
-
-
-
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-    CREATE ROLE migrate LOGIN ENCRYPTED PASSWORD '$POSTGRES_PASSWORD';
-    GRANT USAGE, CREATE ON SCHEMA public TO migrate;
-    GRANT CONNECT ON DATABASE arbeitszeitmessung TO migrate;
-EOSQL
-
-# psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-
-#     GRANT SELECT, INSERT, UPDATE ON anwesenheit, abwesenheit, user_password, wochen_report, s_feiertage TO $POSTGRES_API_USER;
-#     GRANT DELETE ON abwesenheit TO $POSTGRES_API_USER;
-#     GRANT SELECT ON s_personal_daten, s_abwesenheit_typen, s_anwesenheit_typen, s_feiertage TO $POSTGRES_API_USER;
-#     GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO $POSTGRES_API_USER;
-# EOSQL
-
-echo "User creation and permissions setup complete!"
-
-
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-
--- privilege roles
-DO \$\$
-BEGIN
-    IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'app_base') THEN
-        CREATE ROLE app_base NOLOGIN;
-    END IF;
-END
-\$\$;
-
--- dynamic login role
-DO \$\$
-BEGIN
-    IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '$POSTGRES_API_USER') THEN
-        CREATE ROLE $POSTGRES_API_USER
-            LOGIN
-            ENCRYPTED PASSWORD '$POSTGRES_API_PASS';
-    END IF;
-END
-\$\$;
-
--- grant base privileges
-GRANT app_base TO $POSTGRES_API_USER;
-GRANT CONNECT ON DATABASE $POSTGRES_DB TO $POSTGRES_API_USER;
-GRANT USAGE ON SCHEMA public TO $POSTGRES_API_USER;
-
-CREATE EXTENSION IF NOT EXISTS pgcrypto;
-
-EOSQL
-
-# psql -v ON_ERROR_STOP=1 --username root --dbname arbeitszeitmessung

DB/initdb/01_schema.sql

@@ -103,21 +103,8 @@ CREATE TABLE "s_abwesenheit_typen" (
     "abwesenheit_name" varchar(255) NOT NULL,
     "arbeitszeit_equivalent" float4 NOT NULL
 );
-COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS '0=keine Arbeitszeit; -1=Arbeitszeit auffüllen; <=1 - 100 => Arbeitszeit pro Tag prozentual';
 
-DROP TABLE IF EXISTS "s_feiertage";
+COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS '0=keine Arbeitszeit; 1=Arbeitszeit auffüllen; 2=Arbeitszeit austauschen';
-CREATE TABLE "s_feiertage" (
-    "counter_id" serial PRIMARY KEY NOT NULL,
-    "datum" date  NOT NULL,
-    "name" varchar(100) NOT NULL,
-    "wiederholen" smallint NOT NULL DEFAULT 0,
-    "arbeitszeit_equivalent" smallint NOT NULL DEFAULT 100
-);
-
-CREATE UNIQUE index feiertage_unique_pro_jahr on s_feiertage (
-    extract ( year from datum ),
-    name
-);
 
 -- Adds crypto extension
 

DB/initdb/02_sample_data.sql

@@ -0,0 +1,8 @@
+INSERT INTO "s_personal_daten" ("personal_nummer", "aktiv_beschaeftigt", "vorname", "nachname", "geburtsdatum", "plz", "adresse", "geschlecht", "card_uid", "hauptbeschaeftigungs_ort", "arbeitszeit_per_tag", "arbeitszeit_per_woche", "arbeitszeit_min_start", "arbeitszeit_max_ende", "vorgesetzter_pers_nr") VALUES
+(123,	't',	'Kim',	'Mustermensch',	'2003-02-01',	'08963',	'Altenburger Str. 44A',	1,	'aaaa-aaaa',	1,	8, 40,	'07:00:00',	'20:00:00',	0);
+
+INSERT INTO "user_password" ("personal_nummer", "pass_hash") VALUES
+(123, crypt('max_pass', gen_salt('bf')));
+
+INSERT INTO "s_anwesenheit_typen" ("anwesenheit_id", "anwesenheit_name") VALUES (1, 'Büro');
+INSERT INTO "s_abwesenheit_typen" ("abwesenheit_id", "abwesenheit_name", "arbeitszeit_equivalent") VALUES (1, 'Urlaub', 10), (2, 'Krank', 10), (3, 'Kurzarbeit', 2);

DB/initdb/03_create_user.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e  # Exit on error
+
+echo "Creating PostgreSQL user and setting permissions... $POSTGRES_USER for API user $POSTGRES_API_USER"
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    CREATE USER $POSTGRES_API_USER WITH ENCRYPTED PASSWORD '$POSTGRES_API_PASS';
+    GRANT CONNECT ON DATABASE $POSTGRES_DB TO $POSTGRES_API_USER;
+    GRANT USAGE ON SCHEMA public TO $POSTGRES_API_USER;
+    GRANT SELECT, INSERT, UPDATE ON anwesenheit, abwesenheit, user_password, wochen_report TO $POSTGRES_API_USER;
+    GRANT SELECT ON s_personal_daten, s_abwesenheit_typen, s_anwesenheit_typen TO $POSTGRES_API_USER;
+    GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO $POSTGRES_API_USER;
+EOSQL
+
+echo "User creation and permissions setup complete!"
+
+# psql -v ON_ERROR_STOP=1 --username root --dbname arbeitszeitmessung

Docker/docker-compose.dev.yml

@@ -1,9 +1,15 @@
 name: arbeitszeitmessung-dev
 services:
   db:
+    image: postgres:16
+    restart: unless-stopped
+    env_file:
+      - .env
+    environment:
+      PGDATA: /var/lib/postgresql/data/pg_data
     volumes:
       - ${POSTGRES_PATH}:/var/lib/postgresql/data
-      - ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d
+      # - ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d
     ports:
       - 5432:5432
 
@@ -13,8 +19,21 @@ services:
     ports:
       - 8001:8080
   backend:
+    image: git.letsstein.de/tom/arbeitszeitmessung
+    restart: unless-stopped
+    env_file:
+      - .env
     environment:
+      POSTGRES_HOST: db
+      POSTGRES_DB: ${POSTGRES_DB}
+      EXPOSED_PORT: ${EXPOSED_PORT}
       NO_CORS: true
+    ports:
+      - ${EXPOSED_PORT}:8080
+    volumes:
+      - ../logs:/app/Backend/logs
+    depends_on:
+      - db
 
   swagger:
     image: swaggerapi/swagger-ui

Docker/docker-compose.yml

@@ -12,25 +12,20 @@ services:
       - ${POSTGRES_PATH}:/var/lib/postgresql/data
       - ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d
     ports:
-      - ${POSTGRES_PORT}:5432
+      - 5432:5432
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "${POSTGRES_USER}", "--dbname", "${POSTGRES_DB}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
 
   backend:
-    image: git.letsstein.de/tom/arbeitszeitmessung-webserver:dev
+    image: git.letsstein.de/tom/arbeitszeitmessung
     env_file:
       - .env
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: ${POSTGRES_DB}
+      EXPOSED_PORT: ${EXPOSED_PORT}
     ports:
-      - ${WEB_PORT}:8080
+      - ${EXPOSED_PORT}:8080
     depends_on:
-      db:
+      - db
-        condition: service_healthy
     volumes:
-      - ${LOG_PATH}:/app/logs
+      - ../logs:/app/Backend/logs
     restart: unless-stopped

Docker/env.example

@@ -1,16 +1,10 @@
-POSTGRES_USER=root                                  # Postgres ADMIN Nutzername. regex:^\w+$
+POSTGRES_USER=root              # Postgres ADMIN Nutzername
 POSTGRES_PASSWORD=very_secure   # Postgres ADMIN Passwort
-POSTGRES_API_USER=api_nutzer                        # Postgres API Nutzername (für Arbeitszeitmessung). regex:^\w+$
+POSTGRES_API_USER=api_nutzer    # Postgres API Nutzername (für Arbeitszeitmessung)
 POSTGRES_API_PASS=password      # Postgres API Passwort (für Arbeitszeitmessung)
-POSTGRES_PATH=__ROOT__/DB                           # Datebank Pfad (relativ zu Docker Ordner oder absoluter pfad mit /...)
+POSTGRES_PATH=../DB             # Datebank Pfad (relativ zu Docker Ordner oder absoluter pfad mit /...)
-POSTGRES_DB=arbeitszeitmessung                      # Postgres Datenbank Name. regex:^[a-z]+$
+POSTGRES_DB=arbeitszeitmessung  # Postgres Datenbank Name
-POSTGRES_PORT=5432                                  # Postgres Port normalerweise nicht freigegeben. regex:^[0-9]{1,5}$
+EXPOSED_PORT=8000               # Port auf welchem Arbeitszeitmessung läuft regex:^[0-9]{1,5}$
 TZ=Europe/Berlin                # Zeitzone
-API_TOKEN=dont_access                               # API Token für ESP32 Endpoints
+PGTZ=Europe/Berlin              # Zeitzone
-WEB_PORT=8000                                       # Port unter welchem Webserver erreichbar ist. regex:^[0-9]{1,5}$
+API_TOKEN=dont_access           # API Token für ESP Endpoints
-LOG_PATH=__ROOT__/logs                              # Pfad für Audit Logs
-LOG_LEVEL=warn                                      # Welche Log-Nachrichten werden in der Konsole erscheinen. regex:^(debug|info|warn|error)$
-BACKUP_FOLDER=__ROOT__/backup                       # Pfad für DB Backup Datein
-
-BOOKING_OUT_OF_BOUNDS=true                          # Buchungen außerhalb der festgelegten Arbeitszeit erlauben und auf Arbeitszeit anpassen. regex:^(true|false)$
-BOOKING_FOR_UNKNOWN_USER=true                       # Buchungen mit unbekannter CardUID erlauben. regex:^(true|false)$

Jenkinsfile

@@ -0,0 +1,66 @@
+pipeline {
+        environment {
+        DOCKER_USERNAME = 'jenkins'
+        DOCKER_PASSWORD = credentials('gitea_jenkins')
+        SONAR_TOKEN = credentials('sonarcube_token')
+        POSTGRES_USER = 'postgres'
+        POSTGRES_PASSWORD = 'password'
+        POSTGRES_DB = 'arbeitszeitmessung'
+        }
+
+    agent any
+
+    stages {
+        stage('Test') {
+            agent {
+                docker {
+                    image ''
+                    args ''
+                    args ''
+                }
+            }
+            steps {
+                script {
+                    sh '''
+                    docker run -d --rm \
+                        --name test-db \
+                        -e POSTGRES_USER={$POSTGRES_USER} \
+                        -e POSTGRES_PASSWORD={$POSTGRES_PASSWORD} \
+                        -e POSTGRES_DB={$POSTGRES_DB} \
+                        -v ./DB/initdb:/docker-entrypoint-initdb.d\
+                        -p "5432:5432" \
+                        postgres:16
+                    '''
+            //         docker.image('golang:1.24.5').withRun(
+            //             '-u root:root --network=host'
+            //             ) { go ->
+            //             // wait for DB to start
+            //             sh '''
+            //             cd Backend \
+            //             go mod download && go mod tidy \
+            //             go test ./... -v
+
+            //             '''
+            // }
+                }
+            }
+        }
+            stage('SonarCube Analysis') {
+                steps {
+                    sh 'make scan'
+                }
+            }
+            stage('Building image arbeitszeit-backend') {
+                when {
+                    anyOf {
+                        changeset 'Jenkinsfile'
+                        changeset 'Makefile'
+                        changeset 'Backend/**'
+                    }
+                }
+                steps {
+                    sh 'make backend'
+                }
+            }
+    }
+}

Makefile

@@ -44,7 +44,7 @@ generateFrontend:
 
 
 backend: generateFrontend login_registry
-	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeitmessung-webserver:dev Backend --push
+	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeitmessung:latest Backend --push
 	# docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeitmessung:${GIT_COMMIT} Backend //--push
 
 test:

Readme.md

@@ -1,168 +1,122 @@
 # Arbeitszeitmessung
 
-[![Quality Gate Status](https://sonar.letsstein.de/api/project_badges/measure?project=arbeitszeitmessung&metric=alert_status&token=sqb_253028eff30aff24f32b437cd6c484c511b5c33f)](https://sonar.letsstein.de/dashboard?id=arbeitszeitmessung)
+[![Quality Gate Status](https://sonar.letsstein.de/api/project_badges/measure?project=arbeitszeitmessung&metric=alert_status&token=sqb_f8e5ad702b23aa4631a29b99c2f8030caf7d4e05)](https://sonar.letsstein.de/dashboard?id=arbeitszeitmessung)
 
----
+bis jetzt ein einfaches Backend mit PostgreSQL Datenbank und GO Webserver um Arbeitszeitbuchungen per HTTP PUT einzufügen
-
-Eine open-source Software zur Arbeitszeitmessung
-
-## Features
-
-- manuelle Korrektur von einzelnen Buchungen
-- Buchung von benutzerdefinierten Abwesenheiten
-- automatische gesetzlicher Feiertage
-- Pflege eigener Feiertage
-
-- wöchentliches Abrechnungssystem
-- Kontrolle der Arbeitszeiten durch direkte Führungskraft
-
-- Ausgabe der Arbeitszeiten je Monat in PDF Format
-
-- Anwesenheitsübersicht
 
 ## Installation
 
 ```bash
 git clone https://git.letsstein.de/tom/arbeitszeitmessung arbeitszeitmessung
 
-cd arbeitszeitmessung
+cd arbeitszeitmessung/Docker
-
+# .env Datei anpassen
-./install.sh
+docker compose up -d
 ```
 
-### Konfiguration:
+## PREVIEW
 
-- Datenbank
+Zeitverwaltungsansicht (/time):
-  - `POSTGRES_USER` Postgres ADMIN Nutzername
-  - `POSTGRES_PASSWORD` Postgres ADMIN Passwort
-  - `POSTGRES_API_USER` Postgres API Nutzername für Webanwendung
-  - `POSTGRES_API_PASS` Postgres API Passwort für Webanwendung
-  - `POSTGRES_PATH` Datebank Pfad
-  - `POSTGRES_DB` Postgres Datenbank Name
-  - `POSTGRES_PORT` Postgres Port für administration
-- System
-  - `TZ` Zeitzone
-  - `LOG_LEVEL` Welche Log-Nachrichten werden in der Konsole erscheinen
-- Web/API
-  - `API_TOKEN` API Token für ESP Endpoints
-  - `WEB_PORT` Port unter welchem Webserver erreichbar ist
-- Ordnerstruktur
-  - `BACKUP_FOLDER` Pfad für DB Backup Datein
-  - `LOG_PATH` Pfad für Audit Logs
 
-## Administration:
+![time](docs/images/time.png)
 
-### Nutzer erstellen:
+Ansicht der Führungskraft (/team):
 
-Nutzerdaten erstellen:
+![team](docs/images/team.png)
 
-```sql
+Nutzeransicht (/user):
-INSERT INTO "s_personal_daten"
+
-  (
+![user](docs/images/user.png)
-  "personal_nummer",
+
-  "vorname",
+## Buchungstypen
-  "nachname",
+
-  "card_uid",
+1 - Kommen
-  "geburtsdatum",
+2 - Gehen
-  "geschlecht",
+3 - Kommen Manuell
-  "adresse",
+4 - Gehen Manuell
-  "plz",
+254 - Automatisch abgemeldet
-  "hauptbeschaeftigungs_ort",
+
-  "aktiv_beschaeftigt",
+## API
-  "vorgesetzter_pers_nr",
+
-  "arbeitszeit_min_start",
+Nutzung der API
-  "arbeitszeit_max_ende",
+wenn die `dev-docker-compose.yml` Datei gestartet wird, ist direkt ein SwaggerUI Server mit entsprechender Datei inbegriffen.
-  "arbeitszeit_per_tag",
+
-  "arbeitszeit_per_woche",
+### Buchungen [/time]
-  )
+
-VALUES (
+#### [GET] Anfrage
-  1,
+
-  'Max',
+Parameter: cardID (string)
-  'Mustermann',
+Antwort: `200`
-  'acde-edca',
+
-  '2003-02-01',
+```json
-  1,
+[
-  'Musterstr. 42',
+  {
-  '00001',
+    "cradID": "test_card",
-  1,
+    "readerID": "test_reader",
-  true,
+    "bookingTyp": 2,
-  123,
+    "loggedTime": "2024-09-05T08:37:53.117641Z",
-  '07:00:00',
+    "id": 5
-  '20:00:00',
+  },
-  8,
+  {
-  40
+    "cradID": "test_card",
-  );
+    "readerID": "mytest",
+    "bookingTyp": 1,
+    "loggedTime": "2024-09-05T08:51:12.670827Z",
+    "id": 6
+  }
+]
 ```
 
-Nutzerpasswort generieren (kann auch später als Passwort reset genutzt werden):
+Antwort `500`
+Serverfehler
 
-```sql
+#### [PUT] Anfrage
-INSERT INTO "user_password"
+
-  ("personal_nummer", "pass_hash")
+Parameter: id (int)
-VALUES (123, crypt('password', gen_salt('bf')));
+Body: (veränderte Parameter)
+
+```json
+{
+  "cradID": "test_card",
+  "readerID": "mytest",
+  "bookingTyp": 1,
+  "loggedTime": "2024-09-05T08:51:12.670827Z"
+}
 ```
 
-### Buchungstypen erstellen:
+Antwort `200`
 
-Ohne definierte Anwesenheits und Abwesenheitstypen funktioniert die Anwendung nicht!
+```json
-
+{
-Anwesenheiten:
+  "cradID": "test_card",
-
+  "readerID": "mytest",
-```sql
+  "bookingTyp": 1,
-INSERT INTO "s_anwesenheit_typen"
+  "loggedTime": "2024-09-05T08:51:12.670827Z",
-  ("anwesenheit_id", "anwesenheit_name")
+  "id": 6
-VALUES (1, 'Büro');
+}
 ```
 
-Abwesenheiten:
+### Neue Buchung [/time/new]
 
-```sql
+#### [PUT] Anfrage
-INSERT INTO "s_abwesenheit_typen"
+
-  ("abwesenheit_id", "abwesenheit_name", "arbeitszeit_equivalent")
+Parameter:
-VALUES (1, 'Urlaub', 100);
+
+- cardID (string)
+- readerID (string)
+- bookingType (string)
+
+Antwort `202` Akzeptiert und eingefügt
+
+```json
+{
+  "cradID": "test_card",
+  "readerID": "mytest",
+  "bookingTyp": 1,
+  "loggedTime": "2024-09-05T08:51:12.670827Z",
+  "id": 6
+}
 ```
 
-### Feiertage erstellen:
+Antwort `409` Konflikt
-
+Die vorherige Buchung am selben Tag hat den gleichen Buchungstyp
-Die gesetzlichen Feiertage für Deutschland/Sachsen werden automatisch mit der Route `auto/feiertage` für das aktuelle Kalenderjahr erzeugt. Um weitere Unternehmensspezifische Feiertage (z.B. 24.12. oder 31.12.) mit in die Liste der Feiertage aufzunehmen, müssen diese manuell erstellt werden.
-
-```sql
-INSERT INTO "s_feiertage"
-  ("datum", "name", "arbeitszeit_equivalent", "wiederholen")
-VALUES ('2026-12-24', 'Helligabend', 50, 1);
-```
-
-Wenn `wiederholen` == 1 wird der Feiertag automatisch beim Aufruf von `auto/feiertage` mit ins nächste Jahr (am selben Datum) übernommen.
-
-Das Feld `arbeitszeit_equivalent` `arbeitszeit_equivalent` ist die prozentuelle Zeit am Tag welche durch diesen Eintrag eingenommen wird. (dies gilt auch für die [Buchungstypen](#buchungstypen-erstellen))
-
-Alle weiteren Tabellen sollte ausschließlich über die Weboberfläche oder per API befüllt werden.
-
----
-
-# Filestrukture
-
-```
-
-├── Backend (Webserver)
-│   ├── doc (Templates for Document Creator --> typst used to create PDF Reports)
-│   │   ├── static
-│   │   └── templates
-│   ├── endpoints (HTML Server endpoints (see main.go for Routes))
-│   ├── helper (Helper classes)
-│   │   ├── logs
-│   │   └── paramParser
-│   ├── logs (Log Folder, no sourcecode)
-│   ├── migrations (DB Migrations Folder, no direct sourcecode)
-│   ├── models (DB Models and their function)
-│   ├── src (Tailwind src --> used to config css formatter)
-│   ├── static (Webserver static, used to server static content, e.g. JS and CSS files)
-│   │   └── css
-│   └── templates (HTML Templates for every page written in templ and compiled to go)
-├── Cron (all Cron Scripts)
-├── DB (local Database mount Point)
-│   └── initdb (initialization scripts for DB)
-├── Docker (Docker Files, only docker-compose.yaml used)
-├── docs
-└── └── images
-```

WIR-typst/main.typ

@@ -0,0 +1,63 @@
+#set page("a4")
+#set text(font: "Lato")
+
+= Stunden
+
+== Kim Mustermensch
+
+Zeitraum: 01.10.2025 - 31.10.2025
+
+Arbeitszeit: 136h 19min
+
+Überstunden: -39h 41min
+
+
+
+
+
+// #show table.cell: it => {
+//   if it.y == 0 {
+//     set text(white)
+//     strong(it)
+//   } else if it.body == [] {
+//     // Replace empty cells with 'N/A'
+//      pad(..it.inset)[0min]
+    
+//   } else {
+//     it
+//   }
+// }
+
+#let subgrid(body) = {
+  table.cell(colspan: 3, inset: 0em)[
+    #table(
+        columns: (1fr, 1fr, 1fr),
+        gutter: 0em,
+        stroke: black,
+        [..#body]
+    )
+  ]
+}
+
+
+  "01.09.2025",
+  "08:07",
+  "16:28",
+  "Büro",
+  "7h 51min",
+  "30min",
+  "-9min",
+    "02.09.2025",
+    	// return work, pause, overtime
+table.cell(colspan: 3, inset: 0em)[#table(
+        columns: (1fr, 1fr, 1fr),
+        gutter: 0em,
+        stroke: black,
+        [08:12], [16:24], [Büro],
+        [16:30], [17:24], [Homeoffice]
+      )],
+  "6h",
+  "0min",
+  "-1h 15min"
+
+)

install.sh

@@ -1,19 +1,9 @@
 #!/usr/bin/env bash
-#©Tom Tröger 2026
 set -e
 
 envFile=Docker/.env
-envBkp=Docker/.env.old
 envExample=Docker/env.example
 
-cronFilePath=Cron
-customCronFilePath=Docker/config/cron
-
-autoBackupScript=autoBackup.sh
-autoHolidaysScript=autoHolidays.sh
-autoLogoutScript=autoLogout.sh
-
-function checkDocker() {
 echo "Checking Docker installation..."
 if ! command -v docker >/dev/null 2>&1; then
     echo "Docker not found. Install Docker? [y/N]"
@@ -28,64 +18,31 @@ function checkDocker() {
     echo "Docker is already installed."
 fi
 
-  ###########################################################################
-
 echo "Checking Docker Compose..."
 if ! docker compose version >/dev/null 2>&1; then
     echo "Docker Compose plugin missing. You may need to update Docker."
     exit 1
 fi
-}
-###########################################################################
 
-function setupConfig() {
-  local reconfig=false
-  if [ $# -gt 0 ]; then
-    if ask_reconfig $1 "Reconfigure .env File?"
-    then
-      reconfig=true
-    else
-     return 0
-    fi
-  fi
-  echo -e "\r\n==================================================\r\n"
 echo "Preparing .env file..."
-  if [ ! -f $envFile ] || [ $reconfig == true ]; then
+if [ ! -f $envFile ]; then
     if [ -f $envExample ]; then
-        if [ $reconfig == true ]; then
-          echo "Reconfiguring env file. Backup stored at $envBkp"
-          echo "All previous values will be used as defaults!"
-          cp $envFile $envBkp
-        else
         echo ".env not found. Creating interactively from .env.example."
-        fi
         > $envFile
 
-
         while IFS= read -r line; do
 
             #ignore empty lines and comments
             [[ "$line" =~ ^#.*$ || -z "$line" ]] && continue
 
 
-              local key=$(printf "%s" "$line" | cut -d '=' -f 1)
+            key=$(printf "%s" "$line" | cut -d '=' -f 1)
-              local rest=$(printf "%s" "$line" | cut -d '=' -f 2-)
+            rest=$(printf "%s" "$line" | cut -d '=' -f 2-)
 
             # extract inline comment portion
-              local comment=$(printf "%s" "$rest" | sed -n 's/.*# \(.*\)$/\1/p')
+            comment=$(printf "%s" "$rest" | sed -n 's/.*# \(.*\)$/\1/p')
-              local raw_val=$(printf "%s" "$rest" | sed 's/ *#.*//')
+            raw_val=$(printf "%s" "$rest" | sed 's/ *#.*//')
-
+            default_value=$(printf "%s" "$raw_val" | sed 's/"//g')
-              local default_value=$(printf "%s" "$raw_val" | sed 's/"//g')
-
-              if [ $reconfig == true ]; then
-                local previous_value=$(grep -E "^$key=" $envBkp | cut -d= -f2)
-                if [ -n "$previous_value" ]; then
-                  default_value=$previous_value
-                fi
-              fi
-
-              # Replace __ROOT__ with script pwd
-              local default_value="${default_value/__ROOT__/$(pwd)}"
 
             regex=""
             if [[ "$comment" =~ regex:(.*)$ ]]; then
@@ -96,9 +53,9 @@ function setupConfig() {
 
         while true; do
             if [ -z "$comment" ]; then
-                  printf "Value for $key (default: $default_value"
-              else
                 printf "Value for $key - $comment (default: $default_value"
+            else
+                printf "Value for $key (default: $default_value"
             fi
             if [ -n "$regex" ]; then
                 printf ", must match: %s" "$regex"
@@ -138,129 +95,7 @@ function setupConfig() {
 else
     echo "Using existing .env. (found at $envFile)"
 fi
-}
-###########################################################################
 
-function setupFolders(){
-  if [ $# -gt 0 ]; then
-    if ! ask_reconfig $1 "Recreate Folders?"
-    then
-      return 0
-    fi
-  fi
-  LOG_PATH=$(grep -E '^LOG_PATH=' $envFile | cut -d= -f2)
-  if [ -z "$LOG_PATH" ]; then
-    echo "LOG_PATH not found in .env using default $(pwd)/logs"
-    LOG_PATH=$(pwd)/logs
-  fi
-  if [ ! -d "$LOG_PATH" ]; then
-    mkdir -p $LOG_PATH
-    echo "Created logs folder at $LOG_PATH"
-  fi
-
-  POSTGRES_PATH=$(grep -E '^POSTGRES_PATH=' $envFile | cut -d= -f2)
-  if [ -z "$POSTGRES_PATH" ]; then
-    echo "POSTGRES_PATH not found in .env using default $(pwd)/DB"
-    POSTGRES_PATH=$(pwd)/DB
-  fi
-  if [ ! -d "$POSTGRES_PATH" ]; then
-    mkdir -p $POSTGRES_PATH
-    echo "Created DB folder at $POSTGRES_PATH"
-  fi
-
-  BACKUP_FOLDER=$(grep -E '^BACKUP_FOLDER=' $envFile | cut -d= -f2)
-  if [ -z "$BACKUP_FOLDER" ]; then
-    echo "BACKUP_FOLDER not found in .env using default $(pwd)/backup"
-    BACKUP_FOLDER=$(pwd)/backup
-  fi
-  if [ ! -d "$BACKUP_FOLDER" ]; then
-    mkdir -p $BACKUP_FOLDER
-    echo "Created backup folder at $BACKUP_FOLDER"
-  fi
-}
-###########################################################################
-
-function setupCron(){
-  echo -e "\r\n==================================================\r\n"
-  echo "Setup Crontab for automatic logout, backup and holiday creation? [y/N]"
-  read -r setup_cron
-  if [[ "$setup_cron" =~ ^[Yy]$ ]]; then
-      echo "Copying custom cron files to $customCronFilePath"
-      mkdir -p "$customCronFilePath"
-
-      if [ ! -s "$customCronFilePath/$autoBackupScript" ];then
-        cp "$cronFilePath/$autoBackupScript" "$customCronFilePath/$autoBackupScript"
-        echo "Copied $autoBackupScript"
-      fi
-
-      if [ ! -s "$customCronFilePath/$autoLogoutScript" ];then
-        cp "$cronFilePath/$autoLogoutScript" "$customCronFilePath/$autoLogoutScript"
-        echo "Copied $autoLogoutScript"
-      fi
-
-      if [ ! -s "$customCronFilePath/$autoHolidaysScript" ];then
-        cp "$cronFilePath/$autoHolidaysScript" "$customCronFilePath/$autoHolidaysScript"
-        echo "Copied $autoHolidaysScript"
-      fi
-
-      WEB_PORT=$(grep -E '^WEB_PORT=' $envFile | cut -d= -f2)
-      if [ -z "$WEB_PORT" ]; then
-        echo "WEB_PORT not found in .env using default 8000"
-        WEB_PORT=8000
-      fi
-
-      POSTGRES_DB=$(grep -E '^POSTGRES_DB=' $envFile | cut -d= -f2)
-      if [ -z "$POSTGRES_DB" ]; then
-          echo "POSTGRES_DB not found in .env using default arbeitszeitmessung"
-          POSTGRES_DB="arbeitszeitmessung"
-      fi
-
-      BACKUP_FOLDER=$(grep -E '^BACKUP_FOLDER=' $envFile | cut -d= -f2)
-      if [ -z "$BACKUP_FOLDER" ]; then
-          echo "BACKUP_FOLDER not found in .env using default $(pwd)/backup"
-          BACKUP_FOLDER="$(pwd)/backup"
-      fi
-
-      sed -i "s|__PORT__|$WEB_PORT|" $customCronFilePath/$autoHolidaysScript && \
-      sed -i "s|__PORT__|$WEB_PORT|" $customCronFilePath/$autoLogoutScript && \
-      sed -i "s|__DATABASE__|$POSTGRES_DB|" $customCronFilePath/$autoBackupScript && \
-      sed -i "s|__BACKUP_FOLDER__|$BACKUP_FOLDER|" $customCronFilePath/$autoBackupScript
-
-      chmod +x "$customCronFilePath/$autoBackupScript" "$customCronFilePath/$autoHolidaysScript" "$customCronFilePath/$autoLogoutScript"
-
-      # echo "Scripts build with PORT=$WEB_PORT and DATABSE=$POSTGRES_DB!"
-      echo "Adding rules to crontab."
-
-      cron_commands=$(mktemp /tmp/arbeitszeitmessung-cron.XXX)
-      pwd
-
-      for file in $customCronFilePath/*; do
-          cron_timing=$(grep -E '^# cron-timing:' "$file" | sed 's/^# cron-timing:[[:space:]]*//')
-
-          if [ -z "$cron_timing" ]; then
-            echo "No cron-timing found in $file, so it's not added to crontab."
-            continue
-          fi
-
-          ( crontab -l ; echo "$cron_timing $(pwd)/$file" )| awk '!x[$0]++' | crontab -
-          echo "Added entry to crontab: $cron_timing $(pwd)/$file."
-      done
-
-      if  systemctl is-active --quiet cron.service ; then
-        echo "cron.service is running. Everything should be fine now."
-      else
-        echo "cron.service is not running. Please start and enable cron.service."
-        echo "For how to start a service, see: https://wiki.ubuntuusers.de/systemd/systemctl UNITNAME will be cron.service"
-      fi
-
-  else
-      echo "Please setup cron manually by executing crontab -e and adding all files from inside the Cron directory!"
-  fi
-}
-###########################################################################
-
-function startContainer(){
-  echo -e "\r\n==================================================\r\n"
 echo "Start containers with docker compose up -d? [y/N]"
 read -r start_containers
 if [[ "$start_containers" =~ ^[Yy]$ ]]; then
@@ -270,58 +105,3 @@ function startContainer(){
 else
     echo "You can start them manually with: docker compose up -d"
 fi
-}
-###########################################################################
-
-function help(){
-  echo "Installer Script für Arbeitszeitmessung Software"
-  echo -e "\r\n==================================================\r\n"
-  echo "Nutzung: ./install.sh [options]"
-  echo -e "\r\n==================================================\r\n"
-  echo "Optionen:"
-  echo "  -h        zeigt diese Übersicht"
-  echo "  -c        .env Datei bearbeiten/aktualisieren && cron neu configurieren"
-  echo -e "\r\n=================================================="
-}
-###########################################################################
-
-function main(){
-  echo -e "================Arbeitszeitmessung================\r\n"
-  if [ $# -gt 0 ];then
-    if [ $1 == reconfig ]; then
-      echo -e "================Reconfiguring================\r\n"
-      setupConfig $1
-      setupFolders $1
-      setupCron $1
-    fi
-  else
-    checkDocker
-    setupConfig
-    setupFolders
-    setupCron
-    startContainer
-  fi
-  echo "Installation finished, you can re-run the script any time!"
-}
-###########################################################################
-
-function ask_reconfig(){
-  echo -e "\r\n==================================================\r\n"
-  echo "$2 [y/N]"
-  read -r do_reconfig
-
-  [[ "$do_reconfig" =~ ^[Yy]$ ]] && return # true
-  echo "Skipping..."
-  return 1
-}
-###########################################################################
-
-while getopts ":hc" opt; do
-  case $opt in
-    h) help; exit 0 ;;
-    c) main reconfig; exit 0 ;;
-    *) echo "Ungültiges Argument"; exit 1 ;;
-  esac
-done
-
-main

migrations/20250901201159_initial.up.sql

@@ -1,11 +1,3 @@
-ALTER DEFAULT PRIVILEGES FOR ROLE migrate
-IN SCHEMA public
-GRANT SELECT ON TABLES TO app_base;
-
-ALTER DEFAULT PRIVILEGES FOR ROLE migrate
-IN SCHEMA public
-GRANT USAGE, SELECT ON SEQUENCES TO app_base;
-
 -- create "abwesenheit" table
 CREATE TABLE "abwesenheit" (
   "counter_id" bigserial NOT NULL,
@@ -14,7 +6,6 @@ CREATE TABLE "abwesenheit" (
   "datum" timestamptz NULL DEFAULT (now())::date,
   PRIMARY KEY ("counter_id")
 );
-
 -- create "anwesenheit" table
 CREATE TABLE "anwesenheit" (
   "counter_id" bigserial NOT NULL,
@@ -64,6 +55,3 @@ CREATE TABLE "wochen_report" (
   PRIMARY KEY ("id"),
   CONSTRAINT "wochen_report_personal_nummer_woche_start_key" UNIQUE ("personal_nummer", "woche_start")
 );
-
-GRANT INSERT, UPDATE ON abwesenheit, anwesenheit, wochen_report, user_password TO app_base;
-GRANT DELETE ON abwesenheit to app_base;

migrations/20250901201710_triggers_extension.down.sql

@@ -3,3 +3,8 @@
 DROP FUNCTION update_zuletzt_geandert;
 
 DROP TRIGGER  IF EXISTS pass_hash_update ON user_password;
+
+
+-- revert: Adds crypto extension
+
+DROP EXTENSION IF EXISTS pgcrypto;

migrations/20250901201710_triggers_extension.up.sql

@@ -17,3 +17,5 @@ FOR EACH ROW
 EXECUTE FUNCTION update_zuletzt_geandert();
 
 -- Adds crypto extension
+
+CREATE EXTENSION IF NOT EXISTS pgcrypto;