fixed bugs happening when EMTPY_DAYS was disabled

to sql

.gitignore

@@ -24,3 +24,15 @@ go.work.sum
 #Debug files
 
 **__debug*
+
+*_templ.txt
+DB/pg_data
+
+.env.*
+.env
+!.env.example
+
+.idea
+.vscode
+
+node_modules

.vscode/launch.json

@@ -1,19 +0,0 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "Backend",
-			"type": "go",
-			"request": "launch",
-			"mode": "auto",
-			"program": "${workspaceFolder}/Backend",
-			"dlvFlags": ["--check-go-version=false"],
-			"env": {
-				"DEBUG": "true"
-			}
-		}
-	]
-}

.vscode/settings.json

@@ -1,15 +0,0 @@
-{
-	"sqltools.connections": [
-		{
-			"previewLimit": 50,
-			"server": "localhost",
-			"port": 5432,
-			"askForPassword": true,
-			"driver": "PostgreSQL",
-			"name": "arbeitszeiten",
-			"database": "arbeitszeitmessung",
-			"username": "arbeit_zeit"
-		}
-	],
-	"makefile.configureOnOpen": false
-}

Backend/Dockerfile

@@ -1,12 +1,21 @@
-FROM golang:alpine
+# syntax=docker/dockerfile:1
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
+ARG TARGETOS
+ARG TARGETARCH
+ENV CGO_ENABLED=0 \
+    GOOS=$TARGETOS \
+    GOARCH=$TARGETARCH
 
 WORKDIR /app
-
 COPY go.mod go.sum /app/
-
 RUN go mod download && go mod verify
 
 COPY . .
-RUN go build -o /usr/local/bin/app
+RUN go build -o server .
 
-CMD ["app"]
+FROM alpine
+WORKDIR /app
+COPY --from=build /app/server /app/server
+
+COPY /static /app/static
+ENTRYPOINT ["./server"]

Backend/database.go

@@ -10,10 +10,10 @@ import (
 func OpenDatabase() (*sql.DB, error) {
 	dbHost := helper.GetEnv("POSTGRES_HOST", "localhost")
 	dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung")
-	dbUser := helper.GetEnv("POSTGRES_USER", "arbeit_zeit")
-	dbPassword := helper.GetEnv("POSTGRES_PASS", "password")
+	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", dbUser, dbPassword, dbHost, dbName)
+	connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName)
 	return sql.Open("postgres", connStr)
 }
 

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

@@ -0,0 +1,135 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"context"
+	"errors"
+	"log"
+	"net/http"
+	"strconv"
+	"time"
+)
+
+func TeamHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	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) {
+	err := r.ParseForm()
+	if err != nil {
+		log.Println("Error parsing form", err)
+		return
+	}
+	userPN, _ := strconv.Atoi(r.FormValue("user"))
+	_weekTs := r.FormValue("week")
+	weekTs, err := time.Parse(time.DateOnly, _weekTs)
+	user, err := (*models.User).GetByPersonalNummer(nil, userPN)
+	workWeek := (*models.WorkWeek).GetWeek(nil, user, weekTs, false)
+
+	if err != nil {
+		log.Println("Could not get user!")
+		return
+	}
+
+	switch r.FormValue("method") {
+	case "send":
+		err = workWeek.Send()
+		break
+	case "accept":
+		err = workWeek.Accept()
+		break
+	default:
+		break
+	}
+	if errors.Is(err, models.ErrRunningWeek) {
+		showWeeks(w, r.WithContext(context.WithValue(r.Context(), "error", true)))
+	}
+	showWeeks(w, r)
+}
+
+func showWeeks(w http.ResponseWriter, r *http.Request) {
+	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
+	}
+	submissionDate := r.URL.Query().Get("submission_date")
+	lastSub := user.GetLastSubmission()
+	if submissionDate != "" {
+		submissionDate, err := time.Parse("2006-01-02", submissionDate)
+		if err == nil {
+			lastSub = 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...)
+	}
+	// isRunningWeek := time.Since(lastSub) < 24*5*time.Hour //the last submission is this week and cannot be send yet
+	templates.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
+}
+
+func getWeeksTillNow(lastWeek time.Time) []time.Time {
+	var weeks []time.Time
+	if lastWeek.After(time.Now()) {
+		log.Println("Timestamp is after today, no weeks till now!")
+		return weeks
+	}
+	if lastWeek.Weekday() != time.Monday {
+		if lastWeek.Weekday() == time.Sunday {
+			lastWeek = lastWeek.AddDate(0, 0, -6)
+		} else {
+			lastWeek = lastWeek.AddDate(0, 0, -int(lastWeek.Weekday()-1))
+		}
+	}
+	if time.Since(lastWeek) < 24*5*time.Hour {
+		log.Println("Timestamp in running week, cannot split!")
+	}
+
+	for t := lastWeek; t.Before(time.Now()); t = t.Add(7 * 24 * time.Hour) {
+		weeks = append(weeks, t)
+	}
+	log.Println(weeks)
+	return weeks
+}
+
+func getMonday(ts time.Time) time.Time {
+	if ts.Weekday() != time.Monday {
+		if ts.Weekday() == time.Sunday {
+			ts = ts.AddDate(0, 0, -6)
+		} else {
+			ts = ts.AddDate(0, 0, -int(ts.Weekday()-1))
+		}
+	}
+	return ts
+}

Backend/endpoints/team_presence.go

@@ -0,0 +1,45 @@
+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)
+		break
+	case http.MethodOptions:
+		// just support options header for non GET Requests from SWAGGER
+		w.WriteHeader(http.StatusOK)
+		break
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
+	}
+}
+
+func teamPresence(w http.ResponseWriter, r *http.Request){
+	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	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

@@ -13,25 +13,31 @@ import (
 // GET only for demo purpose
 func TimeCreateHandler(w http.ResponseWriter, r *http.Request) {
 	helper.SetCors(w)
-	// switch with request methods
 	switch r.Method {
-	case "PUT":
+	case http.MethodPut:
 		createBooking(w, r)
-	case "GET":
+		break
+	case http.MethodGet:
 		createBooking(w, r)
-	case "OPTIONS":
+		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) {
+		log.Println("Wrong or no API key provided!")
+		http.Error(w, "Wrong or no API key provided", http.StatusUnauthorized)
+		return
+	}
 
 	booking := (*models.Booking).FromUrlParams(nil, r.URL.Query())
 	if booking.Verify() {
@@ -51,3 +57,17 @@ func createBooking(w http.ResponseWriter, r *http.Request) {
 	}
 	w.WriteHeader(http.StatusBadRequest)
 }
+
+func checkPassword(r *http.Request) bool {
+	authToken := helper.GetEnv("API_TOKEN", "dont_access")
+	authHeaders := r.Header.Get("Authorization")
+	_authStart := len("Bearer ")
+	if len(authHeaders) <= _authStart {
+		authHeaders = r.URL.Query().Get("api_key")
+		_authStart = 0
+		if len(authHeaders) <= _authStart {
+			return false
+		}
+	}
+	return authToken == authHeaders[_authStart:]
+}

Backend/endpoints/time.go

@@ -8,69 +8,199 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
+	"sort"
 	"strconv"
 	"time"
 )
 
 // Frontend relevant backend functionality -> not used by the arduino devices
 func TimeHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
 	helper.SetCors(w)
 	switch r.Method {
-	case "GET":
+	case http.MethodGet:
 		getBookings(w, r)
-	case "POST":
+		break
+	case http.MethodPost:
 		updateBooking(w, r)
-	case "OPTIONS":
+		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)
+		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, get_key string, fallback string) (time.Time, error) {
 	_timestamp_get := r.URL.Query().Get(get_key)
-	if(_timestamp_get == "") {
+	if _timestamp_get == "" {
 		_timestamp_get = fallback
 	}
 	timestamp_get, err := time.Parse("2006-01-02", _timestamp_get)
-	if(err != nil){
+	if err != nil {
 		return time.Now(), err
 	}
 	return timestamp_get, nil
 }
 
-
 // Returns bookings from DB with similar card uid -> checks for card uid in http query params
 func getBookings(w http.ResponseWriter, r *http.Request) {
-	// if(!Session.Exists(r.Context(), "user")){
-	// 	log.Println("No user in session storage!")
-	// 	http.Error(w, "Not logged in!", http.StatusForbidden)
-	// 	return
-	// }
-
-	// user, err := (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
-	user, err := (*models.User).GetByPersonalNummer(nil, 123)
-	if(err != nil){
+	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	if err != nil {
 		log.Println("No user found with the given personal number!")
-		http.Error(w, "No user found", http.StatusNotFound)
+		http.Redirect(w, r, "/user/login", http.StatusSeeOther)
 		return
 	}
 
-
-	tsFrom, err := parseTimestamp(r, "time_from", "2000-01-01")
-	if(err != nil ){
+	// TODO add config for timeoffset
+	tsFrom, err := parseTimestamp(r, "time_from", time.Now().AddDate(0, -1, 0).Format("2006-01-02"))
+	if err != nil {
 		log.Println("Error parsing 'from' time", err)
 		http.Error(w, "Timestamp 'from' cannot be parsed!", http.StatusBadRequest)
 		return
 	}
 	tsTo, err := parseTimestamp(r, "time_to", time.Now().Format("2006-01-02"))
-	if(err != nil ){
+	if err != nil {
 		log.Println("Error parsing 'to' time", err)
 		http.Error(w, "Timestamp 'to' cannot be parsed!", http.StatusBadRequest)
 		return
 	}
-	tsTo = tsTo.AddDate(0,0,1) // so that today is inside
+	tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside
+
+	workDays := (*models.WorkDay).GetWorkDays(nil, user.CardUID, tsFrom, tsTo)
+	sort.Slice(workDays, func(i, j int) bool {
+		return workDays[i].Day.After(workDays[j].Day)
+	})
+
+	if r.Header.Get("Accept") == "application/json" {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		json.NewEncoder(w).Encode(workDays)
+		return
+	}
+
+	ctx := context.WithValue(r.Context(), "user", user)
+	templates.TimePage(workDays).Render(ctx, w)
+}
+
+func updateBooking(w http.ResponseWriter, r *http.Request) {
+	r.ParseForm()
+	var loc *time.Location
+	loc, err := time.LoadLocation(helper.GetEnv("TZ", "Europe/Berlin"))
+	if err != nil {
+		log.Println("Error loading location", err)
+		loc = time.Local
+	}
+	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.InsertTimestamp()
+		if err != nil {
+			log.Println("Error inserting booking", err)
+		}
+		break
+	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)
+			}
+		}
+		break
+	}
+
+	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 := models.NewAbsence(user.CardUID, int8(absenceType), absenceDate)
+	err = absence.Insert()
+	if err != nil {
+		log.Println("Error inserting absence!", err)
+		return
+	}
+}
+
+func getBookingsAPI(w http.ResponseWriter, r *http.Request) {
+	_user_pn := r.URL.Query().Get("personal_nummer")
+	user_pn, err := strconv.Atoi(_user_pn)
+	if err != nil {
+		log.Println("No personal numver found!")
+		http.Error(w, "No personal number found", http.StatusBadRequest)
+		return
+	}
+
+	user, err := (*models.User).GetByPersonalNummer(nil, user_pn)
+	if err != nil {
+		log.Println("No user found with the given personal number!")
+		http.Error(w, "No user found", http.StatusNotFound)
+		return
+	}
+
+	// TODO add config for timeoffset
+	tsFrom, err := parseTimestamp(r, "time_from", time.Now().AddDate(0, -1, 0).Format("2006-01-02"))
+	if err != nil {
+		log.Println("Error parsing 'from' time", err)
+		http.Error(w, "Timestamp 'from' cannot be parsed!", http.StatusBadRequest)
+		return
+	}
+	tsTo, err := parseTimestamp(r, "time_to", time.Now().Format("2006-01-02"))
+	if err != nil {
+		log.Println("Error parsing 'to' time", err)
+		http.Error(w, "Timestamp 'to' cannot be parsed!", http.StatusBadRequest)
+		return
+	}
+	tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside
 
 	bookings, err := (*models.Booking).GetBookingsGrouped(nil, user.CardUID, tsFrom, tsTo)
 	if err != nil {
@@ -78,35 +208,8 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		return
 	}
-	ctx := context.WithValue(r.Context(), "user", user)
-	templates.TimeDashboard(bookings).Render(ctx, w)
-	// w.Header().Set("Content-Type", "application/json")
-	// json.NewEncoder(w).Encode(bookings)
-}
-
-func updateBooking(w http.ResponseWriter, r *http.Request){
-	r.ParseForm()
-	for index, possibleBooking := range r.PostForm{
-		if(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.Parse("15:04", possibleBooking[0])
-			if(err != nil){
-				log.Println("Error parsing time!", err)
-				continue
-			}
-			booking.UpdateTime(parsedTime)
-		}
-	}
-	getBookings(w, r)
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(bookings)
 }
 
 // Updates a booking form the given json body

Backend/endpoints/user-login.go

@@ -0,0 +1,87 @@
+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 LoginHandler(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		showLoginPage(w, r, false)
+		break
+	case http.MethodPost:
+		loginUser(w, r)
+		break
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
+	}
+}
+
+func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
+	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.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
+}

Backend/endpoints/user-settings.go

@@ -0,0 +1,76 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"log"
+	"net/http"
+)
+
+func UserSettingsHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	switch r.Method {
+	case http.MethodGet:
+		showUserPage(w, r, 0)
+		break
+	case http.MethodPost:
+		switch r.FormValue("action") {
+		case "change-pass":
+			changePassword(w, r)
+			break
+		case "logout-user":
+			logoutUser(w, r)
+			break
+		}
+
+		break
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
+	}
+}
+
+// change user password and store salted hash in db
+func changePassword(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	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.StatusAccepted)
+		return
+	}
+	showUserPage(w, r, http.StatusUnauthorized)
+}
+
+func logoutUser(w http.ResponseWriter, r *http.Request) {
+
+	err := Session.Destroy(r.Context())
+	if err != nil {
+		log.Println("Error destroying session!", err)
+	}
+	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+}
+
+func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
+	templates.UserPage(status).Render(r.Context(), w)
+	return
+}

Backend/endpoints/user.go

@@ -1,62 +0,0 @@
-package endpoints
-
-import (
-	"arbeitszeitmessung/models"
-	"arbeitszeitmessung/templates"
-	"log"
-	"net/http"
-	"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 LoginHandler(w http.ResponseWriter, r *http.Request){
-	switch r.Method{
-		case http.MethodGet: showForm(w, r)
-		break
-		case http.MethodPost: loginUser(w, r)
-		break
-		default:
-		showForm(w, r)
-		break
-	}
-}
-
-func showForm(w http.ResponseWriter, r *http.Request){
-	templates.LoginForm().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)
-	}
-	card_uid := r.FormValue("card_uid")
-	if(card_uid == ""){
-		log.Println("No card_uid provided!")
-		http.Error(w, "No card_uid provided", http.StatusBadRequest)
-	}
-	user, err := (*models.User).GetByCardUID(nil, card_uid)
-	if(err != nil){
-		log.Println("No user found under this card_uid!")
-		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
-	}
-
-showForm(w, r)
-}

Backend/go.mod

@@ -8,4 +8,6 @@ require github.com/lib/pq v1.10.9
 
 require github.com/a-h/templ v0.3.833
 
-require github.com/alexedwards/scs/v2 v2.8.0 // indirect
+require github.com/alexedwards/scs/v2 v2.8.0
+
+require github.com/joho/godotenv v1.5.1

Backend/go.sum

@@ -4,5 +4,7 @@ github.com/alexedwards/scs/v2 v2.8.0 h1:h31yUYoycPuL0zt14c0gd+oqxfRwIj6SOjHdKRZx
 github.com/alexedwards/scs/v2 v2.8.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8=
 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/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=

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

@@ -1,17 +1,32 @@
 package helper
 
 import (
+	"context"
 	"net/http"
 	"os"
+
+	"github.com/alexedwards/scs/v2"
 )
 
 // setting cors, important for later frontend use
 //
 // in DEBUG == "true" everything is set to "*" so that no cors errors will be happen
 func SetCors(w http.ResponseWriter) {
-	if os.Getenv("DEBUG") == "true" {
+	if os.Getenv("NO_CORS") == "true" {
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Access-Control-Allow-Methods", "*")
 		w.Header().Set("Access-Control-Allow-Headers", "*")
+		// log.Println("Setting cors to *")
 	}
 }
+
+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
+	}
+	if session.Exists(r.Context(), "user") {
+		return
+	}
+	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+}

Backend/main.go

@@ -8,15 +8,31 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"time"
 
+	"github.com/joho/godotenv"
 	_ "github.com/lib/pq"
 )
 
-
-
 func main() {
 	var err error
+
+	err = godotenv.Load(".env")
+	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)
@@ -29,22 +45,25 @@ func main() {
 	server := http.NewServeMux()
 
 	// handles the different http routes
-	withMiddleware := ParamsMiddleware(endpoints.TimeHandler)
 	server.HandleFunc("/time/new", endpoints.TimeCreateHandler)
-	server.Handle("/time", withMiddleware)
+	server.Handle("/time", ParamsMiddleware(endpoints.TimeHandler))
 	server.HandleFunc("/logout", endpoints.LogoutHandler)
-	server.HandleFunc("/", endpoints.LoginHandler)
+	server.HandleFunc("/user/login", endpoints.LoginHandler)
+	server.HandleFunc("/user/settings", endpoints.UserSettingsHandler)
+	server.HandleFunc("/team", endpoints.TeamHandler)
+	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))
 }
 
-func ParamsMiddleware(next http.HandlerFunc) http.Handler{
-	return http.HandlerFunc(func (w http.ResponseWriter, r *http.Request) {
+func ParamsMiddleware(next http.HandlerFunc) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		queryParams := r.URL.Query()
 		ctx := context.WithValue(r.Context(), "urlParams", queryParams)
 		next.ServeHTTP(w, r.WithContext(ctx))

Backend/models/absence.go

@@ -0,0 +1,68 @@
+package models
+
+import (
+	"log"
+	"time"
+)
+
+type AbsenceType struct {
+	Value int8
+	Label string
+}
+
+const (
+	AbsenceNone int8 = iota
+	AbsenceUrlaub
+	AbsenceKurzarbeit
+	AbsenceKrank
+	AbsenceKindkrank
+)
+
+var AbsenceTypes = []AbsenceType{
+	// {Value: AbsenceNone, Label: "Abwesenheit"},
+	{Value: AbsenceUrlaub, Label: "Urlaub"},
+	{Value: AbsenceKurzarbeit, Label: "Kurzarbeit"},
+	{Value: AbsenceKrank, Label: "Krank"},
+	{Value: AbsenceKindkrank, Label: "Kindkrank"},
+}
+
+var AbsenceTypesLabel = map[int8]string{
+	0:                 "None",
+	AbsenceUrlaub:     "Urlaub",
+	AbsenceKurzarbeit: "Kurzarbeit",
+	AbsenceKrank:      "Krank",
+	AbsenceKindkrank:  "Kindkrank",
+}
+
+type Absence struct {
+	CounterId      int
+	CardUID        string
+	AbwesenheitTyp int8
+	Datum          time.Time
+}
+
+func NewAbsence(card_uid string, abwesenheit_typ int8, datum time.Time) Absence {
+	return Absence{
+		CardUID:        card_uid,
+		AbwesenheitTyp: abwesenheit_typ,
+		Datum:          datum,
+	}
+}
+
+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, 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]
+}

Backend/models/booking.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
 	"database/sql"
 	"fmt"
 	"log"
@@ -46,8 +47,9 @@ func (b *Booking) FromUrlParams(params url.Values) Booking {
 	return booking
 }
 
-func (b Booking) Verify() bool {
-	if b.CardUID == "" || b.GeraetID == 0 || b.CheckInOut == 0 {
+func (b *Booking) Verify() bool {
+	//check for overlapping time + arbeitszeit verstoß
+	if b.CardUID == "" { //|| b.GeraetID == 0 || b.CheckInOut == 0 {
 		return false
 	}
 	return true
@@ -68,6 +70,21 @@ func (b *Booking) Insert() error {
 	return nil
 }
 
+func (b *Booking) InsertTimestamp() 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 +95,10 @@ func (b *Booking) GetBookingById(booking_id int) (Booking, error) {
 	if err != nil {
 		return booking, err
 	}
-	if !booking.Verify() {
-		fmt.Printf("Booking verification failed")
-		return booking, nil
-	}
+	// if !booking.Verify() {
+	// 	fmt.Printf("Booking verification failed! %d", )
+	// 	return booking, nil
+	// }
 	return booking, nil
 }
 
@@ -116,11 +133,11 @@ func (b *Booking) GetBookingsByCardID(card_uid string, tsFrom time.Time, tsTo ti
 	return bookings, nil
 }
 
-func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo time.Time) ([]WorkDay, error){
+func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo time.Time) ([]WorkDay, error) {
 	var grouped = make(map[string][]Booking)
 	bookings, err := b.GetBookingsByCardID(card_uid, tsFrom, tsTo)
-	if (err != nil){
-		log.Println("Failed to get bookings",err)
+	if err != nil {
+		log.Println("Failed to get bookings", err)
 		return []WorkDay{}, nil
 	}
 	for _, booking := range bookings {
@@ -135,7 +152,9 @@ func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo tim
 		sort.Slice(bookings, func(i, j int) bool {
 			return bookings[i].Timestamp.Before(bookings[j].Timestamp)
 		})
-		result = append(result, WorkDay{Day: day, Bookings: bookings})
+		workDay := WorkDay{Day: day, Bookings: bookings}
+		workDay.getWorkTime()
+		result = append(result, workDay)
 	}
 
 	sort.Slice(result, func(i, j int) bool {
@@ -159,14 +178,25 @@ func (b Booking) Save() {
 }
 
 func (b *Booking) GetBookingType() string {
-	switch b.CheckInOut{
-		case 1,3: //manuelle Änderung
+	debug := (helper.GetEnv("GO_ENV", "production") == "debug")
+	switch b.CheckInOut {
+	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:
+	default:
 		return "Buchungs Typ unbekannt"
 	}
 }
@@ -181,7 +211,7 @@ func (b *Booking) Update(nb Booking) {
 	if b.GeraetID != nb.GeraetID && nb.GeraetID != 0 {
 		b.GeraetID = nb.GeraetID
 	}
-	if(b.Timestamp != nb.Timestamp){
+	if b.Timestamp != nb.Timestamp {
 		b.Timestamp = nb.Timestamp
 	}
 }
@@ -201,27 +231,33 @@ func checkLastBooking(b Booking) bool {
 		log.Println("Error checking last booking: ", err)
 		return false
 	}
-	if int16(check_in_out) == b.CheckInOut {
+	if int16(check_in_out)%2 == b.CheckInOut%2 {
 		return false
 	}
 	return true
 }
 
-func (b *Booking) UpdateTime(newTime time.Time){
+func (b *Booking) UpdateTime(newTime time.Time) {
 	hour, minute, _ := newTime.Clock()
-	if(hour == b.Timestamp.Local().Hour() && minute == b.Timestamp.Local().Minute()){
+	if hour == b.Timestamp.Hour() && minute == b.Timestamp.Minute() {
 		return
 	}
 	// TODO: add check for time overlap
 
 	var newBooking Booking
-	newBooking.Timestamp =  time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, time.Local).UTC()
-	if(b.CheckInOut < 3){
+	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)
+}

Backend/models/user.go

@@ -1,20 +1,46 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
+	"context"
+	"database/sql"
+	"errors"
 	"fmt"
-	"strings"
+	"log"
+	"time"
+
+	"github.com/alexedwards/scs/v2"
 )
 
 type User struct {
-	CardUID                 string `json:"card_uid"`
-	Name                    string `json:"name"`
-	Vorname                 string `json:"vorname"`
-	HauptbeschaeftigungsOrt int8   `json:"hauptbeschaeftigungsort"`
-	PersonalNummer			int		`json:"personal_nummer"`
+	CardUID           string  `json:"card_uid"`
+	Name              string  `json:"name"`
+	Vorname           string  `json:"vorname"`
+	PersonalNummer    int     `json:"personal_nummer"`
+	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)
+	} 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"))
+	}
+	if err != nil {
+		log.Println("Cannot get user from session!")
+		return user, err
+	}
+	return user, nil
 }
 
 func (u *User) GetAll() ([]User, error) {
-	qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname, hauptbeschaeftigung_ort FROM personal_daten;`))
+	qStr, err := DB.Prepare((`SELECT card_uid, vorname, nachname FROM personal_daten;`))
 	var users []User
 	if err != nil {
 		fmt.Printf("Error preparing query statement %v\n", err)
@@ -27,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, &user.HauptbeschaeftigungsOrt); err != nil {
-			return users, nil
+		if err := rows.Scan(&user.CardUID, &user.Vorname, &user.Name); err != nil {
+			log.Println("Error creating user!", err)
+			continue
 		}
 		users = append(users, user)
 	}
@@ -42,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
@@ -53,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
-func (u *User) Logout() error {
-	booking := (*Booking).New(nil, u.CardUID, 0, 255)
+// Creates a new booking for the user -> check_in_out will be 254 for automatic check out
+func (u *User) CheckOut() error {
+	booking := (*Booking).New(nil, u.CardUID, 0, 254)
 	err := booking.Insert()
 	if err != nil {
 		fmt.Printf("Error inserting booking %v\n", err)
@@ -67,34 +95,164 @@ func (u *User) Logout() error {
 	return nil
 }
 
-func (u *User) GetByCardUID(card_uid string) (User, error) {
+func (u *User) GetByPersonalNummer(personalNummer int) (User, error) {
 	var user User
-	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, hauptbeschaeftigung_ort FROM personal_daten WHERE card_uid = $1;`))
+
+	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE personal_nummer = $1;`))
 	if err != nil {
 		return user, err
 	}
-	err = qStr.QueryRow(card_uid).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.HauptbeschaeftigungsOrt)
-	if err != nil{
-		return user, err
-	}
-	return user, nil
-}
+	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag)
 
-func (u *User) GetByPersonalNummer (personalNummer int) (User, error) {
-	var user User
-
-	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, hauptbeschaeftigung_ort FROM 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.HauptbeschaeftigungsOrt)
-	if err != nil{
-		return user, err
-	}
 	return user, nil
 }
 
 func (u *User) Login(password string) bool {
-	userPassword := strings.ToLower(fmt.Sprintf("%s_%s", u.Vorname, u.Name)) //temp password: "max_mustermann"
-	return userPassword == password
+	var loginSuccess bool
+	qStr, err := DB.Prepare((`SELECT (pass_hash = crypt($2, pass_hash)) AS pass_hash FROM user_password WHERE personal_nummer = $1;`))
+	if err != nil {
+		log.Println("Error preparing db statement", err)
+		return false
+	}
+	defer qStr.Close()
+	err = qStr.QueryRow(u.PersonalNummer, password).Scan(&loginSuccess)
+	if err != nil {
+		log.Println("Error queriing db", err)
+		return false
+	}
+	return loginSuccess
+}
+
+// checks if old password matches and changes to new password
+//
+// returns auth(bool), error
+func (u *User) ChangePass(password, newPassword string) (bool, error) {
+	if !u.Login(password) {
+		return false, nil
+	}
+	qStr, err := DB.Prepare((`UPDATE user_password SET pass_hash = crypt($2, gen_salt('bf')) WHERE personal_nummer = $1;`))
+	if err != nil {
+		return false, err
+	}
+	_, err = qStr.Exec(u.PersonalNummer, newPassword)
+	if err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
+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`)
+	if err != nil {
+		return teamMembers, err
+	}
+	defer qStr.Close()
+	rows, err := qStr.Query(u.PersonalNummer)
+	if err != nil {
+		log.Println("Error getting rows!")
+		return teamMembers, err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		user, err := parseUser(rows)
+		if err != nil {
+			log.Println("Error parsing user!")
+			return teamMembers, err
+		}
+		teamMembers = append(teamMembers, user)
+	}
+
+	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)
+	bookings, err := (*Booking).GetBookingsGrouped(nil, u.CardUID, weekStart, time.Now())
+	if err != nil {
+		log.Println("Error fetching bookings!")
+		return WorkWeek{WorkDays: bookings}
+	}
+	return WorkWeek{WorkDays: bookings}
+}
+
+// gets the first week, that needs to be submitted
+func (u *User) GetNextWeek() WorkWeek {
+	var week WorkWeek
+	return week
+
+}
+
+func parseUser(rows *sql.Rows) (User, error) {
+	var user User
+	if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag); err != nil {
+		log.Println("Error scanning row!", err)
+		return user, err
+	}
+	return user, nil
+}
+
+// returns the start of the week, the last submission was made, submission == first booking or last send booking_report to team leader
+func (u *User) GetLastSubmission() time.Time {
+	var lastSub time.Time
+	qStr, err := DB.Prepare(`
+	SELECT COALESCE(
+	    (SELECT woche_start + INTERVAL '1 week' FROM wochen_report WHERE personal_nummer = $1 ORDER BY woche_start DESC LIMIT 1),
+	    (SELECT timestamp FROM anwesenheit WHERE card_uid = $2 ORDER BY timestamp LIMIT 1)
+    ) AS letzte_buchung;
+`)
+	if err != nil {
+		log.Println("Error preparing statement!", err)
+		return lastSub
+	}
+	err = qStr.QueryRow(u.PersonalNummer, u.CardUID).Scan(&lastSub)
+	if err != nil {
+		log.Println("Error executing query!", err)
+		return lastSub
+	}
+	log.Println("From DB: ", lastSub)
+	lastSub = getMonday(lastSub)
+	lastSub = lastSub.Round(24 * time.Hour)
+	log.Println("After truncate: ", lastSub)
+	return lastSub
+}
+
+func (u *User) GetFromCardUID(card_uid string) (User, error) {
+	user := User{}
+	var err error
+
+	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE card_uid = $1;`))
+	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 {
+			ts = ts.AddDate(0, 0, -6)
+		} else {
+			ts = ts.AddDate(0, 0, -int(ts.Weekday()-1))
+		}
+	}
+	return ts
 }

Backend/models/workDay.go

@@ -1,51 +1,216 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"log"
+	"strconv"
 	"time"
 )
 
 type WorkDay struct {
-	Day time.Time
-	Bookings []Booking
-	workTime time.Duration
+	Day       time.Time `json:"day"`
+	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 all_days AS (
+    SELECT generate_series($2, $3, 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
+        d.work_date,
+        COALESCE(MIN(b.timestamp), NOW()) AS time_from,
+        COALESCE(MAX(b.timestamp), NOW()) AS time_to,
+        COALESCE(
+            EXTRACT(EPOCH FROM SUM(
+                CASE
+                    WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 255)
+                    THEN b.timestamp - b.prev_timestamp
+                    ELSE INTERVAL '0'
+                END
+            )), 0
+        ) AS total_work_seconds,
+        COALESCE(
+            EXTRACT(EPOCH FROM SUM(
+                CASE
+                    WHEN b.prev_check IN (2, 4, 255) AND b.check_in_out IN (1, 3)
+                    THEN b.timestamp - b.prev_timestamp
+                    ELSE INTERVAL '0'
+                END
+            )), 0
+        ) AS total_pause_seconds,
+        COALESCE(jsonb_agg(jsonb_build_object(
+            'check_in_out', b.check_in_out,
+            'timestamp', b.timestamp,
+            'counter_id', b.counter_id
+        ) ORDER BY b.timestamp), '[]'::jsonb) AS bookings,
+        a.abwesenheit_typ
+    FROM all_days d
+    LEFT JOIN ordered_bookings b ON d.work_date = b.work_date
+    LEFT JOIN abwesenheiten a ON d.work_date = a.work_date
+    GROUP BY d.work_date, a.abwesenheit_typ
+    ORDER BY d.work_date;`)
+
+	if err != nil {
+		log.Println("Error preparing SQL statement", err)
+		return workDays
+	}
+
+	defer qStr.Close()
+	rows, err := qStr.Query(card_uid, tsFrom, tsTo)
+	if err != nil {
+		log.Println("Error getting rows!")
+		return workDays
+	}
+	defer rows.Close()
+	emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false"))
+	for rows.Next() {
+		var workDay WorkDay
+		var bookings []byte
+		var absenceType sql.NullInt16
+		if err := rows.Scan(&workDay.Day, &workDay.TimeFrom, &workDay.TimeTo, &workSec, &pauseSec, &bookings, &absenceType); err != nil {
+			log.Println("Error scanning row!", err)
+			return workDays
+		}
+		workDay.workTime = time.Duration(workSec * float64(time.Second))
+		workDay.pauseTime = time.Duration(pauseSec * float64(time.Second))
+		err = json.Unmarshal(bookings, &workDay.Bookings)
+		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 = NewAbsence(card_uid, int8(absenceType.Int16), workDay.Day)
+			log.Println("Found absence", workDay.Absence)
+		}
+
+		if workDay.Day.Equal(time.Now().Truncate(24 * time.Hour)) {
+			workDay.getWorkTime()
+		} else {
+			workDay.calcPauseTime()
+		}
+		if emptyDays || 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
+	}
+	return workDays
+}
+
+func (d *WorkDay) calcPauseTime() {
+	if d.workTime > 6*time.Hour && d.pauseTime < 45*time.Minute {
+		if d.workTime < 9*time.Hour && d.pauseTime < 30*time.Minute {
+			diff := 30*time.Minute - d.pauseTime
+			d.workTime -= diff
+			d.pauseTime += diff
+		} else if d.pauseTime < 45*time.Minute {
+			diff := 45*time.Minute - d.pauseTime
+			d.workTime -= diff
+			d.pauseTime += diff
+		}
+	}
 }
 
 // Gets the duration someone worked that day
-func (d WorkDay) GetWorkTime() time.Duration{
-	d.workTime = 0
-	for i := 0; i < len(d.Bookings) - (1 + len(d.Bookings)%2); i += 2{
-		start := d.Bookings[i].Timestamp
-		end := d.Bookings[i+1].Timestamp
-		d.workTime += end.Sub(start)
+func (d *WorkDay) getWorkTime() {
+	if len(d.Bookings) <= 1 && d.Bookings[0].CounterId == 0 {
+		return
+	}
+	var workTime, pauseTime time.Duration
+	var lastBooking Booking
+	for _, booking := range d.Bookings {
+		if booking.CheckInOut%2 == 1 {
+			if !lastBooking.Timestamp.IsZero() {
+				pauseTime += booking.Timestamp.Sub(lastBooking.Timestamp)
+			}
+		} else {
+			workTime += booking.Timestamp.Sub(lastBooking.Timestamp)
+		}
+		lastBooking = booking
 	}
-
 	// checks if booking is today and has no gehen yet, so the time since last kommen booking is added to workTime
-	if(d.Day.Equal(time.Now().Truncate(24 * time.Hour)) && len(d.Bookings) % 2 == 1){
-		d.workTime += time.Since(d.Bookings[len(d.Bookings)-1].Timestamp)
+	if d.Day.Day() == time.Now().Day() && len(d.Bookings)%2 == 1 {
+		workTime += time.Since(lastBooking.Timestamp.Local())
 	}
-	return d.workTime
+	d.workTime = workTime
+	d.pauseTime = pauseTime
+
+	d.calcPauseTime()
 }
 
-// Converts duration to string and replaces 0s with in
-//
-// -> output xhxmin
-func (d WorkDay) GetWorkTimeString() string {
-	str := d.GetWorkTime().Abs().Round(time.Minute).String()
-	str = str[:len(str)-2] + "in"
-	if(len(str) > 2){
-	return str
+// Converts duration to string
+func formatDuration(d time.Duration) string {
+	hours := int(d.Abs().Hours())
+	minutes := int(d.Abs().Minutes()) % 60
+	switch {
+	case hours > 0:
+		return fmt.Sprintf("%dh %dmin", hours, minutes)
+	case minutes > 0:
+		return fmt.Sprintf("%dmin", minutes)
+	default:
+		return ""
 	}
-	return ""
+}
+
+func (d *WorkDay) GetWorkTimeString() (string, string) {
+	workString := formatDuration(d.workTime)
+	pauseString := 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
+func (d *WorkDay) RequiresAction() bool {
+	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() uint8 {
-	defaultWorkTime, _ := time.ParseDuration("7h42m")
-	progress := (d.GetWorkTime().Seconds()/defaultWorkTime.Seconds())*100
+func (d *WorkDay) GetWorkDayProgress(user User) uint8 {
+	defaultWorkTime := time.Duration(user.ArbeitszeitPerTag * float32(time.Hour))
+	progress := (d.workTime.Seconds() / defaultWorkTime.Seconds()) * 100
 	return uint8(progress)
 }

Backend/models/workWeek.go

@@ -0,0 +1,151 @@
+package models
+
+import (
+	"database/sql"
+	"errors"
+	"log"
+	"time"
+)
+
+type WorkWeek struct {
+	Id        int
+	WorkDays  []WorkDay
+	User      User
+	WeekStart time.Time
+	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 {
+		week.WorkDays = (*WorkDay).GetWorkDays(nil, user.CardUID, tsMonday, tsMonday.Add(7*24*time.Hour))
+		week.WorkHours = aggregateWorkTime(week.WorkDays)
+	}
+	week.User = user
+	week.WeekStart = tsMonday
+	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)
+}
+
+func aggregateWorkTime(days []WorkDay) time.Duration {
+	var workTime time.Duration
+	for _, day := range days {
+		workTime += day.workTime
+	}
+	return workTime
+}
+
+func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
+	var weeks []WorkWeek
+	qStr, err := DB.Prepare(`SELECT id, woche_start::DATE FROM wochen_report WHERE bestaetigt = FALSE AND personal_nummer = $1;`)
+	if err != nil {
+		log.Println("Error preparing SQL statement", err)
+		return weeks
+	}
+	defer qStr.Close()
+
+	rows, err := qStr.Query(user.PersonalNummer)
+	if err != nil {
+		log.Println("Error querining db!", err)
+		return weeks
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var week WorkWeek
+		week.User = user
+		if err := rows.Scan(&week.Id, &week.WeekStart); err != nil {
+			log.Println("Error scanning row!", err)
+			return weeks
+		}
+		week.WorkDays = (*WorkDay).GetWorkDays(nil, user.CardUID, week.WeekStart, week.WeekStart.Add(7*24*time.Hour))
+		week.WorkHours = aggregateWorkTime(week.WorkDays)
+		weeks = append(weeks, week)
+	}
+	if err = rows.Err(); err != nil {
+		return weeks
+	}
+
+	return weeks
+}
+
+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
+	}
+	if w.CheckStatus() != WeekStatusNone {
+		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE WHERE personal_nummer = $1 AND woche_start = $2;`)
+		if err != nil {
+			log.Println("Error preparing SQL statement", err)
+			return err
+		}
+	} else {
+		qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start) VALUES ($1, $2);`)
+		if err != nil {
+			log.Println("Error preparing SQL statement", err)
+			return err
+		}
+	}
+	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart)
+	if err != nil {
+		log.Println("Error executing query!", err)
+		return err
+	}
+	return nil
+
+}
+
+func (w *WorkWeek) Accept() error {
+	qStr, err := DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = TRUE WHERE personal_nummer = $1 AND woche_start = $2;`)
+	if err != nil {
+		log.Println("Error preparing SQL statement", err)
+		return err
+	}
+	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart)
+	if err != nil {
+		log.Println("Error executing query!", err)
+		return err
+	}
+	return nil
+}

Backend/src/main.css

@@ -26,3 +26,38 @@
   --color-text-900: #161816;
   --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 {
+      grid-template-columns: repeat(5, 1fr);
+      margin: 0 10%;
+    }
+
+    .grid-sub {
+    }
+  }
+}

Backend/static/css/styles.css

@@ -1,365 +1,32 @@
-/*! tailwindcss v4.0.6 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v4.0.8 | MIT License | https://tailwindcss.com */
 @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-100: oklch(0.936 0.032 17.717);
-    --color-red-200: oklch(0.885 0.062 18.334);
-    --color-red-300: oklch(0.808 0.114 19.571);
-    --color-red-400: oklch(0.704 0.191 22.216);
     --color-red-500: oklch(0.637 0.237 25.331);
     --color-red-600: oklch(0.577 0.245 27.325);
-    --color-red-700: oklch(0.505 0.213 27.518);
-    --color-red-800: oklch(0.444 0.177 26.899);
-    --color-red-900: oklch(0.396 0.141 25.723);
-    --color-red-950: oklch(0.258 0.092 26.042);
-    --color-orange-50: oklch(0.98 0.016 73.684);
-    --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);
@@ -374,29 +41,7 @@
     --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 {
@@ -541,12 +186,6 @@
   }
 }
 @layer utilities {
-  .collapse {
-    visibility: collapse;
-  }
-  .relative {
-    position: relative;
-  }
   .static {
     position: static;
   }
@@ -556,48 +195,27 @@
   .col-span-3 {
     grid-column: span 3 / span 3;
   }
-  .col-span-5 {
-    grid-column: span 5 / span 5;
-  }
-  .col-span-full {
-    grid-column: 1 / -1;
-  }
-  .row-span-3 {
-    grid-row: span 3 / span 3;
-  }
-  .row-span-full {
-    grid-row: 1 / -1;
+  .mx-auto {
+    margin-inline: auto;
   }
   .-my-1 {
     margin-block: calc(var(--spacing) * -1);
   }
-  .my-2 {
-    margin-block: calc(var(--spacing) * 2);
-  }
   .mt-1 {
     margin-top: calc(var(--spacing) * 1);
   }
-  .block {
-    display: block;
+  .mb-2 {
+    margin-bottom: calc(var(--spacing) * 2);
   }
   .flex {
     display: flex;
   }
-  .grid {
-    display: grid;
-  }
   .hidden {
     display: none;
   }
   .inline {
     display: inline;
   }
-  .inline-flex {
-    display: inline-flex;
-  }
-  .list-item {
-    display: list-item;
-  }
   .table {
     display: table;
   }
@@ -612,50 +230,47 @@
   .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);
   }
   .w-4 {
     width: calc(var(--spacing) * 4);
   }
+  .w-9\/10 {
+    width: calc(9/10 * 100%);
+  }
   .w-\[2px\] {
     width: 2px;
   }
   .w-full {
     width: 100%;
   }
-  .max-w-\[70\%\] {
-    max-width: 70%;
-  }
   .flex-grow {
     flex-grow: 1;
   }
+  .grow {
+    flex-grow: 1;
+  }
   .grow-1 {
     flex-grow: 1;
   }
-  .border-collapse {
-    border-collapse: collapse;
-  }
-  .transform {
-    transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-  }
   .cursor-pointer {
     cursor: pointer;
   }
-  .resize {
-    resize: both;
-  }
-  .grid-cols-4 {
-    grid-template-columns: repeat(4, minmax(0, 1fr));
-  }
-  .grid-cols-6 {
-    grid-template-columns: repeat(6, minmax(0, 1fr));
-  }
-  .grid-cols-subgrid {
-    grid-template-columns: subgrid;
+  .grid-cols-2 {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
   }
   .flex-col {
     flex-direction: column;
@@ -663,9 +278,15 @@
   .flex-row {
     flex-direction: row;
   }
+  .content-end {
+    align-content: flex-end;
+  }
   .items-center {
     align-items: center;
   }
+  .justify-around {
+    justify-content: space-around;
+  }
   .justify-between {
     justify-content: space-between;
   }
@@ -695,15 +316,13 @@
       border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
     }
   }
-  .divide-neutral-300 {
-    :where(& > :not(:last-child)) {
-      border-color: var(--color-neutral-300);
-    }
+  .justify-self-end {
+    justify-self: flex-end;
   }
-  .divide-neutral-400 {
-    :where(& > :not(:last-child)) {
-      border-color: var(--color-neutral-400);
-    }
+  .truncate {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
   .overflow-hidden {
     overflow: hidden;
@@ -718,23 +337,14 @@
     border-style: var(--tw-border-style);
     border-width: 1px;
   }
-  .border-0 {
-    border-style: var(--tw-border-style);
-    border-width: 0px;
-  }
-  .border-r-0 {
-    border-right-style: var(--tw-border-style);
-    border-right-width: 0px;
-  }
-  .border-b-0 {
-    border-bottom-style: var(--tw-border-style);
-    border-bottom-width: 0px;
-  }
   .border-neutral-200 {
     border-color: var(--color-neutral-200);
   }
-  .border-neutral-400 {
-    border-color: var(--color-neutral-400);
+  .border-neutral-300 {
+    border-color: var(--color-neutral-300);
+  }
+  .border-neutral-800 {
+    border-color: var(--color-neutral-800);
   }
   .border-neutral-900 {
     border-color: var(--color-neutral-900);
@@ -745,9 +355,6 @@
   .bg-neutral-100 {
     background-color: var(--color-neutral-100);
   }
-  .bg-neutral-200 {
-    background-color: var(--color-neutral-200);
-  }
   .bg-neutral-300 {
     background-color: var(--color-neutral-300);
   }
@@ -763,6 +370,9 @@
   .bg-red-600 {
     background-color: var(--color-red-600);
   }
+  .p-1 {
+    padding: calc(var(--spacing) * 1);
+  }
   .p-2 {
     padding: calc(var(--spacing) * 2);
   }
@@ -779,16 +389,20 @@
     font-size: var(--text-sm);
     line-height: var(--tw-leading, var(--text-sm--line-height));
   }
+  .text-xl {
+    font-size: var(--text-xl);
+    line-height: var(--tw-leading, var(--text-xl--line-height));
+  }
   .font-bold {
     --tw-font-weight: var(--font-weight-bold);
     font-weight: var(--font-weight-bold);
   }
+  .whitespace-nowrap {
+    white-space: nowrap;
+  }
   .text-accent {
     color: var(--color-accent);
   }
-  .text-black {
-    color: var(--color-black);
-  }
   .text-neutral-500 {
     color: var(--color-neutral-500);
   }
@@ -798,26 +412,18 @@
   .text-neutral-800 {
     color: var(--color-neutral-800);
   }
+  .text-red-500 {
+    color: var(--color-red-500);
+  }
   .text-red-600 {
     color: var(--color-red-600);
   }
   .uppercase {
     text-transform: uppercase;
   }
-  .underline {
-    text-decoration-line: underline;
-  }
-  .outline {
-    outline-style: var(--tw-outline-style);
-    outline-width: 1px;
-  }
   .filter {
     filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
   }
-  .backdrop-filter {
-    -webkit-backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);
-    backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);
-  }
   .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-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -832,11 +438,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;
@@ -847,16 +472,6 @@
       display: inline;
     }
   }
-  .peer-\[\.edit\]\:block {
-    &:is(:where(.peer):is(.edit) ~ *) {
-      display: block;
-    }
-  }
-  .peer-\[\.edit\]\:hidden {
-    &:is(:where(.peer):is(.edit) ~ *) {
-      display: none;
-    }
-  }
   .placeholder\:text-neutral-400 {
     &::placeholder {
       color: var(--color-neutral-400);
@@ -869,6 +484,20 @@
       }
     }
   }
+  .hover\:border-neutral-500 {
+    &:hover {
+      @media (hover: hover) {
+        border-color: var(--color-neutral-500);
+      }
+    }
+  }
+  .hover\:bg-neutral-200 {
+    &:hover {
+      @media (hover: hover) {
+        background-color: var(--color-neutral-200);
+      }
+    }
+  }
   .hover\:bg-neutral-700 {
     &:hover {
       @media (hover: hover) {
@@ -876,6 +505,13 @@
       }
     }
   }
+  .hover\:text-accent {
+    &:hover {
+      @media (hover: hover) {
+        color: var(--color-accent);
+      }
+    }
+  }
   .hover\:text-white {
     &:hover {
       @media (hover: hover) {
@@ -914,6 +550,21 @@
       opacity: 50%;
     }
   }
+  .max-md\:flex {
+    @media (width < 48rem) {
+      display: flex;
+    }
+  }
+  .max-md\:grid {
+    @media (width < 48rem) {
+      display: grid;
+    }
+  }
+  .max-md\:flex-col {
+    @media (width < 48rem) {
+      flex-direction: column;
+    }
+  }
   .md\:col-span-1 {
     @media (width >= 48rem) {
       grid-column: span 1 / span 1;
@@ -924,6 +575,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%;
@@ -939,9 +595,14 @@
       display: none;
     }
   }
-  .md\:grid-cols-5 {
+  .md\:inline {
     @media (width >= 48rem) {
-      grid-template-columns: repeat(5, minmax(0, 1fr));
+      display: inline;
+    }
+  }
+  .md\:w-1\/2 {
+    @media (width >= 48rem) {
+      width: calc(1/2 * 100%);
     }
   }
   .md\:px-4 {
@@ -949,6 +610,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) {
@@ -956,70 +622,39 @@
       }
     }
   }
-  .md\:group-\[\.edit\]\:block {
-    @media (width >= 48rem) {
-      &:is(:where(.group):is(.edit) *) {
-        display: block;
-      }
-    }
-  }
   .print\:hidden {
     @media print {
       display: none;
     }
   }
 }
-@keyframes spin {
-  to {
-    transform: rotate(360deg);
+@layer components {
+  .grid-main {
+    display: grid;
+    grid-template-columns: 2fr auto 1fr;
+    align-items: stretch;
   }
-}
-@keyframes ping {
-  75%, 100% {
-    transform: scale(2);
-    opacity: 0;
+  .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;
   }
-}
-@keyframes pulse {
-  50% {
-    opacity: 0.5;
+  .grid-sub:hover {
+    background-color: var(--color-neutral-200);
   }
-}
-@keyframes bounce {
-  0%, 100% {
-    transform: translateY(-25%);
-    animation-timing-function: cubic-bezier(0.8, 0, 1, 1);
+  .grid-cell {
+    padding: calc(var(--spacing) * 2);
+    border-color: var(--color-neutral-400);
   }
-  50% {
-    transform: none;
-    animation-timing-function: cubic-bezier(0, 0, 0.2, 1);
+  @media (width >=48rem) {
+    .grid-main {
+      grid-template-columns: repeat(5, 1fr);
+      margin: 0 10%;
+    }
   }
 }
-@property --tw-rotate-x {
-  syntax: "*";
-  inherits: false;
-  initial-value: rotateX(0);
-}
-@property --tw-rotate-y {
-  syntax: "*";
-  inherits: false;
-  initial-value: rotateY(0);
-}
-@property --tw-rotate-z {
-  syntax: "*";
-  inherits: false;
-  initial-value: rotateZ(0);
-}
-@property --tw-skew-x {
-  syntax: "*";
-  inherits: false;
-  initial-value: skewX(0);
-}
-@property --tw-skew-y {
-  syntax: "*";
-  inherits: false;
-  initial-value: skewY(0);
-}
 @property --tw-divide-x-reverse {
   syntax: "*";
   inherits: false;
@@ -1039,11 +674,6 @@
   syntax: "*";
   inherits: false;
 }
-@property --tw-outline-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}
 @property --tw-blur {
   syntax: "*";
   inherits: false;
@@ -1080,39 +710,7 @@
   syntax: "*";
   inherits: false;
 }
-@property --tw-backdrop-blur {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-brightness {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-contrast {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-grayscale {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-hue-rotate {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-invert {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-opacity {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-saturate {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-backdrop-sepia {
+@property --tw-drop-shadow {
   syntax: "*";
   inherits: false;
 }

Backend/static/script.js

@@ -1,12 +1,34 @@
 function editDay(element, event, formId) {
   var form = element
-    .closest(".grid-cols-subgrid")
-    .querySelector(".time-component > form");
+    .closest(".grid-sub")
+    .querySelector(".all-booking-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;
+}

Backend/templates/base.templ

@@ -1,11 +0,0 @@
-package templates
-
-templ Style(){
-	<!DOCTYPE html>
-		<head>
-			<title>Arbeitszeit</title>
-			<link rel="stylesheet" href="/static/css/styles.css"/>
-			<meta name="viewport" content="width=device-width, initial-scale=1" />
-			<script src="/static/script.js" defer></script>
-		</head>
-}

Backend/templates/base_templ.go

@@ -1,40 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.833
-package templates
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-func Style() templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><head><title>Arbeitszeit</title><link rel=\"stylesheet\" href=\"/static/css/styles.css\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><script src=\"/static/script.js\" defer></script></head>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

Backend/templates/base_templ.txt

@@ -1 +0,0 @@
-<!doctype html><head><title>Arbeitszeit</title><link rel=\"stylesheet\" href=\"/static/css/styles.css\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><script src=\"/static/script.js\" defer></script></head>

Backend/templates/headerComponent.templ

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

Backend/templates/headerComponent_templ.go

@@ -8,7 +8,7 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-func Hello(name string) templ.Component {
+func headerComponent() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -29,20 +29,17 @@ func Hello(name string) templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div>Hello, ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-row justify-between md:mx-[10%] py-2\"><a href=\"/time\">Zeitverwaltung</a> <a href=\"/team\">Abrechnung</a> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/hello.templ`, Line: 4, Col: 19}
+		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 = 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, "</div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<a href=\"/user/settings\">Einstellungen</a></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/hello.templ

@@ -1,5 +0,0 @@
-package templates
-
-templ Hello(name string) {
-	<div>Hello, { name }</div>
-}

Backend/templates/hello_templ.txt

@@ -1,2 +0,0 @@
-<div>Hello, 
-</div>

Backend/templates/pages.templ

@@ -0,0 +1,184 @@
+package templates
+
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+templ Base() {
+	<!DOCTYPE html>
+	<head>
+		<title>Arbeitszeit</title>
+		<link rel="stylesheet" href="/static/css/styles.css"/>
+		<meta name="viewport" content="width=device-width, initial-scale=1"/>
+		<script src="/static/script.js" defer></script>
+	</head>
+}
+
+templ TimePage(workDays []models.WorkDay) {
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		@inputForm()
+		for _, day := range workDays {
+			@dayComponent(day)
+		}
+	</div>
+	@LegendComponent()
+}
+
+templ LoginPage(failed bool) {
+	@Base()
+	<div class="w-full h-[100vh] flex flex-col justify-center items-center">
+		<form method="POST" class="w-9/10 md:w-1/2 flex flex-col gap-4 p-2 mb-2">
+			<h1 class="font-bold uppercase text-xl text-center mb-2">Benutzer Anmelden</h1>
+			<input name="personal_nummer" placeholder="Personalnummer" type="text" class="w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500"/>
+			<input name="password" placeholder="Passwort" type="password" class="w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500"/>
+			if failed {
+				<p class="text-red-600 text-sm">Login fehlgeschlagen, bitte erneut versuchen!</p>
+			}
+			<button type="submit" class="cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Login</button>
+		</form>
+	</div>
+}
+
+templ UserPage(status int) {
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		<div class="grid-sub"></div>
+		<form method="POST" class="grid-sub divide-x-1">
+			<h1 class="grid-cell font-bold uppercase text-xl text-center">Passwort ändern</h1>
+			<div class="grid-cell col-span-3 flex flex-col gap-2">
+				<input name="password" placeholder="Aktuelles Passwort" type="password" class="w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500"/>
+				<input name="new_password" placeholder="Neues Passwort" type="password" class="w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500"/>
+				<input name="new_password_repeat" placeholder="Neues Passwort wiederholen" type="password" class="w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500"/>
+				switch  {
+					case status == 401:
+						<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 == 202:
+						<p class="text-accent text-sm">Passwortänderung erfolgreich</p>
+				}
+			</div>
+			<div class="grid-cell">
+				<button name="action" value="change-pass" type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Ändern</button>
+			</div>
+		</form>
+		<form method="POST" class="grid-sub divide-x-1">
+			<h1 class="grid-cell font-bold uppercase text-xl text-center">Nutzer abmelden</h1>
+			<div class="grid-cell col-span-3">
+				<p>Nutzer von Weboberfläche abmelden.</p>
+			</div>
+			<div class="grid-cell">
+				<button name="action" value="logout-user" type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Abmelden</button>
+			</div>
+		</form>
+	</div>
+}
+
+templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
+	{{
+		year, kw := userWeek.WeekStart.ISOWeek()
+	}}
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		<div class="grid-sub divide-x-1 bg-neutral-300">
+			<div class="grid-cell font-bold uppercase">{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }</div>
+			<div class="grid-cell col-span-3 flex flex-col gap-2">
+				for _, day := range userWeek.WorkDays {
+					@weekDayComponent(userWeek.User, day)
+				}
+			</div>
+			<div class="grid-cell flex flex-col gap-2">
+				<form method="get" class="flex flex-row gap-4 items-center justify-around">
+					<input type="date" class="hidden" name="submission_date" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
+					<button onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1") } class="p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700">
+						<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="chevron-left size-4 mx-auto" viewBox="0 0 16 16">
+							<path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0"></path>
+						</svg>
+					</button>
+					<p class="whitespace-nowrap">KW { fmt.Sprintf("%02d, %d", kw, year) }</p>
+					<button disabled?={ time.Since(userWeek.WeekStart) < 24*7*time.Hour } onclick={ templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1") } class="p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">
+						<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="chevron-right size-4 mx-auto" viewBox="0 0 16 16">
+							<path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708"></path>
+						</svg>
+					</button>
+				</form>
+				<form method="post">
+					<input type="hidden" name="method" value="send"/>
+					<input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
+					<input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
+					switch userWeek.CheckStatus() {
+						case models.WeekStatusNone:
+							<p class="text-sm">an Vorgesetzten senden</p>
+							<button disabled?={ time.Since(userWeek.WeekStart) < 24*7*time.Hour } type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Senden</button>
+							if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
+								<p class="text-sm text-red-500">Die Woche kann erst am nächsten Montag abgesendet werden!</p>
+							}
+						case models.WeekStatusSent:
+							<p class="text-sm">an Vorgesetzten gesendet</p>
+							<button type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Korrigieren</button>
+							<p class="flex flex-row gap-2 items-center">
+								akzeptiert:
+								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-circle" viewBox="0 0 16 16">
+									<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"></path>
+								</svg>
+							</p>
+						case models.WeekStatusAccepted:
+							<p class="text-sm">vom Vorgesetzten bestätigt</p>
+							<button type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Korrigieren</button>
+							<p class="flex flex-row gap-2 text-accent items-center">
+								akzeptiert:
+								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check-circle" viewBox="0 0 16 16">
+									<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"></path>
+									<path d="m10.97 4.97-.02.022-3.473 4.425-2.093-2.094a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-1.071-1.05"></path>
+								</svg>
+							</p>
+					}
+				</form>
+			</div>
+		</div>
+		for _, week := range weeks {
+			@employeComponent(week)
+		}
+	</div>
+}
+
+templ NavPage() {
+	@Base()
+	<div class="w-full h-[100vh] flex flex-col justify-center items-center">
+		<div class="flex flex-col justify-between w-full md:w-1/2 py-2">
+			<a class="text-xl hover:text-accent transition-colors1" href="/time">Zeitverwaltung</a>
+			<a class="text-xl hover:text-accent transition-colors1" href="/team">Mitarbeiter</a>
+			<a class="text-xl hover:text-accent transition-colors1" href="/user">Nutzer</a>
+		</div>
+	</div>
+}
+
+templ TeamPresencePage(teamPresence map[bool][]models.User) {
+	@Base()
+	@headerComponent()
+	<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>
+}

Backend/templates/pages_templ.go

@@ -0,0 +1,498 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.833
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+func Base() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<!doctype html><head><title>Arbeitszeit</title><link rel=\"stylesheet\" href=\"/static/css/styles.css\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><script src=\"/static/script.js\" defer></script></head>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func TimePage(workDays []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_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"grid-main divide-y-1\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = inputForm().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, day := range workDays {
+			templ_7745c5c3_Err = dayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = LegendComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func LoginPage(failed bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><form method=\"POST\" class=\"w-9/10 md:w-1/2 flex flex-col gap-4 p-2 mb-2\"><h1 class=\"font-bold uppercase text-xl text-center mb-2\">Benutzer Anmelden</h1><input name=\"personal_nummer\" placeholder=\"Personalnummer\" type=\"text\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"password\" placeholder=\"Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if failed {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<p class=\"text-red-600 text-sm\">Login fehlgeschlagen, bitte erneut versuchen!</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<button type=\"submit\" class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Login</button></form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func UserPage(status int) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		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, 7, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub\"></div><form method=\"POST\" class=\"grid-sub divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Passwort ändern</h1><div class=\"grid-cell col-span-3 flex flex-col gap-2\"><input name=\"password\" placeholder=\"Aktuelles Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password\" placeholder=\"Neues Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password_repeat\" placeholder=\"Neues Passwort wiederholen\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		switch {
+		case status == 401:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<p class=\"text-red-600 text-sm\">Aktuelles Passwort nicht korrekt!</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		case status >= 400:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<p class=\"text-red-600 text-sm\">Passwortwechsel fehlgeschlagen, bitte erneut versuchen!</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		case status == 202:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\"text-accent text-sm\">Passwortänderung erfolgreich</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div><div class=\"grid-cell\"><button name=\"action\" value=\"change-pass\" type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Ändern</button></div></form><form method=\"POST\" class=\"grid-sub divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Nutzer abmelden</h1><div class=\"grid-cell col-span-3\"><p>Nutzer von Weboberfläche abmelden.</p></div><div class=\"grid-cell\"><button name=\"action\" value=\"logout-user\" type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Abmelden</button></div></form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			templ_7745c5c3_Var5 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		year, kw := userWeek.WeekStart.ISOWeek()
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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, 12, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1 bg-neutral-300\"><div class=\"grid-cell font-bold uppercase\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 91, Col: 111}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, day := range userWeek.WorkDays {
+			templ_7745c5c3_Err = weekDayComponent(userWeek.User, day).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div><div class=\"grid-cell flex flex-col gap-2\"><form method=\"get\" class=\"flex flex-row gap-4 items-center justify-around\"><input type=\"date\" class=\"hidden\" name=\"submission_date\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(userWeek.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 99, Col: 110}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1"))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<button onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 templ.ComponentScript = templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "-1")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "\" class=\"p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"chevron-left size-4 mx-auto\" viewBox=\"0 0 16 16\"><path fill-rule=\"evenodd\" d=\"M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0\"></path></svg></button><p class=\"whitespace-nowrap\">KW ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d, %d", kw, year))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 105, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1"))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<button")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, " disabled")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, " onclick=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 templ.ComponentScript = templ.JSFuncCall("navigateWeek", templ.JSExpression("this"), templ.JSExpression("event"), "1")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var10.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\" class=\"p-2 w-1/3 cursor-pointer rounded-md text-neutral-800 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"chevron-right size-4 mx-auto\" viewBox=\"0 0 16 16\"><path fill-rule=\"evenodd\" d=\"M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708\"></path></svg></button></form><form method=\"post\"><input type=\"hidden\" name=\"method\" value=\"send\"> <input type=\"hidden\" name=\"user\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(userWeek.User.PersonalNummer))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 114, Col: 88}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(userWeek.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 115, Col: 86}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		switch userWeek.CheckStatus() {
+		case models.WeekStatusNone:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<p class=\"text-sm\">an Vorgesetzten senden</p><button")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " disabled")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, " type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Senden</button> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if time.Since(userWeek.WeekStart) < 24*7*time.Hour {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<p class=\"text-sm text-red-500\">Die Woche kann erst am nächsten Montag abgesendet werden!</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		case models.WeekStatusSent:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<p class=\"text-sm\">an Vorgesetzten gesendet</p><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Korrigieren</button><p class=\"flex flex-row gap-2 items-center\">akzeptiert: <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" fill=\"currentColor\" class=\"bi bi-circle\" viewBox=\"0 0 16 16\"><path d=\"M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16\"></path></svg></p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		case models.WeekStatusAccepted:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<p class=\"text-sm\">vom Vorgesetzten bestätigt</p><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Korrigieren</button><p class=\"flex flex-row gap-2 text-accent items-center\">akzeptiert: <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" fill=\"currentColor\" class=\"bi bi-check-circle\" viewBox=\"0 0 16 16\"><path d=\"M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16\"></path> <path d=\"m10.97 4.97-.02.022-3.473 4.425-2.093-2.094a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-1.071-1.05\"></path></svg></p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</form></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, week := range weeks {
+			templ_7745c5c3_Err = employeComponent(week).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func NavPage() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var13 == nil {
+			templ_7745c5c3_Var13 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><div class=\"flex flex-col justify-between w-full md:w-1/2 py-2\"><a class=\"text-xl hover:text-accent transition-colors1\" href=\"/time\">Zeitverwaltung</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/team\">Mitarbeiter</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/user\">Nutzer</a></div></div>")
+		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
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/teamComponents.templ

@@ -0,0 +1,73 @@
+package templates
+
+import (
+	"arbeitszeitmessung/models"
+	"fmt"
+	"strconv"
+	"time"
+)
+
+templ weekDayComponent(user models.User, day models.WorkDay) {
+	{{ work, pause := day.GetWorkTimeString() }}
+	<div class="flex flex-row gap-2">
+		@timeGaugeComponent(day.GetWorkDayProgress(user), false, false)
+		<div class="flex flex-col">
+			<p class=""><span class="font-bold uppercase hidden md:inline">{ day.Day.Format("Mon") }:</span> { day.Day.Format("02.01.2006") }</p>
+			<div class="flex flex-row gap-2">
+				<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.TimeFrom == day.TimeTo {
+					<p>Keine Anwesenheit</p>
+				} else {
+					<span>{ day.TimeFrom.Format("15:04") }</span>
+					<span>-</span>
+					<span>{ day.TimeTo.Format("15:04") }</span>
+				}
+			</div>
+		</div>
+	</div>
+}
+
+templ employeComponent(week models.WorkWeek) {
+	{{
+		year, kw := week.WeekStart.ISOWeek()
+	}}
+	<div class="employeComponent grid-sub divide-x-1">
+		<div class="grid-cell">
+			<p class="font-bold uppercase">{ week.User.Vorname } { week.User.Name }</p>
+			<p class="text-sm">Arbeitszeit</p>
+			<p class="text-accent">{ week.GetWorkHourString() }</p>
+		</div>
+		<div class="grid-cell col-span-3 flex flex-col gap-2">
+			for _, day := range week.WorkDays {
+				@weekDayComponent(week.User, day)
+			}
+		</div>
+		<form class="grid-cell flex flex-col justify-between gap-2" method="post">
+			<p class="text-sm"><span class="">Woche:</span> { fmt.Sprintf("%02d-%d", kw, year) }</p>
+			<input type="hidden" name="method" value="accept"/>
+			<input type="hidden" name="user" value={ strconv.Itoa(week.User.PersonalNummer) }/>
+			<input type="hidden" name="week" value={ week.WeekStart.Format(time.DateOnly) }/>
+			<button type="submit" class="w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">
+				<p class="">Bestätigen</p>
+			</button>
+		</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

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

Backend/templates/timeComponents.templ

@@ -2,136 +2,188 @@ package templates
 
 import (
 	"arbeitszeitmessung/models"
-	"net/url"
-	"time"
 	"fmt"
+	"net/url"
 	"strconv"
+	"time"
 )
 
-templ inputForm(){
+templ inputForm() {
 	{{
 		urlParams := ctx.Value("urlParams").(url.Values)
 		user := ctx.Value("user").(models.User)
 	}}
-	<div class="bg-neutral-300 p-2 col-span-2 md:col-span-1">
-		<p class="font-bold uppercase">{user.Vorname + " " + user.Name}</p>
-		<p class="text-sm">Überstunden</p>
-		<p class="text-accent">4h 32min</p>
-	</div>
-	<form id="timeRangeForm" method="GET" class="bg-neutral-300 flex flex-row col-span-3 md:col-span-3 p-2 gap-2 ">
-		// <input type="hidden" value={urlParams.Get("card_uid")} name="card_uid" class="">
-		@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-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum von...">
-			<input type="date" value={urlParams.Get("time_to")} name="time_to" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum bis...">
+	<div class="grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col">
+		<div class="grid-cell md:col-span-1 max-md:grid grid-cols-2">
+			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
+			<div class="justify-self-end">
+				<p class="text-sm">Überstunden</p>
+				<p class="text-accent">0h 0min (statisch)</p>
+			</div>
 		</div>
-	</form>
-	<div class="bg-neutral-300 border-r-0 p-2">
-		<button type="submit" form="timeRangeForm" class="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="hidden md:block" >Senden</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" />
-  </svg>
-		</button>
-	</div>
-}
-
-templ dayComponent(workDay models.WorkDay){
-	<div class="col-span-5 grid grid-cols-subgrid divide-x-1 divide-neutral-400">
-	<div class="p-2 col-span-2 md:col-span-1 flex flex-row gap-2">
-		@timeGaugeComponent(workDay.GetWorkDayProgress(), workDay.Day.Equal(time.Now().Truncate(24 * time.Hour)), workDay.RequiresAction())
-		<div>
-			<p class="" ><span class="font-bold uppercase" >{workDay.Day.Format("Mon")}:</span> {workDay.Day.Format("02.01.2006")}</p>
-			<p class=" text-sm mt-1">Arbeitszeit</p>
-			if (workDay.RequiresAction()) {
-				<p class="text-red-600">Bitte anpassen</p>
-			}else {
-				<p class=" text-accent">{workDay.GetWorkTimeString()}</p>
-			}
-		</div>
-	</div>
-	<div class="time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full p-2">
-		@lineComponent()
-		<form id={"time-" + workDay.Day.Format("2006-01-02")} class="flex flex-col gap-2 justify-between group w-full" method="post">
-		for _, booking := range workDay.Bookings {
-			@bookingComponent(booking)
-		}
+		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row md:col-span-3 gap-2 ">
+			@lineComponent()
+			<div class="flex flex-col gap-2 justify-between grow-1">
+				<input type="date" value={ urlParams.Get("time_from") } name="time_from" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum von..."/>
+				<input type="date" value={ urlParams.Get("time_to") } name="time_to" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum bis..."/>
+			</div>
 		</form>
-	</div>
-	<div class="p-2">
-		@changeButtonComponent("time-" + workDay.Day.Format("2006-01-02"))
-	</div>
+		<div class="grid-cell content-end">
+			<button type="submit" form="timeRangeForm" class="w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">
+				<p class="">Anzeigen</p>
+			</button>
+		</div>
 	</div>
 }
 
-templ 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)}>
-	<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" />
-  		</svg>
+templ dayComponent(workDay models.WorkDay) {
+	{{
+		work, pause := workDay.GetWorkTimeString()
+		justify := ""
+		if len(workDay.Bookings) <= 1 {
+			justify = "justify-content: center"
+		}
+	}}
+	<div class="grid-sub divide-x-1 hover:bg-neutral-200 transition-colors">
+		<div class="grid-cell md:col-span-1 flex flex-row gap-2">
+			@timeGaugeComponent(workDay.GetWorkDayProgress(ctx.Value("user").(models.User)), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction())
+			<div>
+				<p class=""><span class="font-bold uppercase hidden md:inline">{ workDay.Day.Format("Mon") }:</span> { workDay.Day.Format("02.01.2006") }</p>
+				if work!="" {
+					<p class=" text-sm mt-1">Arbeitszeit:</p>
+					if (workDay.RequiresAction()) {
+						<p class="text-red-600">Bitte anpassen</p>
+					} else {
+						<p class=" text-accent">{ work }</p>
+					}
+					<p class="text-neutral-500">{ pause }</p>
+				}
+			</div>
+		</div>
+		<div class="all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell">
+			@lineComponent()
+			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 group w-full justify-between" style={ justify } method="post">
+				if (workDay.Absence != models.Absence{}) {
+					<p>{ workDay.Absence.GetStringType() }</p>
+				}
+				if len(workDay.Bookings) <= 1 && (workDay.Absence == models.Absence{}) {
+					<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+					@absenceComponent(workDay)
+					@newBookingComponent(workDay)
+				} else {
+					@absenceComponent(workDay)
+					for _, booking := range workDay.Bookings {
+						@bookingComponent(booking)
+					}
+					@newBookingComponent(workDay)
+				}
+				<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
+			</form>
+		</div>
+		<div class="grid-cell">
+			@changeButtonComponent("time-" + workDay.Day.Format("2006-01-02"))
+		</div>
+	</div>
+}
+
+templ changeButtonComponent(id string) {
+	<button class="cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group" type="submit" onclick={ templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id) }>
+		<p class="hidden md:block group-[.edit]:hidden">Ändern</p>
+		<p class="hidden group-[.edit]:md:block">Absenden</p>
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4 md:hidden">
+			<path class="group-[.edit]:hidden md:hidden" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325"></path>
+			<path class="hidden group-[.edit]:block md:hidden" d="M12.736 3.97a.733.733 0 0 1 j1.047 0c.286.289.29.756.01 1.05L7.88 12.01a.733.733 0 0 1-1.065.02L3.217 8.384a.757.757 0 0 1 0-1.06.733.733 0 0 1 1.047 0l3.052 3.093 5.4-6.425z"></path>
+		</svg>
 	</button>
 }
 
-templ timeGaugeComponent(progress uint8, today bool, warning bool){
+templ timeGaugeComponent(progress uint8, today bool, warning bool) {
 	{{
 		var bgColor string
-		switch  {
-			case (warning):
+		switch {
+		case (warning):
 			bgColor = "bg-red-600"
 			break
-			case (progress > 0 && progress < 80):
+		case (progress > 0 && progress < 90):
 			bgColor = "bg-orange-500"
 			break
-			case (80 < progress && progress <=110):
+		case (90 <= progress && progress <= 110):
 			bgColor = "bg-accent"
 			break
-			case(progress > 110):
+		case (progress > 110):
 			bgColor = "bg-purple-600"
 			break
-			default:
+		default:
 			bgColor = "bg-neutral-400"
 			break
 		}
 	}}
 	if today {
-	 <div class="flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-200 print:hidden">
-			<div class={"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor} style={fmt.Sprintf("height: %d%%", int(progress))}></div>
-    </div>
-	}else {
-	<div class={"w-2 h-full bg-accent rounded-md", bgColor} ></div>
-
+		<div class="flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden">
+			<div class={ "flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor } style={ fmt.Sprintf("height: %d%%", int(progress)) }></div>
+		</div>
+	} else {
+		<div class={ "w-2 h-full bg-accent rounded-md", bgColor }></div>
 	}
 }
 
-templ lineComponent(){
-	<div class="flex flex-col w-2 py-2 items-center text-accent print:hidden" >
-	   <svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
-	        <polygon points="12,2 22,12 12,22 2,12" />
-	    </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" />
-	    </svg>
+templ lineComponent() {
+	<div class="flex flex-col w-2 py-2 items-center text-accent print:hidden">
+		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
+			<polygon points="12,2 22,12 12,22 2,12"></polygon>
+		</svg>
+		<div class="w-[2px] bg-accent flex-grow -my-1"></div>
+		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
+			<polygon points="12,2 22,12 12,22 2,12"></polygon>
+		</svg>
+	</div>
+}
+
+templ absenceComponent(d models.WorkDay) {
+	<div class="no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center">
+		<select name="absence" onchange={ templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event")) } class="grow cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm transition-colors border-neutral-900" disabled>
+			<option value="0">Abwesenheit?</option>
+			for _, absence := range models.AbsenceTypes {
+				<option value={ strconv.Itoa(int(absence.Value)) }>{ absence.Label }</option>
+			}
+		</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.Local().Format("15:04")}</span>
-		<input name={"booking_" + strconv.Itoa(booking.CounterId)} 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" type="time" value={booking.Timestamp.Local().Format("15:04")} />
-		{booking.GetBookingType()}</p>
+			<span class="text-neutral-700 group-[.edit]:hidden inline">{ booking.Timestamp.Format("15:04") }</span>
+			<input disabled name={ "booking_" + strconv.Itoa(booking.CounterId) } type="time" value={ booking.Timestamp.Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm 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>
 }
 
-templ LegendComponent(){
+templ LegendComponent() {
 	<div class="flex flex-row gap-4 md:mx-[10%] print:hidden">
-	<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-red-600"></div><span>Fehler</span></div>
-	<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-orange-500"></div><span>Arbeitszeit unter regulär</span></div>
-	<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-accent"></div><span>Arbeitszeit vollständig</span></div>
-	<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-purple-600"></div><span>Überstunden</span></div>
-	<div class="flex flex-row items-center gap-2"><div class="rounded-full size-4 bg-neutral-400"></div><span>Keine Buchungen</span></div>
+		<div 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>
 }

Backend/templates/timeComponents_templ.go

@@ -40,20 +40,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=\"bg-neutral-300 p-2 col-span-2 md:col-span-1\"><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: 17, Col: 64}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 18, Col: 66}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</p><p class=\"text-sm\">Überstunden</p><p class=\"text-accent\">4h 32min</p></div><form id=\"timeRangeForm\" method=\"GET\" class=\"bg-neutral-300 flex flex-row col-span-3 md:col-span-3 p-2 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,26 +68,26 @@ 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: 25, Col: 55}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 27, Col: 57}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\" name=\"time_from\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\" placeholder=\"Zeitraum von...\"> <input type=\"date\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\" name=\"time_from\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\" placeholder=\"Zeitraum von...\"> <input type=\"date\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_to"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 26, Col: 53}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 28, Col: 55}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\" name=\"time_to\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\" placeholder=\"Zeitraum bis...\"></div></form><div class=\"bg-neutral-300 border-r-0 p-2\"><button type=\"submit\" form=\"timeRangeForm\" class=\"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=\"hidden md:block\">Senden</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></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\" name=\"time_to\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\" placeholder=\"Zeitraum bis...\"></div></form><div class=\"grid-cell content-end\"><button type=\"submit\" form=\"timeRangeForm\" class=\"w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><p class=\"\">Anzeigen</p></button></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -116,22 +116,28 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 			templ_7745c5c3_Var5 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"col-span-5 grid grid-cols-subgrid divide-x-1 divide-neutral-400\"><div class=\"p-2 col-span-2 md:col-span-1 flex flex-row gap-2\">")
+
+		work, pause := workDay.GetWorkTimeString()
+		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
 		}
-		templ_7745c5c3_Err = timeGaugeComponent(workDay.GetWorkDayProgress(), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction()).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = timeGaugeComponent(workDay.GetWorkDayProgress(ctx.Value("user").(models.User)), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction()).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div><p class=\"\"><span class=\"font-bold uppercase\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div><p class=\"\"><span class=\"font-bold uppercase hidden md:inline\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var6 string
 		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Day.Format("Mon"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 44, Col: 77}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 94}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -144,41 +150,64 @@ 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: 44, Col: 120}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 139}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p><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() {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\"text-red-600\">Bitte anpassen</p>")
+		if work != "" {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\" text-sm mt-1\">Arbeitszeit:</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<p class=\" text-accent\">")
+			if workDay.RequiresAction() {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<p class=\"text-red-600\">Bitte anpassen</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<p class=\" text-accent\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var8 string
+				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(work)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 57, Col: 36}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " <p class=\"text-neutral-500\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var8 string
-			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.GetWorkTimeString())
+			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: 49, Col: 56}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 59, Col: 40}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_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>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div></div><div class=\"time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full p-2\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</div></div><div class=\"all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -186,30 +215,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, 14, "<form id=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<form id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("time-" + workDay.Day.Format("2006-01-02"))
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("time-" + workDay.Day.Format("2006-01-02"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 55, Col: 54}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 65, Col: 56}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		_, 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, 15, "\" class=\"flex flex-col gap-2 justify-between group w-full\" method=\"post\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\" class=\"flex flex-col gap-2 group w-full justify-between\" style=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for _, booking := range workDay.Bookings {
-			templ_7745c5c3_Err = bookingComponent(booking).Render(ctx, templ_7745c5c3_Buffer)
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(justify)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 65, Col: 131}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\" method=\"post\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if (workDay.Absence != models.Absence{}) {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var12 string
+			templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Absence.GetStringType())
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 67, Col: 41}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</form></div><div class=\"p-2\">")
+		if len(workDay.Bookings) <= 1 && (workDay.Absence == models.Absence{}) {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<p class=\"text group-[.edit]:hidden\">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = absenceComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			templ_7745c5c3_Err = absenceComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			for _, booking := range workDay.Bookings {
+				templ_7745c5c3_Err = bookingComponent(booking).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<input type=\"hidden\" name=\"action\" value=\"change\"><!-- default action value for ändern button --></form></div><div class=\"grid-cell\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -217,7 +309,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, 17, "</div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "</div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -241,25 +333,25 @@ func changeButtonComponent(id string) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var10 == nil {
-			templ_7745c5c3_Var10 = templ.NopComponent
+		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var13 == nil {
+			templ_7745c5c3_Var13 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<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, 27, "<button class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group\" type=\"submit\" onclick=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var11 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11.Call)
+		var templ_7745c5c3_Var14 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\"><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, 28, "\"><p class=\"hidden md:block group-[.edit]:hidden\">Ändern</p><p class=\"hidden group-[.edit]:md:block\">Absenden</p><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" fill=\"currentColor\" class=\"w-4 h-4 md:hidden\"><path class=\"group-[.edit]:hidden md:hidden\" d=\"M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325\"></path> <path class=\"hidden group-[.edit]:block md:hidden\" d=\"M12.736 3.97a.733.733 0 0 1 j1.047 0c.286.289.29.756.01 1.05L7.88 12.01a.733.733 0 0 1-1.065.02L3.217 8.384a.757.757 0 0 1 0-1.06.733.733 0 0 1 1.047 0l3.052 3.093 5.4-6.425z\"></path></svg></button>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -283,9 +375,9 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var12 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var12 == nil {
-			templ_7745c5c3_Var12 = templ.NopComponent
+		templ_7745c5c3_Var15 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var15 == nil {
+			templ_7745c5c3_Var15 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
@@ -294,10 +386,10 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 		case (warning):
 			bgColor = "bg-red-600"
 			break
-		case (progress > 0 && progress < 80):
+		case (progress > 0 && progress < 90):
 			bgColor = "bg-orange-500"
 			break
-		case (80 < progress && progress <= 110):
+		case (90 <= progress && progress <= 110):
 			bgColor = "bg-accent"
 			break
 		case (progress > 110):
@@ -308,52 +400,16 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			break
 		}
 		if today {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-200 print:hidden\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var13 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var13...)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<div class=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var14 string
-			templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var13).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_Var14))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\" style=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var15 string
-			templ_7745c5c3_Var15, 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: 100, Col: 146}
-			}
-			_, 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, "\"></div></div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			var templ_7745c5c3_Var16 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
+			var templ_7745c5c3_Var16 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
 			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var16...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -366,7 +422,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, 25, "\"></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\" style=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var18 string
+			templ_7745c5c3_Var18, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(fmt.Sprintf("height: %d%%", int(progress)))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 123, Col: 149}
+			}
+			_, 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, 32, "\"></div></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			var templ_7745c5c3_Var19 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var19...)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<div class=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var20 string
+			templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var19).String())
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "\"></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -391,12 +483,169 @@ func lineComponent() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var18 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var18 == nil {
-			templ_7745c5c3_Var18 = templ.NopComponent
+		templ_7745c5c3_Var21 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var21 == nil {
+			templ_7745c5c3_Var21 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<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, 35, "<div class=\"flex flex-col w-2 py-2 items-center text-accent print:hidden\"><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg><div class=\"w-[2px] bg-accent flex-grow -my-1\"></div><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg></div>")
+		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_Var22 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var22 == nil {
+			templ_7745c5c3_Var22 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "<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, 37, "<select name=\"absence\" onchange=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 templ.ComponentScript = templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event"))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var23.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "\" class=\"grow cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm transition-colors border-neutral-900\" disabled><option value=\"0\">Abwesenheit?</option> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, absence := range models.AbsenceTypes {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "<option value=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var24 string
+			templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(absence.Value)))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 147, Col: 52}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var25 string
+			templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(absence.Label)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 147, Col: 70}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</option>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "</select></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func newBookingComponent(d models.WorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var26 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var26 == nil {
+			templ_7745c5c3_Var26 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "<div class=\"new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center\"><button name=\"action\" value=\"add\" type=\"submit\" class=\"hover:text-accent cursor-pointer\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"size-4 transition-colors\" viewBox=\"0 0 16 16\"><path d=\"M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16\"></path> <path d=\"M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4\"></path></svg></button> <input name=\"timestamp\" type=\"time\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var27 string
+		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(time.Now().Format("15:04"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 161, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> <input name=\"date\" type=\"hidden\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(d.Day.Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 162, Col: 69}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "\"> <select name=\"check_in_out\"><option value=\"0\" disabled>Kommen/Gehen</option> <option value=\"3\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, ">Kommen</option> <option value=\"4\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, ">Gehen</option></select></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -420,64 +669,64 @@ func bookingComponent(booking models.Booking) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var19 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var19 == nil {
-			templ_7745c5c3_Var19 = templ.NopComponent
+		templ_7745c5c3_Var29 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var29 == nil {
+			templ_7745c5c3_Var29 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<div><p class=\"text-neutral-500\"><span class=\"text-neutral-700 group-[.edit]:hidden inline\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "<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_Var20 string
-		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Local().Format("15:04"))
+		var templ_7745c5c3_Var30 string
+		templ_7745c5c3_Var30, 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: 123, Col: 103}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 174, Col: 97}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</span> <input name=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "</span> <input disabled name=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs("booking_" + strconv.Itoa(booking.CounterId))
+		var templ_7745c5c3_Var31 string
+		templ_7745c5c3_Var31, 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: 124, Col: 59}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 175, Col: 70}
 		}
-		_, 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, "\" 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\" type=\"time\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "\" type=\"time\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Local().Format("15:04"))
+		var templ_7745c5c3_Var32 string
+		templ_7745c5c3_Var32, 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: 124, Col: 342}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 175, Col: 126}
 		}
-		_, 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, "\"> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
+		var templ_7745c5c3_Var33 string
+		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 125, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 176, Col: 29}
 		}
-		_, 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, "</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -501,12 +750,12 @@ func LegendComponent() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var24 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var24 == nil {
-			templ_7745c5c3_Var24 = templ.NopComponent
+		templ_7745c5c3_Var34 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var34 == nil {
+			templ_7745c5c3_Var34 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<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, 55, "<div class=\"flex flex-row gap-4 md:mx-[10%] print:hidden\"><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-red-600\"></div><span>Fehler</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-orange-500\"></div><span>Arbeitszeit unter regulär</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-accent\"></div><span>Arbeitszeit vollständig</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-purple-600\"></div><span>Überstunden</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-neutral-400\"></div><span>Keine Buchungen</span></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/timeComponents_templ.txt

@@ -1,32 +0,0 @@
-<div class=\"bg-neutral-300 p-2 col-span-2 md:col-span-1\"><p class=\"font-bold uppercase\">
-</p><p class=\"text-sm\">Überstunden</p><p class=\"text-accent\">4h 32min</p></div><form id=\"timeRangeForm\" method=\"GET\" class=\"bg-neutral-300 flex flex-row col-span-3 md:col-span-3 p-2 gap-2 \">
-<div class=\"flex flex-col gap-2 justify-between grow-1\"><input type=\"date\" value=\"
-\" name=\"time_from\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 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\" placeholder=\"Zeitraum von...\"> <input type=\"date\" value=\"
-\" name=\"time_to\" class=\"w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\" placeholder=\"Zeitraum bis...\"></div></form><div class=\"bg-neutral-300 border-r-0 p-2\"><button type=\"submit\" form=\"timeRangeForm\" class=\"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=\"hidden md:block\">Senden</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></div>
-<div class=\"col-span-5 grid grid-cols-subgrid divide-x-1 divide-neutral-400\"><div class=\"p-2 col-span-2 md:col-span-1 flex flex-row gap-2\">
-<div><p class=\"\"><span class=\"font-bold uppercase\">
-:</span> 
-</p><p class=\" text-sm mt-1\">Arbeitszeit</p>
-<p class=\"text-red-600\">Bitte anpassen</p>
-<p class=\" text-accent\">
-</p>
-</div></div><div class=\"time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full p-2\">
-<form id=\"
-\" class=\"flex flex-col gap-2 justify-between group w-full\" method=\"post\">
-</form></div><div class=\"p-2\">
-</div></div>
-<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=\"
-\"><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>
-<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-200 print:hidden\">
-<div class=\"
-\" style=\"
-\"></div></div>
-<div class=\"
-\"></div>
-<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>
-<div><p class=\"text-neutral-500\"><span class=\"text-neutral-700 group-[.edit]:hidden inline\">
-</span> <input name=\"
-\" 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\" type=\"time\" value=\"
-\"> 
-</p></div>
-<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>

Backend/templates/timeDashboard.templ

@@ -1,14 +0,0 @@
-package templates
-
-import "arbeitszeitmessung/models"
-
-templ TimeDashboard(workDays []models.WorkDay){
-	@Style()
-	<div class="grid grid-cols-6 md:grid-cols-5 items-strech md:mx-[10%] divide-y-1 divide-neutral-400" >
-		@inputForm()
-		for _, bookingGroup := range workDays {
-			@dayComponent(bookingGroup)
-		}
-	</div>
-	@LegendComponent()
-}

Backend/templates/timeDashboard_templ.go

@@ -1,64 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.833
-package templates
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-import "arbeitszeitmessung/models"
-
-func TimeDashboard(workDays []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_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = Style().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid grid-cols-6 md:grid-cols-5 items-strech md:mx-[10%] divide-y-1 divide-neutral-400\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = inputForm().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, bookingGroup := range workDays {
-			templ_7745c5c3_Err = dayComponent(bookingGroup).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = LegendComponent().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

Backend/templates/timeDashboard_templ.txt

@@ -1,2 +0,0 @@
-<div class=\"grid grid-cols-6 md:grid-cols-5 items-strech md:mx-[10%] divide-y-1 divide-neutral-400\">
-</div>

Backend/templates/user.templ

@@ -1,10 +0,0 @@
-package templates
-
-templ LoginForm(){
-	@Style()
-	<form method="POST">
-		<input name="card_uid" type="text" placeholder="card_uid"/>
-		<input name="password" type="passwort" placeholder="password"/>
-		<button type="submit">Send</button>
-	</form>
-}

Backend/templates/user_templ.go

@@ -1,44 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.3.833
-package templates
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-func LoginForm() templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = Style().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<form method=\"POST\"><input name=\"card_uid\" type=\"text\" placeholder=\"card_uid\"> <input name=\"password\" type=\"passwort\" placeholder=\"password\"> <button type=\"submit\">Send</button></form>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

Backend/templates/user_templ.txt

@@ -1 +0,0 @@
-<form method=\"POST\"><input name=\"card_uid\" type=\"text\" placeholder=\"card_uid\"> <input name=\"password\" type=\"passwort\" placeholder=\"password\"> <button type=\"submit\">Send</button></form>

DB/initdb/01_create_tables.sql

@@ -0,0 +1,92 @@
+-- ----------------------------
+-- Table structure for anwesenheit
+-- ----------------------------
+DROP TABLE IF EXISTS "anwesenheit";
+CREATE TABLE "anwesenheit" (
+    "counter_id" bigserial PRIMARY KEY,
+    "timestamp" timestamptz(6) DEFAULT CURRENT_TIMESTAMP,
+    "card_uid" varchar(255),
+    "check_in_out" int2,
+    "geraet_id" int2
+);
+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 personal_daten
+-- ----------------------------
+DROP TABLE IF EXISTS "personal_daten";
+CREATE TABLE "personal_daten" (
+    "personal_nummer" int4 NOT NULL PRIMARY KEY,
+    "aktiv_beschaeftigt" bool,
+    "vorname" varchar(255),
+    "nachname" varchar(255),
+    "geburtsdatum" date,
+    "plz" varchar(255),
+    "adresse" varchar(255),
+    "geschlecht" int2,
+    "card_uid" varchar(255),
+    "hauptbeschaeftigungs_ort" int2,
+    "arbeitszeit_per_tag" float4,
+    "arbeitszeit_min_start" time(6),
+    "arbeitszeit_max_ende" time(6),
+    "vorgesetzter_pers_nr" int4
+);
+COMMENT ON COLUMN "personal_daten"."geschlecht" IS '1==weiblich, 2==maennlich, 3==divers';
+
+DROP TABLE IF EXISTS "user_password";
+CREATE TABLE "user_password" (
+    "personal_nummer" int4 NOT NULL PRIMARY KEY,
+    "pass_hash" TEXT,
+    "zuletzt_geandert" timestamp(6) DEFAULT CURRENT_TIMESTAMP
+);
+
+-- update Funktion für pass_hash
+
+CREATE OR REPLACE FUNCTION update_zuletzt_geandert()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Nur wenn hash geändert wurde
+    IF NEW.pass_hash IS DISTINCT FROM OLD.pass_hash THEN
+        NEW.zuletzt_geandert = now();
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER pass_hash_update
+BEFORE UPDATE ON user_password
+FOR EACH ROW
+EXECUTE FUNCTION update_zuletzt_geandert();
+
+-- audittabelle für arbeitsstunden bestätigung
+
+DROP TABLE IF EXISTS "wochen_report";
+CREATE TABLE "wochen_report" (
+    "id" serial PRIMARY KEY,
+    "personal_nummer" int4,
+    "woche_start" date,
+    "bestaetigt" bool DEFAULT FALSE,
+    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
+    );
+
+-- 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_create_user.sh

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

Docker/.env

@@ -1,5 +0,0 @@
-POSTGRES_USER=arbeit_zeit
-POSTGRES_PASSWORD=password
-POSTGRES_PATH=../DB
-POSTGRES_DB=arbeitszeitmessung
-EXPOSED_PORT=8000

Docker/.env.example

@@ -0,0 +1,11 @@
+POSTGRES_USER=root
+POSTGRES_PASSWORD=very_secure
+POSTGRES_API_USER=api_nuter
+POSTGRES_API_PASSWORD=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

@@ -1,292 +1,457 @@
 {
-	"openapi": "3.0.3",
-	"info": {
-		"title": "Arbeitszeitmessung - OpenAPI 3.0",
-		"description": "This demos the API for the Arbeitszeitmessung Project ",
-		"version": "0.1.0"
-	},
-	"externalDocs": {
-		"description": "Git-Repository",
-		"url": "https://git.letsstein.de/tom/arbeitszeitmessung"
-	},
-	"servers": [
-		{
-			"url": "http://localhost:8000"
-		}
-	],
-	"tags": [
-		{
-			"name": "booking",
-			"description": "all Bookings"
-		}
-	],
-	"paths": {
-		"/time": {
-			"put": {
-				"tags": ["booking"],
-				"summary": "Update a existing booking",
-				"description": "Update an existing booking by Id",
-				"operationId": "updateBooking",
-				"parameters": [
-					{
-						"name": "counter_id",
-						"in": "query",
-						"description": "Booking ID to update",
-						"required": true,
-						"schema": {
-							"type": "string"
-						}
-					}
-				],
-				"requestBody": {
-					"description": "Update an existent booking in the db. Not all values have to be updated",
-					"content": {
-						"application/json": {
-							"schema": {
-								"$ref": "#/components/schemas/Booking"
-							}
-						}
-					},
-					"required": true
-				},
-				"responses": {
-					"200": {
-						"description": "Booking Updated",
-						"content": {
-							"application/json": {
-								"schema": {
-									"$ref": "#/components/schemas/Booking"
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Invalid ID supplied"
-					},
-					"500": {
-						"description": "Server Error"
-					}
-				}
-			},
-			"get": {
-				"tags": ["booking"],
-				"summary": "Gets all the bookings limited",
-				"description": "Returns all the bookings optionally filtered with cardID",
-				"operationId": "getBooking",
-				"parameters": [
-					{
-						"name": "card_uid",
-						"in": "query",
-						"description": "CardID to filter for",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "Successful operation",
-						"content": {
-							"application/json": {
-								"schema": {
-									"type": "array",
-									"items": {
-										"$ref": "#/components/schemas/Booking"
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Invalid cardID"
-					}
-				}
-			}
-		},
-		"/time/new": {
-			"put": {
-				"tags": ["booking"],
-				"summary": "Create new Booking",
-				"description": "Creates a new booking with the supplied parameters",
-				"operationId": "pcreateBooking",
-				"parameters": [
-					{
-						"name": "card_uid",
-						"in": "query",
-						"description": "id of the RFID card scanned",
-						"required": true,
-						"schema": {
-							"type": "string"
-						}
-					},
-					{
-						"name": "geraet_id",
-						"in": "query",
-						"description": "id of the RFID reader scanning the card",
-						"required": true,
-						"schema": {
-							"type": "string"
-						}
-					},
-					{
-						"name": "check_in_out",
-						"in": "query",
-						"description": "booking Type",
-						"required": true,
-						"schema": {
-							"type": "integer",
-							"enum": [1, 2, 255]
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "successfully created booking",
-						"content": {
-							"application/json": {
-								"schema": {
-									"$ref": "#/components/schemas/Booking"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Same booking type as last booking"
-					}
-				}
-			},
-			"get": {
-				"tags": ["booking"],
-				"summary": "Create new Booking",
-				"description": "Creates a new booking with the supplied parameters",
-				"operationId": "gcreateBooking",
-				"parameters": [
-					{
-						"name": "card_uid",
-						"in": "query",
-						"description": "id of the RFID card scanned",
-						"required": true,
-						"schema": {
-							"type": "string"
-						}
-					},
-					{
-						"name": "geraet_id",
-						"in": "query",
-						"description": "id of the RFID reader scanning the card",
-						"required": true,
-						"schema": {
-							"type": "string"
-						}
-					},
-					{
-						"name": "check_in_out",
-						"in": "query",
-						"description": "booking Type",
-						"required": true,
-						"schema": {
-							"type": "integer",
-							"enum": [1, 2, 255]
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "successfully created booking",
-						"content": {
-							"application/json": {
-								"schema": {
-									"$ref": "#/components/schemas/Booking"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Same booking type as last booking"
-					}
-				}
-			}
-		},
-		"/logout": {
-			"get": {
-				"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)",
-				"operationId": "autoLogout",
-				"responses": {
-					"200": {
-						"description": "Succesful",
-						"content": {
-							"application/json": {
-								"schema": {
-									"type": "array",
-									"items": {
-										"$ref": "#/components/schemas/User"
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	},
-	"components": {
-		"schemas": {
-			"Booking": {
-				"type": "object",
-				"properties": {
-					"counter_id": {
-						"type": "integer",
-						"format": "int64",
-						"example": 100
-					},
-					"card_uid": {
-						"type": "string",
-						"example": "test_card"
-					},
-					"geraet_id": {
-						"type": "string",
-						"example": "test_reader"
-					},
-					"check_in_out": {
-						"type": "integer",
-						"example": 1,
-						"enum": [1, 2, 255]
-					},
-					"timestamp": {
-						"type": "string",
-						"format": "date-time",
-						"example": "2024-09-05T08:51:12.670Z"
-					}
-				},
-				"xml": {
-					"name": "booking"
-				}
-			},
-			"User": {
-				"type": "object",
-				"properties": {
-					"card_uid": {
-						"type": "string",
-						"example": "test_card"
-					},
-					"name": {
-						"type": "string",
-						"example": "Mustermann"
-					},
-					"vorname": {
-						"type": "string",
-						"example": "Max"
-					},
-					"hauptbeschäftigungsort": {
-						"type": "integer",
-						"format": "int8",
-						"example": 1
-					}
-				}
-			}
-		}
-	}
+  "openapi": "3.0.3",
+  "info": {
+    "title": "Arbeitszeitmessung - OpenAPI 3.0",
+    "description": "This demos the API for the Arbeitszeitmessung Project ",
+    "version": "0.1.0"
+  },
+  "externalDocs": {
+    "description": "Git-Repository",
+    "url": "https://git.letsstein.de/tom/arbeitszeitmessung"
+  },
+  "servers": [
+    {
+      "url": "http://localhost:8000",
+      "description": "Docker Server"
+    },
+    {
+      "url": "http://localhost:8080",
+      "description": "Local Development"
+    }
+  ],
+  "tags": [
+    {
+      "name": "booking",
+      "description": "all Bookings"
+    }
+  ],
+  "paths": {
+    "/time": {
+      "get": {
+        "tags": ["booking"],
+        "summary": "Gets all the bookings from one card_uid",
+        "description": "Returns all the bookings optionally filtered with cardID",
+        "operationId": "getBooking",
+        "parameters": [
+          {
+            "name": "card_uid",
+            "in": "query",
+            "description": "CardID to filter for",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "time_from",
+            "in": "query",
+            "description": "Timestamp since when all bookings are shown (default=1 month ago)",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "example": "2025-02-28"
+            }
+          },
+          {
+            "name": "time_to",
+            "in": "query",
+            "description": "Timestamp till when all bookings are shown (default=today)",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "example": "2025-02-28"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "day": {
+                        "type": "string",
+                        "format": "date"
+                      },
+                      "bookings": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "counter_id": {
+                              "type": "integer",
+                              "format": "int64",
+                              "example": 100
+                            },
+                            "card_uid": {
+                              "type": "string",
+                              "example": "test_card"
+                            },
+                            "geraet_id": {
+                              "type": "string",
+                              "example": "test_reader"
+                            },
+                            "check_in_out": {
+                              "type": "integer",
+                              "example": 1,
+                              "enum": [1, 2, 254]
+                            },
+                            "timestamp": {
+                              "type": "string",
+                              "format": "date-time",
+                              "example": "2024-09-05T08:51:12.670Z"
+                            }
+                          },
+                          "xml": {
+                            "name": "booking"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid cardID"
+          }
+        }
+      }
+    },
+    "/time/new": {
+      "put": {
+        "tags": ["booking"],
+        "summary": "Create new Booking",
+        "description": "Creates a new booking with the supplied parameters",
+        "operationId": "pcreateBooking",
+        "parameters": [
+          {
+            "in": "header",
+            "name": "Authorization",
+            "description": "Predefined API Key to authorize access",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "card_uid",
+            "in": "query",
+            "description": "id of the RFID card scanned",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "geraet_id",
+            "in": "query",
+            "description": "id of the RFID reader scanning the card",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "check_in_out",
+            "in": "query",
+            "description": "booking Type",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "enum": [1, 2, 254]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successfully created booking",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "counter_id": {
+                      "type": "integer",
+                      "format": "int64",
+                      "example": 100
+                    },
+                    "card_uid": {
+                      "type": "string",
+                      "example": "test_card"
+                    },
+                    "geraet_id": {
+                      "type": "string",
+                      "example": "test_reader"
+                    },
+                    "check_in_out": {
+                      "type": "integer",
+                      "example": 1,
+                      "enum": [1, 2, 254]
+                    },
+                    "timestamp": {
+                      "type": "string",
+                      "format": "date-time",
+                      "example": "2024-09-05T08:51:12.670Z"
+                    }
+                  },
+                  "xml": {
+                    "name": "booking"
+                  }
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "Same booking type as last booking"
+          }
+        }
+      },
+      "get": {
+        "tags": ["booking"],
+        "summary": "Create new Booking",
+        "description": "Creates a new booking with the supplied parameters",
+        "operationId": "gcreateBooking",
+        "parameters": [
+          {
+            "in": "header",
+            "name": "Authorization",
+            "description": "Predefined API Key to authorize access",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "api_key",
+            "description": "Predefined API Key to authorize access",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "card_uid",
+            "in": "query",
+            "description": "id of the RFID card scanned",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "geraet_id",
+            "in": "query",
+            "description": "id of the RFID reader scanning the card",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "check_in_out",
+            "in": "query",
+            "description": "booking Type",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "enum": [1, 2, 254]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successfully created booking",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "counter_id": {
+                      "type": "integer",
+                      "format": "int64",
+                      "example": 100
+                    },
+                    "card_uid": {
+                      "type": "string",
+                      "example": "test_card"
+                    },
+                    "geraet_id": {
+                      "type": "string",
+                      "example": "test_reader"
+                    },
+                    "check_in_out": {
+                      "type": "integer",
+                      "example": 1,
+                      "enum": [1, 2, 254]
+                    },
+                    "timestamp": {
+                      "type": "string",
+                      "format": "date-time",
+                      "example": "2024-09-05T08:51:12.670Z"
+                    }
+                  },
+                  "xml": {
+                    "name": "booking"
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "none or wrong api key provided!"
+          },
+          "409": {
+            "description": "Same booking type as last booking"
+          }
+        }
+      }
+    },
+    "/logout": {
+      "get": {
+        "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=254)",
+        "operationId": "autoLogout",
+        "responses": {
+          "200": {
+            "description": "Succesful",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "card_uid": {
+                        "type": "string",
+                        "example": "test_card"
+                      },
+                      "name": {
+                        "type": "string",
+                        "example": "Mustermann"
+                      },
+                      "vorname": {
+                        "type": "string",
+                        "example": "Max"
+                      },
+                      "hauptbeschäftigungsort": {
+                        "type": "integer",
+                        "format": "int8",
+                        "example": 1
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "BookingGrouped": {
+        "type": "object",
+        "properties": {
+          "day": {
+            "type": "string",
+            "format": "date"
+          },
+          "bookings": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "counter_id": {
+                  "type": "integer",
+                  "format": "int64",
+                  "example": 100
+                },
+                "card_uid": {
+                  "type": "string",
+                  "example": "test_card"
+                },
+                "geraet_id": {
+                  "type": "string",
+                  "example": "test_reader"
+                },
+                "check_in_out": {
+                  "type": "integer",
+                  "example": 1,
+                  "enum": [1, 2, 254]
+                },
+                "timestamp": {
+                  "type": "string",
+                  "format": "date-time",
+                  "example": "2024-09-05T08:51:12.670Z"
+                }
+              },
+              "xml": {
+                "name": "booking"
+              }
+            }
+          }
+        }
+      },
+      "Booking": {
+        "type": "object",
+        "properties": {
+          "counter_id": {
+            "type": "integer",
+            "format": "int64",
+            "example": 100
+          },
+          "card_uid": {
+            "type": "string",
+            "example": "test_card"
+          },
+          "geraet_id": {
+            "type": "string",
+            "example": "test_reader"
+          },
+          "check_in_out": {
+            "type": "integer",
+            "example": 1,
+            "enum": [1, 2, 254]
+          },
+          "timestamp": {
+            "type": "string",
+            "format": "date-time",
+            "example": "2024-09-05T08:51:12.670Z"
+          }
+        },
+        "xml": {
+          "name": "booking"
+        }
+      },
+      "User": {
+        "type": "object",
+        "properties": {
+          "card_uid": {
+            "type": "string",
+            "example": "test_card"
+          },
+          "name": {
+            "type": "string",
+            "example": "Mustermann"
+          },
+          "vorname": {
+            "type": "string",
+            "example": "Max"
+          },
+          "hauptbeschäftigungsort": {
+            "type": "integer",
+            "format": "int8",
+            "example": 1
+          }
+        }
+      }
+    }
+  }
 }

Docker/arbeitszeitmessung.yaml

@@ -1,74 +1,58 @@
 openapi: 3.0.3
 info:
   title: Arbeitszeitmessung - OpenAPI 3.0
-  description: 'This demos the API for the Arbeitszeitmessung Project '
+  description: "This demos the API for the Arbeitszeitmessung Project "
   version: 0.1.0
 externalDocs:
   description: Git-Repository
   url: https://git.letsstein.de/tom/arbeitszeitmessung
 servers:
   - url: http://localhost:8000
+    description: Docker Server
+  - url: http://localhost:8080
+    description: Local Development
 tags:
   - name: booking
     description: all Bookings
 paths:
   /time:
-    put:
-      tags:
-        - booking
-      summary: Update a existing booking
-      description: Update an existing booking by Id
-      operationId: updateBooking
-      parameters:
-        - name: counter_id
-          in: query
-          description: Booking ID to update
-          required: true
-          schema:
-            type: string
-      requestBody:
-        description: >-
-          Update an existent booking in the db. Not all values have to be
-          updated
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Booking'
-        required: true
-      responses:
-        '200':
-          description: Booking Updated
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Booking'
-        '400':
-          description: Invalid ID supplied
-        '500':
-          description: Server Error
     get:
       tags:
         - booking
-      summary: Gets all the bookings limited
+      summary: Gets all the bookings from one card_uid
       description: Returns all the bookings optionally filtered with cardID
       operationId: getBooking
       parameters:
         - name: card_uid
           in: query
           description: CardID to filter for
+          required: true
+          schema:
+            type: string
+        - name: time_from
+          in: query
+          description: Timestamp since when all bookings are shown (default=1 month ago)
           required: false
           schema:
             type: string
+            example: "2025-02-28"
+        - name: time_to
+          in: query
+          description: Timestamp till when all bookings are shown (default=today)
+          required: false
+          schema:
+            type: string
+            example: "2025-02-28"
       responses:
-        '200':
+        "200":
           description: Successful operation
           content:
             application/json:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/Booking'
-        '400':
+                  $ref: "#/components/schemas/BookingGrouped"
+        "400":
           description: Invalid cardID
   /time/new:
     put:
@@ -78,6 +62,11 @@ paths:
       description: Creates a new booking with the supplied parameters
       operationId: pcreateBooking
       parameters:
+        - in: header
+          name: Authorization
+          description: Predefined API Key to authorize access
+          schema:
+            type: string
         - name: card_uid
           in: query
           description: id of the RFID card scanned
@@ -99,15 +88,15 @@ paths:
             enum:
               - 1
               - 2
-              - 255
+              - 254
       responses:
-        '200':
+        "200":
           description: successfully created booking
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Booking'
-        '409':
+                $ref: "#/components/schemas/Booking"
+        "409":
           description: Same booking type as last booking
     get:
       tags:
@@ -116,6 +105,17 @@ paths:
       description: Creates a new booking with the supplied parameters
       operationId: gcreateBooking
       parameters:
+        - in: header
+          name: Authorization
+          description: Predefined API Key to authorize access
+          schema:
+            type: string
+        - in: query
+          name: api_key
+          description: Predefined API Key to authorize access
+          required: false
+          schema:
+            type: string
         - name: card_uid
           in: query
           description: id of the RFID card scanned
@@ -137,34 +137,46 @@ paths:
             enum:
               - 1
               - 2
-              - 255
+              - 254
       responses:
-        '200':
+        "200":
           description: successfully created booking
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Booking'
-        '409':
+                $ref: "#/components/schemas/Booking"
+        "401":
+          description: none or wrong api key provided!
+        "409":
           description: Same booking type as last booking
   /logout:
     get:
       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':
+        "200":
           description: Succesful
           content:
             application/json:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/User'
+                  $ref: "#/components/schemas/User"
 components:
   schemas:
+    BookingGrouped:
+      type: object
+      properties:
+        day:
+          type: string
+          format: date
+        bookings:
+          type: array
+          items:
+            $ref: "#/components/schemas/Booking"
     Booking:
       type: object
       properties:
@@ -184,11 +196,11 @@ components:
           enum:
             - 1
             - 2
-            - 255
+            - 254
         timestamp:
           type: string
           format: date-time
-          example: '2024-09-05T08:51:12.670Z'
+          example: "2024-09-05T08:51:12.670Z"
       xml:
         name: booking
     User:

Docker/docker-compose.dev.yml

@@ -6,12 +6,10 @@ services:
     env_file:
       - .env
     environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: ${POSTGRES_DB}
       PGDATA: /var/lib/postgresql/data/pg_data
     volumes:
       - ${POSTGRES_PATH}:/var/lib/postgresql/data
+      - ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d
     ports:
       - 5432:5432
 
@@ -22,18 +20,17 @@ services:
       - 8001:8080
   backend:
     build: ../Backend
-    image: git.letsstein.de/tom/arbeitszeit-backend
+    image: git.letsstein.de/tom/arbeitszeit-backend:0.1.1
+    restart: unless-stopped
     env_file:
       - .env
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASS: ${POSTGRES_PASSWORD}
       EXPOSED_PORT: ${EXPOSED_PORT}
-      DEBUG: true
+      NO_CORS: true
     ports:
-      - 8000:8080
+      - ${EXPOSED_PORT}:8080
     depends_on:
       - db
   swagger:

Docker/docker-compose.yml

@@ -12,6 +12,9 @@ services:
       PGDATA: /var/lib/postgresql/data/pg_data
     volumes:
       - ${POSTGRES_PATH}:/var/lib/postgresql/data
+      - ${POSTGRES_PATH}/initdb:/docker-entrypoint-initdb.d
+    ports:
+      - 5432:5432
 
   backend:
     image: git.letsstein.de/tom/arbeitszeit-backend
@@ -20,10 +23,9 @@ services:
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASS: ${POSTGRES_PASSWORD}
       EXPOSED_PORT: ${EXPOSED_PORT}
     ports:
       - ${EXPOSED_PORT}:8080
     depends_on:
       - db
+    restart: unless-stopped

Jenkinsfile

@@ -16,22 +16,9 @@ pipeline {
                 }
             }
             steps {
-                sh 'make build_backend'
+                sh 'make backend'
             }
 
         }
-        stage('Deploying image arbeitszeit-backend') {
-            when {
-                anyOf{
-                    changeset 'Jenkinsfile'
-                    changeset 'Makefile'
-                    changeset 'Backend/**'
-                }
-            }
-            steps {
-                sh 'make push_backend'
-            }
-        }
-
     }
 }

Makefile

@@ -36,3 +36,12 @@ push_%:
 full_%:
 	make build_$*
 	make push_$*
+
+generateFrontend:
+	cd Backend && templ generate
+	cd Backend && npx @tailwindcss/cli -i ./src/main.css -o ./static/css/styles.css
+
+
+backend: generateFrontend login_registry
+	docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:latest Backend --push
+	docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:${GIT_COMMIT} Backend --push

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",
-    "bookingTyp": 1,
-    "loggedTime": "2024-09-05T08:51:12.670827Z",
-}
-```
- Antwort `200`
- ```json
-{
+    "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",
+  "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",
-    "readerID": "mytest",
-    "bookingTyp": 1,
-    "loggedTime": "2024-09-05T08:51:12.670827Z",
-    "id": 6
+  "cradID": "test_card",
+  "readerID": "mytest",
+  "bookingTyp": 1,
+  "loggedTime": "2024-09-05T08:51:12.670827Z",
+  "id": 6
 }
 ```
 

db.sql

@@ -6,8 +6,9 @@ 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
 CREATE TABLE "public"."personal_daten" (
     "personal_nummer" SERIAL PRIMARY KEY,
@@ -25,9 +26,13 @@ COMMENT ON COLUMN "public"."personal_daten"."akiv_beschaeftig" IS 'derzeit aktiv
 COMMENT ON COLUMN "public"."personal_daten"."geschlecht" IS 'w:1 m:2 div:3 kA:null ';
 COMMENT ON COLUMN "public"."personal_daten"."card_uid" IS 'RFID-Karten-UID';
 COMMENT ON COLUMN "public"."personal_daten"."hauptbeschaeftigung_ort" IS 'Chemnitz:1 Sayda:2';
+
+
 -- @block drop tables
 DROP TABLE IF EXISTS "public"."anwesenheit";
 DROP TABLE IF EXISTS "public"."personal_daten";
+
+
 -- @block insert into personal_daten
 INSERT INTO personal_daten (
         personal_nummer,
@@ -53,6 +58,91 @@ VALUES (
         'test_card',
         '1'
     );
+
 -- @block select
 SELECT *
 FROM personal_daten;
+
+-- @block work and pause time
+WITH ordered_bookings AS (
+    SELECT
+        timestamp,
+        check_in_out,
+        LAG(timestamp) OVER (PARTITION BY card_uid ORDER BY timestamp) AS prev_timestamp,
+        LAG(check_in_out) OVER (PARTITION BY card_uid ORDER BY timestamp) AS prev_check
+    FROM anwesenheit
+    WHERE card_uid = 'acde-edca'  -- Replace with actual card_uid
+    AND timestamp::DATE = '2025-02-23'  -- Replace with actual date
+)
+SELECT
+    -- Total work time: Duration between check-in (1,3) and check-out (2,4,254)
+    COALESCE(
+        SUM(
+            CASE
+                WHEN prev_check IN (1, 3) AND check_in_out IN (2, 4, 254)
+                THEN timestamp - prev_timestamp
+                ELSE INTERVAL '0'
+            END
+        ), INTERVAL '0'
+    ) AS total_work,
+
+    -- Total pause time: Duration between check-out (2,4,254) and next check-in (1,3)
+    COALESCE(
+        SUM(
+            CASE
+                WHEN prev_check IN (2, 4, 254) AND check_in_out IN (1, 3)
+                THEN timestamp - prev_timestamp
+                ELSE INTERVAL '0'
+            END
+        ), INTERVAL '0'
+    ) AS total_pause
+
+FROM ordered_bookings;
+
+-- @block work and pause time multi day
+WITH ordered_bookings AS (
+    SELECT
+        timestamp::DATE AS work_date,  -- Extract date for grouping
+        timestamp,
+        check_in_out,
+        LAG(timestamp) OVER (
+            PARTITION BY card_uid, timestamp::DATE  -- Reset for each day
+            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  -- Replace with actual card_uid
+    AND timestamp::DATE >= $2  -- Set date range
+    AND timestamp::DATE < $3
+)
+SELECT
+    work_date,
+
+    -- Total work time per day
+    COALESCE(
+        EXTRACT(EPOCH FROM SUM(
+            CASE
+                WHEN prev_check IN (1, 3) AND check_in_out IN (2, 4, 254)
+                THEN timestamp - prev_timestamp
+                ELSE INTERVAL '0'
+            END
+        )), 0
+    ) AS total_work,
+
+    -- Extract total pause time in seconds
+    COALESCE(
+        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;