Merge pull request 'kurzarbeit + multi day absence' (#46) from dev/kurzarbeit into main

Reviewed-on: #46

.gitattributes

@@ -0,0 +1,2 @@
+# Ensure all text files use LF line endings
+* text=auto eol=lf

.gitea/workflows/build.yaml

@@ -0,0 +1,76 @@
+name: Arbeitszeitmessung Deploy
+run-name: ${{ gitea.actor }} is building and deploying arbeitszeitmesssung
+on:
+  push:
+    tags: "*"
+
+jobs:
+  testing:
+    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
+      - 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: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          context: Backend
+          tags: |
+            git.letsstein.de/tom/arbeitszeitmessung:latest
+            git.letsstein.de/tom/arbeitszeitmessung:${{  github.ref_name }}

.gitea/workflows/test.yaml

@@ -0,0 +1,48 @@
+name: Tests
+run-name: ${{ gitea.actor }} is testing golang Code
+on: [push]
+
+jobs:
+  testing:
+    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 ./...

.gitignore

@@ -36,3 +36,6 @@ DB/pg_data
 .vscode
 
 node_modules
+atlas.hcl
+.scannerwork
+Backend/logs

Backend/Dockerfile

@@ -14,6 +14,7 @@ COPY . .
 RUN go build -o server .
 
 FROM alpine
+RUN apk add --no-cache tzdata
 WORKDIR /app
 COPY --from=build /app/server /app/server
 

Backend/Makefile

@@ -0,0 +1,6 @@
+test:
+	mkdir -p .test
+	go test ./... -coverprofile=.test/coverage.out -json > .test/report.json
+
+scan:
+	sonar-scanner -Dsonar.token=sqa_ca8394c93a728d6cff96703955288d8902c15200

Backend/database.go

@@ -5,9 +5,11 @@ import (
 	"arbeitszeitmessung/models"
 	"database/sql"
 	"fmt"
+
+	_ "github.com/lib/pq"
 )
 
-func OpenDatabase() (*sql.DB, error) {
+func OpenDatabase() (models.IDatabase, error) {
 	dbHost := helper.GetEnv("POSTGRES_HOST", "localhost")
 	dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung")
 	dbUser := helper.GetEnv("POSTGRES_API_USER", "api_nutzer")
@@ -16,30 +18,3 @@ func OpenDatabase() (*sql.DB, error) {
 	connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName)
 	return sql.Open("postgres", connStr)
 }
-
-func GetBookingsByCardID(db *sql.DB, card_id string) ([]models.Booking, error) {
-	qStr, err := db.Prepare((`SELECT * FROM anwesenheit WHERE card_id = $1`))
-	if err != nil {
-		return nil, err
-	}
-	var bookings []models.Booking
-	rows, err := qStr.Query(card_id)
-	if err == sql.ErrNoRows {
-		return bookings, err
-	}
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var booking models.Booking
-		if err := rows.Scan(&booking.CounterId, &booking.Timestamp, &booking.CardUID, &booking.GeraetID, &booking.CheckInOut); err != nil {
-			return bookings, err
-		}
-		bookings = append(bookings, booking)
-	}
-	if err = rows.Err(); err != nil {
-		return bookings, err
-	}
-	return bookings, nil
-}

Backend/endpoints/pdf.go

@@ -0,0 +1,36 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"log"
+	"net/http"
+	"time"
+)
+
+func PDFHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	startDate, err := parseTimestamp(r, "start", time.Now().Format("2006-01-02"))
+	if err != nil {
+		log.Println("Error parsing 'start_date' time", err)
+		http.Error(w, "Timestamp 'start_date' cannot be parsed!", http.StatusBadRequest)
+		return
+	}
+	if startDate.Day() > 1 {
+		startDate = startDate.AddDate(0, 0, -(startDate.Day() - 1))
+	}
+	endDate := startDate.AddDate(0, 1, -1)
+
+	user, err := models.GetUserFromSession(Session, r.Context())
+	if err != nil {
+		log.Println("Error getting user!")
+	}
+
+	//TODO: only accepted weeks
+
+	weeks := models.GetDays(user, startDate, endDate, false)
+
+	// log.Printf("Using Dates: %s - %s\n", startDate.String(), endDate.String())
+	templates.PDFReportEmploye(user, weeks, startDate, endDate).Render(r.Context(), w)
+}

Backend/endpoints/team.go

@@ -17,26 +17,11 @@ func TeamHandler(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodPost:
 		submitReport(w, r)
-		break
 	case http.MethodGet:
 		showWeeks(w, r)
-		break
 	default:
 		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		break
 	}
-	// user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
-	// if err != nil {
-	// 	log.Println("No user found with the given personal number!")
-	// 	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
-	// 	return
-	// }
-	// var userWorkDays []models.WorkDay
-	// userWorkDays = (*models.WorkDay).GetWorkDays(nil, user.CardUID, time.Date(2025, time.February, 24, 0, 0, 0, 0, time.Local), time.Date(2025, time.February, 24+7, 0, 0, 0, 0, time.Local))
-	// log.Println("User:", user)
-	// teamMembers, err := user.GetTeamMembers()
-	// getWeeksTillNow(time.Now().AddDate(0, 0, -14))
-	// templates.TeamPage(teamMembers, userWorkDays).Render(r.Context(), w)
 }
 
 func submitReport(w http.ResponseWriter, r *http.Request) {
@@ -48,8 +33,8 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
 	userPN, _ := strconv.Atoi(r.FormValue("user"))
 	_weekTs := r.FormValue("week")
 	weekTs, err := time.Parse(time.DateOnly, _weekTs)
-	user, err := (*models.User).GetByPersonalNummer(nil, userPN)
-	workWeek := (*models.WorkWeek).GetWeek(nil, user, weekTs, false)
+	user, err := models.GetUserByPersonalNr(userPN)
+	workWeek := models.NewWorkWeek(user, weekTs, true)
 
 	if err != nil {
 		log.Println("Could not get user!")
@@ -58,11 +43,9 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
 
 	switch r.FormValue("method") {
 	case "send":
-		err = workWeek.Send()
-		break
+		err = workWeek.SendWeek()
 	case "accept":
 		err = workWeek.Accept()
-		break
 	default:
 		break
 	}
@@ -73,21 +56,21 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
 }
 
 func showWeeks(w http.ResponseWriter, r *http.Request) {
-	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	user, err := models.GetUserFromSession(Session, r.Context())
 	if err != nil {
 		log.Println("No user found with the given personal number!")
 		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
 		return
 	}
 	submissionDate := r.URL.Query().Get("submission_date")
-	lastSub := user.GetLastSubmission()
+	lastSub := user.GetLastWorkWeekSubmission()
 	if submissionDate != "" {
 		submissionDate, err := time.Parse("2006-01-02", submissionDate)
 		if err == nil {
-			lastSub = getMonday(submissionDate)
+			lastSub = helper.GetMonday(submissionDate)
 		}
 	}
-	userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
+	userWeek := models.NewWorkWeek(user, lastSub, true)
 
 	var workWeeks []models.WorkWeek
 	teamMembers, err := user.GetTeamMembers()
@@ -96,40 +79,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.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
-}
-
-func getWeeksTillNow(lastWeek time.Time) []time.Time {
-	var weeks []time.Time
-	if lastWeek.After(time.Now()) {
-		log.Println("Timestamp is after today, no weeks till now!")
-		return weeks
-	}
-	if lastWeek.Weekday() != time.Monday {
-		if lastWeek.Weekday() == time.Sunday {
-			lastWeek = lastWeek.AddDate(0, 0, -6)
-		} else {
-			lastWeek = lastWeek.AddDate(0, 0, -int(lastWeek.Weekday()-1))
-		}
-	}
-	if time.Since(lastWeek) < 24*5*time.Hour {
-		log.Println("Timestamp in running week, cannot split!")
-	}
-
-	for t := lastWeek; t.Before(time.Now()); t = t.Add(7 * 24 * time.Hour) {
-		weeks = append(weeks, t)
-	}
-	log.Println(weeks)
-	return weeks
-}
-
-func getMonday(ts time.Time) time.Time {
-	if ts.Weekday() != time.Monday {
-		if ts.Weekday() == time.Sunday {
-			ts = ts.AddDate(0, 0, -6)
-		} else {
-			ts = ts.AddDate(0, 0, -int(ts.Weekday()-1))
-		}
-	}
-	return ts
+	templates.TeamPage([]models.WorkWeek{userWeek, userWeek}, userWeek).Render(r.Context(), w)
 }

Backend/endpoints/team_presence.go

@@ -8,25 +8,22 @@ import (
 	"net/http"
 )
 
-func TeamPresenceHandler(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 {
 	case http.MethodGet:
 		teamPresence(w, r)
-		break
 	case http.MethodOptions:
 		// just support options header for non GET Requests from SWAGGER
 		w.WriteHeader(http.StatusOK)
-		break
 	default:
 		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		break
 	}
 }
 
-func teamPresence(w http.ResponseWriter, r *http.Request){
-	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+func teamPresence(w http.ResponseWriter, r *http.Request) {
+	user, err := models.GetUserFromSession(Session, r.Context())
 	if err != nil {
 		log.Println("Error getting user!", err)
 	}
@@ -37,8 +34,7 @@ func teamPresence(w http.ResponseWriter, r *http.Request){
 		teamPresence[present] = append(teamPresence[present], user)
 	}
 
-
-	if(err != nil){
+	if err != nil {
 		log.Println("Error getting team", err)
 	}
 	templates.TeamPresencePage(teamPresence).Render(r.Context(), w)

Backend/endpoints/time-create.go

@@ -16,24 +16,20 @@ func TimeCreateHandler(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodPut:
 		createBooking(w, r)
-		break
 	case http.MethodGet:
 		createBooking(w, r)
-		break
 	case http.MethodOptions:
 		// just support options header for non GET Requests from SWAGGER
 		w.WriteHeader(http.StatusOK)
-		break
 	default:
 		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		break
 	}
 }
 
 // Creates a booking from the http query params -> no body needed
 // after that entry wi'll be written to database and the booking is returned as json
 func createBooking(w http.ResponseWriter, r *http.Request) {
-	if !checkPassword(r) {
+	if !verifyToken(r) {
 		log.Println("Wrong or no API key provided!")
 		http.Error(w, "Wrong or no API key provided", http.StatusUnauthorized)
 		return
@@ -54,20 +50,20 @@ func createBooking(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusAccepted)
 		json.NewEncoder(w).Encode(booking)
+		return
 	}
-	w.WriteHeader(http.StatusBadRequest)
+	http.Error(w, "Cannot verify booking, maybe missing a parameter", http.StatusBadRequest)
 }
 
-func checkPassword(r *http.Request) bool {
+func verifyToken(r *http.Request) bool {
 	authToken := helper.GetEnv("API_TOKEN", "dont_access")
 	authHeaders := r.Header.Get("Authorization")
-	_authStart := len("Bearer ")
-	if len(authHeaders) <= _authStart {
+	if len(authHeaders) <= 7 { //len "Bearer "
 		authHeaders = r.URL.Query().Get("api_key")
-		_authStart = 0
-		if len(authHeaders) <= _authStart {
+		if len(authHeaders) <= 0 {
 			return false
 		}
+		return authToken == authHeaders
 	}
-	return authToken == authHeaders[_authStart:]
+	return authToken == authHeaders[7:]
 }

Backend/endpoints/time.go

@@ -5,6 +5,7 @@ import (
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"context"
+	"database/sql"
 	"encoding/json"
 	"log"
 	"net/http"
@@ -20,35 +21,47 @@ func TimeHandler(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodGet:
 		getBookings(w, r)
-		break
 	case http.MethodPost:
 		updateBooking(w, r)
-		break
 	case http.MethodOptions:
 		// just support options header for non GET Requests from SWAGGER
 		w.WriteHeader(http.StatusOK)
-		break
 	default:
 		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		break
 	}
 }
 
-func parseTimestamp(r *http.Request, get_key string, fallback string) (time.Time, error) {
-	_timestamp_get := r.URL.Query().Get(get_key)
-	if _timestamp_get == "" {
-		_timestamp_get = fallback
+func AbsencHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	helper.SetCors(w)
+	switch r.Method {
+	case http.MethodPost:
+		err := updateAbsence(r)
+		if err != nil {
+			http.Error(w, "Internal error", http.StatusInternalServerError)
+			return
 		}
-	timestamp_get, err := time.Parse("2006-01-02", _timestamp_get)
+		http.Redirect(w, r, "/time", 301)
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+	}
+}
+
+func parseTimestamp(r *http.Request, getKey string, fallback string) (time.Time, error) {
+	getTimestamp := r.URL.Query().Get(getKey)
+	if getTimestamp == "" {
+		getTimestamp = fallback
+	}
+	Timestamp, err := time.Parse("2006-01-02", getTimestamp)
 	if err != nil {
 		return time.Now(), err
 	}
-	return timestamp_get, nil
+	return Timestamp, nil
 }
 
 // Returns bookings from DB with similar card uid -> checks for card uid in http query params
 func getBookings(w http.ResponseWriter, r *http.Request) {
-	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	user, err := models.GetUserFromSession(Session, r.Context())
 	if err != nil {
 		log.Println("No user found with the given personal number!")
 		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
@@ -70,20 +83,35 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 	}
 	tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside
 
-	workDays := (*models.WorkDay).GetWorkDays(nil, user.CardUID, tsFrom, tsTo)
-	sort.Slice(workDays, func(i, j int) bool {
-		return workDays[i].Day.After(workDays[j].Day)
+	days := models.GetDays(user, tsFrom, tsTo, true)
+	sort.Slice(days, func(i, j int) bool {
+		return days[i].Date().After(days[j].Date())
 	})
 
+	lastSub := user.GetLastWorkWeekSubmission()
+	var aggregatedOvertime time.Duration
+	for _, day := range days {
+		if day.Date().Before(lastSub) {
+			continue
+		}
+		aggregatedOvertime += day.TimeOvertimeReal(user)
+	}
+	if reportedOvertime, err := user.GetReportedOvertime(); err == nil {
+		user.Overtime = (reportedOvertime + aggregatedOvertime).Round(time.Minute)
+	} else {
+		log.Println("Cannot calculate overtime: ", err)
+	}
+
 	if r.Header.Get("Accept") == "application/json" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(workDays)
+		json.NewEncoder(w).Encode(days)
 		return
 	}
 
 	ctx := context.WithValue(r.Context(), "user", user)
-	templates.TimePage(workDays).Render(ctx, w)
+	ctx = context.WithValue(ctx, "days", days)
+	templates.TimePage([]models.WorkDay{}, lastSub).Render(ctx, w)
 }
 
 func updateBooking(w http.ResponseWriter, r *http.Request) {
@@ -94,7 +122,7 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 		log.Println("Error loading location", err)
 		loc = time.Local
 	}
-	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	user, err := models.GetUserFromSession(Session, r.Context())
 	if err != nil {
 		log.Println("No user found!", err)
 		return
@@ -114,13 +142,12 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		newBooking := (*models.Booking).New(nil, user.CardUID, 0, int16(check_in_out))
+		newBooking := (*models.Booking).New(nil, user.CardUID, 0, int16(check_in_out), 1)
 		newBooking.Timestamp = timestamp
-		err = newBooking.InsertTimestamp()
+		err = newBooking.InsertWithTimestamp()
 		if err != nil {
-			log.Println("Error inserting booking", err)
+			log.Printf("Error inserting booking %v -> %v\n", newBooking, err)
 		}
-		break
 	case "change":
 		absenceType, err := strconv.Atoi(r.FormValue("absence"))
 		if err != nil {
@@ -151,10 +178,86 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 				booking.UpdateTime(parsedTime)
 			}
 		}
-		break
+	}
+	getBookings(w, r)
+}
+
+func updateAbsence(r *http.Request) error {
+	r.ParseForm()
+	var loc *time.Location
+	loc, err := time.LoadLocation(helper.GetEnv("TZ", "Europe/Berlin"))
+	if err != nil {
+		log.Println("Error loading location", err)
+		loc = time.Local
 	}
 
-	getBookings(w, r)
+	dateFrom, err := time.ParseInLocation("2006-01-02", r.FormValue("date_from"), loc)
+	if err != nil {
+		log.Println("Error parsing date_from input for absence", err)
+		return err
+	}
+
+	dateTo, err := time.ParseInLocation("2006-01-02", r.FormValue("date_to"), loc)
+	if err != nil {
+		log.Println("Error parsing date_to input for absence", err)
+		return err
+	}
+
+	absenceTypeId, err := strconv.Atoi(r.FormValue("aw_type"))
+	if err != nil {
+		log.Println("Error parsing aw_type", err)
+		return err
+	}
+
+	absenceId, err := strconv.Atoi(r.FormValue("aw_id"))
+	if err != nil && r.FormValue("aw_id") == "" {
+		absenceId = 0
+	} else if err != nil {
+		log.Println("Error parsing aw_id", err)
+		return err
+	}
+
+	absenceType, err := models.GetAbsenceTypeById(int8(absenceTypeId))
+	if err != nil {
+		log.Println("No matching absence type found!")
+		return err
+	}
+
+	newAbsence := models.Absence{DateFrom: dateFrom, DateTo: dateTo, AbwesenheitTyp: absenceType}
+
+	absence, err := models.GetAbsenceById(absenceId)
+	if err == sql.ErrNoRows {
+		err = nil
+		log.Println("Absence not found creating new!")
+
+		user, err := models.GetUserFromSession(Session, r.Context())
+		if err != nil {
+			log.Println("No user found!", err)
+			return err
+		}
+		newAbsence.CardUID = user.CardUID
+		newAbsence.Insert()
+	}
+	if err != nil {
+		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()
+		if err != nil {
+			log.Println("Error saving updated absence!", err)
+			return err
+		}
+	}
+	return nil
+
 }
 
 func createAbsence(absenceType int, user models.User, loc *time.Location, r *http.Request) {
@@ -163,89 +266,15 @@ func createAbsence(absenceType int, user models.User, loc *time.Location, r *htt
 		log.Println("Cannot get date from input! Skipping absence creation", err)
 		return
 	}
-	absence := models.NewAbsence(user.CardUID, int8(absenceType), absenceDate)
+
+	absence, err := models.NewAbsence(user.CardUID, absenceType, absenceDate)
+	if err != nil {
+		log.Println("Error creating absence!", err)
+		return
+	}
 	err = absence.Insert()
 	if err != nil {
 		log.Println("Error inserting absence!", err)
 		return
 	}
 }
-
-func getBookingsAPI(w http.ResponseWriter, r *http.Request) {
-	_user_pn := r.URL.Query().Get("personal_nummer")
-	user_pn, err := strconv.Atoi(_user_pn)
-	if err != nil {
-		log.Println("No personal numver found!")
-		http.Error(w, "No personal number found", http.StatusBadRequest)
-		return
-	}
-
-	user, err := (*models.User).GetByPersonalNummer(nil, user_pn)
-	if err != nil {
-		log.Println("No user found with the given personal number!")
-		http.Error(w, "No user found", http.StatusNotFound)
-		return
-	}
-
-	// TODO add config for timeoffset
-	tsFrom, err := parseTimestamp(r, "time_from", time.Now().AddDate(0, -1, 0).Format("2006-01-02"))
-	if err != nil {
-		log.Println("Error parsing 'from' time", err)
-		http.Error(w, "Timestamp 'from' cannot be parsed!", http.StatusBadRequest)
-		return
-	}
-	tsTo, err := parseTimestamp(r, "time_to", time.Now().Format("2006-01-02"))
-	if err != nil {
-		log.Println("Error parsing 'to' time", err)
-		http.Error(w, "Timestamp 'to' cannot be parsed!", http.StatusBadRequest)
-		return
-	}
-	tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside
-
-	bookings, err := (*models.Booking).GetBookingsGrouped(nil, user.CardUID, tsFrom, tsTo)
-	if err != nil {
-		log.Println("Error getting bookings: ", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(bookings)
-}
-
-// Updates a booking form the given json body
-func updateBookingAPI(w http.ResponseWriter, r *http.Request) {
-	_booking_id := r.URL.Query().Get("counter_id")
-	if _booking_id == "" {
-		http.Error(w, "Missing bookingID query parameter", http.StatusBadRequest)
-		return
-	}
-	booking_id, err := strconv.Atoi(_booking_id)
-	if err != nil {
-		http.Error(w, "Invalid bookingID query parameter", http.StatusBadRequest)
-		return
-	}
-	bookingDB, err := (*models.Booking).GetBookingById(nil, booking_id)
-	if err != nil {
-		log.Println("Error getting booking: ", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-	var booking models.Booking
-	dec := json.NewDecoder(r.Body)
-	dec.DisallowUnknownFields()
-	err = dec.Decode(&booking)
-	if err != nil {
-		log.Println("Error parsing booking: ", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-	if booking.CounterId != 0 && booking.CounterId != bookingDB.CounterId {
-		log.Println("Booking Ids do not match")
-		http.Error(w, "Booking Ids do not match", http.StatusBadRequest)
-		return
-	}
-	bookingDB.Update(booking)
-	bookingDB.Save()
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(bookingDB)
-}

Backend/endpoints/user-session.go

@@ -1,7 +1,6 @@
 package endpoints
 
 import (
-	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"context"
@@ -21,67 +20,55 @@ func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
 	return Session
 }
 
-func LoginHandler(w http.ResponseWriter, r *http.Request) {
-	switch r.Method {
-	case http.MethodGet:
-		showLoginPage(w, r, false)
-		break
-	case http.MethodPost:
-		loginUser(w, r)
-		break
-	default:
-		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		break
-	}
-}
-
-func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
+func showLoginPage(w http.ResponseWriter, r *http.Request, success bool, errorMsg string) {
 	r = r.WithContext(context.WithValue(r.Context(), "session", Session))
-	if helper.GetEnv("GO_ENV", "production") == "debug" {
-		// http.Redirect(w, r, "/time", http.StatusSeeOther)
-		templates.LoginPage(failed).Render(r.Context(), w)
-	}
 	if Session.Exists(r.Context(), "user") {
 		http.Redirect(w, r, "/time", http.StatusSeeOther)
 	}
-	templates.LoginPage(failed).Render(r.Context(), w)
+	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)
-		http.Error(w, "Internal error", http.StatusBadRequest)
+		showLoginPage(w, r, false, "Internal error!")
 		return
 	}
 	_personal_nummer := r.FormValue("personal_nummer")
 	if _personal_nummer == "" {
 		log.Println("No personal_nummer provided!")
-		http.Error(w, "No personal_nummer provided", http.StatusBadRequest)
+		showLoginPage(w, r, false, "Keine Personalnummer gesetzt.")
 		return
 	}
 	personal_nummer, err := strconv.Atoi(_personal_nummer)
 	if err != nil {
 		log.Println("Cannot parse personal nubmer!")
-		http.Error(w, "Cannot parse number", http.StatusBadRequest)
+		showLoginPage(w, r, false, "Personalnummer ist nicht valide gesetzt.")
 		return
 	}
-
-	user, err := (*models.User).GetByPersonalNummer(nil, personal_nummer)
+	user, err := models.GetUserByPersonalNr(personal_nummer)
 	if err != nil {
-		log.Println("No user found under this personal number!")
-		http.Error(w, "No user found!", http.StatusNotFound)
+		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!\n", user.Vorname, user.Name)
+		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
-	} else {
-		showLoginPage(w, r, true)
-		return
 	}
-	showLoginPage(w, r, false)
-	return
+	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,36 +1,12 @@
 package endpoints
 
 import (
-	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"log"
 	"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)
-		break
-	case http.MethodPost:
-		switch r.FormValue("action") {
-		case "change-pass":
-			changePassword(w, r)
-			break
-		case "logout-user":
-			logoutUser(w, r)
-			break
-		}
-
-		break
-	default:
-		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		break
-	}
-}
-
 // change user password and store salted hash in db
 func changePassword(w http.ResponseWriter, r *http.Request) {
 	err := r.ParseForm()
@@ -45,7 +21,7 @@ func changePassword(w http.ResponseWriter, r *http.Request) {
 		showUserPage(w, r, http.StatusBadRequest)
 		return
 	}
-	user, err := (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
+	user, err := models.GetUserByPersonalNr(Session.GetInt(r.Context(), "user"))
 	if err != nil {
 		log.Println("Error getting user!", err)
 		showUserPage(w, r, http.StatusBadRequest)
@@ -61,16 +37,6 @@ func changePassword(w http.ResponseWriter, r *http.Request) {
 	showUserPage(w, r, http.StatusUnauthorized)
 }
 
-func logoutUser(w http.ResponseWriter, r *http.Request) {
-
-	err := Session.Destroy(r.Context())
-	if err != nil {
-		log.Println("Error destroying session!", err)
-	}
-	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
-}
-
 func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
 	templates.UserPage(status).Render(r.Context(), w)
-	return
 }

Backend/endpoints/user.go

@@ -0,0 +1,45 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"net/http"
+)
+
+func UserHandler(w http.ResponseWriter, r *http.Request) {
+	switch r.PathValue("action") {
+	case "login":
+		LoginHandler(w, r)
+	case "settings":
+		UserSettingsHandler(w, r)
+	case "logout":
+		logoutUser(w, r)
+	}
+}
+
+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)
+	}
+}
+
+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)
+	}
+}

Backend/go.mod

@@ -1,13 +1,21 @@
 module arbeitszeitmessung
 
-go 1.23
-
-toolchain go1.23.6
+go 1.24.7
 
 require github.com/lib/pq v1.10.9
 
-require github.com/a-h/templ v0.3.833
+require github.com/a-h/templ v0.3.943
 
 require github.com/alexedwards/scs/v2 v2.8.0
 
-require github.com/joho/godotenv v1.5.1
+require (
+	github.com/golang-migrate/migrate/v4 v4.18.3
+	github.com/joho/godotenv v1.5.1
+)
+
+require (
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+)

Backend/go.sum

@@ -1,10 +1,74 @@
-github.com/a-h/templ v0.3.833 h1:L/KOk/0VvVTBegtE0fp2RJQiBm7/52Zxv5fqlEHiQUU=
-github.com/a-h/templ v0.3.833/go.mod h1:cAu4AiZhtJfBjMY0HASlyzvkrtjnHWPeEsyGK2YYmfk=
+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/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.943 h1:o+mT/4yqhZ33F3ootBiHwaY4HM5EVaOJfIshvd5UNTY=
+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/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=
+github.com/dhui/dktest v0.4.5 h1:uUfYBIVREmj/Rw6MvgmqNAYzTiKOHJak+enB5Di73MM=
+github.com/dhui/dktest v0.4.5/go.mod h1:tmcyeHDKagvlDrz7gDKq4UAJOLIfVZYkfD5OnHDwcCo=
+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
+github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4=
+github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-migrate/migrate/v4 v4.18.3 h1:EYGkoOsvgHHfm5U/naS1RP/6PL/Xv3S4B/swMiAmDLs=
+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/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=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+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/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=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
+github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
+github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+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=
+go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
+go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
+go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
+go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
+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/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

Backend/helper/logs/main.go

@@ -0,0 +1,24 @@
+package logs
+
+import (
+	"log"
+	"os"
+	"time"
+)
+
+type FileLog struct {
+	Logger *log.Logger
+	Close  func() error
+}
+
+var Logs map[string]FileLog = make(map[string]FileLog)
+
+func NewAudit() (i *log.Logger, close func() error) {
+	LOG_FILE := "logs/" + time.Now().Format("2006-01-02") + ".log"
+	logFile, err := os.OpenFile(LOG_FILE, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	if err != nil {
+		log.Panic(err)
+	}
+
+	return log.New(logFile, "", log.LstdFlags), logFile.Close
+}

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_test.go

@@ -0,0 +1,53 @@
+package helper
+
+import (
+	"os"
+	"testing"
+	"time"
+)
+
+func TestGetEnv(t *testing.T) {
+	os.Setenv("GO_TEST_VALUE", "123")
+	env := GetEnv("GO_TEST_VALUE", "")
+	if env != "123" {
+		t.Error("GetEnv() cannot find value")
+	}
+}
+
+func TestGetEnvEmpty(t *testing.T) {
+	env := GetEnv("GO_TEST_NOVALUE", "123")
+	if env != "123" {
+		t.Errorf("GetEnv() did not use default value: want=%s got=%s", "123", env)
+	}
+}
+
+func TestCacheCreate(t *testing.T) {
+	cacheFetch := func(key string) (any, error) {
+		return "123", nil
+	}
+
+	cache := NewCache(1*time.Second, cacheFetch)
+	if cache.ttl != 1*time.Second {
+		t.Error("Error creating cache")
+	}
+}
+
+func TestCacheFunction(t *testing.T) {
+	counter := 1
+	cacheFetch := func(key string) (any, error) {
+		counter += 1
+		return counter, nil
+	}
+
+	cache := NewCache(1*time.Millisecond, cacheFetch)
+	valInit, err := cache.Get("TEST")
+	valCache, err := cache.Get("TEST")
+	time.Sleep(1 * time.Millisecond)
+	valNoCache, err := cache.Get("TEST")
+	if err != nil {
+		t.Errorf("Error getting key from Cache: %e", err)
+	}
+	if valInit != valCache || valCache != 2 || valNoCache != 3 {
+		t.Error("Caching does not resprect ttl.")
+	}
+}

Backend/helper/time.go

@@ -0,0 +1,57 @@
+package helper
+
+import (
+	"fmt"
+	"time"
+)
+
+func GetMonday(ts time.Time) time.Time {
+	if ts.Weekday() != time.Monday {
+		if ts.Weekday() == time.Sunday {
+			return ts.AddDate(0, 0, -6)
+		} else {
+			return ts.AddDate(0, 0, -int(ts.Weekday()-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 {
+	hours := int(d.Abs().Hours())
+	minutes := int(d.Abs().Minutes()) % 60
+	sign := ""
+	if d < 0 {
+		sign = "-"
+	}
+	switch {
+	case hours > 0 && minutes == 0:
+		return fmt.Sprintf("%s%dh", sign, hours)
+	case hours > 0:
+		return fmt.Sprintf("%s%dh %dmin", sign, hours, minutes)
+	case minutes > 0:
+		return fmt.Sprintf("%s%dmin", sign, minutes)
+	default:
+		if fill {
+			return "0min"
+		}
+		return ""
+	}
+}
+
+func IsSameDate(a, b time.Time) bool {
+	return a.Truncate(24 * time.Hour).Equal(b.Truncate(24 * time.Hour))
+}

Backend/helper/time_test.go

@@ -0,0 +1,37 @@
+package helper
+
+import (
+	"testing"
+	"time"
+)
+
+func TestGetMonday(t *testing.T) {
+	isMonday, err := time.Parse("2006-01-02", "2025-07-14")
+	notMonday, err := time.Parse("2006-01-02", "2025-07-16")
+	if err != nil || isMonday.Equal(notMonday) {
+		t.Errorf("U stupid? %e", err)
+	}
+	if GetMonday(isMonday) != isMonday || GetMonday(notMonday) != isMonday {
+		t.Error("Wrong date conversion!")
+	}
+}
+
+func TestFormatDuration(t *testing.T) {
+	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 _, d := range durations {
+		t.Run(d.name, func(t *testing.T) {
+			if FormatDuration(d.duration) != d.name {
+				t.Error("Format missmatch in Formatduration.")
+			}
+		})
+	}
+}

Backend/main.go

@@ -22,7 +22,7 @@ func main() {
 	if err != nil {
 		log.Println("No .env file found in directory!")
 	}
-	if(helper.GetEnv("GO_ENV", "production") == "debug") {
+	if helper.GetEnv("GO_ENV", "production") == "debug" {
 		log.Println("Debug mode enabled")
 		log.Println("Environment Variables")
 		envs := os.Environ()
@@ -31,13 +31,10 @@ func main() {
 		}
 	}
 
-
-
 	models.DB, err = OpenDatabase()
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer models.DB.Close()
 
 	fs := http.FileServer(http.Dir("./static"))
 	endpoints.CreateSessionManager(24 * time.Hour)
@@ -46,12 +43,15 @@ func main() {
 
 	// handles the different http routes
 	server.HandleFunc("/time/new", endpoints.TimeCreateHandler)
+	server.Handle("/absence", ParamsMiddleware(endpoints.AbsencHandler))
 	server.Handle("/time", ParamsMiddleware(endpoints.TimeHandler))
 	server.HandleFunc("/logout", endpoints.LogoutHandler)
-	server.HandleFunc("/user/login", endpoints.LoginHandler)
-	server.HandleFunc("/user/settings", endpoints.UserSettingsHandler)
+	server.HandleFunc("/user/{action}", endpoints.UserHandler)
+	// server.HandleFunc("/user/login", endpoints.LoginHandler)
+	// server.HandleFunc("/user/settings", endpoints.UserSettingsHandler)
 	server.HandleFunc("/team", endpoints.TeamHandler)
 	server.HandleFunc("/team/presence", endpoints.TeamPresenceHandler)
+	server.HandleFunc("/pdf", endpoints.PDFHandler)
 	server.Handle("/", http.RedirectHandler("/time", http.StatusPermanentRedirect))
 	server.Handle("/static/", http.StripPrefix("/static/", fs))
 

Backend/models/absence.go

@@ -1,61 +1,107 @@
 package models
 
 import (
+	"encoding/json"
+	"errors"
 	"log"
 	"time"
 )
 
 type AbsenceType struct {
-	Value int8
-	Label string
-}
-
-const (
-	AbsenceNone int8 = iota
-	AbsenceUrlaub
-	AbsenceKurzarbeit
-	AbsenceKrank
-	AbsenceKindkrank
-)
-
-var AbsenceTypes = []AbsenceType{
-	// {Value: AbsenceNone, Label: "Abwesenheit"},
-	{Value: AbsenceUrlaub, Label: "Urlaub"},
-	{Value: AbsenceKurzarbeit, Label: "Kurzarbeit"},
-	{Value: AbsenceKrank, Label: "Krank"},
-	{Value: AbsenceKindkrank, Label: "Kindkrank"},
-}
-
-var AbsenceTypesLabel = map[int8]string{
-	0:                 "None",
-	AbsenceUrlaub:     "Urlaub",
-	AbsenceKurzarbeit: "Kurzarbeit",
-	AbsenceKrank:      "Krank",
-	AbsenceKindkrank:  "Kindkrank",
+	Id       int8   `json:"abwesenheit_id"`
+	Name     string `json:"abwesenheit_name"`
+	WorkTime int8   `json:"arbeitszeit_equivalent"`
 }
 
 type Absence struct {
+	Day            time.Time
 	CounterId      int
 	CardUID        string
-	AbwesenheitTyp int8
-	Datum          time.Time
+	AbwesenheitTyp AbsenceType
+	DateFrom       time.Time
+	DateTo         time.Time
 }
 
-func NewAbsence(card_uid string, abwesenheit_typ int8, datum time.Time) Absence {
+func NewAbsence(card_uid string, abwesenheit_typ int, datum time.Time) (Absence, error) {
+	if abwesenheit_typ < 0 {
 		return Absence{
 			CardUID:        card_uid,
-		AbwesenheitTyp: abwesenheit_typ,
-		Datum:          datum,
+			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) 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 "Abwesenheit"
+}
+
+func (a *Absence) IsWorkDay() bool {
+	return false
+}
+
+func (a *Absence) IsKurzArbeit() bool {
+	return false
+}
+
+func (a *Absence) GetDayProgress(u User) int8 {
+	return 100
+}
+
+func (a *Absence) RequiresAction() bool {
+	return false
+}
+
+func (a *Absence) GetAllWorkTimesVirtual(u User) (work, pause, overtime time.Duration) {
+	if a.AbwesenheitTyp.WorkTime > 1 {
+		return u.ArbeitszeitProTag(), 0, 0
+	}
+	return 0, 0, 0
 }
 
 func (a *Absence) Insert() error {
-	qStr, err := DB.Prepare(`INSERT INTO abwesenheit (card_uid, abwesenheit_typ, datum) VALUES ($1, $2, $3) RETURNING counter_id;`)
+	qStr, err := DB.Prepare(`INSERT INTO abwesenheit (card_uid, abwesenheit_typ, datum_from, datum_to) VALUES ($1, $2, $3, $4) RETURNING counter_id;`)
 	if err != nil {
 		log.Println("Error preparing sql Statement", err)
 		return err
 	}
-	err = qStr.QueryRow(a.CardUID, a.AbwesenheitTyp, a.Datum).Scan(&a.CounterId)
+	defer qStr.Close()
+	err = qStr.QueryRow(a.CardUID, a.AbwesenheitTyp.Id, a.DateFrom, a.DateTo).Scan(&a.CounterId)
 	if err != nil {
 		log.Println("Error executing insert statement", err)
 		return err
@@ -63,6 +109,156 @@ func (a *Absence) Insert() error {
 	return nil
 }
 
-func (a *Absence) GetStringType() string {
-	return AbsenceTypesLabel[a.AbwesenheitTyp]
+func (a *Absence) Save() error {
+	qStr, err := DB.Prepare(`
+		UPDATE abwesenheit SET card_uid = $2, abwesenheit_typ = $3, datum_from = $4, datum_to = $5 WHERE counter_id = $1;
+	`)
+	if err != nil {
+		log.Println("Error preparing sql Statement (Absence Save)", err)
+		return err
+	}
+	defer qStr.Close()
+	_, err = qStr.Query(a.CounterId, a.CardUID, a.AbwesenheitTyp.Id, a.DateFrom, a.DateTo)
+	if err != nil {
+		log.Println("Error executing update statement", err)
+		return err
+	}
+	return nil
+}
+
+func GetAbsenceById(counterId int) (Absence, error) {
+	var absence Absence = Absence{CounterId: counterId}
+	qStr, err := DB.Prepare("SELECT card_uid, abwesenheit_typ, datum_from, datum_to FROM abwesenheit WHERE counter_id = $1;")
+	if err != nil {
+		return absence, err
+	}
+	defer qStr.Close()
+	err = qStr.QueryRow(counterId).Scan(&absence.CardUID, &absence.AbwesenheitTyp.Id, &absence.DateFrom, &absence.DateTo)
+	if err != nil {
+		return absence, err
+	}
+	return absence, nil
+}
+
+func GetAbsencesByCardUID(card_uid string, tsFrom time.Time, tsTo time.Time) ([]Absence, error) {
+	var absences []Absence
+	// qStr, err := DB.Prepare(`SELECT counter_id, abwesenheit_typ, datum_from, datum_to FROM abwesenheit WHERE card_uid = $1 AND datum_from <= $2 AND datum_to >= $3 ORDER BY datum_from;`)
+	qStr, err := DB.Prepare(`
+	SELECT
+	    ab.counter_id,
+	    gs::DATE AS work_date,
+	    ab.card_uid,
+	    ab.datum_from,
+	    ab.datum_to,
+	    jsonb_build_object(
+	        'abwesenheit_id', sat.abwesenheit_id,
+	        'abwesenheit_name', sat.abwesenheit_name,
+	        'arbeitszeit_equivalent', sat.arbeitszeit_equivalent
+	    ) AS abwesenheit_info
+	FROM generate_series(
+	        $2,
+	        $3,
+	        INTERVAL '1 day'
+	    ) gs
+	JOIN abwesenheit ab
+	  ON ab.card_uid = $1
+	 AND ab.datum_from::DATE <= gs::DATE
+	 AND ab.datum_to::DATE >= gs::DATE
+	LEFT JOIN s_abwesenheit_typen sat
+	  ON ab.abwesenheit_typ = sat.abwesenheit_id
+	ORDER BY gs::DATE, ab.counter_id;
+	`)
+	if err != nil {
+		return absences, err
+	}
+	defer qStr.Close()
+	rows, err := qStr.Query(card_uid, tsFrom, tsTo)
+	if err != nil {
+		return absences, err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var absence Absence
+		var abwesenheitsTyp []byte
+		if err := rows.Scan(&absence.CounterId, &absence.Day, &absence.CardUID, &absence.DateFrom, &absence.DateTo, &abwesenheitsTyp); err != nil {
+			return absences, err
+		}
+		err = json.Unmarshal(abwesenheitsTyp, &absence.AbwesenheitTyp)
+		if err != nil {
+			log.Println("Error parsing abwesenheitsTyp to JSON!", err)
+			return absences, nil
+		}
+		absences = append(absences, absence)
+	}
+	if err = rows.Err(); err != nil {
+		return absences, err
+	}
+	return absences, nil
+}
+
+func (a *Absence) Update(na Absence) bool {
+	change := false
+	if a.CardUID != na.CardUID && na.CardUID != "" {
+		a.CardUID = na.CardUID
+		change = true
+	}
+	if a.AbwesenheitTyp != na.AbwesenheitTyp && na.AbwesenheitTyp.Id != 0 {
+		a.AbwesenheitTyp = na.AbwesenheitTyp
+		change = true
+	}
+	if !a.DateFrom.Equal(na.DateFrom) && !na.DateFrom.IsZero() {
+		a.DateFrom = na.DateFrom
+		change = true
+	}
+	if !a.DateTo.Equal(na.DateTo) && !na.DateTo.IsZero() {
+		a.DateTo = na.DateTo
+		change = true
+	}
+	return change
+}
+
+func GetAbsenceTypes() (map[int8]AbsenceType, error) {
+	var types = make(map[int8]AbsenceType)
+	qStr, err := DB.Prepare("SELECT abwesenheit_id, abwesenheit_name, arbeitszeit_equivalent FROM s_abwesenheit_typen;")
+	if err != nil {
+		return types, err
+	}
+	defer qStr.Close()
+	rows, err := qStr.Query()
+	if err != nil {
+		log.Println("Error getting abwesenheit rows!", err)
+		return types, err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var absenceType AbsenceType
+		if err := rows.Scan(&absenceType.Id, &absenceType.Name, &absenceType.WorkTime); err != nil {
+			log.Println("Error scanning absence row!", err)
+		}
+		types[absenceType.Id] = absenceType
+	}
+	return types, nil
+}
+
+func GetAbsenceTypesCached() map[int8]AbsenceType {
+	types, err := definedTypes.Get("s_abwesenheit_typen")
+	if err != nil {
+		return map[int8]AbsenceType{}
+	}
+	return types.(map[int8]AbsenceType)
+}
+
+func GetAbsenceTypeById(absenceTypeId int8) (AbsenceType, error) {
+	var absenceType AbsenceType = AbsenceType{Id: absenceTypeId}
+
+	qStr, err := DB.Prepare("SELECT abwesenheit_name, arbeitszeit_equivalent FROM s_abwesenheit_typen WHERE abwesenheit_id = $1;")
+	if err != nil {
+		return absenceType, err
+	}
+	defer qStr.Close()
+	err = qStr.QueryRow(absenceTypeId).Scan(&absenceType.Name, &absenceType.WorkTime)
+	if err != nil {
+		return absenceType, err
+	}
+	return absenceType, nil
 }

Backend/models/booking.go

@@ -2,17 +2,22 @@ package models
 
 import (
 	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/helper/logs"
 	"database/sql"
 	"fmt"
 	"log"
 	"net/url"
-	"sort"
 	"strconv"
 	"time"
 )
 
 type SameBookingError struct{}
 
+type BookingType struct {
+	Id   int8   `json:"anwesenheit_id"`
+	Name string `json:"anwesenheit_name"`
+}
+
 func (e SameBookingError) Error() string {
 	return "the same booking already exists!"
 }
@@ -23,35 +28,62 @@ type Booking struct {
 	CheckInOut  int16       `json:"check_in_out"`
 	Timestamp   time.Time   `json:"timestamp"`
 	CounterId   int         `json:"counter_id"`
+	BookingType BookingType `json:"anwesenheit_typ"`
 }
 
-var DB *sql.DB
+type IDatabase interface {
+	Prepare(query string) (*sql.Stmt, error)
+	Exec(query string, args ...any) (sql.Result, error)
+}
 
-func (b *Booking) New(card_uid string, geraet_id int16, check_in_out int16) Booking {
+var DB IDatabase
+
+func (b *Booking) New(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)
+	}
 	return Booking{
-		CardUID:    card_uid,
-		GeraetID:   geraet_id,
-		CheckInOut: check_in_out,
+		CardUID:     cardUid,
+		GeraetID:    gereatId,
+		CheckInOut:  checkInOut,
+		BookingType: bookingType,
 	}
 }
 
 func (b *Booking) FromUrlParams(params url.Values) Booking {
 	var booking Booking
+
 	if _check_in_out, err := strconv.Atoi(params.Get("check_in_out")); err == nil {
 		booking.CheckInOut = int16(_check_in_out)
 	}
 	if _geraet_id, err := strconv.Atoi(params.Get("geraet_id")); err == nil {
 		booking.GeraetID = int16(_geraet_id)
 	}
+	if _booking_type, err := strconv.Atoi(params.Get("booking_type")); err == nil {
+		booking.BookingType.Id = int8(_booking_type)
+	}
 	booking.CardUID = params.Get("card_uid")
+
 	return booking
 }
 
 func (b *Booking) Verify() bool {
 	//check for overlapping time + arbeitszeit verstoß
 	if b.CardUID == "" { //|| b.GeraetID == 0 || b.CheckInOut == 0 {
+		log.Println("Booking verify failed invalid CardUID!")
 		return false
 	}
+	if b.CheckInOut == 0 {
+		log.Println("Booking verify failed invalid CheckInOut!")
+		return false
+	}
+	if bookingType, err := GetBookingTypeById(b.BookingType.Id); err != nil {
+		log.Println("Booking verify failed invalid BookingType.Id!")
+		return false
+	} else {
+		b.BookingType.Name = bookingType.Name
+	}
 	return true
 }
 
@@ -59,26 +91,26 @@ func (b *Booking) Insert() error {
 	if !checkLastBooking(*b) {
 		return SameBookingError{}
 	}
-	stmt, err := DB.Prepare((`INSERT INTO anwesenheit (card_uid, geraet_id, check_in_out) VALUES ($1, $2, $3) RETURNING counter_id, timestamp`))
+	stmt, err := DB.Prepare((`INSERT INTO anwesenheit (card_uid, geraet_id, check_in_out, anwesenheit_typ) VALUES ($1, $2, $3, $4) RETURNING counter_id, timestamp`))
 	if err != nil {
 		return err
 	}
-	err = stmt.QueryRow(b.CardUID, b.GeraetID, b.CheckInOut).Scan(&b.CounterId, &b.Timestamp)
+	err = stmt.QueryRow(b.CardUID, b.GeraetID, b.CheckInOut, b.BookingType.Id).Scan(&b.CounterId, &b.Timestamp)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (b *Booking) InsertTimestamp() error {
+func (b *Booking) InsertWithTimestamp() error {
 	if b.Timestamp.IsZero() {
 		return b.Insert()
 	}
-	stmt, err := DB.Prepare((`INSERT INTO anwesenheit (card_uid, geraet_id, check_in_out, timestamp) VALUES ($1, $2, $3, $4) RETURNING counter_id`))
+	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
 	}
-	err = stmt.QueryRow(b.CardUID, b.GeraetID, b.CheckInOut, b.Timestamp).Scan(&b.CounterId)
+	err = stmt.QueryRow(b.CardUID, b.GeraetID, b.CheckInOut, b.BookingType.Id, b.Timestamp).Scan(&b.CounterId)
 	if err != nil {
 		return err
 	}
@@ -87,18 +119,15 @@ func (b *Booking) InsertTimestamp() error {
 
 func (b *Booking) GetBookingById(booking_id int) (Booking, error) {
 	var booking Booking
-	qStr, err := DB.Prepare((`SELECT counter_id, timestamp, card_uid, geraet_id, check_in_out FROM anwesenheit WHERE counter_id = $1`))
+	qStr, err := DB.Prepare((`SELECT counter_id, timestamp, card_uid, geraet_id, check_in_out, anwesenheit_typ FROM anwesenheit WHERE counter_id = $1`))
 	if err != nil {
 		return booking, err
 	}
-	err = qStr.QueryRow(booking_id).Scan(&booking.CounterId, &booking.Timestamp, &booking.CardUID, &booking.GeraetID, &booking.CheckInOut)
+	// TODO: also get booking type name
+	err = qStr.QueryRow(booking_id).Scan(&booking.CounterId, &booking.Timestamp, &booking.CardUID, &booking.GeraetID, &booking.CheckInOut, &booking.BookingType.Id)
 	if err != nil {
 		return booking, err
 	}
-	// if !booking.Verify() {
-	// 	fmt.Printf("Booking verification failed! %d", )
-	// 	return booking, nil
-	// }
 	return booking, nil
 }
 
@@ -133,43 +162,13 @@ func (b *Booking) GetBookingsByCardID(card_uid string, tsFrom time.Time, tsTo ti
 	return bookings, nil
 }
 
-func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo time.Time) ([]WorkDay, error) {
-	var grouped = make(map[string][]Booking)
-	bookings, err := b.GetBookingsByCardID(card_uid, tsFrom, tsTo)
-	if err != nil {
-		log.Println("Failed to get bookings", err)
-		return []WorkDay{}, nil
-	}
-	for _, booking := range bookings {
-		day := booking.Timestamp.Truncate(24 * time.Hour)
-		key := day.Format("2006-01-02")
-		grouped[key] = append(grouped[key], booking)
-	}
-
-	var result []WorkDay
-	for key, bookings := range grouped {
-		day, _ := time.Parse("2006-01-02", key)
-		sort.Slice(bookings, func(i, j int) bool {
-			return bookings[i].Timestamp.Before(bookings[j].Timestamp)
-		})
-		workDay := WorkDay{Day: day, Bookings: bookings}
-		workDay.getWorkTime()
-		result = append(result, workDay)
-	}
-
-	sort.Slice(result, func(i, j int) bool {
-		return result[i].Day.After(result[j].Day)
-	})
-
-	return result, nil
-}
-
 func (b Booking) Save() {
 	qStr, err := DB.Prepare((`UPDATE "anwesenheit" SET "card_uid" = $2, "geraet_id" = $3, "check_in_out" = $4, "timestamp" = $5 WHERE "counter_id" = $1;`))
 	if err != nil {
 		log.Fatalf("Error preparing query: %v", err)
 		return
 	}
+
 	_, err = qStr.Query(b.CounterId, b.CardUID, b.GeraetID, b.CheckInOut, b.Timestamp)
 	if err != nil {
 		log.Fatalf("Error executing query: %v", err)
@@ -202,6 +201,8 @@ func (b *Booking) GetBookingType() string {
 }
 
 func (b *Booking) Update(nb Booking) {
+	auditLog, closeLog := logs.NewAudit()
+	defer closeLog()
 	if b.CheckInOut != nb.CheckInOut && nb.CheckInOut != 0 {
 		b.CheckInOut = nb.CheckInOut
 	}
@@ -212,6 +213,7 @@ 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("15:04"), nb.Timestamp.Format("15:04)"))
 		b.Timestamp = nb.Timestamp
 	}
 }
@@ -252,12 +254,63 @@ func (b *Booking) UpdateTime(newTime time.Time) {
 	if b.CheckInOut == 254 {
 		newBooking.CheckInOut = 4
 	}
-	log.Println("Updating")
 	b.Update(newBooking)
-	b.Verify()
+	// 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 {
-	return fmt.Sprintf("Booking %d: at: %s, as type: %d", b.CounterId, b.Timestamp.Format("15:04"), b.CheckInOut)
+	return fmt.Sprintf("Booking %d: at: %s, CheckInOut: %d, TypeId: %d", b.CounterId, b.Timestamp.Format("15:04"), b.CheckInOut, b.BookingType.Id)
+}
+
+func GetBookingTypes() ([]BookingType, error) {
+	var types []BookingType
+	qStr, err := DB.Prepare("SELECT anwesenheit_id, anwesenheit_name FROM s_anwesenheit_typen;")
+	if err != nil {
+		return types, err
+	}
+	defer qStr.Close()
+	rows, err := qStr.Query()
+	if err != nil {
+		log.Println("Error getting anwesenheit rows!", err)
+		return types, err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var bookingType BookingType
+		if err := rows.Scan(&bookingType.Id, &bookingType.Name); err != nil {
+			log.Println("Error scanning row!", err)
+		}
+		types = append(types, bookingType)
+	}
+	return types, nil
+}
+
+func GetBookingTypeById(bookingTypeId int8) (BookingType, error) {
+	var bookingType BookingType = BookingType{Id: bookingTypeId}
+
+	qStr, err := DB.Prepare("SELECT anwesenheit_name FROM s_anwesenheit_typen WHERE anwesenheit_id = $1;")
+	if err != nil {
+		return bookingType, err
+	}
+	defer qStr.Close()
+	err = qStr.QueryRow(bookingTypeId).Scan(&bookingType.Name)
+	if err != nil {
+		return bookingType, err
+	}
+	return bookingType, nil
+}
+
+func GetBookingTypesCached() []BookingType {
+	types, err := definedTypes.Get("s_anwesenheit_typen")
+	if err != nil {
+		return []BookingType{}
+	}
+	return types.([]BookingType)
 }

Backend/models/booking_test.go

@@ -0,0 +1,47 @@
+package models_test
+
+import (
+	"arbeitszeitmessung/models"
+	"time"
+)
+
+var testBookingType = models.BookingType{
+	Id:   1,
+	Name: "Büro",
+}
+
+var testBookings8hrs = []models.Booking{models.Booking{
+	CardUID:     "aaaa-aaaa",
+	CheckInOut:  1,
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
+	BookingType: testBookingType,
+}, models.Booking{
+	CardUID:     "aaaa-aaaa",
+	CheckInOut:  2,
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 16:00")),
+	BookingType: testBookingType,
+}}
+
+var testBookings6hrs = []models.Booking{models.Booking{
+	CardUID:     "aaaa-aaaa",
+	CheckInOut:  1,
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
+	BookingType: testBookingType,
+}, models.Booking{
+	CardUID:     "aaaa-aaaa",
+	CheckInOut:  2,
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 14:00")),
+	BookingType: testBookingType,
+}}
+
+var testBookings10hrs = []models.Booking{models.Booking{
+	CardUID:     "aaaa-aaaa",
+	CheckInOut:  1,
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
+	BookingType: testBookingType,
+}, models.Booking{
+	CardUID:     "aaaa-aaaa",
+	CheckInOut:  2,
+	Timestamp:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 18:00")),
+	BookingType: testBookingType,
+}}

Backend/models/database.go

@@ -0,0 +1,15 @@
+package models
+
+import (
+	"arbeitszeitmessung/helper"
+)
+
+var definedTypes = helper.NewCache(3600, func(key string) (any, error) {
+	switch key {
+	case "s_abwesenheit_typen":
+		return GetAbsenceTypes()
+	case "s_anwesenheit_typen":
+		return GetBookingTypes()
+	}
+	return nil, nil
+})

Backend/models/db_test.go

@@ -0,0 +1,74 @@
+package models_test
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"database/sql"
+	"fmt"
+	"log"
+	"testing"
+
+	"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"
+)
+
+type DBFixture struct {
+	Database models.IDatabase
+	TX       *sql.Tx
+}
+
+func SetupDBFixture(t *testing.T) *DBFixture {
+	t.Helper()
+	if helper.GetEnv("TEST_SQL", "false") != "true" {
+		t.Skip("Skipping Test because TEST_SQL is not 'true'!")
+	}
+
+	dbHost := helper.GetEnv("POSTGRES_HOST", "localhost")
+	dbPort := helper.GetEnv("POSTGRES_PORT", "5433")
+	dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung")
+	dbUser := helper.GetEnv("POSTGRES_USER", "postgres")
+	dbPassword := helper.GetEnv("POSTGRES_PASSWORD", "password")
+
+	connStr := fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbPort, dbName)
+
+	db, err := sql.Open("postgres", connStr)
+	if err != nil {
+		t.Fatalf("failed to connect to database: %v", err)
+	}
+
+	defer db.Close()
+
+	err = MigrateDB(db, "file://../../migrations")
+	if err != nil && err != migrate.ErrNoChange {
+		t.Fatalf("Failed to migrate database: %v", err)
+	}
+
+	tx, err := db.Begin()
+	if err != nil {
+		t.Fatalf("Failed to start transaction: %v", err)
+	}
+
+	t.Cleanup(func() {
+		tx.Rollback()
+		db.Close()
+	})
+
+	return &DBFixture{
+		Database: tx,
+		TX:       tx,
+	}
+}
+
+func MigrateDB(db *sql.DB, fileUrl string) error {
+	driver, err := postgres.WithInstance(db, &postgres.Config{})
+	if err != nil {
+		log.Fatalln("Error starting migration", err)
+	}
+	m, err := migrate.NewWithDatabaseInstance(
+		fileUrl,
+		"postgres", driver)
+	return m.Up()
+}

Backend/models/user.go

@@ -13,24 +13,26 @@ import (
 )
 
 type User struct {
-	CardUID           string  `json:"card_uid"`
+	CardUID             string  //`json:"card_uid"`
 	Name                string  `json:"name"`
 	Vorname             string  `json:"vorname"`
-	PersonalNummer    int     `json:"personal_nummer"`
-	ArbeitszeitPerTag float32 `json:"arbeitszeit"`
+	PersonalNummer      int     //`json:"personal_nummer"`
+	ArbeitszeitPerTag   float32 //`json:"arbeitszeit_per_tag"`
+	ArbeitszeitPerWoche float32 //`json:"arbeitszeit_per_woche"`
+	Overtime            time.Duration
 }
 
-func (u *User) GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) {
+func GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) {
 	var user User
 	var err error
 	if helper.GetEnv("GO_ENV", "production") == "debug" {
-		user, err = (*User).GetByPersonalNummer(nil, 123)
+		user, err = GetUserByPersonalNr(123)
 	} else {
 		if !Session.Exists(ctx, "user") {
 			log.Println("No user in session storage!")
 			return user, errors.New("No user in session storage!")
 		}
-		user, err = (*User).GetByPersonalNummer(nil, Session.GetInt(ctx, "user"))
+		user, err = GetUserByPersonalNr(Session.GetInt(ctx, "user"))
 	}
 	if err != nil {
 		log.Println("Cannot get user from session!")
@@ -39,8 +41,24 @@ func (u *User) GetUserFromSession(Session *scs.SessionManager, ctx context.Conte
 	return user, nil
 }
 
+// Returns the actual overtime for this moment
+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;")
+	if err != nil {
+		return 0, err
+	}
+	defer qStr.Close()
+	err = qStr.QueryRow(u.PersonalNummer).Scan(&overtime)
+	if err != nil {
+		return 0, err
+	}
+	return overtime, nil
+}
+
 func (u *User) GetAll() ([]User, error) {
-	qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname FROM personal_daten;`))
+	qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname FROM s_personal_daten;`))
 	var users []User
 	if err != nil {
 		fmt.Printf("Error preparing query statement %v\n", err)
@@ -67,6 +85,15 @@ func (u *User) GetAll() ([]User, error) {
 	return users, nil
 }
 
+// Returns the worktime per day rounded to minutes
+func (u *User) ArbeitszeitProTag() time.Duration {
+	return time.Duration(u.ArbeitszeitPerTag * float32(time.Hour)).Round(time.Minute)
+}
+
+func (u *User) ArbeitszeitProWoche() time.Duration {
+	return time.Duration(u.ArbeitszeitPerWoche * float32(time.Hour)).Round(time.Minute)
+}
+
 // Returns true if there is a booking 1 for today -> meaning the user is at work
 // Returns false if there is no booking today or the user is already booked out of the system
 func (u *User) CheckAnwesenheit() bool {
@@ -86,23 +113,23 @@ 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).New(nil, u.CardUID, 0, 254)
+	booking := (*Booking).New(nil, u.CardUID, 0, 254, 1)
 	err := booking.Insert()
 	if err != nil {
-		fmt.Printf("Error inserting booking %v\n", err)
+		fmt.Printf("Error inserting booking %v -> %v\n", booking, err)
 		return err
 	}
 	return nil
 }
 
-func (u *User) GetByPersonalNummer(personalNummer int) (User, error) {
+func GetUserByPersonalNr(personalNummer int) (User, error) {
 	var user User
 
-	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM 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.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag)
+	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag, &user.ArbeitszeitPerWoche)
 
 	if err != nil {
 		return user, err
@@ -146,7 +173,7 @@ func (u *User) ChangePass(password, newPassword string) (bool, error) {
 
 func (u *User) GetTeamMembers() ([]User, error) {
 	var teamMembers []User
-	qStr, err := DB.Prepare(`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE vorgesetzter_pers_nr = $1`)
+	qStr, err := DB.Prepare(`SELECT personal_nummer FROM s_personal_daten WHERE vorgesetzter_pers_nr = $1`)
 	if err != nil {
 		return teamMembers, err
 	}
@@ -158,9 +185,11 @@ func (u *User) GetTeamMembers() ([]User, error) {
 	}
 	defer rows.Close()
 	for rows.Next() {
-		user, err := parseUser(rows)
+		var personalNr int
+		err := rows.Scan(&personalNr)
+		user, err := GetUserByPersonalNr(personalNr)
 		if err != nil {
-			log.Println("Error parsing user!")
+			log.Println("Error getting user!")
 			return teamMembers, err
 		}
 		teamMembers = append(teamMembers, user)
@@ -178,17 +207,6 @@ func (u *User) IsTeamLeader() bool {
 	return len(team) > 0
 }
 
-func (u *User) GetWeek(tsFrom time.Time) WorkWeek {
-	var bookings []WorkDay
-	weekStart := tsFrom.AddDate(0, 0, -1*int(tsFrom.Local().Weekday())-1)
-	bookings, err := (*Booking).GetBookingsGrouped(nil, u.CardUID, weekStart, time.Now())
-	if err != nil {
-		log.Println("Error fetching bookings!")
-		return WorkWeek{WorkDays: bookings}
-	}
-	return WorkWeek{WorkDays: bookings}
-}
-
 // gets the first week, that needs to be submitted
 func (u *User) GetNextWeek() WorkWeek {
 	var week WorkWeek
@@ -205,8 +223,8 @@ func parseUser(rows *sql.Rows) (User, error) {
 	return user, nil
 }
 
-// returns the start of the week, the last submission was made, submission == first booking or last send booking_report to team leader
-func (u *User) GetLastSubmission() time.Time {
+// 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 COALESCE(
@@ -223,10 +241,8 @@ func (u *User) GetLastSubmission() time.Time {
 		log.Println("Error executing query!", err)
 		return lastSub
 	}
-	log.Println("From DB: ", lastSub)
 	lastSub = getMonday(lastSub)
 	lastSub = lastSub.Round(24 * time.Hour)
-	log.Println("After truncate: ", lastSub)
 	return lastSub
 }
 
@@ -234,7 +250,7 @@ func (u *User) GetFromCardUID(card_uid string) (User, error) {
 	user := User{}
 	var err error
 
-	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE card_uid = $1;`))
+	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 {
 		return user, err
 	}

Backend/models/user_test.go

@@ -0,0 +1,60 @@
+package models_test
+
+import (
+	"arbeitszeitmessung/models"
+	"database/sql"
+	"testing"
+)
+
+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()
+	_, err := db.Exec(`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
+		(456, 't', 'Kim', 'Mustermensch', '2003-02-01', '08963', 'Altenburger Str. 44A', 1, 'aaaa-aaaa', 1, 8, 40, '07:00:00', '20:00:00', 0);`)
+	if err != nil {
+		t.Fatal("SetupUserFixture:", err)
+	}
+}
+
+func TestGetUserByPersonalNr(t *testing.T) {
+	tc := SetupDBFixture(t)
+
+	SetupUserFixture(t, tc.Database)
+
+	models.DB = tc.Database
+
+	user, err := models.GetUserByPersonalNr(testUser.PersonalNummer)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if user != testUser {
+		t.Error("Retrieved user not the same as testUser!")
+	}
+
+	_, err = models.GetUserByPersonalNr(000)
+	if err != sql.ErrNoRows {
+		t.Error("Wrong error handling, when retrieving wrong personalnummer")
+	}
+}
+
+func TestCheckAnwesenheit(t *testing.T) {
+	tc := SetupDBFixture(t)
+	models.DB = tc.Database
+	SetupUserFixture(t, tc.Database)
+
+	var actual bool
+
+	if actual = testUser.CheckAnwesenheit(); actual != false {
+		t.Errorf("Checkabwesenheit with no booking should be false but is %t", actual)
+	}
+	tc.Database.Exec("INSERT INTO anwesenheit (timestamp, card_uid, check_in_out, geraet_id, anwesenheit_typ) VALUES (NOW() - INTERVAL '2 minute', 'aaaa-aaaa', 1, 1, 1);")
+	if actual = testUser.CheckAnwesenheit(); actual != true {
+		t.Errorf("Checkabwesenheit with 'kommen' booking should be true but is %t", actual)
+	}
+
+	tc.Database.Exec("INSERT INTO anwesenheit (timestamp, card_uid, check_in_out, geraet_id, anwesenheit_typ) VALUES (NOW() - INTERVAL '1 minute', 'aaaa-aaaa', 2, 1, 1);")
+	if actual = testUser.CheckAnwesenheit(); actual != false {
+		t.Errorf("Checkabwesenheit with 'gehen' booking should be false but is %t", actual)
+	}
+}

Backend/models/workDay.go

@@ -2,53 +2,185 @@ package models
 
 import (
 	"arbeitszeitmessung/helper"
-	"database/sql"
 	"encoding/json"
-	"fmt"
 	"log"
+	"sort"
 	"strconv"
 	"time"
 )
 
+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
+}
+
 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
-	Absence   Absence
+	kurzArbeit        bool
+	kurzArbeitAbsence Absence
 }
 
-func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay {
+func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay {
+	var allDays map[string]IWorkDay = make(map[string]IWorkDay)
+	var sortedDays []IWorkDay
+	for _, day := range GetWorkDays(user, tsFrom, tsTo) {
+		allDays[day.Date().Format("2006-01-02")] = &day
+	}
+	absences, err := GetAbsencesByCardUID(user.CardUID, tsFrom, tsTo)
+	if err != nil {
+		log.Println("Error gettings absences for all Days!", err)
+		return sortedDays
+	}
+	for _, day := range absences {
+		if helper.IsWeekend(day.Date()) {
+			continue
+		}
+		if day.AbwesenheitTyp.WorkTime == 1 {
+			if workDay, ok := allDays[day.Date().Format("2006-01-02")].(*WorkDay); ok {
+				workDay.kurzArbeit = true
+				workDay.kurzArbeitAbsence = day
+			}
+		} else {
+			allDays[day.Date().Format("2006-01-02")] = &day
+		}
+	}
+
+	for _, day := range allDays {
+		sortedDays = append(sortedDays, day)
+	}
+	if orderedForward {
+		sort.Slice(sortedDays, func(i, j int) bool {
+			return sortedDays[i].Date().After(sortedDays[j].Date())
+		})
+	} else {
+		sort.Slice(sortedDays, func(i, j int) bool {
+			return sortedDays[i].Date().Before(sortedDays[j].Date())
+		})
+	}
+	return sortedDays
+}
+
+func (d *WorkDay) Date() time.Time {
+	return d.Day
+}
+
+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())
+	}
+	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 "WorkDay"
+}
+
+func (d *WorkDay) IsWorkDay() bool {
+	return true
+}
+
+func (d *WorkDay) SetKurzArbeit(kurzArbeit bool) {
+	d.kurzArbeit = kurzArbeit
+}
+
+func (d *WorkDay) IsKurzArbeit() bool {
+	return d.kurzArbeit
+}
+
+func GetWorkDays(user User, tsFrom, tsTo time.Time) []WorkDay {
 	var workDays []WorkDay
 	var workSec, pauseSec float64
 
 	qStr, err := DB.Prepare(`
 	WITH all_days AS (
-    SELECT generate_series($2, $3, INTERVAL '1 day')::DATE AS work_date
-    ),
+    	SELECT generate_series($2::DATE, $3::DATE - INTERVAL '1 day', INTERVAL '1 day')::DATE AS work_date),
     ordered_bookings AS (
 	    SELECT
-            timestamp::DATE AS work_date,
-            timestamp,
-            check_in_out,
-            counter_id,
-            LAG(timestamp) OVER (PARTITION BY card_uid, timestamp::DATE ORDER BY timestamp) AS prev_timestamp,
-            LAG(check_in_out) OVER (PARTITION BY card_uid, timestamp::DATE ORDER BY timestamp) AS prev_check
-        FROM anwesenheit
-        WHERE card_uid = $1
-        AND timestamp::DATE >= $2
-        AND timestamp::DATE <= $3
-    ),
-    abwesenheiten AS (
-        SELECT
-            datum::DATE AS work_date,
-            abwesenheit_typ
-        FROM abwesenheit
-        WHERE card_uid = $1
-        AND datum::DATE >= $2
-        AND datum::DATE <= $3
+	        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.timestamp) OVER (PARTITION BY a.card_uid, a.timestamp::DATE ORDER BY a.timestamp) AS prev_timestamp,
+	        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
 	)
 	SELECT
 	    d.work_date,
@@ -57,7 +189,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 	    COALESCE(
 	        EXTRACT(EPOCH FROM SUM(
 	            CASE
-                    WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 255)
+	                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
@@ -66,7 +198,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 	    COALESCE(
 	        EXTRACT(EPOCH FROM SUM(
 	            CASE
-                    WHEN b.prev_check IN (2, 4, 255) AND b.check_in_out IN (1, 3)
+	                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
@@ -75,14 +207,17 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 	    COALESCE(jsonb_agg(jsonb_build_object(
 	        'check_in_out', b.check_in_out,
 	        'timestamp', b.timestamp,
-            'counter_id', b.counter_id
-        ) ORDER BY b.timestamp), '[]'::jsonb) AS bookings,
-        a.abwesenheit_typ
+	        '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
-    LEFT JOIN abwesenheiten a ON d.work_date = a.work_date
-    GROUP BY d.work_date, a.abwesenheit_typ
-    ORDER BY d.work_date;`)
+	GROUP BY d.work_date
+	ORDER BY d.work_date ASC;`)
 
 	if err != nil {
 		log.Println("Error preparing SQL statement", err)
@@ -90,7 +225,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 	}
 
 	defer qStr.Close()
-	rows, err := qStr.Query(card_uid, tsFrom, tsTo)
+	rows, err := qStr.Query(user.CardUID, tsFrom, tsTo)
 	if err != nil {
 		log.Println("Error getting rows!")
 		return workDays
@@ -100,8 +235,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 	for rows.Next() {
 		var workDay WorkDay
 		var bookings []byte
-		var absenceType sql.NullInt16
-		if err := rows.Scan(&workDay.Day, &workDay.TimeFrom, &workDay.TimeTo, &workSec, &pauseSec, &bookings, &absenceType); err != nil {
+		if err := rows.Scan(&workDay.Day, &workDay.TimeFrom, &workDay.TimeTo, &workSec, &pauseSec, &bookings); err != nil {
 			log.Println("Error scanning row!", err)
 			return workDays
 		}
@@ -116,21 +250,9 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 		if len(workDay.Bookings) == 1 && workDay.Bookings[0].CounterId == 0 {
 			workDay.Bookings = []Booking{}
 		}
-
-		if absenceType.Valid {
-			workDay.Absence = NewAbsence(card_uid, int8(absenceType.Int16), workDay.Day)
-			log.Println("Found absence", workDay.Absence)
-		}
-
-		if workDay.Day.Equal(time.Now().Truncate(24 * time.Hour)) {
-			workDay.getWorkTime()
-		} else {
-			workDay.calcPauseTime()
-		}
-		if emptyDays || workDay.Bookings[0].CounterId != 0 {
+		workDay.TimePauseReal(user)
+		if emptyDays && !helper.IsWeekend(workDay.Date()) {
 			workDays = append(workDays, workDay)
-		} else {
-			log.Println("no booking on day", workDay.Day.Format("02.01.2006"))
 		}
 	}
 	if err = rows.Err(); err != nil {
@@ -139,78 +261,43 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 	return workDays
 }
 
-func (d *WorkDay) calcPauseTime() {
-	if d.workTime > 6*time.Hour && d.pauseTime < 45*time.Minute {
-		if d.workTime < 9*time.Hour && d.pauseTime < 30*time.Minute {
-			diff := 30*time.Minute - d.pauseTime
-			d.workTime -= diff
-			d.pauseTime += diff
-		} else if d.pauseTime < 45*time.Minute {
-			diff := 45*time.Minute - d.pauseTime
-			d.workTime -= diff
-			d.pauseTime += diff
-		}
+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)
 }
 
-// Gets the duration someone worked that day
-func (d *WorkDay) getWorkTime() {
-	if len(d.Bookings) <= 1 && d.Bookings[0].CounterId == 0 {
-		return
-	}
-	var workTime, pauseTime time.Duration
-	var lastBooking Booking
-	for _, booking := range d.Bookings {
-		if booking.CheckInOut%2 == 1 {
-			if !lastBooking.Timestamp.IsZero() {
-				pauseTime += booking.Timestamp.Sub(lastBooking.Timestamp)
-			}
-		} else {
-			workTime += booking.Timestamp.Sub(lastBooking.Timestamp)
-		}
-		lastBooking = booking
-	}
-	// checks if booking is today and has no gehen yet, so the time since last kommen booking is added to workTime
-	if d.Day.Day() == time.Now().Day() && len(d.Bookings)%2 == 1 {
-		workTime += time.Since(lastBooking.Timestamp.Local())
-	}
-	d.workTime = workTime
-	d.pauseTime = pauseTime
-
-	d.calcPauseTime()
-}
-
-// Converts duration to string
-func formatDuration(d time.Duration) string {
-	hours := int(d.Abs().Hours())
-	minutes := int(d.Abs().Minutes()) % 60
-	switch {
-	case hours > 0:
-		return fmt.Sprintf("%dh %dmin", hours, minutes)
-	case minutes > 0:
-		return fmt.Sprintf("%dmin", minutes)
-	default:
-		return ""
-	}
-}
-
-func (d *WorkDay) GetWorkTimeString() (string, string) {
-	workString := formatDuration(d.workTime)
-	pauseString := formatDuration(d.pauseTime)
-	return workString, pauseString
+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 {
-	if len(d.Bookings) > 0 {
-		return d.Bookings[len(d.Bookings)-1].CheckInOut == 254
-	}
+	if len(d.Bookings) == 0 {
 		return false
+	}
+	return d.Bookings[len(d.Bookings)-1].CheckInOut == 254
 }
 
-// returns a integer percentage of how much day has been worked of
-func (d *WorkDay) GetWorkDayProgress(user User) uint8 {
-	defaultWorkTime := time.Duration(user.ArbeitszeitPerTag * float32(time.Hour))
-	progress := (d.workTime.Seconds() / defaultWorkTime.Seconds()) * 100
-	return uint8(progress)
+func (d *WorkDay) GetDayProgress(u User) int8 {
+	if d.RequiresAction() {
+		return -1
+	}
+	workTime := d.TimeWorkVirtual(u)
+	progress := (workTime.Seconds() / u.ArbeitszeitProTag().Seconds()) * 100
+	return int8(progress)
 }
+
+// func (d *WorkDay) CalcOvertime(user User) time.Duration {
+// 	if d.workTime == 0 {
+// 		d.TimePauseReal(user)
+// 	}
+// 	if helper.IsWeekend(d.Day) && len(d.Bookings) == 0 {
+// 		return 0
+// 	}
+// 	var overtime time.Duration
+// 	overtime = d.workTime - user.ArbeitszeitProTag()
+// 	return overtime
+// }

Backend/models/workDay_test.go

@@ -0,0 +1,81 @@
+package models_test
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"log"
+	"testing"
+	"time"
+)
+
+func CatchError[T any](val T, err error) T {
+	if err != nil {
+		log.Fatalln(err)
+	}
+	return val
+}
+
+var testWorkDay = models.WorkDay{
+	Day:      CatchError(time.Parse("2006-01-02", "2025-01-01")),
+	Bookings: testBookings8hrs,
+	TimeFrom: CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 08:00")),
+	TimeTo:   CatchError(time.Parse("2006-01-02 15:04", "2025-01-01 16:30")),
+}
+
+func TestCalcRealWorkTime(t *testing.T) {
+	workTime := testWorkDay.TimeWorkReal(testUser)
+	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
+		expectedWorkTime  time.Duration
+		expectedPauseTime time.Duration
+		expectedOvertime  time.Duration
+	}
+
+	testCases := []testCase{testCase{
+		Name:              "6hrs no pause",
+		bookings:          testBookings6hrs,
+		expectedWorkTime:  6 * time.Hour,
+		expectedPauseTime: 0,
+		expectedOvertime:  -2 * time.Hour,
+	},
+		testCase{
+			Name:              "8hrs - 30min pause",
+			bookings:          testBookings8hrs,
+			expectedWorkTime:  7*time.Hour + 30*time.Minute,
+			expectedPauseTime: 30 * time.Minute,
+			expectedOvertime:  -30 * time.Minute,
+		},
+		testCase{
+			Name:              "10hrs - 45min pause",
+			bookings:          testBookings10hrs,
+			expectedWorkTime:  9*time.Hour + 15*time.Minute,
+			expectedPauseTime: 45 * time.Minute,
+			expectedOvertime:  1*time.Hour + 15*time.Minute,
+		}}
+
+	for _, test := range testCases {
+		t.Run(test.Name, func(t *testing.T) {
+			testWorkDay.Bookings = test.bookings
+			testWorkDay.TimeWorkReal(testUser)
+			testWorkDay.TimePauseReal(testUser)
+			testWorkDay.TimeOvertimeReal(testUser)
+			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))
+			}
+			if overTime != test.expectedOvertime {
+				t.Errorf("Calculated wrong overtime: should be %s, but was %s", helper.FormatDuration(test.expectedOvertime), helper.FormatDuration(overTime))
+			}
+		})
+	}
+}

Backend/models/workWeek.go

@@ -7,12 +7,20 @@ import (
 	"time"
 )
 
+// Workweeks are
+
 type WorkWeek struct {
 	Id           int
 	WorkDays     []WorkDay
+	Absences     []Absence
+	Days         []IWorkDay
 	User         User
 	WeekStart    time.Time
-	WorkHours time.Duration
+	Worktime     time.Duration
+	Overtime     time.Duration
+	Status       WeekStatus
+	overtimeDiff time.Duration
+	worktimeDiff time.Duration
 }
 
 type WeekStatus int8
@@ -21,59 +29,90 @@ const (
 	WeekStatusNone WeekStatus = iota
 	WeekStatusSent
 	WeekStatusAccepted
+	WeekStatusDifferences
 )
 
-func (w *WorkWeek) GetWeek(user User, tsMonday time.Time, populateDays bool) WorkWeek {
-	var week WorkWeek
-	if populateDays {
-		week.WorkDays = (*WorkDay).GetWorkDays(nil, user.CardUID, tsMonday, tsMonday.Add(7*24*time.Hour))
-		week.WorkHours = aggregateWorkTime(week.WorkDays)
+func NewWorkWeek(user User, tsMonday time.Time, populate bool) WorkWeek {
+	var week WorkWeek = WorkWeek{
+		User:      user,
+		WeekStart: tsMonday,
+		Status:    WeekStatusNone,
+	}
+	if populate {
+		week.PopulateWithDays(0, 0)
 	}
-	week.User = user
-	week.WeekStart = tsMonday
 	return week
 }
 
+func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Duration) {
+	w.Days = GetDays(w.User, w.WeekStart, w.WeekStart.Add(6*24*time.Hour), false)
+
+	for _, day := range w.Days {
+		w.Worktime += day.TimeWorkVirtual(w.User)
+	}
+	w.Overtime = w.Worktime - w.User.ArbeitszeitProWoche()
+
+	w.Worktime = w.Worktime.Round(time.Minute)
+	w.Overtime = w.Overtime.Round(time.Minute)
+
+	if overtime == 0 && worktime == 0 {
+		return
+	}
+
+	if overtime != w.Overtime || worktime != w.Worktime {
+		w.Status = WeekStatusDifferences
+		w.overtimeDiff = overtime
+		w.worktimeDiff = worktime
+	}
+}
+
 func (w *WorkWeek) CheckStatus() WeekStatus {
-	weekStatus := WeekStatusNone
+	if w.Status != WeekStatusNone {
+		return w.Status
+	}
+	if DB == nil {
+		log.Println("Cannot access Database!")
+		return w.Status
+	}
 	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 weekStatus
+		return w.Status
 	}
 	defer qStr.Close()
 	var beastatigt bool
 	err = qStr.QueryRow(w.WeekStart, w.User.PersonalNummer).Scan(&beastatigt)
 	if err == sql.ErrNoRows {
-		return weekStatus
+		return w.Status
 	}
 	if err != nil {
 		log.Println("Error querying database", err)
-		return weekStatus
+		return w.Status
 	}
 	if beastatigt {
-		weekStatus = WeekStatusAccepted
+		w.Status = WeekStatusAccepted
 	} else {
-		weekStatus = WeekStatusSent
+		w.Status = WeekStatusSent
 	}
-	return weekStatus
+	return w.Status
 }
 
-func (w *WorkWeek) GetWorkHourString() string {
-	return formatDuration(w.WorkHours)
-}
-
-func aggregateWorkTime(days []WorkDay) time.Duration {
+func (w *WorkWeek) aggregateWorkTime() time.Duration {
 	var workTime time.Duration
-	for _, day := range days {
+	for _, day := range w.WorkDays {
 		workTime += day.workTime
 	}
+	// for _, absence := range w.Absences {
+	// 	log.Println(absence)
+	// 	absenceWorkTime := float32(8) // := absences.AbwesenheitTyp.WorkTime - (absences.AbwesenheitTyp.WorkTime - w.User.ArbeitszeitPerTag) // workTime Equivalent of Absence is capped at user Worktime per Day
+	// 	workTime += time.Duration(absenceWorkTime * float32(time.Hour)).Round(time.Minute)
+	// }
 	return workTime
 }
 
 func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
 	var weeks []WorkWeek
-	qStr, err := DB.Prepare(`SELECT id, woche_start::DATE FROM wochen_report WHERE bestaetigt = FALSE AND personal_nummer = $1;`)
+	qStr, err := DB.Prepare(`SELECT id, woche_start::DATE, (EXTRACT(epoch FROM arbeitszeit)*1000000000)::BIGINT, (EXTRACT(epoch FROM ueberstunden)*1000000000)::BIGINT FROM wochen_report WHERE bestaetigt = FALSE AND personal_nummer = $1;`)
 	if err != nil {
 		log.Println("Error preparing SQL statement", err)
 		return weeks
@@ -87,14 +126,13 @@ func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
 	}
 	defer rows.Close()
 	for rows.Next() {
-		var week WorkWeek
-		week.User = user
-		if err := rows.Scan(&week.Id, &week.WeekStart); err != nil {
+		var week WorkWeek = WorkWeek{User: user}
+		if err := rows.Scan(&week.Id, &week.WeekStart, &week.Worktime, &week.Overtime); err != nil {
 			log.Println("Error scanning row!", err)
 			return weeks
 		}
-		week.WorkDays = (*WorkDay).GetWorkDays(nil, user.CardUID, week.WeekStart, week.WeekStart.Add(7*24*time.Hour))
-		week.WorkHours = aggregateWorkTime(week.WorkDays)
+
+		week.PopulateWithDays(week.Worktime, week.Overtime)
 		weeks = append(weeks, week)
 	}
 	if err = rows.Err(); err != nil {
@@ -107,33 +145,34 @@ func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
 var ErrRunningWeek = errors.New("Week is in running week")
 
 // creates a new entry in the woche_report table with the given workweek
-func (w *WorkWeek) Send() error {
+func (w *WorkWeek) SendWeek() error {
 	var qStr *sql.Stmt
 	var err error
+
 	if time.Since(w.WeekStart) < 5*24*time.Hour {
 		log.Println("Cannot send week, because it's the running week!")
 		return ErrRunningWeek
 	}
+
 	if w.CheckStatus() != WeekStatusNone {
-		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE WHERE personal_nummer = $1 AND woche_start = $2;`)
+		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE, arbeitszeit = make_interval(secs => $3::numeric / 1000000000), ueberstunden = make_interval(secs => $4::numeric / 1000000000) WHERE personal_nummer = $1 AND woche_start = $2;`)
 		if err != nil {
 			log.Println("Error preparing SQL statement", err)
 			return err
 		}
 	} else {
-		qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start) VALUES ($1, $2);`)
+		qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start, arbeitszeit, ueberstunden) VALUES ($1, $2, make_interval(secs => $3::numeric / 1000000000), make_interval(secs => $4::numeric / 1000000000));`)
 		if err != nil {
 			log.Println("Error preparing SQL statement", err)
 			return err
 		}
 	}
-	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart)
+	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart, int64(w.Worktime), int64(w.Overtime))
 	if err != nil {
 		log.Println("Error executing query!", err)
 		return err
 	}
 	return nil
-
 }
 
 func (w *WorkWeek) Accept() error {
@@ -149,3 +188,11 @@ func (w *WorkWeek) Accept() error {
 	}
 	return nil
 }
+
+func (w *WorkWeek) RequiresAction() bool {
+	var requiresAction bool = false
+	for _, day := range w.Days {
+		requiresAction = requiresAction || day.RequiresAction()
+	}
+	return requiresAction
+}

Backend/models/workWeek_test.go

@@ -0,0 +1,51 @@
+package models_test
+
+import (
+	"arbeitszeitmessung/models"
+	"testing"
+	"time"
+)
+
+func SetupWorkWeekFixture(t *testing.T) models.WorkWeek {
+	t.Helper()
+	monday, err := time.Parse("2006-01-02", "2025-01-10")
+	if err != nil {
+		t.Fatal(err)
+	}
+	return models.WorkWeek{User: testUser, WeekStart: monday, Status: models.WeekStatusSent}
+}
+
+func TestNewWorkWeekNoPopulate(t *testing.T) {
+	monday, err := time.Parse("2006-01-02", "2025-01-10")
+	if err != nil {
+		t.Fatal(err)
+	}
+	workWeek := models.NewWorkWeek(testUser, monday, false)
+
+	if workWeek.User != testUser || workWeek.WeekStart != monday {
+		t.Error("No populate workweek does not have right values!")
+	}
+}
+
+func TestCheckStatus(t *testing.T) {
+	SetupDBFixture(t)
+	testWeek := SetupWorkWeekFixture(t)
+	testCases := []struct {
+		name       string
+		weekStatus models.WeekStatus
+	}{
+		{"State=None", models.WeekStatusNone},
+		{"State=Sent", models.WeekStatusSent},
+		{"State=Accepted", models.WeekStatusAccepted},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			testWeek.Status = tc.weekStatus
+			if testWeek.CheckStatus() != tc.weekStatus {
+				t.Error("WorkWeek Status missmatch!")
+			}
+		})
+	}
+
+}

Backend/sonar-project.properties

@@ -0,0 +1,8 @@
+sonar.projectKey=Arbeitszeitmessung
+sonar.sources=.
+sonar.exclusions=**/*_test.go
+
+sonar.tests=.
+sonar.test.inclusions=**/*_test.go
+sonar.go.tests.reportPaths=.test/report.json
+sonar.go.coverage.reportPaths=.test/coverage.out

Backend/src/main.css

@@ -1,5 +1,8 @@
 @import "tailwindcss";
 @source "../templates/*.templ";
+@plugin "@iconify/tailwind4" {
+    scale: 1.25;
+}
 
 @theme {
     --color-accent-50: #e7fdea;
@@ -27,10 +30,18 @@
     --color-text-950: #000000;
 }
 
+@layer base {
+    body {
+        -webkit-print-color-adjust: exact !important;
+        print-color-adjust: exact !important;
+        background-color: white;
+    }
+}
+
 @layer components {
     .grid-main {
         display: grid;
-    grid-template-columns: 2fr auto 1fr;
+        grid-template-columns: 4fr 6fr 1fr;
         align-items: stretch;
     }
 
@@ -42,6 +53,11 @@
         transition: background-color 0.2s ease-in-out;
     }
 
+    .grid-sub.responsive {
+        display: flex;
+        flex-direction: column;
+    }
+
     .grid-sub:hover {
         background-color: var(--color-neutral-200);
     }
@@ -51,13 +67,61 @@
         border-color: var(--color-neutral-400);
     }
 
+    .btn {
+        width: 100%;
+        cursor: pointer;
+        border-radius: var(--radius-md);
+        color: var(--color-neutral-800);
+        font-size: var(--text-sm);
+        text-align: center;
+        padding: calc(var(--spacing) * 2);
+        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-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+        transition-duration: var(--tw-duration, var(--default-transition-duration));
+    }
+
+    input.btn,
+    select.btn {
+        transition-duration: 300ms;
+    }
+
+    .btn:hover {
+        color: var(--color-white);
+        background-color: var(--color-neutral-700);
+    }
+
+    .btn:disabled {
+        opacity: 50%;
+        pointer-events: none;
+    }
+
+    input.btn,
+    select.btn {
+        text-align: left;
+    }
+
+    input.btn:hover,
+    select.btn:hover {
+        border-color: var(--color-neutral-300);
+        background-color: var(--color-neutral-100);
+        color: var(--color-neutral-800);
+    }
+
     @media (width >=48rem) {
         .grid-main {
             grid-template-columns: repeat(5, 1fr);
             margin: 0 10%;
         }
 
-    .grid-sub {
+        .grid-sub.responsive {
+            display: grid;
+        }
+
+        .btn {
+            padding-inline: calc(var(--spacing) * 4);
         }
     }
 }

Backend/static/script.js

@@ -1,7 +1,5 @@
 function editDay(element, event, formId) {
-  var form = element
-    .closest(".grid-sub")
-    .querySelector(".all-booking-component > form");
+  var form = element.closest(".grid-sub").querySelector(".all-booking-component > form");
   form.classList.toggle("edit");
   element.classList.toggle("edit");
   if (element.classList.contains("edit")) {
@@ -14,10 +12,32 @@ function editDay(element, event, formId) {
   }
 }
 
+function editAbsence(element, event, absenceId) {
+  var form = document.getElementById("absence_form");
+  console.log(absenceId);
+
+  if (absenceId != 0) {
+    const fieldsToSync = ["date_from", "date_to", "aw_type", "aw_id"];
+
+    var dataForm = document.getElementById(absenceId);
+
+    fieldsToSync.forEach((name) => {
+      const src = dataForm.querySelector(`[name=${name}]`);
+      const target = form.querySelector(`[name=${name}]`);
+      if (!src || !target) return;
+      target.value = src.value;
+    });
+  } else {
+    var dataForm = element.closest(".grid-sub").querySelector(".all-booking-component > form");
+    form.querySelector("[name=date_from]").value = dataForm.id.replace("time-", "");
+    form.querySelector("[name=date_to]").value = dataForm.id.replace("time-", "");
+  }
+  form.classList.remove("hidden");
+  form.scrollIntoView({ behavior: "smooth", block: "start", inline: "nearest" });
+}
+
 function editAbwesenheit(element, event) {
-  var newBookingComponent = element
-    .closest(".grid-sub")
-    .querySelector(".new-booking-component");
+  var newBookingComponent = element.closest(".grid-sub").querySelector(".new-booking-component");
   if (element.value == 0) {
     newBookingComponent.style.display = "";
   } else {
@@ -32,3 +52,7 @@ function navigateWeek(element, event, direction) {
   date.setHours(10);
   dateInput.valueAsDate = date;
 }
+
+function logoutUser() {
+  fetch("/user/logout", {}).then(() => window.location.reload());
+}

Backend/templates/headerComponent.templ

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

Backend/templates/headerComponent_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.833
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -29,7 +29,7 @@ func headerComponent() templ.Component {
 			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\"><a href=\"/time\">Zeitverwaltung</a> <a href=\"/team\">Abrechnung</a> ")
+		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> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -39,7 +39,15 @@ func headerComponent() templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<a href=\"/user/settings\">Einstellungen</a></div>")
+		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
 		}

Backend/templates/pages.templ

@@ -1,11 +1,6 @@
 package templates
 
-import (
-	"arbeitszeitmessung/models"
-	"fmt"
-	"strconv"
-	"time"
-)
+import "arbeitszeitmessung/models"
 
 templ Base() {
 	<!DOCTYPE html>
@@ -17,27 +12,16 @@ templ Base() {
 	</head>
 }
 
-templ TimePage(workDays []models.WorkDay) {
-	@Base()
-	@headerComponent()
-	<div class="grid-main divide-y-1">
-		@inputForm()
-		for _, day := range workDays {
-			@dayComponent(day)
-		}
-	</div>
-	@LegendComponent()
-}
-
-templ LoginPage(failed bool) {
+templ LoginPage(success bool, errorMsg string) {
 	@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>
 			<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 failed {
+			if !success {
 				<p class="text-red-600 text-sm">Login fehlgeschlagen, bitte erneut versuchen!</p>
+				<p class="text-red-600 text-sm">{ errorMsg }</p>
 			}
 			<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>
@@ -48,8 +32,7 @@ templ UserPage(status int) {
 	@Base()
 	@headerComponent()
 	<div class="grid-main divide-y-1">
-		<div class="grid-sub"></div>
-		<form method="POST" class="grid-sub divide-x-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"/>
@@ -65,101 +48,105 @@ templ UserPage(status int) {
 				}
 			</div>
 			<div class="grid-cell">
-				<button name="action" value="change-pass" type="submit" class="w-full 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">Ändern</button>
+				<button name="action" value="change-pass" type="submit" class="btn">Ändern</button>
 			</div>
 		</form>
-		<form method="POST" class="grid-sub divide-x-1">
+		<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 name="action" value="logout-user" type="submit" class="w-full 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">Abmelden</button>
+				<button onclick="logoutUser" type="button" class="btn">Abmelden</button>
 			</div>
-		</form>
 		</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) {
-	{{
-		year, kw := userWeek.WeekStart.ISOWeek()
-	}}
 	@Base()
 	@headerComponent()
 	<div class="grid-main divide-y-1">
-		<div class="grid-sub divide-x-1 bg-neutral-300">
-			<div class="grid-cell font-bold uppercase">{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }</div>
-			<div class="grid-cell col-span-3 flex flex-col gap-2">
-				for _, day := range userWeek.WorkDays {
-					@weekDayComponent(userWeek.User, day)
-				}
-			</div>
-			<div class="grid-cell flex flex-col gap-2">
-				<form method="get" class="flex flex-row gap-4 items-center justify-around">
-					<input type="date" class="hidden" name="submission_date" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
-					<button onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1") } class="p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700">
-						<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(userWeek.WeekStart) < 24*7*time.Hour } onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1") } class="p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 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>
-				<form method="post">
-					<input type="hidden" name="method" value="send"/>
-					<input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
-					<input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
-					switch userWeek.CheckStatus() {
-						case models.WeekStatusNone:
-							<p class="text-sm">an Vorgesetzten senden</p>
-							<button disabled?={ time.Since(userWeek.WeekStart) < 24*7*time.Hour } type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Senden</button>
-							if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
-								<p class="text-sm text-red-500">Die Woche kann erst am nächsten Montag abgesendet werden!</p>
-							}
-						case models.WeekStatusSent:
-							<p class="text-sm">an Vorgesetzten gesendet</p>
-							<button type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Korrigieren</button>
-							<p class="flex flex-row gap-2 items-center">
-								akzeptiert:
-								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-circle" viewBox="0 0 16 16">
-									<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"></path>
-								</svg>
-							</p>
-						case models.WeekStatusAccepted:
-							<p class="text-sm">vom Vorgesetzten bestätigt</p>
-							<button type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Korrigieren</button>
-							<p class="flex flex-row gap-2 text-accent items-center">
-								akzeptiert:
-								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check-circle" viewBox="0 0 16 16">
-									<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"></path>
-									<path d="m10.97 4.97-.02.022-3.473 4.425-2.093-2.094a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-1.071-1.05"></path>
-								</svg>
-							</p>
-					}
-				</form>
+		<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-2xl uppercase font-bold">Eigene Abrechnung</h2>
 			</div>
 		</div>
+		@workWeekComponent(userWeek, false)
+		// <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-2xl uppercase font-bold">Eigene Abrechnung</h2>
+		// 	</div>
+		// 	<div class="grid-cell flex flex-col max-md:border-b-1 max-md:bg-neutral-300 gap-2 ">
+		// 		<div class="lg:hidden">
+		// 			@weekPicker(userWeek.WeekStart)
+		// 		</div>
+		// 		<h2 class="uppercase font-bold">{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }</h2>
+		// 		<div class="grid grid-cols-5 gap-2 lg:grid-cols-1">
+		// 			<div class="col-span-2">
+		// 				<span class="flex flex-row gap-2 items-center">
+		// 					@statusCheckMark(userWeek.CheckStatus(), models.WeekStatusSent)
+		// 					Gesendet
+		// 				</span>
+		// 				<span class="flex flex-row gap-2 items-center">
+		// 					@statusCheckMark(userWeek.CheckStatus(), models.WeekStatusAccepted)
+		// 					Akzeptiert
+		// 				</span>
+		// 			</div>
+		// 			<div class="flex flex-row gap-2 col-span-3">
+		// 				@timeGaugeComponent(int8(progress), false)
+		// 				<div>
+		// 					<p>Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDuration(userWeek.Worktime)) }</p>
+		// 					<p>Überstunden: { fmt.Sprintf("%s", helper.FormatDurationFill(userWeek.Overtime, true)) }</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">
+		// 		for _, day := range userWeek.Days {
+		// 			@defaultWeekDayComponent(userWeek.User, day)
+		// 		}
+		// 	</div>
+		// 	<div class="grid-cell flex flex-col gap-2 justify-between">
+		// 		<div class="max-md:hidden">
+		// 			@weekPicker(userWeek.WeekStart)
+		// 		</div>
+		// 		<form method="post" class="flex flex-col gap-2">
+		// 			<input type="hidden" name="method" value="send"/>
+		// 			<input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
+		// 			<input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
+		// 			switch userWeek.CheckStatus() {
+		// 				case models.WeekStatusNone:
+		// 					<p class="text-sm">an Vorgesetzten senden</p>
+		// 				case models.WeekStatusSent:
+		// 					<p class="text-sm">an Vorgesetzten gesendet</p>
+		// 				case models.WeekStatusAccepted:
+		// 					<p class="text-sm">vom Vorgesetzten bestätigt</p>
+		// 			}
+		// 			<button disabled?={ userWeek.Status < models.WeekStatusSent } type="submit" class="btn">Korrigieren</button>
+		// 			<button disabled?={ time.Since(userWeek.WeekStart) < 24*7*time.Hour || userWeek.Status >= models.WeekStatusSent || userWeek.RequiresAction() } type="submit" class="btn">Senden</button>
+		// 		</form>
+		// 	</div>
+		// </div>
+		if len(weeks) > 0 {
+			<div class="grid-cell col-span-full bg-neutral-300">
+				<h2 class="text-2xl uppercase font-bold">Abrechnung Mitarbeiter</h2>
+			</div>
+		}
 		for _, week := range weeks {
-			@employeComponent(week)
+			@workWeekComponent(week, true)
 		}
 	</div>
 }
 
-templ NavPage() {
-	@Base()
-	<div class="w-full h-[100vh] flex flex-col justify-center items-center">
-		<div class="flex flex-col justify-between w-full md:w-1/2 py-2">
-			<a class="text-xl hover:text-accent transition-colors1" href="/time">Zeitverwaltung</a>
-			<a class="text-xl hover:text-accent transition-colors1" href="/team">Mitarbeiter</a>
-			<a class="text-xl hover:text-accent transition-colors1" href="/user">Nutzer</a>
-		</div>
-	</div>
-}
-
 templ TeamPresencePage(teamPresence map[bool][]models.User) {
 	@Base()
 	@headerComponent()
@@ -182,3 +169,7 @@ templ TeamPresencePage(teamPresence map[bool][]models.User) {
 		</div>
 	</div>
 }
+
+templ LogoutButton() {
+	<button onclick="logoutUser()" type="button" class="cursor-pointer">Abmelden</button>
+}

Backend/templates/pages_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.833
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -8,12 +8,7 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import (
-	"arbeitszeitmessung/models"
-	"fmt"
-	"strconv"
-	"time"
-)
+import "arbeitszeitmessung/models"
 
 func Base() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
@@ -44,7 +39,7 @@ func Base() templ.Component {
 	})
 }
 
-func TimePage(workDays []models.WorkDay) templ.Component {
+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 {
@@ -69,72 +64,30 @@ func TimePage(workDays []models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		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
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"grid-main divide-y-1\">")
+		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
 			}
-		templ_7745c5c3_Err = inputForm().Render(ctx, templ_7745c5c3_Buffer)
+			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
 			}
-		for _, day := range workDays {
-			templ_7745c5c3_Err = dayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
+			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, 3, "</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 LoginPage(failed 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_Var3 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var3 == nil {
-			templ_7745c5c3_Var3 = 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, 4, "<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 failed {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<p class=\"text-red-600 text-sm\">Login fehlgeschlagen, bitte erneut versuchen!</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<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>")
+		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
 		}
@@ -171,28 +124,28 @@ func UserPage(status int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub\"></div><form method=\"POST\" class=\"grid-sub 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\"> ")
+		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, 8, "<p class=\"text-red-600 text-sm\">Aktuelles Passwort nicht korrekt!</p>")
+			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, 9, "<p class=\"text-red-600 text-sm\">Passwortwechsel fehlgeschlagen, bitte erneut versuchen!</p>")
+			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, 10, "<p class=\"text-accent text-sm\">Passwortänderung erfolgreich</p>")
+			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, 11, "</div><div class=\"grid-cell\"><button name=\"action\" value=\"change-pass\" type=\"submit\" class=\"w-full 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\">Ändern</button></div></form><form method=\"POST\" class=\"grid-sub 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 name=\"action\" value=\"logout-user\" type=\"submit\" class=\"w-full 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\">Abmelden</button></div></form></div>")
+		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\">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
 		}
@@ -200,6 +153,42 @@ func UserPage(status int) templ.Component {
 	})
 }
 
+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_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			templ_7745c5c3_Var5 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if status >= target {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<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, 12, "<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
@@ -216,13 +205,11 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var5 == nil {
-			templ_7745c5c3_Var5 = templ.NopComponent
+		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var6 == nil {
+			templ_7745c5c3_Var6 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-
-		year, kw := userWeek.WeekStart.ISOWeek()
 		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -231,206 +218,27 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1 bg-neutral-300\"><div class=\"grid-cell font-bold uppercase\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<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-2xl uppercase font-bold\">Eigene Abrechnung</h2></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 91, Col: 111}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		templ_7745c5c3_Err = workWeekComponent(userWeek, false).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
+		if len(weeks) > 0 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"grid-cell col-span-full bg-neutral-300\"><h2 class=\"text-2xl uppercase font-bold\">Abrechnung Mitarbeiter</h2></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-		for _, day := range userWeek.WorkDays {
-			templ_7745c5c3_Err = weekDayComponent(userWeek.User, day).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div><div class=\"grid-cell flex flex-col gap-2\"><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_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(userWeek.WeekStart.Format(time.DateOnly))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 99, Col: 110}
-		}
-		_, 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, 15, "\"> ")
-		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, 16, "<button onclick=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 templ.ComponentScript = templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1")
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "\" class=\"p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700\"><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_Var9 string
-		templ_7745c5c3_Var9, 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/pages.templ`, Line: 105, Col: 72}
-		}
-		_, 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, 18, "</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, 19, "<button")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, " disabled")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, " onclick=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 templ.ComponentScript = templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1")
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var10.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\" class=\"p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 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><form method=\"post\"><input type=\"hidden\" name=\"method\" value=\"send\"> <input type=\"hidden\" name=\"user\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(userWeek.User.PersonalNummer))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 114, Col: 88}
-		}
-		_, 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, 23, "\"> <input type=\"hidden\" name=\"week\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(userWeek.WeekStart.Format(time.DateOnly))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 115, Col: 86}
-		}
-		_, 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, 24, "\"> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		switch userWeek.CheckStatus() {
-		case models.WeekStatusNone:
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<p class=\"text-sm\">an Vorgesetzten senden</p><button")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " disabled")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, " type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Senden</button> ")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<p class=\"text-sm text-red-500\">Die Woche kann erst am nächsten Montag abgesendet werden!</p>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-		case models.WeekStatusSent:
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<p class=\"text-sm\">an Vorgesetzten gesendet</p><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Korrigieren</button><p class=\"flex flex-row gap-2 items-center\">akzeptiert: <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" fill=\"currentColor\" class=\"bi bi-circle\" viewBox=\"0 0 16 16\"><path d=\"M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16\"></path></svg></p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		case models.WeekStatusAccepted:
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<p class=\"text-sm\">vom Vorgesetzten bestätigt</p><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Korrigieren</button><p class=\"flex flex-row gap-2 text-accent items-center\">akzeptiert: <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" fill=\"currentColor\" class=\"bi bi-check-circle\" viewBox=\"0 0 16 16\"><path d=\"M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16\"></path> <path d=\"m10.97 4.97-.02.022-3.473 4.425-2.093-2.094a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-1.071-1.05\"></path></svg></p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</form></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
 		}
 		for _, week := range weeks {
-			templ_7745c5c3_Err = employeComponent(week).Render(ctx, templ_7745c5c3_Buffer)
+			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, 32, "</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-func NavPage() 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)
-		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, 33, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><div class=\"flex flex-col justify-between w-full md:w-1/2 py-2\"><a class=\"text-xl hover:text-accent transition-colors1\" href=\"/time\">Zeitverwaltung</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/team\">Mitarbeiter</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/user\">Nutzer</a></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -454,9 +262,9 @@ func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var14 == nil {
-			templ_7745c5c3_Var14 = templ.NopComponent
+		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
@@ -467,7 +275,7 @@ func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1\"><h2 class=\"grid-cell font-bold uppercase\">Anwesend</h2><div class=\"flex flex-col col-span-2 md:col-span-4\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1\"><h2 class=\"grid-cell font-bold uppercase\">Anwesend</h2><div class=\"flex flex-col col-span-2 md:col-span-4\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -477,7 +285,7 @@ func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "</div></div><div class=\"grid-sub divide-x-1\"><h2 class=\"grid-cell font-bold uppercase\">Nicht Anwesend</h2><div class=\"flex flex-col col-span-2 md:col-span-4\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</div></div><div class=\"grid-sub divide-x-1\"><h2 class=\"grid-cell font-bold uppercase\">Nicht Anwesend</h2><div class=\"flex flex-col col-span-2 md:col-span-4\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -487,7 +295,36 @@ func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</div></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div></div></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_Var8 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var8 == nil {
+			templ_7745c5c3_Var8 = 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
 		}

Backend/templates/pdf.templ

@@ -0,0 +1,77 @@
+package templates
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"time"
+)
+
+templ PDFReportEmploye(e models.User, 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">Kim Mustermensch</h1>
+			<p>Zeitraum: <span>{ tsStart.Format("02.01.2006") }</span> - <span>{ tsEnd.Format("02.01.2006") }</span></p>
+			<p>Arbeitszeit: <span></span></p>
+			<p>Überstunden: <span></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() {
+							<p class="col-span-full">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/pdf_templ.go

@@ -0,0 +1,338 @@
+// 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"
+	"time"
+)
+
+func PDFReportEmploye(e models.User, 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_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = 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, 1, "<content class=\"p-8 relative flex flex-col gap-4 break-after-page\"><div><h1 class=\"text-2xl font-bold\">Kim Mustermensch</h1><p>Zeitraum: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, 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: 18, Col: 52}
+		}
+		_, 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, "</span> - <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, 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: 18, Col: 98}
+		}
+		_, 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, 3, "</span></p><p>Arbeitszeit: <span></span></p><p>Überstunden: <span></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_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(kw)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 23, Col: 52}
+		}
+		_, 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, 4, "</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_Var5 = []any{noBorder}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var5...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<p class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var5).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_Var6))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\">")
+			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("02.01.2006"))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 36, Col: 59}
+			}
+			_, 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, 7, "</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 = []any{"grid grid-cols-subgrid col-span-3 " + noBorder}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var8...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var9 string
+			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var8).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_Var9))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\">")
+			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, 10, "<p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var10 string
+					templ_7745c5c3_Var10, 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: 43, Col: 64}
+					}
+					_, 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, "</p><p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var11 string
+					templ_7745c5c3_Var11, 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: 44, Col: 66}
+					}
+					_, 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, 12, "</p><p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var12 string
+					templ_7745c5c3_Var12, 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: 45, Col: 55}
+					}
+					_, 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, 13, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " ")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				if workDay.IsKurzArbeit() {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<p class=\"col-span-full\">Kurzarbeit</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+			} else {
+
+				absentDay, _ := day.(*models.Absence)
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<p class=\"col-span-full\">")
+				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/pdf.templ`, Line: 54, Col: 62}
+				}
+				_, 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, 17, "</p>")
+				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
+			}
+			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, 19, " ")
+			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, 20, " ")
+			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, 21, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if day.Date().Weekday() == time.Friday {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<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, 23, "</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_Var14 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var14 == nil {
+			templ_7745c5c3_Var14 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		color := ""
+		if d.Abs() < time.Minute {
+			color = "text-neutral-300"
+		}
+		var templ_7745c5c3_Var15 = []any{color + " " + classes}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var15...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<p class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var15).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_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, 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: 76, 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, 26, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/teamComponents.templ

@@ -1,64 +1,166 @@
 package templates
 
 import (
+	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"fmt"
 	"strconv"
 	"time"
 )
 
-templ weekDayComponent(user models.User, day models.WorkDay) {
-	{{ work, pause := day.GetWorkTimeString() }}
+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 defaultWeekDayComponent(u models.User, day models.IWorkDay) {
 	<div class="flex flex-row gap-2">
-		@timeGaugeComponent(day.GetWorkDayProgress(user), false, false)
+		@timeGaugeComponent(day.GetDayProgress(u), false)
 		<div class="flex flex-col">
-			<p class=""><span class="font-bold uppercase hidden md:inline">{ day.Day.Format("Mon") }:</span> { day.Day.Format("02.01.2006") }</p>
+			<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">{ work }</span>
-				<span class="text-neutral-500">{ pause }</span>
+						<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">
-				<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="size-4" viewBox="0 0 16 16">
-					<path d="M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z"></path>
-					<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0"></path>
-				</svg>
-				if day.TimeFrom == day.TimeTo {
-					<p>Keine Anwesenheit</p>
-				} else {
-					<span>{ day.TimeFrom.Format("15:04") }</span>
+						<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>{ day.TimeTo.Format("15:04") }</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>
 	</div>
 }
 
-templ employeComponent(week models.WorkWeek) {
-	{{
-		year, kw := week.WeekStart.ISOWeek()
-	}}
-	<div class="employeComponent grid-sub divide-x-1">
-		<div class="grid-cell">
-			<p class="font-bold uppercase">{ week.User.Vorname } { week.User.Name }</p>
-			<p class="text-sm">Arbeitszeit</p>
-			<p class="text-accent">{ week.GetWorkHourString() }</p>
-		</div>
-		<div class="grid-cell col-span-3 flex flex-col gap-2">
-			for _, day := range week.WorkDays {
-				@weekDayComponent(week.User, day)
+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>
-		<form class="grid-cell flex flex-col justify-between gap-2" method="post">
+	</div>
+}
+
+templ workWeekComponent(week models.WorkWeek, onlyAccept bool) {
+	{{
+		year, kw := week.WeekStart.ISOWeek()
+		progress := (float32(week.Worktime.Hours()) / week.User.ArbeitszeitPerWoche) * 100
+	}}
+	<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">
+					@weekPicker(week.WeekStart)
+				</div>
+			}
+			<p class="font-bold uppercase">{ week.User.Vorname } { week.User.Name }</p>
+			<div class="grid grid-cols-5 gap-2 lg:grid-cols-1">
+				if !onlyAccept {
+					<div class="col-span-2">
+						<span class="flex flex-row gap-2 items-center">
+							@statusCheckMark(week.CheckStatus(), models.WeekStatusSent)
+							Gesendet
+						</span>
+						<span class="flex flex-row gap-2 items-center">
+							@statusCheckMark(week.CheckStatus(), models.WeekStatusAccepted)
+							Akzeptiert
+						</span>
+					</div>
+				}
+				<div class="flex flex-row gap-2 col-span-3">
+					@timeGaugeComponent(int8(progress), false)
+					<div>
+						<p>Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDuration(week.Worktime)) }</p>
+						<p>Überstunden: { fmt.Sprintf("%s", helper.FormatDurationFill(week.Overtime, true)) }</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">
+			for _, day := range week.Days {
+				@defaultWeekDayComponent(week.User, day)
+			}
+		</div>
+		<div class="grid-cell flex flex-col gap-2 justify-between">
+			if onlyAccept {
 				<p class="text-sm"><span class="">Woche:</span> { fmt.Sprintf("%02d-%d", kw, year) }</p>
-			<input type="hidden" name="method" value="accept"/>
+			} else {
+				<div class="max-md:hidden">
+					@weekPicker(week.WeekStart)
+				</div>
+			}
+			<form method="post" class="flex flex-col gap-2">
+				{{
+					week.CheckStatus()
+					method := "accept"
+					if !onlyAccept {
+						method = "send"
+					}
+				}}
+				<input type="hidden" name="method" value={ method }/>
 				<input type="hidden" name="user" value={ strconv.Itoa(week.User.PersonalNummer) }/>
 				<input type="hidden" name="week" value={ week.WeekStart.Format(time.DateOnly) }/>
-			<button type="submit" class="w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">
-				<p class="">Bestätigen</p>
-			</button>
+				if onlyAccept {
+					if week.Status == models.WeekStatusDifferences {
+						<p class="text-red-600 text-sm">Unterschiedliche Arbeitszeit zwischen Abrechnung und individuellen Buchungen</p>
+					}
+					<button type="submit" disabled?={ week.Status == models.WeekStatusDifferences } class="btn">Bestätigen</button>
+				} else {
+					switch  {
+						case week.RequiresAction():
+							<p class="text-sm text-red-500">bitte zuerst Buchungen anpassen</p>
+						case time.Since(week.WeekStart) < 24*7*time.Hour:
+							<p class="text-sm text-red-500">Die Woche kann erst am nächsten Montag gesendet werden!</p>
+						case week.Status == models.WeekStatusNone:
+							<p class="text-sm">an Vorgesetzten senden</p>
+						case week.Status == models.WeekStatusSent:
+							<p class="text-sm">an Vorgesetzten gesendet</p>
+						case week.Status == models.WeekStatusAccepted:
+							<p class="text-sm">vom Vorgesetzten bestätigt</p>
+					}
+					<button disabled?={ week.Status < models.WeekStatusSent } type="submit" class="btn">Korrigieren</button>
+					<button disabled?={ time.Since(week.WeekStart) < 24*7*time.Hour || week.Status >= models.WeekStatusSent || week.RequiresAction() } type="submit" class="btn">Senden</button>
+				}
 			</form>
 		</div>
+	</div>
 }
 
 templ userPresenceComponent(user models.User, present bool) {

Backend/templates/teamComponents_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.833
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -9,13 +9,14 @@ import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
 import (
+	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"fmt"
 	"strconv"
 	"time"
 )
 
-func weekDayComponent(user models.User, day models.WorkDay) templ.Component {
+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 {
@@ -36,109 +37,79 @@ func weekDayComponent(user models.User, day models.WorkDay) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		work, pause := day.GetWorkTimeString()
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-row gap-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = timeGaugeComponent(day.GetWorkDayProgress(user), false, false).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=\"flex flex-col\"><p class=\"\"><span class=\"font-bold uppercase hidden md:inline\">")
+
+		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(day.Day.Format("Mon"))
+		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: 15, Col: 89}
+			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, 3, ":</span> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "\"> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(day.Day.Format("02.01.2006"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 15, Col: 130}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		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, 4, "</p><div class=\"flex flex-row gap-2\"><span class=\"text-accent\">")
+		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(work)
+		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: 17, Col: 36}
+			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, "</span> <span class=\"text-neutral-500\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</p>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(pause)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 18, Col: 42}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		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, "</span></div><div class=\"flex flex-row gap-2 items-center\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"size-4\" viewBox=\"0 0 16 16\"><path d=\"M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z\"></path> <path d=\"M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0\"></path></svg> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<button")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if day.TimeFrom == day.TimeTo {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<p>Keine Anwesenheit</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<span>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeFrom.Format("15:04"))
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 28, Col: 41}
-			}
-			_, 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> <span>-</span> <span>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var7 string
-			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeTo.Format("15:04"))
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 30, Col: 39}
-			}
-			_, 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, "</span>")
+		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, 11, "</div></div></div>")
+		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
 		}
@@ -146,7 +117,7 @@ func weekDayComponent(user models.User, day models.WorkDay) templ.Component {
 	})
 }
 
-func employeComponent(week models.WorkWeek) templ.Component {
+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 {
@@ -162,102 +133,498 @@ func employeComponent(week models.WorkWeek) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var8 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var8 == nil {
-			templ_7745c5c3_Var8 = templ.NopComponent
+		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() {
 
-		year, kw := week.WeekStart.ISOWeek()
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<div class=\"employeComponent grid-sub divide-x-1\"><div class=\"grid-cell\"><p class=\"font-bold uppercase\">")
+			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(week.User.Vorname)
+				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: 53}
+					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, 13, " ")
+				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(week.User.Name)
+				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: 43, Col: 72}
+					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, 14, "</p><p class=\"text-sm\">Arbeitszeit</p><p class=\"text-accent\">")
+				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(week.GetWorkHourString())
+					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: 45, Col: 52}
+						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, 15, "</p></div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, day := range week.WorkDays {
-			templ_7745c5c3_Err = weekDayComponent(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, 16, "</div><form class=\"grid-cell flex flex-col justify-between gap-2\" method=\"post\"><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+					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(fmt.Sprintf("%02d-%d", kw, year))
+					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: 53, Col: 85}
+						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, 17, "</p><input type=\"hidden\" name=\"method\" value=\"accept\"> <input type=\"hidden\" name=\"user\" value=\"")
+					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(strconv.Itoa(week.User.PersonalNummer))
+			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: 55, Col: 82}
+				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, 18, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, 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: 56, Col: 80}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\"> <button type=\"submit\" class=\"w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><p class=\"\">Bestätigen</p></button></form></div>")
+		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.Worktime.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
 		}
@@ -281,53 +648,53 @@ func userPresenceComponent(user models.User, present bool) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var15 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var15 == nil {
-			templ_7745c5c3_Var15 = templ.NopComponent
+		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, 20, "<div class=\"grid-cell group flex flex-row gap-2\">")
+		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, 21, "<div class=\"h-8 bg-accent rounded-md group-hover:text-black md:text-transparent text-center p-1\">Anwesend</div>")
+			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, 22, "<div class=\"h-8 bg-red-600 rounded-md group-hover:text-white md:text-transparent text-center p-1\">Abwesend</div>")
+			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, 23, "<p>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "<p>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+		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: 71, Col: 19}
+			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_Var16))
+		_, 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, 24, " ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, " ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var17 string
-		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+		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: 71, Col: 33}
+			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_Var17))
+		_, 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, 25, "</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/timeComponents.templ

@@ -3,130 +3,10 @@ package templates
 import (
 	"arbeitszeitmessung/models"
 	"fmt"
-	"net/url"
 	"strconv"
 	"time"
 )
 
-templ inputForm() {
-	{{
-		urlParams := ctx.Value("urlParams").(url.Values)
-		user := ctx.Value("user").(models.User)
-	}}
-	<div class="grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col">
-		<div class="grid-cell md:col-span-1 max-md:grid grid-cols-2">
-			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
-			<div class="justify-self-end">
-				<p class="text-sm">Überstunden</p>
-				<p class="text-accent">0h 0min (statisch)</p>
-			</div>
-		</div>
-		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row md:col-span-3 gap-2 ">
-			@lineComponent()
-			<div class="flex flex-col gap-2 justify-between grow-1">
-				<input type="date" value={ urlParams.Get("time_from") } name="time_from" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum von..."/>
-				<input type="date" value={ urlParams.Get("time_to") } name="time_to" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum bis..."/>
-			</div>
-		</form>
-		<div class="grid-cell content-end">
-			<button type="submit" form="timeRangeForm" class="w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">
-				<p class="">Anzeigen</p>
-			</button>
-		</div>
-	</div>
-}
-
-templ dayComponent(workDay models.WorkDay) {
-	{{
-		work, pause := workDay.GetWorkTimeString()
-		justify := ""
-		if len(workDay.Bookings) <= 1 {
-			justify = "justify-content: center"
-		}
-	}}
-	<div class="grid-sub divide-x-1 hover:bg-neutral-200 transition-colors">
-		<div class="grid-cell md:col-span-1 flex flex-row gap-2">
-			@timeGaugeComponent(workDay.GetWorkDayProgress(ctx.Value("user").(models.User)), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction())
-			<div>
-				<p class=""><span class="font-bold uppercase hidden md:inline">{ workDay.Day.Format("Mon") }:</span> { workDay.Day.Format("02.01.2006") }</p>
-				if work!="" {
-					<p class=" text-sm mt-1">Arbeitszeit:</p>
-					if (workDay.RequiresAction()) {
-						<p class="text-red-600">Bitte anpassen</p>
-					} else {
-						<p class=" text-accent">{ work }</p>
-					}
-					<p class="text-neutral-500">{ pause }</p>
-				}
-			</div>
-		</div>
-		<div class="all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell">
-			@lineComponent()
-			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 group w-full justify-between" style={ justify } method="post">
-				if (workDay.Absence != models.Absence{}) {
-					<p>{ workDay.Absence.GetStringType() }</p>
-				}
-				if len(workDay.Bookings) <= 1 && (workDay.Absence == models.Absence{}) {
-					<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
-					@absenceComponent(workDay)
-					@newBookingComponent(workDay)
-				} else {
-					@absenceComponent(workDay)
-					for _, booking := range workDay.Bookings {
-						@bookingComponent(booking)
-					}
-					@newBookingComponent(workDay)
-				}
-				<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
-			</form>
-		</div>
-		<div class="grid-cell">
-			@changeButtonComponent("time-" + workDay.Day.Format("2006-01-02"))
-		</div>
-	</div>
-}
-
-templ changeButtonComponent(id string) {
-	<button 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-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group" type="submit" onclick={ templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id) }>
-		<p class="hidden md:block group-[.edit]:hidden">Ändern</p>
-		<p class="hidden group-[.edit]: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]: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]: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>
-}
-
-templ timeGaugeComponent(progress uint8, today bool, warning bool) {
-	{{
-		var bgColor string
-		switch {
-		case (warning):
-			bgColor = "bg-red-600"
-			break
-		case (progress > 0 && progress < 90):
-			bgColor = "bg-orange-500"
-			break
-		case (90 <= progress && progress <= 110):
-			bgColor = "bg-accent"
-			break
-		case (progress > 110):
-			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", bgColor }></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">
@@ -139,25 +19,121 @@ templ lineComponent() {
 	</div>
 }
 
-templ absenceComponent(d models.WorkDay) {
-	<div class="no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center">
-		<select name="absence" onchange={ templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event")) } class="grow cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm transition-colors border-neutral-900" disabled>
-			<option value="0">Abwesenheit?</option>
-			for _, absence := range models.AbsenceTypes {
-				<option value={ strconv.Itoa(int(absence.Value)) }>{ absence.Label }</option>
+// templ workDayComponent(workDay models.WorkDay, submitted bool) {
+// 	{{
+// 		// work, pause := workDay.GetWorkTimeString()
+// 		user := ctx.Value("user").(models.User)
+// 		work, pause, overtime := workDay.GetAllWorkTimesReal(user)
+// 		// overtime := helper.FormatDuration(workDay.CalcOvertime(user))
+// 		justify := ""
+// 		if len(workDay.Bookings) <= 1 {
+// 			justify = "justify-content: center"
+// 		}
+// 	}}
+// 	<div class={ "grid-sub divide-x-1 hover:bg-neutral-200 transition-colors", templ.KV("bg-neutral-100", submitted) }>
+// 		<div class="grid-cell md:col-span-1 flex flex-row gap-2">
+// 			@timeGaugeComponent(workDay.GetDayProgress(user), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)))
+// 			<div>
+// 				<p class=""><span class="font-bold uppercase hidden md:inline">{ workDay.Day.Format("Mon") }:</span> { workDay.Day.Format("02.01.2006") }</p>
+// 				if (workDay.RequiresAction()) {
+// 					<p class="text-red-600">Bitte anpassen</p>
+// 				} else {
+// 					if work > 0 {
+// 						<p class=" text-sm mt-1">Arbeitszeit:</p>
+// 						<p class="text-accent flex flex-row items-center"><span class="icon-[material-symbols-light--nest-clock-farsight-analog-outline]"></span>{ helper.FormatDuration(work) }</p>
+// 					}
+// 					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 overtime > 0 {
+// 						<p class="text-neutral-500 flex flex-row items-center"><span class="icon-[material-symbols-light--more-time]"></span>{ helper.FormatDuration(overtime) }</p>
+// 					}
+// 				}
+// 			</div>
+// 		</div>
+// 		<div class="all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell">
+// 			@lineComponent()
+// 			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 group w-full justify-between" style={ justify } method="post">
+// 				if len(workDay.Bookings) < 1 {
+// 					<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+// 					@absenceComponent(workDay)
+// 					@newBookingComponent(workDay)
+// 				} else {
+// 					@absenceComponent(workDay)
+// 					for _, booking := range workDay.Bookings {
+// 						@bookingComponent(booking)
+// 					}
+// 					if workDay.IsKurzArbeit() {
+// 						<p>Kurzarbeit</p>
+// 					}
+// 					@newBookingComponent(workDay)
+// 				}
+// 				<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
+// 			</form>
+// 		</div>
+// 		<div class="grid-cell">
+// 			@changeButtonComponent("time-" + workDay.Day.Format("2006-01-02"))
+// 		</div>
+// 	</div>
+// }
+templ changeButtonComponent(id string, workDay bool) {
+	{{
+		functionName := "editDay"
+		if !workDay {
+			functionName = "editAbsence"
 		}
-		</select>
+	}}
+	<button class="btn w-auto group" type="submit" onclick={ templ.JSFuncCall(functionName, templ.JSExpression("this"), templ.JSExpression("event"), id) }>
+		<p class="hidden md:block group-[.edit]:hidden">Ändern</p>
+		<p class="hidden group-[.edit]: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]: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]: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>
+}
+
+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 newAbsenceComponent() {
+	<div class="no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center">
+		<button type="button" name="absence" onclick={ templ.JSFuncCall("editAbsence", templ.JSExpression("this"), templ.JSExpression("event"), 0) } class="btn">
+			Abwesenheit
+		</button>
 	</div>
 }
 
-templ newBookingComponent(d models.WorkDay) {
+templ newBookingComponent(d *models.WorkDay) {
 	<div class="new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center">
-		<button name="action" value="add" type="submit" class="hover:text-accent cursor-pointer">
-			<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="size-4 transition-colors" viewBox="0 0 16 16">
-				<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"></path>
-				<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4"></path>
-			</svg>
-		</button>
+		<button name="action" value="add" type="submit" class="hover:text-accent cursor-pointer icon-[material-symbols-light--add-circle-outline]"></button>
 		<input name="timestamp" type="time" value={ time.Now().Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300"/>
 		<input name="date" type="hidden" value={ d.Day.Format("2006-01-02") }/>
 		<select name="check_in_out">

Backend/templates/timeComponents_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.833
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -11,12 +11,11 @@ import templruntime "github.com/a-h/templ/runtime"
 import (
 	"arbeitszeitmessung/models"
 	"fmt"
-	"net/url"
 	"strconv"
 	"time"
 )
 
-func inputForm() templ.Component {
+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 {
@@ -37,57 +36,7 @@ func inputForm() templ.Component {
 			templ_7745c5c3_Var1 = 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, 1, "<div class=\"grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col\"><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_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname + " " + user.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 18, Col: 66}
-		}
-		_, 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, "</p><div class=\"justify-self-end\"><p class=\"text-sm\">Überstunden</p><p class=\"text-accent\">0h 0min (statisch)</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, 3, "<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_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_from"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 27, Col: 57}
-		}
-		_, 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, "\" name=\"time_from\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\" placeholder=\"Zeitraum von...\"> <input type=\"date\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_to"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 28, Col: 55}
-		}
-		_, 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, "\" name=\"time_to\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\" placeholder=\"Zeitraum bis...\"></div></form><div class=\"grid-cell content-end\"><button type=\"submit\" form=\"timeRangeForm\" class=\"w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><p class=\"\">Anzeigen</p></button></div></div>")
+		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
 		}
@@ -95,7 +44,64 @@ func inputForm() templ.Component {
 	})
 }
 
-func dayComponent(workDay models.WorkDay) templ.Component {
+//	templ workDayComponent(workDay models.WorkDay, submitted bool) {
+//		{{
+//			// work, pause := workDay.GetWorkTimeString()
+//			user := ctx.Value("user").(models.User)
+//			work, pause, overtime := workDay.GetAllWorkTimesReal(user)
+//			// overtime := helper.FormatDuration(workDay.CalcOvertime(user))
+//			justify := ""
+//			if len(workDay.Bookings) <= 1 {
+//				justify = "justify-content: center"
+//			}
+//		}}
+//		<div class={ "grid-sub divide-x-1 hover:bg-neutral-200 transition-colors", templ.KV("bg-neutral-100", submitted) }>
+//			<div class="grid-cell md:col-span-1 flex flex-row gap-2">
+//				@timeGaugeComponent(workDay.GetDayProgress(user), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)))
+//				<div>
+//					<p class=""><span class="font-bold uppercase hidden md:inline">{ workDay.Day.Format("Mon") }:</span> { workDay.Day.Format("02.01.2006") }</p>
+//					if (workDay.RequiresAction()) {
+//						<p class="text-red-600">Bitte anpassen</p>
+//					} else {
+//						if work > 0 {
+//							<p class=" text-sm mt-1">Arbeitszeit:</p>
+//							<p class="text-accent flex flex-row items-center"><span class="icon-[material-symbols-light--nest-clock-farsight-analog-outline]"></span>{ helper.FormatDuration(work) }</p>
+//						}
+//						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 overtime > 0 {
+//							<p class="text-neutral-500 flex flex-row items-center"><span class="icon-[material-symbols-light--more-time]"></span>{ helper.FormatDuration(overtime) }</p>
+//						}
+//					}
+//				</div>
+//			</div>
+//			<div class="all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell">
+//				@lineComponent()
+//				<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 group w-full justify-between" style={ justify } method="post">
+//					if len(workDay.Bookings) < 1 {
+//						<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+//						@absenceComponent(workDay)
+//						@newBookingComponent(workDay)
+//					} else {
+//						@absenceComponent(workDay)
+//						for _, booking := range workDay.Bookings {
+//							@bookingComponent(booking)
+//						}
+//						if workDay.IsKurzArbeit() {
+//							<p>Kurzarbeit</p>
+//						}
+//						@newBookingComponent(workDay)
+//					}
+//					<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
+//				</form>
+//			</div>
+//			<div class="grid-cell">
+//				@changeButtonComponent("time-" + workDay.Day.Format("2006-01-02"))
+//			</div>
+//		</div>
+//	}
+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 {
@@ -111,205 +117,30 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var5 == nil {
-			templ_7745c5c3_Var5 = templ.NopComponent
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
-		work, pause := workDay.GetWorkTimeString()
-		justify := ""
-		if len(workDay.Bookings) <= 1 {
-			justify = "justify-content: center"
+		functionName := "editDay"
+		if !workDay {
+			functionName = "editAbsence"
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"grid-sub divide-x-1 hover:bg-neutral-200 transition-colors\"><div class=\"grid-cell md:col-span-1 flex flex-row gap-2\">")
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall(functionName, templ.JSExpression("this"), templ.JSExpression("event"), id))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = timeGaugeComponent(workDay.GetWorkDayProgress(ctx.Value("user").(models.User)), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction()).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<button class=\"btn w-auto group\" type=\"submit\" onclick=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div><p class=\"\"><span class=\"font-bold uppercase hidden md:inline\">")
+		var templ_7745c5c3_Var3 templ.ComponentScript = templ.JSFuncCall(functionName, templ.JSExpression("this"), templ.JSExpression("event"), id)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Day.Format("Mon"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 94}
-		}
-		_, 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, 8, ":</span> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Day.Format("02.01.2006"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 139}
-		}
-		_, 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, 9, "</p>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if work != "" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\" text-sm mt-1\">Arbeitszeit:</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if workDay.RequiresAction() {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<p class=\"text-red-600\">Bitte anpassen</p>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			} else {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<p class=\" text-accent\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var8 string
-				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(work)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 57, Col: 36}
-				}
-				_, 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
-				}
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " <p class=\"text-neutral-500\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var9 string
-			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(pause)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 59, Col: 40}
-			}
-			_, 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, "</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</div></div><div class=\"all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell\">")
-		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, 17, "<form id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("time-" + workDay.Day.Format("2006-01-02"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 65, Col: 56}
-		}
-		_, 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, 18, "\" class=\"flex flex-col gap-2 group w-full justify-between\" style=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(justify)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 65, Col: 131}
-		}
-		_, 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, 19, "\" method=\"post\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if (workDay.Absence != models.Absence{}) {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var12 string
-			templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Absence.GetStringType())
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 67, Col: 41}
-			}
-			_, 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, 21, "</p>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		if len(workDay.Bookings) <= 1 && (workDay.Absence == models.Absence{}) {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<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 = absenceComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
-			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
-			}
-			templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			templ_7745c5c3_Err = absenceComponent(workDay).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, 24, " ")
-			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
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<input type=\"hidden\" name=\"action\" value=\"change\"><!-- default action value for ändern button --></form></div><div class=\"grid-cell\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = changeButtonComponent("time-"+workDay.Day.Format("2006-01-02")).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "</div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "\"><p class=\"hidden md:block group-[.edit]:hidden\">Ändern</p><p class=\"hidden group-[.edit]: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]: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]: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
 		}
@@ -317,7 +148,7 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 	})
 }
 
-func changeButtonComponent(id string) templ.Component {
+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 {
@@ -333,66 +164,24 @@ func changeButtonComponent(id string) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var13 == nil {
-			templ_7745c5c3_Var13 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<button 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-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group\" type=\"submit\" onclick=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var14 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "\"><p class=\"hidden md:block group-[.edit]:hidden\">Ändern</p><p class=\"hidden group-[.edit]: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]: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]: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
-		}
-		return nil
-	})
-}
-
-func timeGaugeComponent(progress uint8, today bool, warning 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
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
 		var bgColor string
 		switch {
-		case (warning):
+		case (0 > progress):
 			bgColor = "bg-red-600"
 			break
-		case (progress > 0 && progress < 90):
+		case (progress > 0 && progress < 95):
 			bgColor = "bg-orange-500"
 			break
-		case (90 <= progress && progress <= 110):
+		case (95 <= progress && progress <= 105):
 			bgColor = "bg-accent"
 			break
-		case (progress > 110):
+		case (progress > 105):
 			bgColor = "bg-purple-600"
 			break
 		default:
@@ -400,65 +189,65 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			break
 		}
 		if today {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<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_Var16 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var16...)
+			var templ_7745c5c3_Var5 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var5...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var17 string
-			templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var16).String())
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var5).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_Var17))
+			_, 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, 31, "\" style=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\" style=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var18 string
-			templ_7745c5c3_Var18, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(fmt.Sprintf("height: %d%%", int(progress)))
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, 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: 123, Col: 149}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 119, Col: 149}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+			_, 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, 32, "\"></div></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "\"></div></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		} else {
-			var templ_7745c5c3_Var19 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var19...)
+			var templ_7745c5c3_Var8 = []any{"w-2 h-full bg-accent rounded-md flex-shrink-0", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var8...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var20 string
-			templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var19).String())
+			var templ_7745c5c3_Var9 string
+			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var8).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_Var20))
+			_, 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, 34, "\"></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\"></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -467,7 +256,7 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 	})
 }
 
-func lineComponent() templ.Component {
+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 {
@@ -483,12 +272,29 @@ func lineComponent() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var21 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var21 == nil {
-			templ_7745c5c3_Var21 = templ.NopComponent
+		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, 35, "<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_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<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("editAbsence", templ.JSExpression("this"), templ.JSExpression("event"), 0))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<button type=\"button\" name=\"absence\" onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 templ.ComponentScript = templ.JSFuncCall("editAbsence", templ.JSExpression("this"), templ.JSExpression("event"), 0)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\" class=\"btn\">Abwesenheit</button></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -496,7 +302,7 @@ func lineComponent() templ.Component {
 	})
 }
 
-func absenceComponent(d models.WorkDay) templ.Component {
+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 {
@@ -512,140 +318,58 @@ func absenceComponent(d models.WorkDay) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var22 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var22 == nil {
-			templ_7745c5c3_Var22 = templ.NopComponent
+		templ_7745c5c3_Var12 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var12 == nil {
+			templ_7745c5c3_Var12 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "<div class=\"no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<div class=\"new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center\"><button name=\"action\" value=\"add\" type=\"submit\" class=\"hover:text-accent cursor-pointer icon-[material-symbols-light--add-circle-outline]\"></button> <input name=\"timestamp\" type=\"time\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event")))
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, 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: 137, Col: 72}
+		}
+		_, 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, 37, "<select name=\"absence\" onchange=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> <input name=\"date\" type=\"hidden\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var23 templ.ComponentScript = templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event"))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var23.Call)
+		var templ_7745c5c3_Var14 string
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(d.Day.Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 138, Col: 69}
+		}
+		_, 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, 38, "\" class=\"grow cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm transition-colors border-neutral-900\" disabled><option value=\"0\">Abwesenheit?</option> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, absence := range models.AbsenceTypes {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "<option value=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var24 string
-			templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(absence.Value)))
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 147, Col: 52}
-			}
-			_, 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, 40, "\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var25 string
-			templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(absence.Label)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 147, 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, 41, "</option>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "</select></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_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, 43, "<div class=\"new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center\"><button name=\"action\" value=\"add\" type=\"submit\" class=\"hover:text-accent cursor-pointer\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"size-4 transition-colors\" viewBox=\"0 0 16 16\"><path d=\"M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16\"></path> <path d=\"M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4\"></path></svg></button> <input name=\"timestamp\" type=\"time\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var27 string
-		templ_7745c5c3_Var27, 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: 161, Col: 72}
-		}
-		_, 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, 44, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> <input name=\"date\" type=\"hidden\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var28 string
-		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(d.Day.Format("2006-01-02"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 162, Col: 69}
-		}
-		_, 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, 45, "\"> <select name=\"check_in_out\"><option value=\"0\" disabled>Kommen/Gehen</option> <option value=\"3\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "\"> <select 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, 46, " selected")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, ">Kommen</option> <option value=\"4\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, ">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, 48, " selected")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, " selected")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, ">Gehen</option></select></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, ">Gehen</option></select></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -669,64 +393,64 @@ func bookingComponent(booking models.Booking) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var29 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var29 == nil {
-			templ_7745c5c3_Var29 = templ.NopComponent
+		templ_7745c5c3_Var15 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var15 == nil {
+			templ_7745c5c3_Var15 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "<div><p class=\"text-neutral-500\"><span class=\"text-neutral-700 group-[.edit]:hidden inline\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<div><p class=\"text-neutral-500\"><span class=\"text-neutral-700 group-[.edit]:hidden inline\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var30 string
-		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, 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: 174, Col: 97}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 150, Col: 97}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
+		_, 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, 51, "</span> <input disabled name=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</span> <input disabled name=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var31 string
-		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs("booking_" + strconv.Itoa(booking.CounterId))
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, 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: 175, Col: 70}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 151, Col: 70}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
+		_, 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, 52, "\" type=\"time\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\" type=\"time\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var32 string
-		templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, 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: 175, Col: 126}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 151, Col: 126}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
+		_, 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, 53, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var33 string
-		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 176, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 152, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
+		_, 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, 54, "</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -750,12 +474,12 @@ func LegendComponent() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var34 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var34 == nil {
-			templ_7745c5c3_Var34 = templ.NopComponent
+		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, 55, "<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_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<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
 		}

Backend/templates/timePage.templ

@@ -0,0 +1,169 @@
+package templates
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"net/url"
+	"strconv"
+	"time"
+)
+
+templ TimePage(workDays []models.WorkDay, lastSub time.Time) {
+	{{
+		allDays := ctx.Value("days").([]models.IWorkDay)
+	}}
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		@inputForm()
+		for _, day := range allDays {
+			@defaultDayComponent(day)
+			if (day.Date().Weekday() == time.Monday) {
+				<div class="grid-sub responsive bg-neutral-300 h-2"></div>
+			}
+		}
+	</div>
+	@LegendComponent()
+}
+
+templ inputForm() {
+	{{
+		urlParams := ctx.Value("urlParams").(url.Values)
+		user := ctx.Value("user").(models.User)
+	}}
+	<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>
+			<div class="justify-self-end">
+				<p class="text-sm">Überstunden</p>
+				<p class="text-accent">{ user.Overtime }</p>
+			</div>
+		</div>
+		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row md:col-span-3 gap-2 ">
+			@lineComponent()
+			<div class="flex flex-col gap-2 justify-between grow-1">
+				<input type="date" value={ urlParams.Get("time_from") } name="time_from" class="btn bg-neutral-100" placeholder="Zeitraum von..."/>
+				<input type="date" value={ urlParams.Get("time_to") } 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">
+					for _, absence := range models.GetAbsenceTypesCached() {
+						<option value={ strconv.Itoa(int(absence.Id)) }>{ absence.Name }</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 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]"><span class="icon-[material-symbols-light--delete-outline]"></span></button>
+			</div>
+		</div>
+	</form>
+}
+
+templ defaultDayComponent(day models.IWorkDay) {
+	{{
+		user := ctx.Value("user").(models.User)
+		justify := "justify-center"
+		if day.IsWorkDay() && len(day.(*models.WorkDay).Bookings) > 1 {
+			justify = "justify-between"
+		}
+	}}
+	<div class={ "grid-sub divide-x-1 hover:bg-neutral-200 transition-colors" }>
+		<div class="grid-cell md:col-span-1 flex flex-row gap-2">
+			@timeGaugeComponent(day.GetDayProgress(user), day.Date().Equal(time.Now().Truncate(24*time.Hour)))
+			<div>
+				<p>
+					<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, overtime := workDay.GetAllWorkTimesVirtual(user)
+					}}
+					if day.RequiresAction() {
+						<p class="text-red-600">Bitte anpassen</p>
+					} else {
+						if work > 0 {
+							<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>{ helper.FormatDuration(work) }</p>
+						}
+						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 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) }
+							</p>
+						}
+					}
+				}
+			</div>
+		</div>
+		<div class="all-booking-component grid-cell flex flex-row md:col-span-3 gap-2 w-full">
+			@lineComponent()
+			<form id={ "time-" + day.Date().Format("2006-01-02") } class={ "flex flex-col gap-2 group w-full ", justify } method="post">
+				@newAbsenceComponent()
+				if day.IsWorkDay() {
+					{{
+					workDay, _ := day.(*models.WorkDay)
+					}}
+					if len(workDay.Bookings) < 1 {
+						<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+					}
+					for _, booking := range workDay.Bookings {
+						@bookingComponent(booking)
+					}
+					@newBookingComponent(workDay)
+					if workDay.IsKurzArbeit() {
+						@absentInput(workDay.GetKurzArbeit())
+						<p>Kurzarbeit</p>
+					}
+				} else {
+					{{
+						absentDay, _ := day.(*models.Absence)
+					}}
+					@absentInput(*absentDay)
+					<p>{ absentDay.AbwesenheitTyp.Name } <span class="text-neutral-700">bis { absentDay.DateTo.Format("02.01.2006") }</span></p>
+				}
+			</form>
+		</div>
+		<div class="grid-cell">
+			@changeButtonComponent("time-"+day.Date().Format("2006-01-02"), day.IsWorkDay())
+		</div>
+	</div>
+}
+
+templ absentInput(a models.Absence) {
+	<input type="hidden" name="date_from" value={ a.DateFrom.Format("2006-01-02") }/>
+	<input type="hidden" name="date_to" value={ a.DateTo.Format("2006-01-02") }/>
+	<input type="hidden" name="aw_type" value={ a.AbwesenheitTyp.Id }/>
+	<input type="hidden" name="aw_id" value={ a.CounterId }/>
+}

Backend/templates/timePage_templ.go

@@ -0,0 +1,595 @@
+// 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]\"><span class=\"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"}
+		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: 103, Col: 13}
+		}
+		_, 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.GetAllWorkTimesVirtual(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: 115, 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: 118, 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: 123, 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 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 group 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("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 132, Col: 55}
+		}
+		_, 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
+		}
+		templ_7745c5c3_Err = newAbsenceComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if day.IsWorkDay() {
+
+			workDay, _ := day.(*models.WorkDay)
+			if len(workDay.Bookings) < 1 {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<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
+				}
+			}
+			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, 34, " ")
+			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
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if workDay.IsKurzArbeit() {
+				templ_7745c5c3_Err = absentInput(workDay.GetKurzArbeit()).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, " <p>Kurzarbeit</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		} else {
+
+			absentDay, _ := day.(*models.Absence)
+			templ_7745c5c3_Err = absentInput(*absentDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, " <p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var20 string
+			templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(absentDay.AbwesenheitTyp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 154, Col: 39}
+			}
+			_, 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, 38, " <span class=\"text-neutral-700\">bis ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var21 string
+			templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(absentDay.DateTo.Format("02.01.2006"))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 154, Col: 116}
+			}
+			_, 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, 39, "</span></p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "</form></div><div class=\"grid-cell\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = changeButtonComponent("time-"+day.Date().Format("2006-01-02"), day.IsWorkDay()).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>")
+		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_Var22 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var22 == nil {
+			templ_7745c5c3_Var22 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "<input type=\"hidden\" name=\"date_from\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateFrom.Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 165, Col: 78}
+		}
+		_, 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, 43, "\"> <input type=\"hidden\" name=\"date_to\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateTo.Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 166, Col: 74}
+		}
+		_, 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, 44, "\"> <input type=\"hidden\" name=\"aw_type\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var25 string
+		templ_7745c5c3_Var25, 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: 167, Col: 64}
+		}
+		_, 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, 45, "\"> <input type=\"hidden\" name=\"aw_id\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var26 string
+		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(a.CounterId)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 168, Col: 54}
+		}
+		_, 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, 46, "\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

DB/initdb/01_schema.sql

@@ -3,36 +3,50 @@
 -- ----------------------------
 DROP TABLE IF EXISTS "anwesenheit";
 CREATE TABLE "anwesenheit" (
-    "counter_id" bigserial PRIMARY KEY,
-    "timestamp" timestamptz(6) DEFAULT CURRENT_TIMESTAMP,
-    "card_uid" varchar(255),
-    "check_in_out" int2,
-    "geraet_id" int2
+  "counter_id" bigserial NOT NULL,
+  "timestamp" timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "card_uid" character varying(255) NOT NULL,
+  "check_in_out" smallint NOT NULL,
+  "geraet_id" smallint NOT NULL,
+  "anwesenheit_typ" int2 NOT NULL,
+  PRIMARY KEY ("counter_id")
 );
+
 COMMENT ON COLUMN "anwesenheit"."check_in_out" IS '1=Check In 2=Check Out , 3=Check in Manuell, 4=Check out manuell255=Automatic Check Out';
 COMMENT ON COLUMN "anwesenheit"."geraet_id" IS 'ID des Lesegerätes';
 
+-- ----------------------------
+-- Table structure for anwesenheitstypen
+-- ----------------------------
+
+DROP TABLE IF EXISTS "s_anwesenheit_typen";
+CREATE TABLE "s_anwesenheit_typen" (
+    "anwesenheit_id" int2 PRIMARY KEY,
+    "anwesenheit_name" varchar(255)
+);
+
 -- ----------------------------
 -- Table structure for personal_daten
 -- ----------------------------
-DROP TABLE IF EXISTS "personal_daten";
-CREATE TABLE "personal_daten" (
+DROP TABLE IF EXISTS "s_personal_daten";
+CREATE TABLE "s_personal_daten" (
     "personal_nummer" int4 NOT NULL PRIMARY KEY,
     "aktiv_beschaeftigt" bool,
-    "vorname" varchar(255),
-    "nachname" varchar(255),
+    "vorname" varchar(255) NOT NULL,
+    "nachname" varchar(255) NOT NULL,
     "geburtsdatum" date,
     "plz" varchar(255),
     "adresse" varchar(255),
     "geschlecht" int2,
     "card_uid" varchar(255),
     "hauptbeschaeftigungs_ort" int2,
-    "arbeitszeit_per_tag" float4,
+    "arbeitszeit_per_tag" float4 NOT NULL,
+    "arbeitszeit_per_woche" float4 NOT NULL,
     "arbeitszeit_min_start" time(6),
     "arbeitszeit_max_ende" time(6),
-    "vorgesetzter_pers_nr" int4
+    "vorgesetzter_pers_nr" int4 NOT NULL
 );
-COMMENT ON COLUMN "personal_daten"."geschlecht" IS '1==weiblich, 2==maennlich, 3==divers';
+COMMENT ON COLUMN "s_personal_daten"."geschlecht" IS '1==weiblich, 2==maennlich, 3==divers';
 
 DROP TABLE IF EXISTS "user_password";
 CREATE TABLE "user_password" (
@@ -67,6 +81,8 @@ CREATE TABLE "wochen_report" (
     "personal_nummer" int4,
     "woche_start" date,
     "bestaetigt" bool DEFAULT FALSE,
+    "arbeitszeit" interval,
+    "ueberstunden" interval,
     UNIQUE ("personal_nummer", "woche_start")
 );
 
@@ -75,18 +91,17 @@ CREATE TABLE "abwesenheit" (
     "counter_id" bigserial PRIMARY KEY,
     "card_uid" varchar(255),
     "abwesenheit_typ" int2,
-    "datum" timestamptz(6) DEFAULT NOW()::DATE
+    "datum_from" timestamptz DEFAULT NOW()::DATE,
+    "datum_to" timestamptz
     );
 
+DROP TABLE IF EXISTS "s_abwesenheit_typen";
+CREATE TABLE "s_abwesenheit_typen" (
+    "abwesenheit_id" int2 PRIMARY KEY,
+    "abwesenheit_name" varchar(255),
+    "arbeitszeit_equivalent" float4
+);
+
 -- Adds crypto extension
 
 CREATE EXTENSION IF NOT EXISTS pgcrypto;
-
-
--- Insert into personal_daten
-
-INSERT INTO "personal_daten" ("personal_nummer", "aktiv_beschaeftigt", "vorname", "nachname", "geburtsdatum", "plz", "adresse", "geschlecht", "card_uid", "hauptbeschaeftigungs_ort", "arbeitszeit_per_tag", "arbeitszeit_min_start", "arbeitszeit_max_ende", "vorgesetzter_pers_nr") VALUES
-(123,	't',	'Max',	'Mustermann',	'2003-02-01',	'08963',	'Altenburger Str. 44A',	1,	'acde-edca',	1,	7.5,	'07:00:00',	'20:00:00',	0);
-
-INSERT INTO "user_password" ("personal_nummer", "pass_hash") VALUES
-(123, crypt('max_pass', gen_salt('bf')));

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

@@ -7,7 +7,8 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
     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, personal_daten, user_password, wochen_report 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
 

Docker/.env.example

@@ -1,7 +1,7 @@
 POSTGRES_USER=root
 POSTGRES_PASSWORD=very_secure
-POSTGRES_API_USER=api_nuter
-POSTGRES_API_PASSWORD=password
+POSTGRES_API_USER=api_nutzer
+POSTGRES_API_PASS=password
 POSTGRES_PATH=../DB
 POSTGRES_DB=arbeitszeitmessung
 EXPOSED_PORT=8000

Docker/docker-compose.dev.yml

@@ -9,7 +9,7 @@ services:
       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
 
@@ -19,8 +19,7 @@ services:
     ports:
       - 8001:8080
   backend:
-    build: ../Backend
-    image: git.letsstein.de/tom/arbeitszeit-backend:0.0.1
+    image: git.letsstein.de/tom/arbeitszeitmessung
     restart: unless-stopped
     env_file:
       - .env
@@ -31,8 +30,11 @@ services:
       NO_CORS: true
     ports:
       - ${EXPOSED_PORT}:8080
+    volumes:
+      - ../logs:/app/Backend/logs
     depends_on:
       - db
+
   swagger:
     image: swaggerapi/swagger-ui
     restart: unless-stopped

Docker/docker-compose.test.yml

@@ -0,0 +1,12 @@
+name: arbeitszeitmessung-test
+services:
+  db:
+    image: postgres:16
+    restart: unless-stopped
+    env_file:
+      - .env.test
+    environment:
+      PGDATA: /var/lib/postgresql/data/pg_data
+    # volumes: //- ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d
+    ports:
+      - 5433:5432

Docker/docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - 5432:5432
 
   backend:
-    image: git.letsstein.de/tom/arbeitszeit-backend
+    image: git.letsstein.de/tom/arbeitszeitmessung
     env_file:
       - .env
     environment:
@@ -28,4 +28,6 @@ services:
       - ${EXPOSED_PORT}:8080
     depends_on:
       - db
+    volumes:
+      - ../logs:/app/Backend/logs
     restart: unless-stopped

Jenkinsfile

@@ -1,15 +1,58 @@
 pipeline {
         environment {
-        DOCKER_USERNAME = 'tom'
-        DOCKER_PASSWORD = credentials('dgitea_tom')
+        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 ("Building image arbeitszeit-backend"){
+        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{
+                    anyOf {
                         changeset 'Jenkinsfile'
                         changeset 'Makefile'
                         changeset 'Backend/**'
@@ -18,7 +61,6 @@ pipeline {
                 steps {
                     sh 'make backend'
                 }
-
             }
     }
 }

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Makefile

@@ -1,4 +1,5 @@
 DOCKER_USERNAME ?= tom
+PACKAGE_OWNER ?= tom
 DOCKER_PASSWORD ?= $(shell echo "YOUR_DEFAULT_PASSWORD")
 IMAGE_REGISTRY ?= git.letsstein.de
 APPLICATION_NAME ?= arbeitszeit
@@ -16,12 +17,12 @@ ifdef JENKINS_HOME
 endif
 
 _builder:
-	docker build --tag ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} -f $(call capitalize, ${_BUILD_ARGS_APP_PART})/Dockerfile $(call capitalize, ${_BUILD_ARGS_APP_PART})
+	docker build --tag ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} -f $(call capitalize, ${_BUILD_ARGS_APP_PART})/Dockerfile $(call capitalize, ${_BUILD_ARGS_APP_PART})
 
 _pusher: login_registry
-	docker push ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT}
-	docker tag ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
-	docker push ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
+	docker push ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT}
+	docker tag ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
+	docker push ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
 
 
 build_%:
@@ -43,5 +44,11 @@ generateFrontend:
 
 
 backend: generateFrontend login_registry
-	docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:latest Backend --push
-	docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:${GIT_COMMIT} 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:
+	$(MAKE) -C Backend test
+
+scan: test
+	$(MAKE) -C Backend scan

db.sql

@@ -146,3 +146,121 @@ SELECT
 FROM ordered_bookings
 GROUP BY work_date
 ORDER BY work_date;
+
+
+-- Generate weekdays for 2 weeks (Mon–Fri), starting 2 weeks ago
+WITH days AS (
+    SELECT gs::date AS work_date
+    FROM generate_series(
+        date_trunc('week', CURRENT_DATE) - interval '14 days', -- start 2 weeks ago Monday
+        CURRENT_DATE,                                          -- end TODAY (no future days)
+        interval '1 day'
+    ) gs
+    WHERE EXTRACT(ISODOW FROM gs) <= 5 -- only Mon–Fri
+),
+sample_bookings AS (
+    SELECT
+        d.work_date,
+        'aaaa-aaaa'::varchar AS card_uid,
+        1 AS check_in_out,  -- come
+        101 AS geraet_id,
+        (d.work_date + make_time(8, floor(random()*50)::int, 0))::timestamptz AS ts,
+        1 AS anwesenheit_typ
+    FROM days d
+    UNION ALL
+    SELECT
+        d.work_date,
+        'aaaa-aaaa'::varchar AS card_uid,
+        2 AS check_in_out,  -- go
+        101 AS geraet_id,
+        (d.work_date + make_time(16, floor(random()*50)::int, 0))::timestamptz AS ts,
+        1 AS anwesenheit_typ
+    FROM days d
+),
+ins_anw AS (
+    -- insert only bookings up to now (prevents future times on today)
+    INSERT INTO anwesenheit ("timestamp", card_uid, check_in_out, geraet_id)
+    SELECT ts, card_uid, check_in_out, geraet_id
+    FROM sample_bookings
+    WHERE ts <= NOW()
+    RETURNING 1
+)
+-- now insert absences (uses the same days CTE)
+INSERT INTO abwesenheit (card_uid, abwesenheit_typ, datum)
+SELECT
+    'aaaa-aaaa',
+    (ARRAY[1, 2])[floor(random()*2 + 1)], -- example types
+    d.work_date::timestamptz
+FROM days d
+WHERE random() < 0.2  -- ~20% random absences
+ORDER BY d.work_date;
+
+
+WITH params AS (
+    SELECT
+        'aaaa-aaaa'::varchar AS card_uid,
+        101::int AS geraet_id,
+        14::int AS start_days_ago,  -- how many days back to start
+        0::int  AS end_days_ahead,  -- how many days forward (0 = today)
+        0::float AS pause_probability,
+        0.0::float AS absence_probability
+),
+days AS (
+    SELECT gs::date AS work_date, p.card_uid, p.geraet_id, p.pause_probability, p.absence_probability
+    FROM params p,
+         generate_series(
+             date_trunc('week', CURRENT_DATE) - (p.start_days_ago || ' days')::interval,
+             CURRENT_DATE + (p.end_days_ahead || ' days')::interval,
+             interval '1 day'
+         ) gs
+    WHERE EXTRACT(ISODOW FROM gs) <= 5 -- only Mon–Fri
+),
+base_bookings AS (
+    -- come
+    SELECT
+        d.work_date, d.card_uid, 1 AS check_in_out, d.geraet_id,
+        (d.work_date + make_time(8, floor(random()*40)::int, 0))::timestamptz AS ts
+    FROM days d
+    UNION ALL
+    -- go
+    SELECT
+        d.work_date, d.card_uid, 2 AS check_in_out, d.geraet_id,
+        (d.work_date + make_time(16, floor(random()*40)::int, 0))::timestamptz AS ts
+    FROM days d
+),
+pause_bookings AS (
+    -- pause come
+    SELECT
+        d.work_date, d.card_uid, 3 AS check_in_out, d.geraet_id,
+        (d.work_date + make_time(11, floor(random()*30)::int, 0))::timestamptz AS ts
+    FROM days d
+    WHERE random() < d.pause_probability
+    UNION ALL
+    -- pause go
+    SELECT
+        d.work_date, d.card_uid, 4 AS check_in_out, d.geraet_id,
+        (d.work_date + make_time(12, floor(random()*30)::int, 0))::timestamptz AS ts
+    FROM days d
+    WHERE random() < d.pause_probability
+),
+all_bookings AS (
+    SELECT * FROM base_bookings
+    UNION ALL
+    SELECT * FROM pause_bookings
+),
+ins_anw AS (
+    INSERT INTO anwesenheit ("timestamp", "card_uid", "check_in_out", "geraet_id", "anwesenheit_typ")
+    SELECT ts, card_uid, check_in_out, geraet_id, 1 as anwesenheit_typ
+    FROM all_bookings
+    WHERE ts <= NOW()
+    ORDER BY work_date, ts
+    RETURNING 1
+)
+INSERT INTO abwesenheit (card_uid, abwesenheit_typ, datum)
+SELECT
+    d.card_uid,
+    (ARRAY[1, 2])[floor(random()*2 + 1)], -- example types
+    d.work_date::timestamptz
+FROM days d
+WHERE random() < d.absence_probability
+ORDER BY d.work_date;

migrations/20250901201159_initial.down.sql

@@ -0,0 +1,16 @@
+-- reverse: create "user_password" table
+DROP TABLE "user_password";
+-- reverse: create "wochen_report" table
+DROP TABLE "wochen_report";
+-- reverse: set comment to column: "geschlecht" on table: "personal_daten"
+COMMENT ON COLUMN "personal_daten"."geschlecht" IS NULL;
+-- reverse: create "personal_daten" table
+DROP TABLE "personal_daten";
+-- reverse: set comment to column: "geraet_id" on table: "anwesenheit"
+COMMENT ON COLUMN "anwesenheit"."geraet_id" IS NULL;
+-- reverse: set comment to column: "check_in_out" on table: "anwesenheit"
+COMMENT ON COLUMN "anwesenheit"."check_in_out" IS NULL;
+-- reverse: create "anwesenheit" table
+DROP TABLE "anwesenheit";
+-- reverse: create "abwesenheit" table
+DROP TABLE "abwesenheit";

migrations/20250901201159_initial.up.sql

@@ -0,0 +1,57 @@
+-- create "abwesenheit" table
+CREATE TABLE "abwesenheit" (
+  "counter_id" bigserial NOT NULL,
+  "card_uid" character varying(255) NULL,
+  "abwesenheit_typ" smallint NULL,
+  "datum" timestamptz NULL DEFAULT (now())::date,
+  PRIMARY KEY ("counter_id")
+);
+-- create "anwesenheit" table
+CREATE TABLE "anwesenheit" (
+  "counter_id" bigserial NOT NULL,
+  "timestamp" timestamptz NULL DEFAULT CURRENT_TIMESTAMP,
+  "card_uid" character varying(255) NULL,
+  "check_in_out" smallint NULL,
+  "geraet_id" smallint NULL,
+  PRIMARY KEY ("counter_id")
+);
+-- set comment to column: "check_in_out" on table: "anwesenheit"
+COMMENT ON COLUMN "anwesenheit"."check_in_out" IS '1=Check In 2=Check Out , 3=Check in Manuell, 4=Check out manuell255=Automatic Check Out';
+-- set comment to column: "geraet_id" on table: "anwesenheit"
+COMMENT ON COLUMN "anwesenheit"."geraet_id" IS 'ID des Lesegerätes';
+-- create "personal_daten" table
+CREATE TABLE "personal_daten" (
+  "personal_nummer" integer NOT NULL,
+  "aktiv_beschaeftigt" boolean NULL,
+  "vorname" character varying(255) NULL,
+  "nachname" character varying(255) NULL,
+  "geburtsdatum" date NULL,
+  "plz" character varying(255) NULL,
+  "adresse" character varying(255) NULL,
+  "geschlecht" smallint NULL,
+  "card_uid" character varying(255) NULL,
+  "hauptbeschaeftigungs_ort" smallint NULL,
+  "arbeitszeit_per_tag" real NULL,
+  "arbeitszeit_min_start" time NULL,
+  "arbeitszeit_max_ende" time NULL,
+  "vorgesetzter_pers_nr" integer NULL,
+  PRIMARY KEY ("personal_nummer")
+);
+-- set comment to column: "geschlecht" on table: "personal_daten"
+COMMENT ON COLUMN "personal_daten"."geschlecht" IS '1==weiblich, 2==maennlich, 3==divers';
+-- create "user_password" table
+CREATE TABLE "user_password" (
+  "personal_nummer" integer NOT NULL,
+  "pass_hash" text NULL,
+  "zuletzt_geandert" timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY ("personal_nummer")
+);
+-- create "wochen_report" table
+CREATE TABLE "wochen_report" (
+  "id" serial NOT NULL,
+  "personal_nummer" integer NULL,
+  "woche_start" date NULL,
+  "bestaetigt" boolean NULL DEFAULT false,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "wochen_report_personal_nummer_woche_start_key" UNIQUE ("personal_nummer", "woche_start")
+);

migrations/20250901201250_control_tables.down.sql

@@ -0,0 +1,14 @@
+-- reverse: remame "personal_daten" table
+ALTER TABLE "s_personal_daten" RENAME TO "personal_daten";
+
+-- reverse: create "s_anwesenheit_typen" table
+DROP TABLE "s_anwesenheit_typen";
+-- reverse: create "s_abwesenheit_typen" table
+DROP TABLE "s_abwesenheit_typen";
+-- reverse: modify "wochen_report" table
+ALTER TABLE "wochen_report" DROP COLUMN "ueberstunden";
+-- reverse: modify "anwesenheit" table
+ALTER TABLE "anwesenheit" DROP COLUMN "anwesenheit_typ", ALTER COLUMN "check_in_out" DROP NOT NULL, ALTER COLUMN "card_uid" DROP NOT NULL;
+
+-- reverse: rename a constraint from "personal_daten_pkey" to "s_personal_daten_pkey"
+ALTER TABLE "s_personal_daten" RENAME CONSTRAINT "s_personal_daten_pkey" TO "personal_daten_pkey";

migrations/20250901201250_control_tables.up.sql

@@ -0,0 +1,21 @@
+-- modify "anwesenheit" table
+ALTER TABLE "anwesenheit" ALTER COLUMN "card_uid" SET NOT NULL, ALTER COLUMN "check_in_out" SET NOT NULL, ADD COLUMN "anwesenheit_typ" smallint NULL;
+-- modify "wochen_report" table
+ALTER TABLE "wochen_report" ADD COLUMN "ueberstunden" smallint NULL;
+-- create "s_abwesenheit_typen" table
+CREATE TABLE "s_abwesenheit_typen" (
+  "abwesenheit_id" smallint NOT NULL,
+  "abwesenheit_name" character varying(255) NULL,
+  PRIMARY KEY ("abwesenheit_id")
+);
+-- create "s_anwesenheit_typen" table
+CREATE TABLE "s_anwesenheit_typen" (
+  "anwesenheit_id" smallint NOT NULL,
+  "anwesenheit_name" character varying(255) NULL,
+  PRIMARY KEY ("anwesenheit_id")
+);
+-- rename "s_personal_daten" table
+ALTER TABLE "personal_daten" RENAME TO "s_personal_daten";
+
+-- rename a constraint from "personal_daten_pkey" to "s_personal_daten_pkey"
+ALTER TABLE "s_personal_daten" RENAME CONSTRAINT "personal_daten_pkey" TO "s_personal_daten_pkey";

migrations/20250901201710_triggers_extension.down.sql

@@ -0,0 +1,10 @@
+-- update Funktion für pass_hash
+
+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

@@ -0,0 +1,21 @@
+-- update Funktion für pass_hash
+
+CREATE OR REPLACE FUNCTION update_zuletzt_geandert()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Nur wenn hash geändert wurde
+    IF NEW.pass_hash IS DISTINCT FROM OLD.pass_hash THEN
+        NEW.zuletzt_geandert = now();
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER pass_hash_update
+BEFORE UPDATE ON user_password
+FOR EACH ROW
+EXECUTE FUNCTION update_zuletzt_geandert();
+
+-- Adds crypto extension
+
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

migrations/20250903221313_overtime.down.sql

@@ -0,0 +1,6 @@
+-- reverse: modify "wochen_report" table
+ALTER TABLE "wochen_report" DROP COLUMN "arbeitszeit", ALTER COLUMN "ueberstunden" TYPE smallint;
+-- reverse: modify "s_personal_daten" table
+ALTER TABLE "s_personal_daten" DROP COLUMN "arbeitszeit_per_woche";
+-- reverse: modify "s_abwesenheit_typen" table
+ALTER TABLE "s_abwesenheit_typen" DROP COLUMN "arbeitszeit_equivalent";

migrations/20250903221313_overtime.up.sql

@@ -0,0 +1,6 @@
+-- modify "s_abwesenheit_typen" table
+ALTER TABLE "s_abwesenheit_typen" ADD COLUMN "arbeitszeit_equivalent" real NULL;
+-- modify "s_personal_daten" table
+ALTER TABLE "s_personal_daten" ADD COLUMN "arbeitszeit_per_woche" real NULL;
+-- modify "wochen_report" table
+ALTER TABLE "wochen_report" ALTER COLUMN "ueberstunden" TYPE real, ADD COLUMN "arbeitszeit" real NULL;

migrations/20250903233030_non_null_contraints.down.sql

@@ -0,0 +1,4 @@
+-- reverse: modify "s_personal_daten" table
+ALTER TABLE "s_personal_daten" ALTER COLUMN "nachname" DROP NOT NULL, ALTER COLUMN "vorname" DROP NOT NULL;
+-- reverse: modify "anwesenheit" table
+ALTER TABLE "anwesenheit" ALTER COLUMN "anwesenheit_typ" DROP NOT NULL, ALTER COLUMN "geraet_id" DROP NOT NULL, ALTER COLUMN "timestamp" DROP NOT NULL;

migrations/20250903233030_non_null_contraints.up.sql

@@ -0,0 +1,4 @@
+-- modify "anwesenheit" table
+ALTER TABLE "anwesenheit" ALTER COLUMN "timestamp" SET NOT NULL, ALTER COLUMN "geraet_id" SET NOT NULL, ALTER COLUMN "anwesenheit_typ" SET NOT NULL;
+-- modify "s_personal_daten" table
+ALTER TABLE "s_personal_daten" ALTER COLUMN "vorname" SET NOT NULL, ALTER COLUMN "nachname" SET NOT NULL;

migrations/20250904114004_intervals.down.sql

@@ -0,0 +1,7 @@
+ALTER TABLE wochen_report
+  ALTER COLUMN ueberstunden TYPE float4
+  USING
+    extract(epoch from ueberstunden) / 3600.0,
+  ALTER COLUMN arbeitszeit TYPE float4
+  USING
+    extract(epoch from arbeitszeit) / 3600.0;

migrations/20250904114004_intervals.up.sql

@@ -0,0 +1,19 @@
+ALTER TABLE wochen_report
+  ADD COLUMN ueberstunden_interval interval,
+  ADD COLUMN arbeitszeit_interval interval;
+
+UPDATE wochen_report
+SET
+  ueberstunden_interval = CASE WHEN ueberstunden IS NULL THEN NULL ELSE (ueberstunden::double precision * INTERVAL '1 hour') END,
+  arbeitszeit_interval  = CASE WHEN arbeitszeit  IS NULL THEN NULL ELSE (arbeitszeit::double precision  * INTERVAL '1 hour') END;
+
+-- when happy, drop old columns and rename new ones
+ALTER TABLE wochen_report
+  DROP COLUMN ueberstunden,
+  DROP COLUMN arbeitszeit;
+
+ALTER TABLE wochen_report
+  RENAME COLUMN ueberstunden_interval TO ueberstunden;
+
+ALTER TABLE wochen_report
+  RENAME COLUMN arbeitszeit_interval TO arbeitszeit;

migrations/20250916093608_kurzarbeit.down.sql

@@ -0,0 +1,13 @@
+-- reverse: modify "wochen_report" table
+ALTER TABLE "wochen_report" ALTER COLUMN "personal_nummer" DROP NOT NULL;
+-- reverse: modify "s_personal_daten" table
+ALTER TABLE "s_personal_daten" ALTER COLUMN "arbeitszeit_per_woche" DROP NOT NULL, ALTER COLUMN "vorgesetzter_pers_nr" DROP NOT NULL, ALTER COLUMN "arbeitszeit_per_tag" DROP NOT NULL;
+-- reverse: modify "s_anwesenheit_typen" table
+ALTER TABLE "s_anwesenheit_typen" ALTER COLUMN "anwesenheit_name" DROP NOT NULL;
+-- reverse: set comment to column: "arbeitszeit_equivalent" on table: "s_abwesenheit_typen"
+COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS NULL;
+-- reverse: modify "s_abwesenheit_typen" table
+ALTER TABLE "s_abwesenheit_typen" ALTER COLUMN "arbeitszeit_equivalent" DROP NOT NULL, ALTER COLUMN "abwesenheit_name" DROP NOT NULL;
+-- reverse: modify "abwesenheit" table
+ALTER TABLE "abwesenheit" DROP COLUMN "datum_to", ALTER COLUMN "datum_from" DROP NOT NULL, ALTER COLUMN "abwesenheit_typ" DROP NOT NULL, ALTER COLUMN "card_uid" DROP NOT NULL;
+ALTER TABLE "abwesenheit" RENAME COLUMN "datum_from" TO "datum";

migrations/20250916093608_kurzarbeit.up.sql

@@ -0,0 +1,13 @@
+-- modify "abwesenheit" table
+ALTER TABLE "abwesenheit" RENAME COLUMN "datum" TO "datum_from";
+ALTER TABLE "abwesenheit" ALTER COLUMN "card_uid" SET NOT NULL, ALTER COLUMN "abwesenheit_typ" SET NOT NULL, ALTER COLUMN "datum_from" SET NOT NULL, ADD COLUMN "datum_to" timestamptz;
+-- modify "s_abwesenheit_typen" table
+ALTER TABLE "s_abwesenheit_typen" ALTER COLUMN "abwesenheit_name" SET NOT NULL, ALTER COLUMN "arbeitszeit_equivalent" SET NOT NULL;
+-- 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';
+-- modify "s_anwesenheit_typen" table
+ALTER TABLE "s_anwesenheit_typen" ALTER COLUMN "anwesenheit_name" SET NOT NULL;
+-- modify "s_personal_daten" table
+ALTER TABLE "s_personal_daten" ALTER COLUMN "arbeitszeit_per_tag" SET NOT NULL, ALTER COLUMN "vorgesetzter_pers_nr" SET NOT NULL, ALTER COLUMN "arbeitszeit_per_woche" SET NOT NULL;
+-- modify "wochen_report" table
+ALTER TABLE "wochen_report" ALTER COLUMN "personal_nummer" SET NOT NULL;

migrations/atlas.sum

@@ -0,0 +1,15 @@
+h1:3AxgD8mnu/F+JGtJu9FZvA9Ro0UUtGPgyjskKtfTYUQ=
+20250901201159_initial.down.sql h1:cmF5CvNGqEfcmbRgiqaqDWERdNNRaMzarbNLJ/Y35o4=
+20250901201159_initial.up.sql h1:Yrak/+wfQ4Tu/dVR/cUZ/75DlAcv4G/OJXDqpgSw47U=
+20250901201250_control_tables.down.sql h1:f/KmhO9pOI45J8ZRjFonvD3CypB+rOoGOPN2WMFHvOw=
+20250901201250_control_tables.up.sql h1:of5E07p0N1aen9CdQNEOrO7ffbKZC6kp4oK5KPzU9+g=
+20250901201710_triggers_extension.down.sql h1:a9va3FSfHBWzODJSJO+ywNa2hiZwjG/vmvYGb3L1lnM=
+20250901201710_triggers_extension.up.sql h1:nUBPd2eDssi/TwMVF/nOJkIM5rUM0iINdg1K9pZRZN0=
+20250903221313_overtime.down.sql h1:X+jJESqcZ6ZTd2H563z6kRaXb4dn4sA02D3ck2795v8=
+20250903221313_overtime.up.sql h1:C3DSiNVpe9v0Un1DEQ0lsy5yToR8iqcggv91GSr6tRE=
+20250903233030_non_null_contraints.down.sql h1:42TZzPsji2Ze50k6sLwgIuNo4Trk3m3ni/aIfQJ97dE=
+20250903233030_non_null_contraints.up.sql h1:k6zR5YNSAP4fo5QEc58KZ0LxvEz1nl0X/AAcZ+TG3I4=
+20250904114004_intervals.down.sql h1:SquJAPinzFIRN6fJjLLIRsz59Tyr4RwGiGuOFI/N1SQ=
+20250904114004_intervals.up.sql h1:AFqncTGOiEZVBbhWFqN2zlQ7DyhybB5wJr6a36Atk1E=
+20250916093608_kurzarbeit.down.sql h1:ljM1a1pQCxOQiXRaXU04GC4V9yy2y20x5eUNQ/zyx+o=
+20250916093608_kurzarbeit.up.sql h1:pTiw0VfGaf26mhJg4wf98Fqwn1kShJ+PiN2PiM4q1kk=

package.json

@@ -0,0 +1,11 @@
+{
+	"dependencies": {
+		"@tailwindcss/cli": "^4.1.12",
+		"tailwindcss": "^4.1.12"
+	},
+	"devDependencies": {
+		"@iconify-json/material-symbols-light": "^1.2.33",
+		"@iconify/tailwind4": "^1.0.6",
+		"prettier": "^3.6.2"
+	}
+}

pnpm-lock.yaml

@@ -0,0 +1,655 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@tailwindcss/cli':
+        specifier: ^4.1.12
+        version: 4.1.12
+      tailwindcss:
+        specifier: ^4.1.12
+        version: 4.1.12
+
+packages:
+
+  '@isaacs/fs-minipass@4.0.1':
+    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
+    engines: {node: '>=18.0.0'}
+
+  '@jridgewell/gen-mapping@0.3.13':
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
+
+  '@jridgewell/remapping@2.3.5':
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
+  '@jridgewell/trace-mapping@0.3.30':
+    resolution: {integrity: sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==}
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.5.1':
+    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
+    engines: {node: '>= 10.0.0'}
+
+  '@tailwindcss/cli@4.1.12':
+    resolution: {integrity: sha512-2PyJ5MGh/6JPS+cEaAq6MGDx3UemkX/mJt+/phm7/VOpycpecwNnHuFZbbgx6TNK/aIjvFOhhTVlappM7tmqvQ==}
+    hasBin: true
+
+  '@tailwindcss/node@4.1.12':
+    resolution: {integrity: sha512-3hm9brwvQkZFe++SBt+oLjo4OLDtkvlE8q2WalaD/7QWaeM7KEJbAiY/LJZUaCs7Xa8aUu4xy3uoyX4q54UVdQ==}
+
+  '@tailwindcss/oxide-android-arm64@4.1.12':
+    resolution: {integrity: sha512-oNY5pq+1gc4T6QVTsZKwZaGpBb2N1H1fsc1GD4o7yinFySqIuRZ2E4NvGasWc6PhYJwGK2+5YT1f9Tp80zUQZQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@tailwindcss/oxide-darwin-arm64@4.1.12':
+    resolution: {integrity: sha512-cq1qmq2HEtDV9HvZlTtrj671mCdGB93bVY6J29mwCyaMYCP/JaUBXxrQQQm7Qn33AXXASPUb2HFZlWiiHWFytw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-darwin-x64@4.1.12':
+    resolution: {integrity: sha512-6UCsIeFUcBfpangqlXay9Ffty9XhFH1QuUFn0WV83W8lGdX8cD5/+2ONLluALJD5+yJ7k8mVtwy3zMZmzEfbLg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-freebsd-x64@4.1.12':
+    resolution: {integrity: sha512-JOH/f7j6+nYXIrHobRYCtoArJdMJh5zy5lr0FV0Qu47MID/vqJAY3r/OElPzx1C/wdT1uS7cPq+xdYYelny1ww==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.12':
+    resolution: {integrity: sha512-v4Ghvi9AU1SYgGr3/j38PD8PEe6bRfTnNSUE3YCMIRrrNigCFtHZ2TCm8142X8fcSqHBZBceDx+JlFJEfNg5zQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.1.12':
+    resolution: {integrity: sha512-YP5s1LmetL9UsvVAKusHSyPlzSRqYyRB0f+Kl/xcYQSPLEw/BvGfxzbH+ihUciePDjiXwHh+p+qbSP3SlJw+6g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.1.12':
+    resolution: {integrity: sha512-V8pAM3s8gsrXcCv6kCHSuwyb/gPsd863iT+v1PGXC4fSL/OJqsKhfK//v8P+w9ThKIoqNbEnsZqNy+WDnwQqCA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.1.12':
+    resolution: {integrity: sha512-xYfqYLjvm2UQ3TZggTGrwxjYaLB62b1Wiysw/YE3Yqbh86sOMoTn0feF98PonP7LtjsWOWcXEbGqDL7zv0uW8Q==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-musl@4.1.12':
+    resolution: {integrity: sha512-ha0pHPamN+fWZY7GCzz5rKunlv9L5R8kdh+YNvP5awe3LtuXb5nRi/H27GeL2U+TdhDOptU7T6Is7mdwh5Ar3A==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-wasm32-wasi@4.1.12':
+    resolution: {integrity: sha512-4tSyu3dW+ktzdEpuk6g49KdEangu3eCYoqPhWNsZgUhyegEda3M9rG0/j1GV/JjVVsj+lG7jWAyrTlLzd/WEBg==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+    bundledDependencies:
+      - '@napi-rs/wasm-runtime'
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+      - '@tybys/wasm-util'
+      - '@emnapi/wasi-threads'
+      - tslib
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.1.12':
+    resolution: {integrity: sha512-iGLyD/cVP724+FGtMWslhcFyg4xyYyM+5F4hGvKA7eifPkXHRAUDFaimu53fpNg9X8dfP75pXx/zFt/jlNF+lg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.1.12':
+    resolution: {integrity: sha512-NKIh5rzw6CpEodv/++r0hGLlfgT/gFN+5WNdZtvh6wpU2BpGNgdjvj6H2oFc8nCM839QM1YOhjpgbAONUb4IxA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tailwindcss/oxide@4.1.12':
+    resolution: {integrity: sha512-gM5EoKHW/ukmlEtphNwaGx45fGoEmP10v51t9unv55voWh6WrOL19hfuIdo2FjxIaZzw776/BUQg7Pck++cIVw==}
+    engines: {node: '>= 10'}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  chownr@3.0.0:
+    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
+    engines: {node: '>=18'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  detect-libc@2.0.4:
+    resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
+    engines: {node: '>=8'}
+
+  enhanced-resolve@5.18.3:
+    resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
+    engines: {node: '>=10.13.0'}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  jiti@2.5.1:
+    resolution: {integrity: sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==}
+    hasBin: true
+
+  lightningcss-darwin-arm64@1.30.1:
+    resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  lightningcss-darwin-x64@1.30.1:
+    resolution: {integrity: sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  lightningcss-freebsd-x64@1.30.1:
+    resolution: {integrity: sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  lightningcss-linux-arm-gnueabihf@1.30.1:
+    resolution: {integrity: sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  lightningcss-linux-arm64-gnu@1.30.1:
+    resolution: {integrity: sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-arm64-musl@1.30.1:
+    resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-x64-gnu@1.30.1:
+    resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-linux-x64-musl@1.30.1:
+    resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-win32-arm64-msvc@1.30.1:
+    resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  lightningcss-win32-x64-msvc@1.30.1:
+    resolution: {integrity: sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  lightningcss@1.30.1:
+    resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==}
+    engines: {node: '>= 12.0.0'}
+
+  magic-string@0.30.17:
+    resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minizlib@3.0.2:
+    resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==}
+    engines: {node: '>= 18'}
+
+  mkdirp@3.0.1:
+    resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  mri@1.2.0:
+    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
+    engines: {node: '>=4'}
+
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  tailwindcss@4.1.12:
+    resolution: {integrity: sha512-DzFtxOi+7NsFf7DBtI3BJsynR+0Yp6etH+nRPTbpWnS2pZBaSksv/JGctNwSWzbFjp0vxSqknaUylseZqMDGrA==}
+
+  tapable@2.2.2:
+    resolution: {integrity: sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==}
+    engines: {node: '>=6'}
+
+  tar@7.4.3:
+    resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
+    engines: {node: '>=18'}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  yallist@5.0.0:
+    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
+    engines: {node: '>=18'}
+
+snapshots:
+
+  '@isaacs/fs-minipass@4.0.1':
+    dependencies:
+      minipass: 7.1.2
+
+  '@jridgewell/gen-mapping@0.3.13':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/trace-mapping': 0.3.30
+
+  '@jridgewell/remapping@2.3.5':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.30
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
+  '@jridgewell/trace-mapping@0.3.30':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher@2.5.1':
+    dependencies:
+      detect-libc: 1.0.3
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      node-addon-api: 7.1.1
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.1
+      '@parcel/watcher-darwin-arm64': 2.5.1
+      '@parcel/watcher-darwin-x64': 2.5.1
+      '@parcel/watcher-freebsd-x64': 2.5.1
+      '@parcel/watcher-linux-arm-glibc': 2.5.1
+      '@parcel/watcher-linux-arm-musl': 2.5.1
+      '@parcel/watcher-linux-arm64-glibc': 2.5.1
+      '@parcel/watcher-linux-arm64-musl': 2.5.1
+      '@parcel/watcher-linux-x64-glibc': 2.5.1
+      '@parcel/watcher-linux-x64-musl': 2.5.1
+      '@parcel/watcher-win32-arm64': 2.5.1
+      '@parcel/watcher-win32-ia32': 2.5.1
+      '@parcel/watcher-win32-x64': 2.5.1
+
+  '@tailwindcss/cli@4.1.12':
+    dependencies:
+      '@parcel/watcher': 2.5.1
+      '@tailwindcss/node': 4.1.12
+      '@tailwindcss/oxide': 4.1.12
+      enhanced-resolve: 5.18.3
+      mri: 1.2.0
+      picocolors: 1.1.1
+      tailwindcss: 4.1.12
+
+  '@tailwindcss/node@4.1.12':
+    dependencies:
+      '@jridgewell/remapping': 2.3.5
+      enhanced-resolve: 5.18.3
+      jiti: 2.5.1
+      lightningcss: 1.30.1
+      magic-string: 0.30.17
+      source-map-js: 1.2.1
+      tailwindcss: 4.1.12
+
+  '@tailwindcss/oxide-android-arm64@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-arm64@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-x64@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-freebsd-x64@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-musl@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-wasm32-wasi@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.1.12':
+    optional: true
+
+  '@tailwindcss/oxide@4.1.12':
+    dependencies:
+      detect-libc: 2.0.4
+      tar: 7.4.3
+    optionalDependencies:
+      '@tailwindcss/oxide-android-arm64': 4.1.12
+      '@tailwindcss/oxide-darwin-arm64': 4.1.12
+      '@tailwindcss/oxide-darwin-x64': 4.1.12
+      '@tailwindcss/oxide-freebsd-x64': 4.1.12
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.12
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.1.12
+      '@tailwindcss/oxide-linux-arm64-musl': 4.1.12
+      '@tailwindcss/oxide-linux-x64-gnu': 4.1.12
+      '@tailwindcss/oxide-linux-x64-musl': 4.1.12
+      '@tailwindcss/oxide-wasm32-wasi': 4.1.12
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.1.12
+      '@tailwindcss/oxide-win32-x64-msvc': 4.1.12
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
+  chownr@3.0.0: {}
+
+  detect-libc@1.0.3: {}
+
+  detect-libc@2.0.4: {}
+
+  enhanced-resolve@5.18.3:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.2.2
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
+  graceful-fs@4.2.11: {}
+
+  is-extglob@2.1.1: {}
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-number@7.0.0: {}
+
+  jiti@2.5.1: {}
+
+  lightningcss-darwin-arm64@1.30.1:
+    optional: true
+
+  lightningcss-darwin-x64@1.30.1:
+    optional: true
+
+  lightningcss-freebsd-x64@1.30.1:
+    optional: true
+
+  lightningcss-linux-arm-gnueabihf@1.30.1:
+    optional: true
+
+  lightningcss-linux-arm64-gnu@1.30.1:
+    optional: true
+
+  lightningcss-linux-arm64-musl@1.30.1:
+    optional: true
+
+  lightningcss-linux-x64-gnu@1.30.1:
+    optional: true
+
+  lightningcss-linux-x64-musl@1.30.1:
+    optional: true
+
+  lightningcss-win32-arm64-msvc@1.30.1:
+    optional: true
+
+  lightningcss-win32-x64-msvc@1.30.1:
+    optional: true
+
+  lightningcss@1.30.1:
+    dependencies:
+      detect-libc: 2.0.4
+    optionalDependencies:
+      lightningcss-darwin-arm64: 1.30.1
+      lightningcss-darwin-x64: 1.30.1
+      lightningcss-freebsd-x64: 1.30.1
+      lightningcss-linux-arm-gnueabihf: 1.30.1
+      lightningcss-linux-arm64-gnu: 1.30.1
+      lightningcss-linux-arm64-musl: 1.30.1
+      lightningcss-linux-x64-gnu: 1.30.1
+      lightningcss-linux-x64-musl: 1.30.1
+      lightningcss-win32-arm64-msvc: 1.30.1
+      lightningcss-win32-x64-msvc: 1.30.1
+
+  magic-string@0.30.17:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  minipass@7.1.2: {}
+
+  minizlib@3.0.2:
+    dependencies:
+      minipass: 7.1.2
+
+  mkdirp@3.0.1: {}
+
+  mri@1.2.0: {}
+
+  node-addon-api@7.1.1: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@2.3.1: {}
+
+  source-map-js@1.2.1: {}
+
+  tailwindcss@4.1.12: {}
+
+  tapable@2.2.2: {}
+
+  tar@7.4.3:
+    dependencies:
+      '@isaacs/fs-minipass': 4.0.1
+      chownr: 3.0.0
+      minipass: 7.1.2
+      minizlib: 3.0.2
+      mkdirp: 3.0.1
+      yallist: 5.0.0
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+
+  yallist@5.0.0: {}