error in db code, closing database before usage

Reviewed-on: #19

.gitea/workflows/build.yaml

@@ -0,0 +1,72 @@
+name: GoLang 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 ./...
+  build:
+    needs: testing
+    name: Build Go Image and Upload
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.letsstein.de
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: git.letsstein.de/tom/arbeitszeitmessung:latest
+          context: Backend

.gitignore

@@ -36,3 +36,5 @@ DB/pg_data
 .vscode
 
 node_modules
+atlas.hcl
+.scannerwork

Backend/Makefile

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

Backend/database.go

@@ -5,41 +5,16 @@ 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", "arbeit_zeit")
+	dbUser := helper.GetEnv("POSTGRES_API_USER", "api_nutzer")
 	dbPassword := helper.GetEnv("POSTGRES_API_PASS", "password")
 
 	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/auto_logout.go

@@ -5,6 +5,7 @@ import (
 	"arbeitszeitmessung/models"
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 )
 
@@ -26,11 +27,13 @@ func autoLogout(w http.ResponseWriter) {
 	}
 	for _, user := range users {
 		if user.CheckAnwesenheit() {
-			err = user.Logout()
+			err = user.CheckOut()
 			if err != nil {
 				fmt.Printf("Error logging out user %v\n", err)
+			} else {
+				logged_out_users = append(logged_out_users, user)
+				log.Printf("Automaticaly logged out user %s, %s ", user.Name, user.Vorname)
 			}
-			logged_out_users = append(logged_out_users, user)
 		}
 
 	}

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,7 +33,7 @@ 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)
+	user, err := models.GetUserByPersonalNr(userPN)
 	workWeek := (*models.WorkWeek).GetWeek(nil, user, weekTs, false)
 
 	if err != nil {
@@ -59,10 +44,8 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
 	switch r.FormValue("method") {
 	case "send":
 		err = workWeek.Send()
-		break
 	case "accept":
 		err = workWeek.Accept()
-		break
 	default:
 		break
 	}
@@ -79,39 +62,22 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
 		return
 	}
+	submissionDate := r.URL.Query().Get("submission_date")
+	lastSub := user.GetLastSubmission()
+	if submissionDate != "" {
+		submissionDate, err := time.Parse("2006-01-02", submissionDate)
+		if err == nil {
+			lastSub = helper.GetMonday(submissionDate)
+		}
+	}
+	userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
+
 	var workWeeks []models.WorkWeek
 	teamMembers, err := user.GetTeamMembers()
 	for _, member := range teamMembers {
 		weeks := (*models.WorkWeek).GetSendWeeks(nil, member)
 		workWeeks = append(workWeeks, weeks...)
 	}
-	lastSub := user.GetLastSubmission()
-	log.Println(lastSub)
-	userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
 	// 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
-}

Backend/endpoints/team_presence.go

@@ -0,0 +1,41 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"log"
+	"net/http"
+)
+
+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)
+	case http.MethodOptions:
+		// just support options header for non GET Requests from SWAGGER
+		w.WriteHeader(http.StatusOK)
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+	}
+}
+
+func teamPresence(w http.ResponseWriter, r *http.Request) {
+	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	if err != nil {
+		log.Println("Error getting user!", err)
+	}
+	team, err := user.GetTeamMembers()
+	teamPresence := make(map[bool][]models.User)
+	for _, user := range team {
+		present := user.CheckAnwesenheit()
+		teamPresence[present] = append(teamPresence[present], user)
+	}
+
+	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
@@ -58,17 +54,15 @@ func createBooking(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(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) <= 7 { //len "Bearer "
-	if len(authHeaders) <= _authStart {
 		authHeaders = r.URL.Query().Get("api_key")
-		_authStart = 0
+		if len(authHeaders) <= 0 {
-		if len(authHeaders) <= _authStart {
 			return false
 		}
+		return authToken == authHeaders
 	}
-	log.Println(authHeaders)
+	return authToken == authHeaders[7:]
-	return authToken == authHeaders[_authStart:]
 }

Backend/endpoints/time.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
+	"sort"
 	"strconv"
 	"time"
 )
@@ -19,30 +20,26 @@ 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) {
+func parseTimestamp(r *http.Request, getKey string, fallback string) (time.Time, error) {
-	_timestamp_get := r.URL.Query().Get(get_key)
+	getTimestamp := r.URL.Query().Get(getKey)
-	if _timestamp_get == "" {
+	if getTimestamp == "" {
-		_timestamp_get = fallback
+		getTimestamp = fallback
 	}
-	timestamp_get, err := time.Parse("2006-01-02", _timestamp_get)
+	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
@@ -69,48 +66,109 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 	}
 	tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside
 
-	bookings, err := (*models.Booking).GetBookingsGrouped(nil, user.CardUID, tsFrom, tsTo)
+	workDays := (*models.WorkDay).GetWorkDays(nil, user.CardUID, tsFrom, tsTo)
-	if err != nil {
+	sort.Slice(workDays, func(i, j int) bool {
-		log.Println("Error getting bookings: ", err)
+		return workDays[i].Day.After(workDays[j].Day)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+	})
-		return
+
-	}
 	if r.Header.Get("Accept") == "application/json" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(bookings)
+		json.NewEncoder(w).Encode(workDays)
 		return
 	}
+
 	ctx := context.WithValue(r.Context(), "user", user)
-	templates.TimePage(bookings).Render(ctx, w)
+	templates.TimePage(workDays).Render(ctx, w)
 }
 
 func updateBooking(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
-	for index, possibleBooking := range r.PostForm {
+	var loc *time.Location
-		if index[:7] == "booking" {
+	loc, err := time.LoadLocation(helper.GetEnv("TZ", "Europe/Berlin"))
-			booking_id, err := strconv.Atoi(index[8:])
+	if err != nil {
-			if err != nil {
+		log.Println("Error loading location", err)
-				log.Println("Error parsing bookingId", err)
+		loc = time.Local
-				continue
+	}
+	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	if err != nil {
+		log.Println("No user found!", err)
+		return
+	}
+	switch r.FormValue("action") {
+	case "add":
+		timestamp, err := time.ParseInLocation("2006-01-02|15:04", r.FormValue("date")+"|"+r.FormValue("timestamp"), loc)
+		if err != nil {
+			log.Println("Error parsing timestamp", err)
+			return
+		}
+
+		var check_in_out int
+		check_in_out, err = strconv.Atoi(r.FormValue("check_in_out"))
+		if err != nil {
+			log.Println("Error parsing check_in_out", err)
+			return
+		}
+
+		newBooking := (*models.Booking).New(nil, user.CardUID, 0, int16(check_in_out))
+		newBooking.Timestamp = timestamp
+		err = newBooking.InsertWithTimestamp()
+		if err != nil {
+			log.Println("Error inserting booking", err)
+		}
+	case "change":
+		absenceType, err := strconv.Atoi(r.FormValue("absence"))
+		if err != nil {
+			log.Println("Error parsing absence type.", err)
+			absenceType = 0
+		}
+		if absenceType != 0 {
+			createAbsence(absenceType, user, loc, r)
+		}
+		for index, possibleBooking := range r.PostForm {
+			if len(index) > 7 && index[:7] == "booking" {
+				booking_id, err := strconv.Atoi(index[8:])
+				if err != nil {
+					log.Println("Error parsing bookingId", err)
+					continue
+				}
+				booking, err := (*models.Booking).GetBookingById(nil, booking_id)
+				if err != nil {
+					log.Println("Error getting booking!", err)
+					continue
+				}
+				parsedTime, err := time.ParseInLocation("15:04", possibleBooking[0], booking.Timestamp.Location())
+				if err != nil {
+					log.Println("Error parsing time!", err)
+					continue
+				}
+				// log.Println("Parsing time", parsedTime)
+				booking.UpdateTime(parsedTime)
 			}
-			booking, err := (*models.Booking).GetBookingById(nil, booking_id)
-			if err != nil {
-				log.Println("Error getting booking!", err)
-				continue
-			}
-			parsedTime, err := time.ParseInLocation("15:04", possibleBooking[0], time.Local)
-			if err != nil {
-				log.Println("Error parsing time!", err)
-				continue
-			}
-			log.Println("Parsing time", parsedTime)
-			booking.UpdateTime(parsedTime)
 		}
 	}
 	getBookings(w, r)
 }
 
+func createAbsence(absenceType int, user models.User, loc *time.Location, r *http.Request) {
+	absenceDate, err := time.ParseInLocation("2006-01-02", r.FormValue("date"), loc)
+	if err != nil {
+		log.Println("Cannot get date from input! Skipping absence creation", err)
+		return
+	}
+
+	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)
@@ -120,7 +178,7 @@ func getBookingsAPI(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	user, err := (*models.User).GetByPersonalNummer(nil, user_pn)
+	user, err := models.GetUserByPersonalNr(user_pn)
 	if err != nil {
 		log.Println("No user found with the given personal number!")
 		http.Error(w, "No user found", http.StatusNotFound)

Backend/endpoints/user-session.go

@@ -0,0 +1,81 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"context"
+	"log"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/alexedwards/scs/v2"
+)
+
+var Session *scs.SessionManager
+
+func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
+	Session = scs.New()
+	Session.Lifetime = lifetime
+	return Session
+}
+
+func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
+	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)
+}
+
+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)
+		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)
+		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)
+		return
+	}
+
+	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)
+	}
+
+	password := r.FormValue("password")
+	if user.Login(password) {
+		log.Printf("New succesfull user login from %s %s!\n", user.Vorname, user.Name)
+		Session.Put(r.Context(), "user", user.PersonalNummer)
+		http.Redirect(w, r, "/time", http.StatusSeeOther) //with this browser always uses GET
+	} else {
+		showLoginPage(w, r, true)
+		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

@@ -0,0 +1,42 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"log"
+	"net/http"
+)
+
+// change user password and store salted hash in db
+func changePassword(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	if err != nil {
+		log.Println("Error parsing form!", err)
+		http.Error(w, "Error parsing form error", http.StatusBadRequest)
+		return
+	}
+	password := r.FormValue("password")
+	newPassword := r.FormValue("new_password")
+	if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") {
+		showUserPage(w, r, http.StatusBadRequest)
+		return
+	}
+	user, err := models.GetUserByPersonalNr(Session.GetInt(r.Context(), "user"))
+	if err != nil {
+		log.Println("Error getting user!", err)
+		showUserPage(w, r, http.StatusBadRequest)
+	}
+	auth, err := user.ChangePass(password, newPassword)
+	if err != nil {
+		log.Println("Error when changing password!", err)
+	}
+	if auth {
+		showUserPage(w, r, http.StatusAccepted)
+		return
+	}
+	showUserPage(w, r, http.StatusUnauthorized)
+}
+
+func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
+	templates.UserPage(status).Render(r.Context(), w)
+}

Backend/endpoints/user.go

@@ -2,127 +2,44 @@ package endpoints
 
 import (
 	"arbeitszeitmessung/helper"
-	"arbeitszeitmessung/models"
-	"arbeitszeitmessung/templates"
-	"log"
 	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/alexedwards/scs/v2"
 )
 
-var Session *scs.SessionManager
+func UserHandler(w http.ResponseWriter, r *http.Request) {
-
+	switch r.PathValue("action") {
-func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
+	case "login":
-	Session = scs.New()
+		LoginHandler(w, r)
-	Session.Lifetime = lifetime
+	case "settings":
-	return Session
+		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, false)
-		break
 	case http.MethodPost:
 		loginUser(w, r)
-		break
 	default:
 		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		break
 	}
 }
 
-func UserHandler(w http.ResponseWriter, r *http.Request) {
+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:
-		changePassword(w, r)
+		switch r.FormValue("action") {
-		break
+		case "change-pass":
+			changePassword(w, r)
+		case "logout-user":
+			logoutUser(w, r)
+		}
 	default:
 		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
-		break
 	}
 }
-
-func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
-	templates.LoginPage(failed).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)
-		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)
-		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)
-		return
-	}
-
-	user, err := (*models.User).GetByPersonalNummer(nil, personal_nummer)
-	if err != nil {
-		log.Println("No user found under this personal number!")
-		http.Error(w, "No user found!", http.StatusNotFound)
-	}
-
-	password := r.FormValue("password")
-	if user.Login(password) {
-		log.Printf("New succesfull user login from %s %s!\n", user.Vorname, user.Name)
-		Session.Put(r.Context(), "user", user.PersonalNummer)
-		http.Redirect(w, r, "/time", http.StatusSeeOther) //with this browser always uses GET
-	} else {
-		showLoginPage(w, r, true)
-		return
-	}
-	showLoginPage(w, r, false)
-	return
-}
-
-// change user password and store salted hash in db
-func changePassword(w http.ResponseWriter, r *http.Request) {
-	err := r.ParseForm()
-	if err != nil {
-		log.Println("Error parsing form!", err)
-		http.Error(w, "Error parsing form error", http.StatusBadRequest)
-		return
-	}
-	password := r.FormValue("password")
-	newPassword := r.FormValue("new_password")
-	if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") {
-		showUserPage(w, r, http.StatusBadRequest)
-		return
-	}
-	user, err := (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
-	if err != nil {
-		log.Println("Error getting user!", err)
-		showUserPage(w, r, http.StatusBadRequest)
-	}
-	auth, err := user.ChangePass(password, newPassword)
-	if err != nil {
-		log.Println("Error when changing password!", err)
-	}
-	if auth {
-		showUserPage(w, r, http.StatusOK)
-		return
-	}
-	showUserPage(w, r, http.StatusUnauthorized)
-}
-
-func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
-	templates.UserPage(status).Render(r.Context(), w)
-	return
-}

Backend/go.mod

@@ -1,13 +1,20 @@
 module arbeitszeitmessung
 
-go 1.23
+go 1.24.5
-
-toolchain go1.23.6
 
 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
+)

Backend/go.sum

@@ -1,10 +1,74 @@
-github.com/a-h/templ v0.3.833 h1:L/KOk/0VvVTBegtE0fp2RJQiBm7/52Zxv5fqlEHiQUU=
+github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
-github.com/a-h/templ v0.3.833/go.mod h1:cAu4AiZhtJfBjMY0HASlyzvkrtjnHWPeEsyGK2YYmfk=
+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.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+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/system.go

@@ -2,11 +2,13 @@ package helper
 
 import (
 	"os"
+	"time"
 )
 
 // Returns env with default fallback value.
 //
 // Params:
+//
 //	key - enviroment var name
 //	fallback - default value
 func GetEnv(key, fallback string) string {
@@ -15,3 +17,37 @@ func GetEnv(key, fallback string) string {
 	}
 	return fallback
 }
+
+type CacheItem struct {
+	value      any
+	expiration time.Time
+}
+
+type Cache struct {
+	data  map[string]CacheItem
+	ttl   time.Duration
+	fetch func(key string) (any, error)
+}
+
+func NewCache(ttl time.Duration, fetchFunc func(key string) (any, error)) *Cache {
+	return &Cache{
+		data:  make(map[string]CacheItem),
+		ttl:   ttl,
+		fetch: fetchFunc,
+	}
+}
+
+func (c *Cache) Get(key string) (any, error) {
+	if item, found := c.data[key]; found {
+		if time.Now().Before(item.expiration) {
+			return item.value, nil
+		}
+	}
+
+	value, err := c.fetch(key)
+	if err != nil {
+		return nil, err
+	}
+	c.data[key] = CacheItem{value: value, expiration: time.Now().Add(c.ttl)}
+	return value, nil
+}

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,37 @@
+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
+}
+
+// Converts duration to string
+func FormatDuration(d time.Duration) 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:
+		return ""
+	}
+}

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 == 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/helper/web.go

@@ -1,6 +1,7 @@
 package helper
 
 import (
+	"context"
 	"net/http"
 	"os"
 
@@ -20,6 +21,7 @@ func SetCors(w http.ResponseWriter) {
 }
 
 func RequiresLogin(session *scs.SessionManager, w http.ResponseWriter, r *http.Request) {
+	r = r.WithContext(context.WithValue(r.Context(), "session", session))
 	if GetEnv("GO_ENV", "production") == "debug" {
 		return
 	}

Backend/main.go

@@ -4,14 +4,13 @@ import (
 	"arbeitszeitmessung/endpoints"
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
-	"arbeitszeitmessung/templates"
 	"context"
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"time"
 
-	"github.com/a-h/templ"
 	"github.com/joho/godotenv"
 	_ "github.com/lib/pq"
 )
@@ -23,12 +22,19 @@ func main() {
 	if err != nil {
 		log.Println("No .env file found in directory!")
 	}
+	if helper.GetEnv("GO_ENV", "production") == "debug" {
+		log.Println("Debug mode enabled")
+		log.Println("Environment Variables")
+		envs := os.Environ()
+		for _, e := range envs {
+			fmt.Println(e)
+		}
+	}
 
 	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)
@@ -39,16 +45,18 @@ func main() {
 	server.HandleFunc("/time/new", endpoints.TimeCreateHandler)
 	server.Handle("/time", ParamsMiddleware(endpoints.TimeHandler))
 	server.HandleFunc("/logout", endpoints.LogoutHandler)
-	server.HandleFunc("/user/login", endpoints.LoginHandler)
+	server.HandleFunc("/user/{action}", endpoints.UserHandler)
-	server.HandleFunc("/user", endpoints.UserHandler)
+	// server.HandleFunc("/user/login", endpoints.LoginHandler)
+	// server.HandleFunc("/user/settings", endpoints.UserSettingsHandler)
 	server.HandleFunc("/team", endpoints.TeamHandler)
-	server.Handle("/", templ.Handler(templates.NavPage()))
+	server.HandleFunc("/team/presence", endpoints.TeamPresenceHandler)
+	server.Handle("/", http.RedirectHandler("/time", http.StatusPermanentRedirect))
 	server.Handle("/static/", http.StripPrefix("/static/", fs))
 
 	serverSessionMiddleware := endpoints.Session.LoadAndSave(server)
 
 	// starting the http server
-	fmt.Printf("Server is running at http://localhost:8000 exposed to port %s\n", helper.GetEnv("EXPOSED_PORT", "8000"))
+	fmt.Printf("Server is running at http://localhost:%s\n", helper.GetEnv("EXPOSED_PORT", "8080"))
 	log.Fatal(http.ListenAndServe(":8080", serverSessionMiddleware))
 }
 

Backend/models/absence.go

@@ -0,0 +1,88 @@
+package models
+
+import (
+	"errors"
+	"log"
+	"time"
+)
+
+type AbsenceType struct {
+	Id   int8
+	Name string
+}
+
+type Absence struct {
+	CounterId      int
+	CardUID        string
+	AbwesenheitTyp AbsenceType
+	Datum          time.Time
+	// Comment        string
+}
+
+func NewAbsence(card_uid string, abwesenheit_typ int, datum time.Time) (Absence, error) {
+	if abwesenheit_typ < 0 {
+		return Absence{
+			CardUID:        card_uid,
+			AbwesenheitTyp: AbsenceType{0, "Custom absence"},
+			Datum:          datum,
+		}, nil
+	}
+	_absenceType, ok := GetAbsenceTypesCached()[int8(abwesenheit_typ)]
+	if !ok {
+		return Absence{}, errors.New("Invalid absencetype")
+	}
+	return Absence{
+		CardUID:        card_uid,
+		AbwesenheitTyp: _absenceType,
+		Datum:          datum,
+	}, nil
+}
+
+func (a *Absence) Insert() error {
+	qStr, err := DB.Prepare(`INSERT INTO abwesenheit (card_uid, abwesenheit_typ, datum) VALUES ($1, $2, $3) RETURNING counter_id;`)
+	if err != nil {
+		log.Println("Error preparing sql Statement", err)
+		return err
+	}
+	err = qStr.QueryRow(a.CardUID, a.AbwesenheitTyp.Id, a.Datum).Scan(&a.CounterId)
+	if err != nil {
+		log.Println("Error executing insert statement", err)
+		return err
+	}
+	return nil
+}
+
+// func (a *Absence) GetStringType() string {
+// 	return AbsenceTypesLabel[a.AbwesenheitTyp]
+// }
+
+func GetAbsenceTypes() (map[int8]AbsenceType, error) {
+	var types = make(map[int8]AbsenceType)
+	qStr, err := DB.Prepare("SELECT abwesenheit_id, abwesenheit_name 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); 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)
+}

Backend/models/booking.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
 	"database/sql"
 	"fmt"
 	"log"
@@ -12,6 +13,11 @@ import (
 
 type SameBookingError struct{}
 
+type BookingType struct {
+	Id   int8
+	Name string
+}
+
 func (e SameBookingError) Error() string {
 	return "the same booking already exists!"
 }
@@ -24,7 +30,12 @@ type Booking struct {
 	CounterId  int       `json:"counter_id"`
 }
 
-var DB *sql.DB
+type IDatabase interface {
+	Prepare(query string) (*sql.Stmt, error)
+	Exec(query string, args ...any) (sql.Result, error)
+}
+
+var DB IDatabase
 
 func (b *Booking) New(card_uid string, geraet_id int16, check_in_out int16) Booking {
 	return Booking{
@@ -46,8 +57,9 @@ func (b *Booking) FromUrlParams(params url.Values) Booking {
 	return booking
 }
 
-func (b Booking) Verify() bool {
+func (b *Booking) Verify() bool {
-	if b.CardUID == "" || b.GeraetID == 0 || b.CheckInOut == 0 {
+	//check for overlapping time + arbeitszeit verstoß
+	if b.CardUID == "" { //|| b.GeraetID == 0 || b.CheckInOut == 0 {
 		return false
 	}
 	return true
@@ -68,6 +80,21 @@ func (b *Booking) Insert() error {
 	return nil
 }
 
+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`))
+	if err != nil {
+		return err
+	}
+	err = stmt.QueryRow(b.CardUID, b.GeraetID, b.CheckInOut, b.Timestamp).Scan(&b.CounterId)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 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`))
@@ -78,10 +105,10 @@ func (b *Booking) GetBookingById(booking_id int) (Booking, error) {
 	if err != nil {
 		return booking, err
 	}
-	if !booking.Verify() {
+	// if !booking.Verify() {
-		fmt.Printf("Booking verification failed")
+	// 	fmt.Printf("Booking verification failed! %d", )
-		return booking, nil
+	// 	return booking, nil
-	}
+	// }
 	return booking, nil
 }
 
@@ -136,7 +163,7 @@ func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo tim
 			return bookings[i].Timestamp.Before(bookings[j].Timestamp)
 		})
 		workDay := WorkDay{Day: day, Bookings: bookings}
-		workDay.GetWorkTime()
+		workDay.getWorkTime()
 		result = append(result, workDay)
 	}
 
@@ -161,12 +188,23 @@ func (b Booking) Save() {
 }
 
 func (b *Booking) GetBookingType() string {
+	debug := (helper.GetEnv("GO_ENV", "production") == "debug")
 	switch b.CheckInOut {
-	case 1, 3: //manuelle Änderung
+	case 1: //manuelle Änderung
 		return "kommen"
-	case 2, 4: //manuelle Änderung
+	case 3:
+		if debug {
+			return "kommen manuell"
+		}
+		return "kommen"
+	case 2: //manuelle Änderung
 		return "gehen"
-	case 255:
+	case 4:
+		if debug {
+			return "gehen manuell"
+		}
+		return "gehen"
+	case 254:
 		return "abgemeldet"
 	default:
 		return "Buchungs Typ unbekannt"
@@ -217,13 +255,50 @@ func (b *Booking) UpdateTime(newTime time.Time) {
 	// TODO: add check for time overlap
 
 	var newBooking Booking
-	newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, time.Local)
+	newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, b.Timestamp.Location())
 	if b.CheckInOut < 3 {
 		newBooking.CheckInOut = b.CheckInOut + 2
 	}
-	if b.CheckInOut == 255 {
+	if b.CheckInOut == 254 {
 		newBooking.CheckInOut = 4
 	}
+	log.Println("Updating")
 	b.Update(newBooking)
+	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)
+}
+
+func GetBokkingTypes() ([]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 GetBookingTypesCached() []BookingType {
+	types, err := definedTypes.Get("s_anwesenheit_typen")
+	if err != nil {
+		return []BookingType{}
+	}
+	return types.([]BookingType)
+}

Backend/models/controlTables.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 GetBokkingTypes()
+	}
+	return nil, nil
+})

Backend/models/db_test.go

@@ -0,0 +1,69 @@
+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()
+
+	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)
+	}
+
+	// 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,24 @@ import (
 )
 
 type User struct {
-	CardUID        string  `json:"card_uid"`
+	CardUID           string  `json:"card_uid"`
-	Name           string  `json:"name"`
+	Name              string  `json:"name"`
-	Vorname        string  `json:"vorname"`
+	Vorname           string  `json:"vorname"`
-	PersonalNummer int     `json:"personal_nummer"`
+	PersonalNummer    int     `json:"personal_nummer"`
-	Arbeitszeit    float32 `json:"arbeitszeit"`
+	ArbeitszeitPerTag float32 `json:"arbeitszeit"`
 }
 
 func (u *User) 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!")
@@ -40,7 +40,7 @@ func (u *User) GetUserFromSession(Session *scs.SessionManager, ctx context.Conte
 }
 
 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)
@@ -53,9 +53,11 @@ func (u *User) GetAll() ([]User, error) {
 	}
 	defer rows.Close()
 	for rows.Next() {
+
 		var user User
 		if err := rows.Scan(&user.CardUID, &user.Vorname, &user.Name); err != nil {
-			return users, nil
+			log.Println("Error creating user!", err)
+			continue
 		}
 		users = append(users, user)
 	}
@@ -68,7 +70,7 @@ func (u *User) GetAll() ([]User, error) {
 // 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 {
-	qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp" >= now()::date + interval '1h' ORDER BY "timestamp" DESC`))
+	qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp"::date = now()::date ORDER BY "timestamp" DESC LIMIT 1;`))
 	if err != nil {
 		fmt.Printf("Error preparing query statement %v\n", err)
 		return false
@@ -79,12 +81,12 @@ func (u *User) CheckAnwesenheit() bool {
 	if err != nil {
 		return false
 	}
-	return check_in_out == 1
+	return check_in_out%2 == 1
 }
 
-// Creates a new booking for the user -> check_in_out will be 255 for automatic check out
+// Creates a new booking for the user -> check_in_out will be 254 for automatic check out
-func (u *User) Logout() error {
+func (u *User) CheckOut() error {
-	booking := (*Booking).New(nil, u.CardUID, 0, 255)
+	booking := (*Booking).New(nil, u.CardUID, 0, 254)
 	err := booking.Insert()
 	if err != nil {
 		fmt.Printf("Error inserting booking %v\n", err)
@@ -93,14 +95,14 @@ func (u *User) Logout() error {
 	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 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.Arbeitszeit)
+	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag)
 
 	if err != nil {
 		return user, err
@@ -144,7 +146,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, card_uid, vorname, nachname, arbeitszeit_per_tag FROM s_personal_daten WHERE vorgesetzter_pers_nr = $1`)
 	if err != nil {
 		return teamMembers, err
 	}
@@ -167,6 +169,15 @@ func (u *User) GetTeamMembers() ([]User, error) {
 	return teamMembers, nil
 }
 
+func (u *User) IsTeamLeader() bool {
+	team, err := u.GetTeamMembers()
+	if err != nil {
+		log.Println("Error getting team Members", err)
+		return false
+	}
+	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)
@@ -187,7 +198,7 @@ func (u *User) GetNextWeek() WorkWeek {
 
 func parseUser(rows *sql.Rows) (User, error) {
 	var user User
-	if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit); err != nil {
+	if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag); err != nil {
 		log.Println("Error scanning row!", err)
 		return user, err
 	}
@@ -219,6 +230,22 @@ func (u *User) GetLastSubmission() time.Time {
 	return lastSub
 }
 
+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 s_personal_daten WHERE card_uid = $1;`))
+	if err != nil {
+		return user, err
+	}
+	err = qStr.QueryRow(card_uid).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag)
+
+	if err != nil {
+		return user, err
+	}
+	return user, nil
+}
+
 func getMonday(ts time.Time) time.Time {
 	if ts.Weekday() != time.Monday {
 		if ts.Weekday() == time.Sunday {

Backend/models/user_test.go

@@ -0,0 +1,56 @@
+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}
+
+func SetupUserFixture(t *testing.T, db models.IDatabase) {
+	t.Helper()
+	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_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,	'07:00:00',	'20:00:00',	0);`)
+}
+
+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) VALUES (NOW() - INTERVAL '2 minute', 'aaaa-aaaa', 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) VALUES (NOW() - INTERVAL '1 minute', 'aaaa-aaaa', 2, 1);")
+	if actual = testUser.CheckAnwesenheit(); actual != false {
+		t.Errorf("Checkabwesenheit with 'gehen' booking should be false but is %t", actual)
+	}
+}

Backend/models/workDay.go

@@ -1,8 +1,11 @@
 package models
 
 import (
-	"fmt"
+	"arbeitszeitmessung/helper"
+	"database/sql"
+	"encoding/json"
 	"log"
+	"strconv"
 	"time"
 )
 
@@ -11,58 +14,74 @@ type WorkDay struct {
 	Bookings  []Booking `json:"bookings"`
 	workTime  time.Duration
 	pauseTime time.Duration
+	TimeFrom  time.Time
+	TimeTo    time.Time
+	Absence   Absence
 }
 
 func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay {
 	var workDays []WorkDay
 	var workSec, pauseSec float64
+
 	qStr, err := DB.Prepare(`
-	WITH ordered_bookings AS (
+	WITH all_days AS (
+	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
+    )
     SELECT
-        timestamp::DATE AS work_date,  -- Extract date for grouping
+        d.work_date,
-        timestamp,
+        COALESCE(MIN(b.timestamp), NOW()) AS time_from,
-        check_in_out,
+        COALESCE(MAX(b.timestamp), NOW()) AS time_to,
-        LAG(timestamp) OVER (
+        COALESCE(
-            PARTITION BY card_uid, timestamp::DATE  -- Reset for each day
+            EXTRACT(EPOCH FROM SUM(
-            ORDER BY timestamp
+                CASE
-        ) AS prev_timestamp,
+                    WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 255)
-        LAG(check_in_out) OVER (
+                    THEN b.timestamp - b.prev_timestamp
-            PARTITION BY card_uid, timestamp::DATE
+                    ELSE INTERVAL '0'
-            ORDER BY timestamp
+                END
-        ) AS prev_check
+            )), 0
-    FROM anwesenheit
+        ) AS total_work_seconds,
-    WHERE card_uid = $1  -- Replace with actual card_uid
+        COALESCE(
-    AND timestamp::DATE >= $2  -- Set date range
+            EXTRACT(EPOCH FROM SUM(
-    AND timestamp::DATE <= $3
+                CASE
-	)
+                    WHEN b.prev_check IN (2, 4, 255) AND b.check_in_out IN (1, 3)
-	SELECT
+                    THEN b.timestamp - b.prev_timestamp
-	    work_date,
+                    ELSE INTERVAL '0'
-
+                END
-	    -- Total work time per day
+            )), 0
-	    COALESCE(
+        ) AS total_pause_seconds,
-	        EXTRACT(EPOCH FROM SUM(
+        COALESCE(jsonb_agg(jsonb_build_object(
-	            CASE
+            'check_in_out', b.check_in_out,
-	                WHEN prev_check IN (1, 3) AND check_in_out IN (2, 4, 254)
+            'timestamp', b.timestamp,
-	                THEN timestamp - prev_timestamp
+            'counter_id', b.counter_id
-	                ELSE INTERVAL '0'
+        ) ORDER BY b.timestamp), '[]'::jsonb) AS bookings,
-	            END
+        a.abwesenheit_typ
-	        )), 0
+    FROM all_days d
-	    ) AS total_work,
+    LEFT JOIN ordered_bookings b ON d.work_date = b.work_date
-
+    LEFT JOIN abwesenheiten a ON d.work_date = a.work_date
-	    -- Extract total pause time in seconds
+    GROUP BY d.work_date, a.abwesenheit_typ
-	    COALESCE(
+    ORDER BY d.work_date;`)
-	        EXTRACT(EPOCH FROM SUM(
-	            CASE
-	                WHEN prev_check IN (2, 4, 254) AND check_in_out IN (1, 3)
-	                THEN timestamp - prev_timestamp
-	                ELSE INTERVAL '0'
-	            END
-	        )), 0
-	    ) AS total_pause
-
-	FROM ordered_bookings
-	GROUP BY work_date
-	ORDER BY work_date;`)
 
 	if err != nil {
 		log.Println("Error preparing SQL statement", err)
@@ -76,16 +95,42 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 		return workDays
 	}
 	defer rows.Close()
+	emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false"))
 	for rows.Next() {
 		var workDay WorkDay
-		if err := rows.Scan(&workDay.Day, &workSec, &pauseSec); err != nil {
+		var bookings []byte
+		var absenceType sql.NullInt16
+		if err := rows.Scan(&workDay.Day, &workDay.TimeFrom, &workDay.TimeTo, &workSec, &pauseSec, &bookings, &absenceType); err != nil {
 			log.Println("Error scanning row!", err)
 			return workDays
 		}
 		workDay.workTime = time.Duration(workSec * float64(time.Second))
 		workDay.pauseTime = time.Duration(pauseSec * float64(time.Second))
-		workDay.calcPauseTime()
+		err = json.Unmarshal(bookings, &workDay.Bookings)
-		workDays = append(workDays, workDay)
+		if err != nil {
+			log.Println("Error parsing bookings JSON!", err)
+			return nil
+		}
+		// better empty day handling
+		if len(workDay.Bookings) == 1 && workDay.Bookings[0].CounterId == 0 {
+			workDay.Bookings = []Booking{}
+		}
+
+		if absenceType.Valid {
+			workDay.Absence, err = NewAbsence(card_uid, int(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 || len(workDay.Bookings) > 0 || (workDay.Absence != Absence{}) {
+			workDays = append(workDays, workDay)
+		} else {
+			log.Println("no booking on day", workDay.Day.Format("02.01.2006"))
+		}
 	}
 	if err = rows.Err(); err != nil {
 		return workDays
@@ -95,7 +140,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
 
 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 {
+		if d.workTime <= (9*time.Hour) && d.pauseTime < 30*time.Minute {
 			diff := 30*time.Minute - d.pauseTime
 			d.workTime -= diff
 			d.pauseTime += diff
@@ -108,7 +153,10 @@ func (d *WorkDay) calcPauseTime() {
 }
 
 // Gets the duration someone worked that day
-func (d *WorkDay) GetWorkTime() {
+func (d *WorkDay) getWorkTime() {
+	if len(d.Bookings) < 1 {
+		return
+	}
 	var workTime, pauseTime time.Duration
 	var lastBooking Booking
 	for _, booking := range d.Bookings {
@@ -131,36 +179,28 @@ func (d *WorkDay) GetWorkTime() {
 	d.calcPauseTime()
 }
 
-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 ""
-	}
-}
-
-// Converts duration to string and replaces 0s with in
-//
-// -> output xhxmin
 func (d *WorkDay) GetWorkTimeString() (string, string) {
-	workString := formatDuration(d.workTime)
+	workString := helper.FormatDuration(d.workTime)
-	pauseString := formatDuration(d.pauseTime)
+	pauseString := helper.FormatDuration(d.pauseTime)
 	return workString, pauseString
 }
 
 // returns bool wheter the workday was ended with an automatic logout
 func (d *WorkDay) RequiresAction() bool {
-	return d.Bookings[len(d.Bookings)-1].CheckInOut == 255
+	if len(d.Bookings) > 0 {
+		return d.Bookings[len(d.Bookings)-1].CheckInOut == 254
+	}
+	return false
 }
 
 // returns a integer percentage of how much day has been worked of
 func (d *WorkDay) GetWorkDayProgress(user User) uint8 {
-	defaultWorkTime := time.Duration(user.Arbeitszeit * float32(time.Hour))
+	defaultWorkTime := time.Duration(user.ArbeitszeitPerTag * float32(time.Hour)).Round(time.Minute)
 	progress := (d.workTime.Seconds() / defaultWorkTime.Seconds()) * 100
 	return uint8(progress)
 }
+
+func (d *WorkDay) CalcOvertime(user User) time.Duration {
+	overtime := d.workTime - time.Duration(user.ArbeitszeitPerTag*float32(time.Hour)).Round(time.Minute)
+	return overtime
+}

Backend/models/workWeek.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
+	"database/sql"
 	"errors"
 	"log"
 	"time"
@@ -14,6 +16,14 @@ type WorkWeek struct {
 	WorkHours time.Duration
 }
 
+type WeekStatus int8
+
+const (
+	WeekStatusNone WeekStatus = iota
+	WeekStatusSent
+	WeekStatusAccepted
+)
+
 func (w *WorkWeek) GetWeek(user User, tsMonday time.Time, populateDays bool) WorkWeek {
 	var week WorkWeek
 	if populateDays {
@@ -25,8 +35,33 @@ func (w *WorkWeek) GetWeek(user User, tsMonday time.Time, populateDays bool) Wor
 	return week
 }
 
+func (w *WorkWeek) CheckStatus() WeekStatus {
+	weekStatus := WeekStatusNone
+	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
+	}
+	defer qStr.Close()
+	var beastatigt bool
+	err = qStr.QueryRow(w.WeekStart, w.User.PersonalNummer).Scan(&beastatigt)
+	if err == sql.ErrNoRows {
+		return weekStatus
+	}
+	if err != nil {
+		log.Println("Error querying database", err)
+		return weekStatus
+	}
+	if beastatigt {
+		weekStatus = WeekStatusAccepted
+	} else {
+		weekStatus = WeekStatusSent
+	}
+	return weekStatus
+}
+
 func (w *WorkWeek) GetWorkHourString() string {
-	return formatDuration(w.WorkHours)
+	return helper.FormatDuration(w.WorkHours)
 }
 
 func aggregateWorkTime(days []WorkDay) time.Duration {
@@ -74,14 +109,24 @@ 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 {
+	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
 	}
-	qStr, err := DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start) VALUES ($1, $2);`)
+	if w.CheckStatus() != WeekStatusNone {
-	if err != nil {
+		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE WHERE personal_nummer = $1 AND woche_start = $2;`)
-		log.Println("Error preparing SQL statement", err)
+		if err != nil {
-		return err
+			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);`)
+		if err != nil {
+			log.Println("Error preparing SQL statement", err)
+			return err
+		}
 	}
 	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart)
 	if err != nil {

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

@@ -2,62 +2,62 @@
 @source "../templates/*.templ";
 
 @theme {
-    --color-accent-50: #e7fdea;
+  --color-accent-50: #e7fdea;
-    --color-accent-100: #cbfbd1;
+  --color-accent-100: #cbfbd1;
-    --color-accent-200: #9cf7a8;
+  --color-accent-200: #9cf7a8;
-    --color-accent-300: #68f37a;
+  --color-accent-300: #68f37a;
-    --color-accent-400: #33ef4d;
+  --color-accent-400: #33ef4d;
-    --color-accent-500: #11db2d;
+  --color-accent-500: #11db2d;
-    --color-accent-600: #0eaf23;
+  --color-accent-600: #0eaf23;
-    --color-accent-700: #0a851b;
+  --color-accent-700: #0a851b;
-    --color-accent-800: #075a12;
+  --color-accent-800: #075a12;
-    --color-accent-900: #032b09;
+  --color-accent-900: #032b09;
-    --color-accent-950: #021805;
+  --color-accent-950: #021805;
-    --color-accent: #0eaf23;
+  --color-accent: #0eaf23;
-    --color-text-50: #f7f8f7;
+  --color-text-50: #f7f8f7;
-    --color-text-100: #f2f3f2;
+  --color-text-100: #f2f3f2;
-    --color-text-200: #e2e4e2;
+  --color-text-200: #e2e4e2;
-    --color-text-300: #d2d6d2;
+  --color-text-300: #d2d6d2;
-    --color-text-400: #c2c7c2;
+  --color-text-400: #c2c7c2;
-    --color-text-500: #afb6af;
+  --color-text-500: #afb6af;
-    --color-text-600: #97a097;
+  --color-text-600: #97a097;
-    --color-text-700: #7d877d;
+  --color-text-700: #7d877d;
-    --color-text-800: #5a625a;
+  --color-text-800: #5a625a;
-    --color-text-900: #161816;
+  --color-text-900: #161816;
-    --color-text-950: #000000;
+  --color-text-950: #000000;
 }
 
 @layer components {
+  .grid-main {
+    display: grid;
+    grid-template-columns: 2fr auto 1fr;
+    align-items: stretch;
+  }
+
+  .grid-sub {
+    display: grid;
+    grid-template-columns: subgrid;
+    grid-column: 1 / -1;
+    border-color: var(--color-neutral-400);
+    transition: background-color 0.2s ease-in-out;
+  }
+
+  .grid-sub:hover {
+    background-color: var(--color-neutral-200);
+  }
+
+  .grid-cell {
+    padding: calc(var(--spacing) * 2);
+    border-color: var(--color-neutral-400);
+  }
+
+  @media (width >=48rem) {
     .grid-main {
-        display: grid;
+      grid-template-columns: repeat(5, 1fr);
-        grid-template-columns: repeat(6, 1fr);
+      margin: 0 10%;
-        align-items: stretch;
     }
 
     .grid-sub {
-        display: grid;
-        grid-template-columns: subgrid;
-        grid-column: 1 / -1;
-        border-color: var(--color-neutral-400);
-        transition: background-color 0.2s ease-in-out;
-    }
-
-    .grid-sub:hover {
-        background-color: var(--color-neutral-200);
-    }
-
-    .grid-cell {
-        padding: calc(var(--spacing) * 2);
-        border-color: var(--color-neutral-400);
-    }
-
-    @media (width >=48rem) {
-        .grid-main {
-            grid-template-columns: repeat(5, 1fr);
-            margin: 0 10%;
-        }
-
-        .grid-sub {
-        }
     }
+  }
 }

Backend/static/css/styles.css

@@ -1,402 +1,38 @@
-/*! tailwindcss v4.0.6 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v4.1.12 | MIT License | https://tailwindcss.com */
+@layer properties;
 @layer theme, base, components, utilities;
 @layer theme {
   :root, :host {
     --font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji",
       "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-    --font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
     --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
       "Courier New", monospace;
-    --color-red-50: oklch(0.971 0.013 17.38);
+    --color-red-500: oklch(63.7% 0.237 25.331);
-    --color-red-100: oklch(0.936 0.032 17.717);
+    --color-red-600: oklch(57.7% 0.245 27.325);
-    --color-red-200: oklch(0.885 0.062 18.334);
+    --color-orange-500: oklch(70.5% 0.213 47.604);
-    --color-red-300: oklch(0.808 0.114 19.571);
+    --color-purple-600: oklch(55.8% 0.288 302.321);
-    --color-red-400: oklch(0.704 0.191 22.216);
+    --color-neutral-100: oklch(97% 0 0);
-    --color-red-500: oklch(0.637 0.237 25.331);
+    --color-neutral-200: oklch(92.2% 0 0);
-    --color-red-600: oklch(0.577 0.245 27.325);
+    --color-neutral-300: oklch(87% 0 0);
-    --color-red-700: oklch(0.505 0.213 27.518);
+    --color-neutral-400: oklch(70.8% 0 0);
-    --color-red-800: oklch(0.444 0.177 26.899);
+    --color-neutral-500: oklch(55.6% 0 0);
-    --color-red-900: oklch(0.396 0.141 25.723);
+    --color-neutral-700: oklch(37.1% 0 0);
-    --color-red-950: oklch(0.258 0.092 26.042);
+    --color-neutral-800: oklch(26.9% 0 0);
-    --color-orange-50: oklch(0.98 0.016 73.684);
+    --color-neutral-900: oklch(20.5% 0 0);
-    --color-orange-100: oklch(0.954 0.038 75.164);
-    --color-orange-200: oklch(0.901 0.076 70.697);
-    --color-orange-300: oklch(0.837 0.128 66.29);
-    --color-orange-400: oklch(0.75 0.183 55.934);
-    --color-orange-500: oklch(0.705 0.213 47.604);
-    --color-orange-600: oklch(0.646 0.222 41.116);
-    --color-orange-700: oklch(0.553 0.195 38.402);
-    --color-orange-800: oklch(0.47 0.157 37.304);
-    --color-orange-900: oklch(0.408 0.123 38.172);
-    --color-orange-950: oklch(0.266 0.079 36.259);
-    --color-amber-50: oklch(0.987 0.022 95.277);
-    --color-amber-100: oklch(0.962 0.059 95.617);
-    --color-amber-200: oklch(0.924 0.12 95.746);
-    --color-amber-300: oklch(0.879 0.169 91.605);
-    --color-amber-400: oklch(0.828 0.189 84.429);
-    --color-amber-500: oklch(0.769 0.188 70.08);
-    --color-amber-600: oklch(0.666 0.179 58.318);
-    --color-amber-700: oklch(0.555 0.163 48.998);
-    --color-amber-800: oklch(0.473 0.137 46.201);
-    --color-amber-900: oklch(0.414 0.112 45.904);
-    --color-amber-950: oklch(0.279 0.077 45.635);
-    --color-yellow-50: oklch(0.987 0.026 102.212);
-    --color-yellow-100: oklch(0.973 0.071 103.193);
-    --color-yellow-200: oklch(0.945 0.129 101.54);
-    --color-yellow-300: oklch(0.905 0.182 98.111);
-    --color-yellow-400: oklch(0.852 0.199 91.936);
-    --color-yellow-500: oklch(0.795 0.184 86.047);
-    --color-yellow-600: oklch(0.681 0.162 75.834);
-    --color-yellow-700: oklch(0.554 0.135 66.442);
-    --color-yellow-800: oklch(0.476 0.114 61.907);
-    --color-yellow-900: oklch(0.421 0.095 57.708);
-    --color-yellow-950: oklch(0.286 0.066 53.813);
-    --color-lime-50: oklch(0.986 0.031 120.757);
-    --color-lime-100: oklch(0.967 0.067 122.328);
-    --color-lime-200: oklch(0.938 0.127 124.321);
-    --color-lime-300: oklch(0.897 0.196 126.665);
-    --color-lime-400: oklch(0.841 0.238 128.85);
-    --color-lime-500: oklch(0.768 0.233 130.85);
-    --color-lime-600: oklch(0.648 0.2 131.684);
-    --color-lime-700: oklch(0.532 0.157 131.589);
-    --color-lime-800: oklch(0.453 0.124 130.933);
-    --color-lime-900: oklch(0.405 0.101 131.063);
-    --color-lime-950: oklch(0.274 0.072 132.109);
-    --color-green-50: oklch(0.982 0.018 155.826);
-    --color-green-100: oklch(0.962 0.044 156.743);
-    --color-green-200: oklch(0.925 0.084 155.995);
-    --color-green-300: oklch(0.871 0.15 154.449);
-    --color-green-400: oklch(0.792 0.209 151.711);
-    --color-green-500: oklch(0.723 0.219 149.579);
-    --color-green-600: oklch(0.627 0.194 149.214);
-    --color-green-700: oklch(0.527 0.154 150.069);
-    --color-green-800: oklch(0.448 0.119 151.328);
-    --color-green-900: oklch(0.393 0.095 152.535);
-    --color-green-950: oklch(0.266 0.065 152.934);
-    --color-emerald-50: oklch(0.979 0.021 166.113);
-    --color-emerald-100: oklch(0.95 0.052 163.051);
-    --color-emerald-200: oklch(0.905 0.093 164.15);
-    --color-emerald-300: oklch(0.845 0.143 164.978);
-    --color-emerald-400: oklch(0.765 0.177 163.223);
-    --color-emerald-500: oklch(0.696 0.17 162.48);
-    --color-emerald-600: oklch(0.596 0.145 163.225);
-    --color-emerald-700: oklch(0.508 0.118 165.612);
-    --color-emerald-800: oklch(0.432 0.095 166.913);
-    --color-emerald-900: oklch(0.378 0.077 168.94);
-    --color-emerald-950: oklch(0.262 0.051 172.552);
-    --color-teal-50: oklch(0.984 0.014 180.72);
-    --color-teal-100: oklch(0.953 0.051 180.801);
-    --color-teal-200: oklch(0.91 0.096 180.426);
-    --color-teal-300: oklch(0.855 0.138 181.071);
-    --color-teal-400: oklch(0.777 0.152 181.912);
-    --color-teal-500: oklch(0.704 0.14 182.503);
-    --color-teal-600: oklch(0.6 0.118 184.704);
-    --color-teal-700: oklch(0.511 0.096 186.391);
-    --color-teal-800: oklch(0.437 0.078 188.216);
-    --color-teal-900: oklch(0.386 0.063 188.416);
-    --color-teal-950: oklch(0.277 0.046 192.524);
-    --color-cyan-50: oklch(0.984 0.019 200.873);
-    --color-cyan-100: oklch(0.956 0.045 203.388);
-    --color-cyan-200: oklch(0.917 0.08 205.041);
-    --color-cyan-300: oklch(0.865 0.127 207.078);
-    --color-cyan-400: oklch(0.789 0.154 211.53);
-    --color-cyan-500: oklch(0.715 0.143 215.221);
-    --color-cyan-600: oklch(0.609 0.126 221.723);
-    --color-cyan-700: oklch(0.52 0.105 223.128);
-    --color-cyan-800: oklch(0.45 0.085 224.283);
-    --color-cyan-900: oklch(0.398 0.07 227.392);
-    --color-cyan-950: oklch(0.302 0.056 229.695);
-    --color-sky-50: oklch(0.977 0.013 236.62);
-    --color-sky-100: oklch(0.951 0.026 236.824);
-    --color-sky-200: oklch(0.901 0.058 230.902);
-    --color-sky-300: oklch(0.828 0.111 230.318);
-    --color-sky-400: oklch(0.746 0.16 232.661);
-    --color-sky-500: oklch(0.685 0.169 237.323);
-    --color-sky-600: oklch(0.588 0.158 241.966);
-    --color-sky-700: oklch(0.5 0.134 242.749);
-    --color-sky-800: oklch(0.443 0.11 240.79);
-    --color-sky-900: oklch(0.391 0.09 240.876);
-    --color-sky-950: oklch(0.293 0.066 243.157);
-    --color-blue-50: oklch(0.97 0.014 254.604);
-    --color-blue-100: oklch(0.932 0.032 255.585);
-    --color-blue-200: oklch(0.882 0.059 254.128);
-    --color-blue-300: oklch(0.809 0.105 251.813);
-    --color-blue-400: oklch(0.707 0.165 254.624);
-    --color-blue-500: oklch(0.623 0.214 259.815);
-    --color-blue-600: oklch(0.546 0.245 262.881);
-    --color-blue-700: oklch(0.488 0.243 264.376);
-    --color-blue-800: oklch(0.424 0.199 265.638);
-    --color-blue-900: oklch(0.379 0.146 265.522);
-    --color-blue-950: oklch(0.282 0.091 267.935);
-    --color-indigo-50: oklch(0.962 0.018 272.314);
-    --color-indigo-100: oklch(0.93 0.034 272.788);
-    --color-indigo-200: oklch(0.87 0.065 274.039);
-    --color-indigo-300: oklch(0.785 0.115 274.713);
-    --color-indigo-400: oklch(0.673 0.182 276.935);
-    --color-indigo-500: oklch(0.585 0.233 277.117);
-    --color-indigo-600: oklch(0.511 0.262 276.966);
-    --color-indigo-700: oklch(0.457 0.24 277.023);
-    --color-indigo-800: oklch(0.398 0.195 277.366);
-    --color-indigo-900: oklch(0.359 0.144 278.697);
-    --color-indigo-950: oklch(0.257 0.09 281.288);
-    --color-violet-50: oklch(0.969 0.016 293.756);
-    --color-violet-100: oklch(0.943 0.029 294.588);
-    --color-violet-200: oklch(0.894 0.057 293.283);
-    --color-violet-300: oklch(0.811 0.111 293.571);
-    --color-violet-400: oklch(0.702 0.183 293.541);
-    --color-violet-500: oklch(0.606 0.25 292.717);
-    --color-violet-600: oklch(0.541 0.281 293.009);
-    --color-violet-700: oklch(0.491 0.27 292.581);
-    --color-violet-800: oklch(0.432 0.232 292.759);
-    --color-violet-900: oklch(0.38 0.189 293.745);
-    --color-violet-950: oklch(0.283 0.141 291.089);
-    --color-purple-50: oklch(0.977 0.014 308.299);
-    --color-purple-100: oklch(0.946 0.033 307.174);
-    --color-purple-200: oklch(0.902 0.063 306.703);
-    --color-purple-300: oklch(0.827 0.119 306.383);
-    --color-purple-400: oklch(0.714 0.203 305.504);
-    --color-purple-500: oklch(0.627 0.265 303.9);
-    --color-purple-600: oklch(0.558 0.288 302.321);
-    --color-purple-700: oklch(0.496 0.265 301.924);
-    --color-purple-800: oklch(0.438 0.218 303.724);
-    --color-purple-900: oklch(0.381 0.176 304.987);
-    --color-purple-950: oklch(0.291 0.149 302.717);
-    --color-fuchsia-50: oklch(0.977 0.017 320.058);
-    --color-fuchsia-100: oklch(0.952 0.037 318.852);
-    --color-fuchsia-200: oklch(0.903 0.076 319.62);
-    --color-fuchsia-300: oklch(0.833 0.145 321.434);
-    --color-fuchsia-400: oklch(0.74 0.238 322.16);
-    --color-fuchsia-500: oklch(0.667 0.295 322.15);
-    --color-fuchsia-600: oklch(0.591 0.293 322.896);
-    --color-fuchsia-700: oklch(0.518 0.253 323.949);
-    --color-fuchsia-800: oklch(0.452 0.211 324.591);
-    --color-fuchsia-900: oklch(0.401 0.17 325.612);
-    --color-fuchsia-950: oklch(0.293 0.136 325.661);
-    --color-pink-50: oklch(0.971 0.014 343.198);
-    --color-pink-100: oklch(0.948 0.028 342.258);
-    --color-pink-200: oklch(0.899 0.061 343.231);
-    --color-pink-300: oklch(0.823 0.12 346.018);
-    --color-pink-400: oklch(0.718 0.202 349.761);
-    --color-pink-500: oklch(0.656 0.241 354.308);
-    --color-pink-600: oklch(0.592 0.249 0.584);
-    --color-pink-700: oklch(0.525 0.223 3.958);
-    --color-pink-800: oklch(0.459 0.187 3.815);
-    --color-pink-900: oklch(0.408 0.153 2.432);
-    --color-pink-950: oklch(0.284 0.109 3.907);
-    --color-rose-50: oklch(0.969 0.015 12.422);
-    --color-rose-100: oklch(0.941 0.03 12.58);
-    --color-rose-200: oklch(0.892 0.058 10.001);
-    --color-rose-300: oklch(0.81 0.117 11.638);
-    --color-rose-400: oklch(0.712 0.194 13.428);
-    --color-rose-500: oklch(0.645 0.246 16.439);
-    --color-rose-600: oklch(0.586 0.253 17.585);
-    --color-rose-700: oklch(0.514 0.222 16.935);
-    --color-rose-800: oklch(0.455 0.188 13.697);
-    --color-rose-900: oklch(0.41 0.159 10.272);
-    --color-rose-950: oklch(0.271 0.105 12.094);
-    --color-slate-50: oklch(0.984 0.003 247.858);
-    --color-slate-100: oklch(0.968 0.007 247.896);
-    --color-slate-200: oklch(0.929 0.013 255.508);
-    --color-slate-300: oklch(0.869 0.022 252.894);
-    --color-slate-400: oklch(0.704 0.04 256.788);
-    --color-slate-500: oklch(0.554 0.046 257.417);
-    --color-slate-600: oklch(0.446 0.043 257.281);
-    --color-slate-700: oklch(0.372 0.044 257.287);
-    --color-slate-800: oklch(0.279 0.041 260.031);
-    --color-slate-900: oklch(0.208 0.042 265.755);
-    --color-slate-950: oklch(0.129 0.042 264.695);
-    --color-gray-50: oklch(0.985 0.002 247.839);
-    --color-gray-100: oklch(0.967 0.003 264.542);
-    --color-gray-200: oklch(0.928 0.006 264.531);
-    --color-gray-300: oklch(0.872 0.01 258.338);
-    --color-gray-400: oklch(0.707 0.022 261.325);
-    --color-gray-500: oklch(0.551 0.027 264.364);
-    --color-gray-600: oklch(0.446 0.03 256.802);
-    --color-gray-700: oklch(0.373 0.034 259.733);
-    --color-gray-800: oklch(0.278 0.033 256.848);
-    --color-gray-900: oklch(0.21 0.034 264.665);
-    --color-gray-950: oklch(0.13 0.028 261.692);
-    --color-zinc-50: oklch(0.985 0 0);
-    --color-zinc-100: oklch(0.967 0.001 286.375);
-    --color-zinc-200: oklch(0.92 0.004 286.32);
-    --color-zinc-300: oklch(0.871 0.006 286.286);
-    --color-zinc-400: oklch(0.705 0.015 286.067);
-    --color-zinc-500: oklch(0.552 0.016 285.938);
-    --color-zinc-600: oklch(0.442 0.017 285.786);
-    --color-zinc-700: oklch(0.37 0.013 285.805);
-    --color-zinc-800: oklch(0.274 0.006 286.033);
-    --color-zinc-900: oklch(0.21 0.006 285.885);
-    --color-zinc-950: oklch(0.141 0.005 285.823);
-    --color-neutral-50: oklch(0.985 0 0);
-    --color-neutral-100: oklch(0.97 0 0);
-    --color-neutral-200: oklch(0.922 0 0);
-    --color-neutral-300: oklch(0.87 0 0);
-    --color-neutral-400: oklch(0.708 0 0);
-    --color-neutral-500: oklch(0.556 0 0);
-    --color-neutral-600: oklch(0.439 0 0);
-    --color-neutral-700: oklch(0.371 0 0);
-    --color-neutral-800: oklch(0.269 0 0);
-    --color-neutral-900: oklch(0.205 0 0);
-    --color-neutral-950: oklch(0.145 0 0);
-    --color-stone-50: oklch(0.985 0.001 106.423);
-    --color-stone-100: oklch(0.97 0.001 106.424);
-    --color-stone-200: oklch(0.923 0.003 48.717);
-    --color-stone-300: oklch(0.869 0.005 56.366);
-    --color-stone-400: oklch(0.709 0.01 56.259);
-    --color-stone-500: oklch(0.553 0.013 58.071);
-    --color-stone-600: oklch(0.444 0.011 73.639);
-    --color-stone-700: oklch(0.374 0.01 67.558);
-    --color-stone-800: oklch(0.268 0.007 34.298);
-    --color-stone-900: oklch(0.216 0.006 56.043);
-    --color-stone-950: oklch(0.147 0.004 49.25);
     --color-black: #000;
     --color-white: #fff;
     --spacing: 0.25rem;
-    --breakpoint-sm: 40rem;
-    --breakpoint-md: 48rem;
-    --breakpoint-lg: 64rem;
-    --breakpoint-xl: 80rem;
-    --breakpoint-2xl: 96rem;
-    --container-3xs: 16rem;
-    --container-2xs: 18rem;
-    --container-xs: 20rem;
-    --container-sm: 24rem;
-    --container-md: 28rem;
-    --container-lg: 32rem;
-    --container-xl: 36rem;
-    --container-2xl: 42rem;
-    --container-3xl: 48rem;
-    --container-4xl: 56rem;
-    --container-5xl: 64rem;
-    --container-6xl: 72rem;
-    --container-7xl: 80rem;
-    --text-xs: 0.75rem;
-    --text-xs--line-height: calc(1 / 0.75);
     --text-sm: 0.875rem;
     --text-sm--line-height: calc(1.25 / 0.875);
-    --text-base: 1rem;
-    --text-base--line-height: calc(1.5 / 1);
-    --text-lg: 1.125rem;
-    --text-lg--line-height: calc(1.75 / 1.125);
     --text-xl: 1.25rem;
     --text-xl--line-height: calc(1.75 / 1.25);
-    --text-2xl: 1.5rem;
-    --text-2xl--line-height: calc(2 / 1.5);
-    --text-3xl: 1.875rem;
-    --text-3xl--line-height: calc(2.25 / 1.875);
-    --text-4xl: 2.25rem;
-    --text-4xl--line-height: calc(2.5 / 2.25);
-    --text-5xl: 3rem;
-    --text-5xl--line-height: 1;
-    --text-6xl: 3.75rem;
-    --text-6xl--line-height: 1;
-    --text-7xl: 4.5rem;
-    --text-7xl--line-height: 1;
-    --text-8xl: 6rem;
-    --text-8xl--line-height: 1;
-    --text-9xl: 8rem;
-    --text-9xl--line-height: 1;
-    --font-weight-thin: 100;
-    --font-weight-extralight: 200;
-    --font-weight-light: 300;
-    --font-weight-normal: 400;
-    --font-weight-medium: 500;
-    --font-weight-semibold: 600;
     --font-weight-bold: 700;
-    --font-weight-extrabold: 800;
-    --font-weight-black: 900;
-    --tracking-tighter: -0.05em;
-    --tracking-tight: -0.025em;
-    --tracking-normal: 0em;
-    --tracking-wide: 0.025em;
-    --tracking-wider: 0.05em;
-    --tracking-widest: 0.1em;
-    --leading-tight: 1.25;
-    --leading-snug: 1.375;
-    --leading-normal: 1.5;
-    --leading-relaxed: 1.625;
-    --leading-loose: 2;
-    --radius-xs: 0.125rem;
-    --radius-sm: 0.25rem;
     --radius-md: 0.375rem;
-    --radius-lg: 0.5rem;
-    --radius-xl: 0.75rem;
-    --radius-2xl: 1rem;
-    --radius-3xl: 1.5rem;
-    --radius-4xl: 2rem;
-    --shadow-2xs: 0 1px rgb(0 0 0 / 0.05);
-    --shadow-xs: 0 1px 2px 0 rgb(0 0 0 / 0.05);
-    --shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
-    --shadow-md: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
-    --shadow-lg: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
-    --shadow-xl: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
-    --shadow-2xl: 0 25px 50px -12px rgb(0 0 0 / 0.25);
-    --inset-shadow-2xs: inset 0 1px rgb(0 0 0 / 0.05);
-    --inset-shadow-xs: inset 0 1px 1px rgb(0 0 0 / 0.05);
-    --inset-shadow-sm: inset 0 2px 4px rgb(0 0 0 / 0.05);
-    --drop-shadow-xs: 0 1px 1px rgb(0 0 0 / 0.05);
-    --drop-shadow-sm: 0 1px 2px rgb(0 0 0 / 0.15);
-    --drop-shadow-md: 0 3px 3px rgb(0 0 0 / 0.12);
-    --drop-shadow-lg: 0 4px 4px rgb(0 0 0 / 0.15);
-    --drop-shadow-xl: 0 9px 7px rgb(0 0 0 / 0.1);
-    --drop-shadow-2xl: 0 25px 25px rgb(0 0 0 / 0.15);
-    --ease-in: cubic-bezier(0.4, 0, 1, 1);
-    --ease-out: cubic-bezier(0, 0, 0.2, 1);
-    --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
-    --animate-spin: spin 1s linear infinite;
-    --animate-ping: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite;
-    --animate-pulse: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
-    --animate-bounce: bounce 1s infinite;
-    --blur-xs: 4px;
-    --blur-sm: 8px;
-    --blur-md: 12px;
-    --blur-lg: 16px;
-    --blur-xl: 24px;
-    --blur-2xl: 40px;
-    --blur-3xl: 64px;
-    --perspective-dramatic: 100px;
-    --perspective-near: 300px;
-    --perspective-normal: 500px;
-    --perspective-midrange: 800px;
-    --perspective-distant: 1200px;
-    --aspect-video: 16 / 9;
     --default-transition-duration: 150ms;
     --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
     --default-font-family: var(--font-sans);
-    --default-font-feature-settings: var(--font-sans--font-feature-settings);
-    --default-font-variation-settings: var(
-      --font-sans--font-variation-settings
-    );
     --default-mono-font-family: var(--font-mono);
-    --default-mono-font-feature-settings: var(
-      --font-mono--font-feature-settings
-    );
-    --default-mono-font-variation-settings: var(
-      --font-mono--font-variation-settings
-    );
-    --color-accent-50: #e7fdea;
-    --color-accent-100: #cbfbd1;
-    --color-accent-200: #9cf7a8;
-    --color-accent-300: #68f37a;
-    --color-accent-400: #33ef4d;
-    --color-accent-500: #11db2d;
-    --color-accent-600: #0eaf23;
-    --color-accent-700: #0a851b;
-    --color-accent-800: #075a12;
-    --color-accent-900: #032b09;
-    --color-accent-950: #021805;
     --color-accent: #0eaf23;
-    --color-text-50: #f7f8f7;
-    --color-text-100: #f2f3f2;
-    --color-text-200: #e2e4e2;
-    --color-text-300: #d2d6d2;
-    --color-text-400: #c2c7c2;
-    --color-text-500: #afb6af;
-    --color-text-600: #97a097;
-    --color-text-700: #7d877d;
-    --color-text-800: #5a625a;
-    --color-text-900: #161816;
-    --color-text-950: #000000;
   }
 }
 @layer base {
@@ -410,14 +46,11 @@
     line-height: 1.5;
     -webkit-text-size-adjust: 100%;
     tab-size: 4;
-    font-family: var( --default-font-family, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" );
+    font-family: var(--default-font-family, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");
     font-feature-settings: var(--default-font-feature-settings, normal);
-    font-variation-settings: var( --default-font-variation-settings, normal );
+    font-variation-settings: var(--default-font-variation-settings, normal);
     -webkit-tap-highlight-color: transparent;
   }
-  body {
-    line-height: inherit;
-  }
   hr {
     height: 0;
     color: inherit;
@@ -440,9 +73,9 @@
     font-weight: bolder;
   }
   code, kbd, samp, pre {
-    font-family: var( --default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace );
+    font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
-    font-feature-settings: var( --default-mono-font-feature-settings, normal );
+    font-feature-settings: var(--default-mono-font-feature-settings, normal);
-    font-variation-settings: var( --default-mono-font-variation-settings, normal );
+    font-variation-settings: var(--default-mono-font-variation-settings, normal);
     font-size: 1em;
   }
   small {
@@ -506,7 +139,14 @@
   }
   ::placeholder {
     opacity: 1;
-    color: color-mix(in oklab, currentColor 50%, transparent);
+  }
+  @supports (not (-webkit-appearance: -apple-pay-button))  or (contain-intrinsic-size: 1px) {
+    ::placeholder {
+      color: currentcolor;
+      @supports (color: color-mix(in lab, red, red)) {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
   }
   textarea {
     resize: vertical;
@@ -527,6 +167,9 @@
   ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month-field, ::-webkit-datetime-edit-day-field, ::-webkit-datetime-edit-hour-field, ::-webkit-datetime-edit-minute-field, ::-webkit-datetime-edit-second-field, ::-webkit-datetime-edit-millisecond-field, ::-webkit-datetime-edit-meridiem-field {
     padding-block: 0;
   }
+  ::-webkit-calendar-picker-indicator {
+    line-height: 1;
+  }
   :-moz-ui-invalid {
     box-shadow: none;
   }
@@ -541,15 +184,15 @@
   }
 }
 @layer utilities {
-  .static {
-    position: static;
-  }
   .col-span-2 {
     grid-column: span 2 / span 2;
   }
   .col-span-3 {
     grid-column: span 3 / span 3;
   }
+  .mx-auto {
+    margin-inline: auto;
+  }
   .-my-1 {
     margin-block: calc(var(--spacing) * -1);
   }
@@ -582,12 +225,18 @@
   .h-4 {
     height: calc(var(--spacing) * 4);
   }
+  .h-8 {
+    height: calc(var(--spacing) * 8);
+  }
   .h-\[100vh\] {
     height: 100vh;
   }
   .h-full {
     height: 100%;
   }
+  .w-1\/3 {
+    width: calc(1/3 * 100%);
+  }
   .w-2 {
     width: calc(var(--spacing) * 2);
   }
@@ -606,6 +255,9 @@
   .flex-grow {
     flex-grow: 1;
   }
+  .grow {
+    flex-grow: 1;
+  }
   .grow-1 {
     flex-grow: 1;
   }
@@ -627,6 +279,9 @@
   .items-center {
     align-items: center;
   }
+  .justify-around {
+    justify-content: space-around;
+  }
   .justify-between {
     justify-content: space-between;
   }
@@ -710,6 +365,9 @@
   .bg-red-600 {
     background-color: var(--color-red-600);
   }
+  .p-1 {
+    padding: calc(var(--spacing) * 1);
+  }
   .p-2 {
     padding: calc(var(--spacing) * 2);
   }
@@ -734,6 +392,9 @@
     --tw-font-weight: var(--font-weight-bold);
     font-weight: var(--font-weight-bold);
   }
+  .whitespace-nowrap {
+    white-space: nowrap;
+  }
   .text-accent {
     color: var(--color-accent);
   }
@@ -746,6 +407,9 @@
   .text-neutral-800 {
     color: var(--color-neutral-800);
   }
+  .text-red-500 {
+    color: var(--color-red-500);
+  }
   .text-red-600 {
     color: var(--color-red-600);
   }
@@ -756,7 +420,7 @@
     filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
   }
   .transition {
-    transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter;
+    transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, visibility, content-visibility, overlay, pointer-events;
     transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
     transition-duration: var(--tw-duration, var(--default-transition-duration));
   }
@@ -769,6 +433,30 @@
     --tw-duration: 300ms;
     transition-duration: 300ms;
   }
+  .group-hover\:text-black {
+    &:is(:where(.group):hover *) {
+      @media (hover: hover) {
+        color: var(--color-black);
+      }
+    }
+  }
+  .group-hover\:text-white {
+    &:is(:where(.group):hover *) {
+      @media (hover: hover) {
+        color: var(--color-white);
+      }
+    }
+  }
+  .group-\[\.edit\]\:block {
+    &:is(:where(.group):is(.edit) *) {
+      display: block;
+    }
+  }
+  .group-\[\.edit\]\:flex {
+    &:is(:where(.group):is(.edit) *) {
+      display: flex;
+    }
+  }
   .group-\[\.edit\]\:hidden {
     &:is(:where(.group):is(.edit) *) {
       display: none;
@@ -882,6 +570,11 @@
       grid-column: span 3 / span 3;
     }
   }
+  .md\:col-span-4 {
+    @media (width >= 48rem) {
+      grid-column: span 4 / span 4;
+    }
+  }
   .md\:mx-\[10\%\] {
     @media (width >= 48rem) {
       margin-inline: 10%;
@@ -912,6 +605,11 @@
       padding-inline: calc(var(--spacing) * 4);
     }
   }
+  .md\:text-transparent {
+    @media (width >= 48rem) {
+      color: transparent;
+    }
+  }
   .group-\[\.edit\]\:md\:block {
     &:is(:where(.group):is(.edit) *) {
       @media (width >= 48rem) {
@@ -928,7 +626,7 @@
 @layer components {
   .grid-main {
     display: grid;
-    grid-template-columns: repeat(6, 1fr);
+    grid-template-columns: 2fr auto 1fr;
     align-items: stretch;
   }
   .grid-sub {
@@ -952,32 +650,6 @@
     }
   }
 }
-@keyframes spin {
-  to {
-    transform: rotate(360deg);
-  }
-}
-@keyframes ping {
-  75%, 100% {
-    transform: scale(2);
-    opacity: 0;
-  }
-}
-@keyframes pulse {
-  50% {
-    opacity: 0.5;
-  }
-}
-@keyframes bounce {
-  0%, 100% {
-    transform: translateY(-25%);
-    animation-timing-function: cubic-bezier(0.8, 0, 1, 1);
-  }
-  50% {
-    transform: none;
-    animation-timing-function: cubic-bezier(0, 0, 0.2, 1);
-  }
-}
 @property --tw-divide-x-reverse {
   syntax: "*";
   inherits: false;
@@ -1033,7 +705,48 @@
   syntax: "*";
   inherits: false;
 }
+@property --tw-drop-shadow {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-drop-shadow-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-drop-shadow-alpha {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 100%;
+}
+@property --tw-drop-shadow-size {
+  syntax: "*";
+  inherits: false;
+}
 @property --tw-duration {
   syntax: "*";
   inherits: false;
 }
+@layer properties {
+  @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+    *, ::before, ::after, ::backdrop {
+      --tw-divide-x-reverse: 0;
+      --tw-border-style: solid;
+      --tw-divide-y-reverse: 0;
+      --tw-font-weight: initial;
+      --tw-blur: initial;
+      --tw-brightness: initial;
+      --tw-contrast: initial;
+      --tw-grayscale: initial;
+      --tw-hue-rotate: initial;
+      --tw-invert: initial;
+      --tw-opacity: initial;
+      --tw-saturate: initial;
+      --tw-sepia: initial;
+      --tw-drop-shadow: initial;
+      --tw-drop-shadow-color: initial;
+      --tw-drop-shadow-alpha: 100%;
+      --tw-drop-shadow-size: initial;
+      --tw-duration: initial;
+    }
+  }
+}

Backend/static/script.js

@@ -1,12 +1,34 @@
 function editDay(element, event, formId) {
-  var form = element
+  var form = element.closest(".grid-sub").querySelector(".all-booking-component > form");
-    .closest(".grid-sub")
-    .querySelector(".time-component > form");
   form.classList.toggle("edit");
   element.classList.toggle("edit");
   if (element.classList.contains("edit")) {
     event.preventDefault();
+    form.querySelectorAll("input, select").forEach((input) => {
+      input.disabled = false;
+    });
   } else {
     form.submit();
   }
 }
+
+function editAbwesenheit(element, event) {
+  var newBookingComponent = element.closest(".grid-sub").querySelector(".new-booking-component");
+  if (element.value == 0) {
+    newBookingComponent.style.display = "";
+  } else {
+    newBookingComponent.style.display = "none";
+  }
+}
+
+function navigateWeek(element, event, direction) {
+  var dateInput = element.closest("form").querySelector("input[type=date]");
+  var date = dateInput.valueAsDate;
+  date.setDate(date.getDate() + 7 * direction);
+  date.setHours(10);
+  dateInput.valueAsDate = date;
+}
+
+function logoutUser() {
+  fetch("/user/logout", {}).then(() => window.location.reload());
+}

Backend/templates/headerComponent.templ

@@ -1,9 +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">Mitarbeiter</a>
+		<a href="/team">Abrechnung</a>
-		<a href="/user">Nutzer</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,25 @@ 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\">Mitarbeiter</a> <a href=\"/user\">Nutzer</a></div>")
+		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
+		}
+		if true {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<a href=\"/team/presence\">Anwesenheit</a> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<a href=\"/user/settings\">Einstellungen</a>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = LogoutButton().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/pages.templ

@@ -22,8 +22,8 @@ templ TimePage(workDays []models.WorkDay) {
 	@headerComponent()
 	<div class="grid-main divide-y-1">
 		@inputForm()
-		for _, bookingGroup := range workDays {
+		for _, day := range workDays {
-			@dayComponent(bookingGroup)
+			@dayComponent(day)
 		}
 	</div>
 	@LegendComponent()
@@ -60,14 +60,23 @@ templ UserPage(status int) {
 						<p class="text-red-600 text-sm">Aktuelles Passwort nicht korrekt!</p>
 					case status >= 400:
 						<p class="text-red-600 text-sm">Passwortwechsel fehlgeschlagen, bitte erneut versuchen!</p>
-					case status == 200:
+					case status == 202:
 						<p class="text-accent text-sm">Passwortänderung erfolgreich</p>
 				}
 			</div>
 			<div class="grid-cell">
-				<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-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="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>
+		<div 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 onclick="logoutUser" type="button" 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>
+		</div>
 	</div>
 }
 
@@ -79,25 +88,62 @@ templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
 	@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 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>
-			<form class="grid-cell flex flex-col gap-2" method="post">
+			<div class="grid-cell flex flex-col gap-2">
-				<div>
+				<form method="get" class="flex flex-row gap-4 items-center justify-around">
-					<p class="text-sm"><span class="">Woche:</span> { fmt.Sprintf("%02d-%d", kw, year) }</p>
+					<input type="date" class="hidden" name="submission_date" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
-					<p class="text-sm">an Vorgesetzten senden</p>
+					<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">
-				</div>
+						<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="chevron-left size-4 mx-auto" viewBox="0 0 16 16">
-				<input type="hidden" name="method" value="send"/>
+							<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>
-				<input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
+						</svg>
-				<input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
+					</button>
-				// if failed {
+					<p class="whitespace-nowrap">KW { fmt.Sprintf("%02d, %d", kw, year) }</p>
-				// 	<p>Fehlgeschlagen</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">
-				<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">Senden</button>
+							<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>
-			</form>
+						</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>
 		</div>
 		for _, week := range weeks {
 			@employeComponent(week)
@@ -115,3 +161,30 @@ templ NavPage() {
 		</div>
 	</div>
 }
+
+templ TeamPresencePage(teamPresence map[bool][]models.User) {
+	@Base()
+	@headerComponent()
+	<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">
+				for _, user := range teamPresence[true] {
+					@userPresenceComponent(user, true)
+				}
+			</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">
+				for _, user := range teamPresence[false] {
+					@userPresenceComponent(user, false)
+				}
+			</div>
+		</div>
+	</div>
+}
+
+templ LogoutButton() {
+	<button onclick="logoutUser()" type="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-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">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.
@@ -81,8 +81,8 @@ func TimePage(workDays []models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for _, bookingGroup := range workDays {
+		for _, day := range workDays {
-			templ_7745c5c3_Err = dayComponent(bookingGroup).Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = dayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -186,13 +186,13 @@ func UserPage(status int) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-		case status == 200:
+		case status == 202:
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<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 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></div>")
+		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><div 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 onclick=\"logoutUser\" type=\"button\" 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></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -238,7 +238,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 		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: 82, Col: 111}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 92, Col: 69}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -254,46 +254,140 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div><form class=\"grid-cell flex flex-col gap-2\" method=\"post\"><div><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+		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(fmt.Sprintf("%02d-%d", kw, year))
+		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: 90, Col: 87}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 101, 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, "</p><p class=\"text-sm\">an Vorgesetzten senden</p></div><input type=\"hidden\" name=\"method\" value=\"send\"> <input type=\"hidden\" name=\"user\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "\"> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1"))
-		templ_7745c5c3_Var8, 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: 94, Col: 87}
-		}
-		_, 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, 16, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		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(userWeek.WeekStart.Format(time.DateOnly))
+		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: 95, Col: 85}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 107, 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, 17, "\"><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\">Senden</button></form></div>")
+		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: 116, 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: 117, 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
 		}
@@ -303,7 +397,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -327,16 +421,102 @@ func NavPage() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var10 == nil {
+		if templ_7745c5c3_Var13 == nil {
-			templ_7745c5c3_Var10 = templ.NopComponent
+			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, 19, "<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, 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>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var14 == nil {
+			templ_7745c5c3_Var14 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 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\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, user := range teamPresence[true] {
+			templ_7745c5c3_Err = userPresenceComponent(user, true).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				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\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, user := range teamPresence[false] {
+			templ_7745c5c3_Err = userPresenceComponent(user, false).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</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_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, 37, "<button onclick=\"logoutUser()\" type=\"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-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Abmelden</button>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/teamComponents.templ

@@ -17,6 +17,21 @@ templ weekDayComponent(user models.User, day models.WorkDay) {
 				<span class="text-accent">{ work }</span>
 				<span class="text-neutral-500">{ 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.Absence.Datum.Equal(day.Day) {
+					<p>{ day.Absence.AbwesenheitTyp.Name }</p>
+				} else if !day.TimeFrom.Equal(day.TimeTo) {
+					<span>{ day.TimeFrom.Format("15:04") }</span>
+					<span>-</span>
+					<span>{ day.TimeTo.Format("15:04") }</span>
+				} else {
+					<p>Keine Anwesenheit</p>
+				}
+			</div>
 		</div>
 	</div>
 }
@@ -25,7 +40,7 @@ templ employeComponent(week models.WorkWeek) {
 	{{
 		year, kw := week.WeekStart.ISOWeek()
 	}}
-	<div class="grid-sub divide-x-1">
+	<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>
@@ -47,3 +62,14 @@ templ employeComponent(week models.WorkWeek) {
 		</form>
 	</div>
 }
+
+templ userPresenceComponent(user models.User, present bool) {
+	<div class="grid-cell group flex flex-row gap-2">
+		if present {
+			<div class="h-8 bg-accent rounded-md group-hover:text-black md:text-transparent text-center p-1">Anwesend</div>
+		} else {
+			<div class="h-8 bg-red-600 rounded-md group-hover:text-white md:text-transparent text-center p-1">Abwesend</div>
+		}
+		<p>{ user.Vorname } { user.Name }</p>
+	</div>
+}

Backend/templates/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.
@@ -97,7 +97,66 @@ func weekDayComponent(user models.User, day models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</span></div></div></div>")
+		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> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if day.Absence.Datum.Equal(day.Day) {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(day.Absence.AbwesenheitTyp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 26, 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, 8, "</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else if !day.TimeFrom.Equal(day.TimeTo) {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<span>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, 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_Var7))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</span> <span>-</span> <span>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, 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_Var8))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</span>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<p>Keine Anwesenheit</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -121,53 +180,53 @@ func employeComponent(week models.WorkWeek) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var6 == nil {
+		if templ_7745c5c3_Var9 == nil {
-			templ_7745c5c3_Var6 = templ.NopComponent
+			templ_7745c5c3_Var9 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
 		year, kw := week.WeekStart.ISOWeek()
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div class=\"grid-sub divide-x-1\"><div class=\"grid-cell\"><p class=\"font-bold uppercase\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"employeComponent grid-sub divide-x-1\"><div class=\"grid-cell\"><p class=\"font-bold uppercase\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var7 string
+		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Vorname)
+		templ_7745c5c3_Var10, 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: 30, Col: 53}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 45, Col: 53}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		_, 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, 8, " ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, " ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var8 string
+		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Name)
+		templ_7745c5c3_Var11, 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: 30, Col: 72}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 45, Col: 72}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		_, 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, 9, "</p><p class=\"text-sm\">Arbeitszeit</p><p class=\"text-accent\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p><p class=\"text-sm\">Arbeitszeit</p><p class=\"text-accent\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var9 string
+		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(week.GetWorkHourString())
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(week.GetWorkHourString())
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 32, Col: 52}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 47, Col: 52}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		_, 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, 10, "</p></div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</p></div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -177,46 +236,116 @@ func employeComponent(week models.WorkWeek) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</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, "</div><form class=\"grid-cell flex flex-col justify-between gap-2\" method=\"post\"><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var10 string
+		var templ_7745c5c3_Var13 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year))
+		templ_7745c5c3_Var13, 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: 40, Col: 85}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 55, Col: 85}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		_, 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, 12, "</p><input type=\"hidden\" name=\"method\" value=\"accept\"> <input type=\"hidden\" name=\"user\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</p><input type=\"hidden\" name=\"method\" value=\"accept\"> <input type=\"hidden\" name=\"user\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var11 string
+		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(week.User.PersonalNummer))
+		templ_7745c5c3_Var14, 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: 42, Col: 82}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 57, Col: 82}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		_, 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, 13, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\"> <input type=\"hidden\" name=\"week\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var12 string
+		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(week.WeekStart.Format(time.DateOnly))
+		templ_7745c5c3_Var15, 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: 43, Col: 80}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 58, Col: 80}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		_, 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, 14, "\"> <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>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "\"> <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>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func userPresenceComponent(user models.User, present bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var16 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var16 == nil {
+			templ_7745c5c3_Var16 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<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, 23, "<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, 24, "<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, 25, "<p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 73, Col: 19}
+		}
+		_, 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, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 73, Col: 33}
+		}
+		_, 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, 27, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/timeComponents.templ

@@ -1,6 +1,7 @@
 package templates
 
 import (
+	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"fmt"
 	"net/url"
@@ -14,14 +15,14 @@ templ inputForm() {
 		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 col-span-2 md:col-span-1 max-md:grid grid-cols-2">
+		<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">4h 32min</p>
+				<p class="text-accent">0h 0min (statisch)</p>
 			</div>
 		</div>
-		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row col-span-3 md:col-span-3 gap-2 ">
+		<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..."/>
@@ -39,27 +40,48 @@ templ inputForm() {
 templ dayComponent(workDay models.WorkDay) {
 	{{
 		work, pause := workDay.GetWorkTimeString()
+		user := ctx.Value("user").(models.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">
-		<div class="grid-cell col-span-2 md:col-span-1 flex flex-row gap-2">
+		<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>
-				<p class=" text-sm mt-1">Arbeitszeit:</p>
+				if work!="" {
-				if (workDay.RequiresAction()) {
+					<p class=" text-sm mt-1">Arbeitszeit:</p>
-					<p class="text-red-600">Bitte anpassen</p>
+					if (workDay.RequiresAction()) {
-				} else {
+						<p class="text-red-600">Bitte anpassen</p>
-					<p class=" text-accent">{ work }</p>
+					} else {
+						<p class=" text-accent">{ work }</p>
+					}
+					<p class="text-neutral-500">{ pause }</p>
+					<p class="text-neutral-500">{ overtime }</p>
 				}
-				<p class="text-neutral-500">{ pause }</p>
 			</div>
 		</div>
-		<div class="time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full grid-cell">
+		<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 justify-between group w-full" method="post">
+			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 group w-full justify-between" style={ justify } method="post">
-				for _, booking := range workDay.Bookings {
+				if (workDay.Absence != models.Absence{}) {
-					@bookingComponent(booking)
+					<p>{ workDay.Absence.AbwesenheitTyp.Name }</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">
@@ -69,11 +91,12 @@ templ dayComponent(workDay models.WorkDay) {
 }
 
 templ changeButtonComponent(id string) {
-	<button type="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="button" onclick={ templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id) }>
+	<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">Submit</p>
+		<p class="hidden group-[.edit]:md:block">Absenden</p>
-		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-4 h-4 md:hidden">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4 md:hidden">
-			<path d="m11.645 20.91-.007-.003-.022-.012a15.247 15.247 0 0 1-.383-.218 25.18 25.18 0 0 1-4.244-3.17C4.688 15.36 2.25 12.174 2.25 8.25 2.25 5.322 4.714 3 7.688 3A5.5 5.5 0 0 1 12 5.052 5.5 5.5 0 0 1 16.313 3c2.973 0 5.437 2.322 5.437 5.25 0 3.925-2.438 7.111-4.739 9.256a25.175 25.175 0 0 1-4.244 3.17 15.247 15.247 0 0 1-.383.219l-.022.012-.007.004-.003.001a.752.752 0 0 1-.704 0l-.003-.001Z"></path>
+			<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>
 }
@@ -120,11 +143,40 @@ 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.GetAbsenceTypesCached() {
+				<option value={ strconv.Itoa(int(absence.Id)) }>{ absence.Name }</option>
+			}
+		</select>
+	</div>
+}
+
+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>
+		<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">
+			<option value="0" disabled>Kommen/Gehen</option>
+			<option value="3" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 }>Kommen</option>
+			<option value="4" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 }>Gehen</option>
+		</select>
+	</div>
+}
+
 templ bookingComponent(booking models.Booking) {
 	<div>
 		<p class="text-neutral-500">
 			<span class="text-neutral-700 group-[.edit]:hidden inline">{ booking.Timestamp.Format("15:04") }</span>
-			<input name={ "booking_" + strconv.Itoa(booking.CounterId) } type="time" value={ booking.Timestamp.Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm 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 disabled name={ "booking_" + strconv.Itoa(booking.CounterId) } type="time" value={ booking.Timestamp.Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm 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"/>
 			{ booking.GetBookingType() }
 		</p>
 	</div>

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.
@@ -9,6 +9,7 @@ import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
 import (
+	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"fmt"
 	"net/url"
@@ -40,20 +41,20 @@ func inputForm() templ.Component {
 
 		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 col-span-2 md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
+		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}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 19, 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\">4h 32min</p></div></div><form id=\"timeRangeForm\" method=\"GET\" class=\"grid-cell flex flex-row col-span-3 md:col-span-3 gap-2 \">")
+		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
 		}
@@ -68,7 +69,7 @@ func inputForm() templ.Component {
 		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}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 28, Col: 57}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
@@ -81,7 +82,7 @@ func inputForm() templ.Component {
 		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}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 29, Col: 55}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
@@ -118,7 +119,13 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		ctx = templ.ClearChildren(ctx)
 
 		work, pause := workDay.GetWorkTimeString()
-		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 col-span-2 md:col-span-1 flex flex-row gap-2\">")
+		user := ctx.Value("user").(models.User)
+		overtime := helper.FormatDuration(workDay.CalcOvertime(user))
+		justify := ""
+		if len(workDay.Bookings) <= 1 {
+			justify = "justify-content: center"
+		}
+		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\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -133,7 +140,7 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		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: 47, Col: 94}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 54, Col: 94}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -146,54 +153,77 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		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: 47, Col: 139}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 54, 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><p class=\" text-sm mt-1\">Arbeitszeit:</p>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if workDay.RequiresAction() {
+		if work != "" {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\"text-red-600\">Bitte anpassen</p>")
+			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
 			}
-		} else {
+			if workDay.RequiresAction() {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<p class=\" text-accent\">")
+				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: 60, 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_Var8 string
+			var templ_7745c5c3_Var9 string
-			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(work)
+			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: 52, Col: 35}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 62, Col: 40}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+			_, 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, 12, "</p>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</p><p 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(overtime)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 63, Col: 43}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<p class=\"text-neutral-500\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</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
-		}
-		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: 54, Col: 39}
-		}
-		_, 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, 14, "</p></div></div><div class=\"time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full grid-cell\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -201,30 +231,93 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<form id=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<form id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var10 string
+		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("time-" + workDay.Day.Format("2006-01-02"))
+		templ_7745c5c3_Var11, 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: 59, Col: 56}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 69, Col: 56}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		_, 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, "\" class=\"flex flex-col gap-2 justify-between group w-full\" method=\"post\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\" class=\"flex flex-col gap-2 group w-full justify-between\" style=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for _, booking := range workDay.Bookings {
+		var templ_7745c5c3_Var12 string
-			templ_7745c5c3_Err = bookingComponent(booking).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(justify)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 69, Col: 131}
+		}
+		_, 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, 20, "\" method=\"post\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if (workDay.Absence != models.Absence{}) {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var13 string
+			templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Absence.AbwesenheitTyp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 71, Col: 45}
+			}
+			_, 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, 22, "</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</form></div><div class=\"grid-cell\">")
+		if len(workDay.Bookings) < 1 && (workDay.Absence == models.Absence{}) {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<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, 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
+			}
+		} 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, 25, " ")
+			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, 26, "<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
 		}
@@ -232,7 +325,7 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -256,25 +349,25 @@ func changeButtonComponent(id string) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var11 == nil {
+		if templ_7745c5c3_Var14 == nil {
-			templ_7745c5c3_Var11 = templ.NopComponent
+			templ_7745c5c3_Var14 = 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, 19, "<button type=\"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=\"button\" onclick=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<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_Var12 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
+		var templ_7745c5c3_Var15 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\"><p class=\"hidden md:block group-[.edit]:hidden\">Ändern</p><p class=\"hidden group-[.edit]:md:block\">Submit</p><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"w-4 h-4 md:hidden\"><path d=\"m11.645 20.91-.007-.003-.022-.012a15.247 15.247 0 0 1-.383-.218 25.18 25.18 0 0 1-4.244-3.17C4.688 15.36 2.25 12.174 2.25 8.25 2.25 5.322 4.714 3 7.688 3A5.5 5.5 0 0 1 12 5.052 5.5 5.5 0 0 1 16.313 3c2.973 0 5.437 2.322 5.437 5.25 0 3.925-2.438 7.111-4.739 9.256a25.175 25.175 0 0 1-4.244 3.17 15.247 15.247 0 0 1-.383.219l-.022.012-.007.004-.003.001a.752.752 0 0 1-.704 0l-.003-.001Z\"></path></svg></button>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\"><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
 		}
@@ -298,9 +391,9 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var16 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var13 == nil {
+		if templ_7745c5c3_Var16 == nil {
-			templ_7745c5c3_Var13 = templ.NopComponent
+			templ_7745c5c3_Var16 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
@@ -323,52 +416,16 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			break
 		}
 		if today {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<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, 30, "<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_Var14 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
+			var templ_7745c5c3_Var17 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var14...)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<div class=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var15 string
-			templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var14).String())
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\" style=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var16 string
-			templ_7745c5c3_Var16, 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: 104, Col: 149}
-			}
-			_, 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, 24, "\"></div></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			var templ_7745c5c3_Var17 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
 			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, 25, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -381,7 +438,43 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\"></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "\" style=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var19 string
+			templ_7745c5c3_Var19, 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: 127, Col: 149}
+			}
+			_, 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, 33, "\"></div></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			var templ_7745c5c3_Var20 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var20...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var21 string
+			templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var20).String())
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "\"></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -406,12 +499,169 @@ func lineComponent() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var19 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var22 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var19 == nil {
+		if templ_7745c5c3_Var22 == nil {
-			templ_7745c5c3_Var19 = templ.NopComponent
+			templ_7745c5c3_Var22 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<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, 36, "<div class=\"flex flex-col w-2 py-2 items-center text-accent print:hidden\"><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg><div class=\"w-[2px] bg-accent flex-grow -my-1\"></div><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func absenceComponent(d models.WorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var23 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var23 == nil {
+			templ_7745c5c3_Var23 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<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("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event")))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "<select name=\"absence\" onchange=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 templ.ComponentScript = templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event"))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var24.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "\" 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.GetAbsenceTypesCached() {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "<option value=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var25 string
+			templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(absence.Id)))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 151, Col: 49}
+			}
+			_, 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, "\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var26 string
+			templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(absence.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 151, Col: 66}
+			}
+			_, 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, 42, "</option>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</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_Var27 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var27 == nil {
+			templ_7745c5c3_Var27 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<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_Var28 string
+		templ_7745c5c3_Var28, 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: 165, Col: 72}
+		}
+		_, 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, "\" 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_Var29 string
+		templ_7745c5c3_Var29, 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: 166, Col: 69}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "\"> <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, 47, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, ">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, 49, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, ">Gehen</option></select></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -435,64 +685,64 @@ func bookingComponent(booking models.Booking) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var20 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var30 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var20 == nil {
+		if templ_7745c5c3_Var30 == nil {
-			templ_7745c5c3_Var20 = templ.NopComponent
+			templ_7745c5c3_Var30 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div><p class=\"text-neutral-500\"><span class=\"text-neutral-700 group-[.edit]:hidden inline\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "<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_Var21 string
+		var templ_7745c5c3_Var31 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
+		templ_7745c5c3_Var31, 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: 126, Col: 97}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 178, Col: 97}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</span> <input name=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "</span> <input disabled name=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var22 string
+		var templ_7745c5c3_Var32 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs("booking_" + strconv.Itoa(booking.CounterId))
+		templ_7745c5c3_Var32, 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: 127, Col: 61}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 179, Col: 70}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "\" type=\"time\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "\" type=\"time\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var23 string
+		var templ_7745c5c3_Var33 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
+		templ_7745c5c3_Var33, 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: 127, Col: 117}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 179, Col: 126}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\" 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, 54, "\" 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_Var24 string
+		var templ_7745c5c3_Var34 string
-		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
+		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 128, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 180, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -516,12 +766,12 @@ func LegendComponent() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var25 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var35 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var25 == nil {
+		if templ_7745c5c3_Var35 == nil {
-			templ_7745c5c3_Var25 = templ.NopComponent
+			templ_7745c5c3_Var35 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<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, 56, "<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
 		}

DB/initdb/01_schema.sql

@@ -7,16 +7,27 @@ CREATE TABLE "anwesenheit" (
     "timestamp" timestamptz(6) DEFAULT CURRENT_TIMESTAMP,
     "card_uid" varchar(255),
     "check_in_out" int2,
-    "geraet_id" int2
+    "geraet_id" int2,
+    "manuelle_buchung" bool
 );
 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";
+DROP TABLE IF EXISTS "s_personal_daten";
-CREATE TABLE "personal_daten" (
+CREATE TABLE "s_personal_daten" (
     "personal_nummer" int4 NOT NULL PRIMARY KEY,
     "aktiv_beschaeftigt" bool,
     "vorname" varchar(255),
@@ -32,7 +43,7 @@ CREATE TABLE "personal_daten" (
     "arbeitszeit_max_ende" time(6),
     "vorgesetzter_pers_nr" int4
 );
-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" (
@@ -70,15 +81,20 @@ CREATE TABLE "wochen_report" (
     UNIQUE ("personal_nummer", "woche_start")
 );
 
+DROP TABLE IF EXISTS "abwesenheit";
+CREATE TABLE "abwesenheit" (
+    "counter_id" bigserial PRIMARY KEY,
+    "card_uid" varchar(255),
+    "abwesenheit_typ" int2,
+    "datum" timestamptz(6) DEFAULT NOW()::DATE
+    );
+
+DROP TABLE IF EXISTS "s_abwesenheit_typen";
+CREATE TABLE "s_abwesenheit_typen" (
+    "abwesenheit_id" int2 PRIMARY KEY,
+    "abwesenheit_name" varchar(255)
+);
+
 -- 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_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,	'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") VALUES (1, 'Urlaub'), (2, 'Krank'), (3, 'Kurzarbeit');

DB/initdb/03_create_user.sh

@@ -4,10 +4,11 @@ set -e  # Exit on error
 echo "Creating PostgreSQL user and setting permissions... $POSTGRES_USER for API user $POSTGRES_API_USER"
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-    CREATE USER $POSTGRES_API_USER WITH ENCRYPTED PASSWORD '$POSTGRES_API_PASSWORD';
+    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, 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,10 +1,11 @@
 POSTGRES_USER=root
 POSTGRES_PASSWORD=very_secure
-POSTGRES_API_USER=api_nuter
+POSTGRES_API_USER=api_nutzer
-POSTGRES_API_PASSWORD=password
+POSTGRES_API_PASS=password
 POSTGRES_PATH=../DB
 POSTGRES_DB=arbeitszeitmessung
 EXPOSED_PORT=8000
 TZ=Europe/Berlin
 PGTZ=Europe/Berlin
 API_TOKEN=dont_access
+EMPTY_DAYS=false

Docker/arbeitszeitmessung.json

@@ -28,9 +28,7 @@
   "paths": {
     "/time": {
       "get": {
-        "tags": [
+        "tags": ["booking"],
-          "booking"
-        ],
         "summary": "Gets all the bookings from one card_uid",
         "description": "Returns all the bookings optionally filtered with cardID",
         "operationId": "getBooking",
@@ -100,11 +98,7 @@
                             "check_in_out": {
                               "type": "integer",
                               "example": 1,
-                              "enum": [
+                              "enum": [1, 2, 254]
-                                1,
-                                2,
-                                255
-                              ]
                             },
                             "timestamp": {
                               "type": "string",
@@ -131,9 +125,7 @@
     },
     "/time/new": {
       "put": {
-        "tags": [
+        "tags": ["booking"],
-          "booking"
-        ],
         "summary": "Create new Booking",
         "description": "Creates a new booking with the supplied parameters",
         "operationId": "pcreateBooking",
@@ -171,11 +163,7 @@
             "required": true,
             "schema": {
               "type": "integer",
-              "enum": [
+              "enum": [1, 2, 254]
-                1,
-                2,
-                255
-              ]
             }
           }
         ],
@@ -203,11 +191,7 @@
                     "check_in_out": {
                       "type": "integer",
                       "example": 1,
-                      "enum": [
+                      "enum": [1, 2, 254]
-                        1,
-                        2,
-                        255
-                      ]
                     },
                     "timestamp": {
                       "type": "string",
@@ -228,9 +212,7 @@
         }
       },
       "get": {
-        "tags": [
+        "tags": ["booking"],
-          "booking"
-        ],
         "summary": "Create new Booking",
         "description": "Creates a new booking with the supplied parameters",
         "operationId": "gcreateBooking",
@@ -277,11 +259,7 @@
             "required": true,
             "schema": {
               "type": "integer",
-              "enum": [
+              "enum": [1, 2, 254]
-                1,
-                2,
-                255
-              ]
             }
           }
         ],
@@ -309,11 +287,7 @@
                     "check_in_out": {
                       "type": "integer",
                       "example": 1,
-                      "enum": [
+                      "enum": [1, 2, 254]
-                        1,
-                        2,
-                        255
-                      ]
                     },
                     "timestamp": {
                       "type": "string",
@@ -339,11 +313,9 @@
     },
     "/logout": {
       "get": {
-        "tags": [
+        "tags": ["booking"],
-          "booking"
-        ],
         "summary": "Logs out all logged in users",
-        "description": "With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=255)",
+        "description": "With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=254)",
         "operationId": "autoLogout",
         "responses": {
           "200": {
@@ -412,11 +384,7 @@
                 "check_in_out": {
                   "type": "integer",
                   "example": 1,
-                  "enum": [
+                  "enum": [1, 2, 254]
-                    1,
-                    2,
-                    255
-                  ]
                 },
                 "timestamp": {
                   "type": "string",
@@ -450,11 +418,7 @@
           "check_in_out": {
             "type": "integer",
             "example": 1,
-            "enum": [
+            "enum": [1, 2, 254]
-              1,
-              2,
-              255
-            ]
           },
           "timestamp": {
             "type": "string",

Docker/arbeitszeitmessung.yaml

@@ -88,7 +88,7 @@ paths:
             enum:
               - 1
               - 2
-              - 255
+              - 254
       responses:
         "200":
           description: successfully created booking
@@ -137,7 +137,7 @@ paths:
             enum:
               - 1
               - 2
-              - 255
+              - 254
       responses:
         "200":
           description: successfully created booking
@@ -154,7 +154,7 @@ paths:
       tags:
         - booking
       summary: Logs out all logged in users
-      description: With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=255)
+      description: With this call all actively logged in users (last booking today has check_in_out=1) will be logged out automaticly (check_in_out=254)
       operationId: autoLogout
       responses:
         "200":
@@ -196,7 +196,7 @@ components:
           enum:
             - 1
             - 2
-            - 255
+            - 254
         timestamp:
           type: string
           format: date-time

Docker/docker-compose.dev.yml

@@ -20,7 +20,8 @@ services:
       - 8001:8080
   backend:
     build: ../Backend
-    image: git.letsstein.de/tom/arbeitszeit-backend:0.1.1
+    image: git.letsstein.de/tom/arbeitszeitmessung
+    restart: unless-stopped
     env_file:
       - .env
     environment:

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:

Jenkinsfile

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

Makefile

@@ -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 push ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${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 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}/${DOCKER_USERNAME}/${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 ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/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}/arbeitszeit-backend:${GIT_COMMIT} Backend --push
+
+test:
+	$(MAKE) -C Backend test
+
+scan: test
+	$(MAKE) -C Backend scan

Readme.md

@@ -12,73 +12,107 @@ cd arbeitszeitmessung/Docker
 docker compose up -d
 ```
 
+## PREVIEW
+
+Zeitverwaltungsansicht (/time):
+
+![time](docs/images/time.png)
+
+Ansicht der Führungskraft (/team):
+
+![team](docs/images/team.png)
+
+Nutzeransicht (/user):
+
+![user](docs/images/user.png)
+
+## Buchungstypen
+
+1 - Kommen
+2 - Gehen
+3 - Kommen Manuell
+4 - Gehen Manuell
+254 - Automatisch abgemeldet
+
 ## API
+
 Nutzung der API
 wenn die `dev-docker-compose.yml` Datei gestartet wird, ist direkt ein SwaggerUI Server mit entsprechender Datei inbegriffen.
 
 ### Buchungen [/time]
 
 #### [GET] Anfrage
+
 Parameter: cardID (string)
 Antwort: `200`
+
 ```json
 [
-    {
+  {
-        "cradID": "test_card",
-        "readerID": "test_reader",
-        "bookingTyp": 2,
-        "loggedTime": "2024-09-05T08:37:53.117641Z",
-        "id": 5
-    },
-    {
-        "cradID": "test_card",
-        "readerID": "mytest",
-        "bookingTyp": 1,
-        "loggedTime": "2024-09-05T08:51:12.670827Z",
-        "id": 6
-    },
-]
-```
-Antwort `500`
-Serverfehler
-
-#### [PUT] Anfrage
-Parameter: id (int)
-Body: (veränderte Parameter)
-```json
-{
     "cradID": "test_card",
-    "readerID": "mytest",
+    "readerID": "test_reader",
-    "bookingTyp": 1,
+    "bookingTyp": 2,
-    "loggedTime": "2024-09-05T08:51:12.670827Z",
+    "loggedTime": "2024-09-05T08:37:53.117641Z",
-}
+    "id": 5
-```
+  },
- Antwort `200`
+  {
- ```json
-{
     "cradID": "test_card",
     "readerID": "mytest",
     "bookingTyp": 1,
     "loggedTime": "2024-09-05T08:51:12.670827Z",
     "id": 6
+  }
+]
+```
+
+Antwort `500`
+Serverfehler
+
+#### [PUT] Anfrage
+
+Parameter: id (int)
+Body: (veränderte Parameter)
+
+```json
+{
+  "cradID": "test_card",
+  "readerID": "mytest",
+  "bookingTyp": 1,
+  "loggedTime": "2024-09-05T08:51:12.670827Z"
 }
- ```
+```
+
+Antwort `200`
+
+```json
+{
+  "cradID": "test_card",
+  "readerID": "mytest",
+  "bookingTyp": 1,
+  "loggedTime": "2024-09-05T08:51:12.670827Z",
+  "id": 6
+}
+```
 
 ### Neue Buchung [/time/new]
+
 #### [PUT] Anfrage
+
 Parameter:
+
 - cardID (string)
 - readerID (string)
 - bookingType (string)
 
 Antwort `202` Akzeptiert und eingefügt
+
 ```json
 {
-    "cradID": "test_card",
+  "cradID": "test_card",
-    "readerID": "mytest",
+  "readerID": "mytest",
-    "bookingTyp": 1,
+  "bookingTyp": 1,
-    "loggedTime": "2024-09-05T08:51:12.670827Z",
+  "loggedTime": "2024-09-05T08:51:12.670827Z",
-    "id": 6
+  "id": 6
 }
 ```
 

db.sql

@@ -6,7 +6,7 @@ CREATE TABLE "public"."anwesenheit" (
     "check_in_out" int2,
     "geraet_id" int2
 );
-COMMENT ON COLUMN "public"."anwesenheit"."check_in_out" IS '1=Check In 2=Check Out 255=Automatic Check Out';
+COMMENT ON COLUMN "public"."anwesenheit"."check_in_out" IS '1=Check In 2=Check Out 254=Automatic Check Out';
 COMMENT ON COLUMN "public"."anwesenheit"."geraet_id" IS 'ID des Lesegerätes';
 
 -- @block create table personaldaten

migrations/20250802065143_initial.down.sql

@@ -0,0 +1,16 @@
+-- reverse: create "wochen_report" table
+DROP TABLE "wochen_report";
+-- reverse: create "user_password" table
+DROP TABLE "user_password";
+-- 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/20250802065143_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/20250802075213_control_tables.down.sql

@@ -0,0 +1,10 @@
+-- reverse rename "s_personal_daten" table
+ALTER TABLE "s_personal_daten" RENAME TO "personal_daten";
+
+DROP TABLE "s_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 "anwesenheit" table
+ALTER TABLE "anwesenheit" DROP COLUMN "manuelle_buchung";

migrations/20250802075213_control_tables.up.sql

@@ -0,0 +1,16 @@
+-- modify "anwesenheit" table
+ALTER TABLE "anwesenheit" ADD COLUMN "manuelle_buchung" boolean 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")
+);
+-- create "s_personal_daten" table
+ALTER TABLE "personal_daten" RENAME TO "s_personal_daten";

migrations/atlas.sum

@@ -0,0 +1,3 @@
+h1:5gPDmrcQS12KjKLuwN1ycTBHtbHbkzd7rUIj01uJrhA=
+20250802065143_initial.up.sql h1:9cUWduWgONRfI5LV+b3nFvei6DKDqPxcNryKVg1xo80=
+20250802075213_control_tables.up.sql h1:5vQLBHMM2Sa1FErP5gQUUHAoSiV2RQ0cOlMEEDFcoKA=

package.json

@@ -0,0 +1,6 @@
+{
+	"dependencies": {
+		"tailwindcss": "^4.1.12",
+		"@tailwindcss/cli": "^4.1.12"
+	}
+}

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: {}