CHANGE: Minor improvements + updated api docs

.gitignore

@@ -31,3 +31,8 @@ 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/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", "arbeit_zeit")
+	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/team.go

@@ -0,0 +1,117 @@
+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
+	}
+	var workWeeks []models.WorkWeek
+	teamMembers, err := user.GetTeamMembers()
+	for _, member := range teamMembers {
+		weeks := (*models.WorkWeek).GetSendWeeks(nil, member)
+		workWeeks = append(workWeeks, weeks...)
+	}
+	lastSub := user.GetLastSubmission()
+	log.Println(lastSub)
+	userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
+	// isRunningWeek := time.Since(lastSub) < 24*5*time.Hour //the last submission is this week and cannot be send yet
+	templates.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
+}
+
+func getWeeksTillNow(lastWeek time.Time) []time.Time {
+	var weeks []time.Time
+	if lastWeek.After(time.Now()) {
+		log.Println("Timestamp is after today, no weeks till now!")
+		return weeks
+	}
+	if lastWeek.Weekday() != time.Monday {
+		if lastWeek.Weekday() == time.Sunday {
+			lastWeek = lastWeek.AddDate(0, 0, -6)
+		} else {
+			lastWeek = lastWeek.AddDate(0, 0, -int(lastWeek.Weekday()-1))
+		}
+	}
+	if time.Since(lastWeek) < 24*5*time.Hour {
+		log.Println("Timestamp in running week, cannot split!")
+	}
+
+	for t := lastWeek; t.Before(time.Now()); t = t.Add(7 * 24 * time.Hour) {
+		weeks = append(weeks, t)
+	}
+	log.Println(weeks)
+	return weeks
+}

Backend/endpoints/time.go

@@ -14,68 +14,60 @@ import (
 
 // 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) {
-	var user models.User
-	var err error
-	if(helper.GetEnv("GO_ENV", "production") == "debug"){
-		user, err = (*models.User).GetByPersonalNummer(nil, 123)
-	}else{
-		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"))
-	}
-	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
 
 	bookings, err := (*models.Booking).GetBookingsGrouped(nil, user.CardUID, tsFrom, tsTo)
 	if err != nil {
@@ -83,37 +75,83 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		return
 	}
+	if r.Header.Get("Accept") == "application/json" {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		json.NewEncoder(w).Encode(bookings)
+		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)
+	templates.TimePage(bookings).Render(ctx, w)
 }
 
-func updateBooking(w http.ResponseWriter, r *http.Request){
+func updateBooking(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
-	for index, possibleBooking := range r.PostForm{
-		if(index[:7] == "booking"){
+	for index, possibleBooking := range r.PostForm {
+		if index[:7] == "booking" {
 			booking_id, err := strconv.Atoi(index[8:])
-			if(err != nil){
+			if err != nil {
 				log.Println("Error parsing bookingId", err)
 				continue
 			}
 			booking, err := (*models.Booking).GetBookingById(nil, booking_id)
-			if(err != nil){
+			if err != nil {
 				log.Println("Error getting booking!", err)
 				continue
 			}
-			parsedTime, err := time.Parse("15:04", possibleBooking[0])
-			if(err != nil){
+			parsedTime, err := time.ParseInLocation("15:04", possibleBooking[0], time.Local)
+			if err != nil {
 				log.Println("Error parsing time!", err)
 				continue
 			}
+			log.Println("Parsing time", parsedTime)
 			booking.UpdateTime(parsedTime)
 		}
 	}
 	getBookings(w, r)
 }
 
+func getBookingsAPI(w http.ResponseWriter, r *http.Request) {
+	_user_pn := r.URL.Query().Get("personal_nummer")
+	user_pn, err := strconv.Atoi(_user_pn)
+	if err != nil {
+		log.Println("No personal numver found!")
+		http.Error(w, "No personal number found", http.StatusBadRequest)
+		return
+	}
+
+	user, err := (*models.User).GetByPersonalNummer(nil, user_pn)
+	if err != nil {
+		log.Println("No user found with the given personal number!")
+		http.Error(w, "No user found", http.StatusNotFound)
+		return
+	}
+
+	// TODO add config for timeoffset
+	tsFrom, err := parseTimestamp(r, "time_from", time.Now().AddDate(0, -1, 0).Format("2006-01-02"))
+	if err != nil {
+		log.Println("Error parsing 'from' time", err)
+		http.Error(w, "Timestamp 'from' cannot be parsed!", http.StatusBadRequest)
+		return
+	}
+	tsTo, err := parseTimestamp(r, "time_to", time.Now().Format("2006-01-02"))
+	if err != nil {
+		log.Println("Error parsing 'to' time", err)
+		http.Error(w, "Timestamp 'to' cannot be parsed!", http.StatusBadRequest)
+		return
+	}
+	tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside
+
+	bookings, err := (*models.Booking).GetBookingsGrouped(nil, user.CardUID, tsFrom, tsTo)
+	if err != nil {
+		log.Println("Error getting bookings: ", err)
+		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		return
+	}
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(bookings)
+}
+
 // Updates a booking form the given json body
 func updateBookingAPI(w http.ResponseWriter, r *http.Request) {
 	_booking_id := r.URL.Query().Get("counter_id")

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,18 @@ 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
+		}
+	}
+	log.Println(authHeaders)
+	return authToken == authHeaders[_authStart:]
+}

Backend/endpoints/user.go

@@ -1,6 +1,7 @@
 package endpoints
 
 import (
+	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"log"
@@ -19,23 +20,40 @@ func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
 	return Session
 }
 
-func LoginHandler(w http.ResponseWriter, r *http.Request){
-	switch r.Method{
-		case http.MethodGet: showForm(w, r, false)
+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)
+	case http.MethodPost:
+		loginUser(w, r)
 		break
-		default:
-		showForm(w, r, false)
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
 		break
 	}
 }
 
-func showForm(w http.ResponseWriter, r *http.Request, failed bool){
-	templates.LoginForm(failed).Render(r.Context(), w)
+func UserHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	switch r.Method {
+	case http.MethodGet:
+		showUserPage(w, r, 0)
+		break
+	case http.MethodPost:
+		changePassword(w, r)
+		break
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
+	}
 }
 
-func loginUser(w http.ResponseWriter, r *http.Request){
+func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
+	templates.LoginPage(failed).Render(r.Context(), w)
+}
+
+func loginUser(w http.ResponseWriter, r *http.Request) {
 	err := r.ParseForm()
 	if err != nil {
 		log.Println("Error parsing form!", err)
@@ -43,32 +61,68 @@ func loginUser(w http.ResponseWriter, r *http.Request){
 		return
 	}
 	_personal_nummer := r.FormValue("personal_nummer")
-	if(_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){
+	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){
+	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)){
+	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{
-		showForm(w, r, true)
+	} else {
+		showLoginPage(w, r, true)
+		return
 	}
-
-showForm(w, r, false)
+	showLoginPage(w, r, false)
+	return
+}
+
+// change user password and store salted hash in db
+func changePassword(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	if err != nil {
+		log.Println("Error parsing form!", err)
+		http.Error(w, "Error parsing form error", http.StatusBadRequest)
+		return
+	}
+	password := r.FormValue("password")
+	newPassword := r.FormValue("new_password")
+	if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") {
+		showUserPage(w, r, http.StatusBadRequest)
+		return
+	}
+	user, err := (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
+	if err != nil {
+		log.Println("Error getting user!", err)
+		showUserPage(w, r, http.StatusBadRequest)
+	}
+	auth, err := user.ChangePass(password, newPassword)
+	if err != nil {
+		log.Println("Error when changing password!", err)
+	}
+	if auth {
+		showUserPage(w, r, http.StatusOK)
+		return
+	}
+	showUserPage(w, r, http.StatusUnauthorized)
+}
+
+func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
+	templates.UserPage(status).Render(r.Context(), w)
+	return
 }

Backend/helper/web.go

@@ -3,15 +3,28 @@ package helper
 import (
 	"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) {
+	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

@@ -4,25 +4,25 @@ import (
 	"arbeitszeitmessung/endpoints"
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
 	"context"
 	"fmt"
 	"log"
 	"net/http"
 	"time"
 
+	"github.com/a-h/templ"
 	"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!")
- 	}
+	}
 
 	models.DB, err = OpenDatabase()
 	if err != nil {
@@ -36,11 +36,13 @@ 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", endpoints.UserHandler)
+	server.HandleFunc("/team", endpoints.TeamHandler)
+	server.Handle("/", templ.Handler(templates.NavPage()))
 	server.Handle("/static/", http.StripPrefix("/static/", fs))
 
 	serverSessionMiddleware := endpoints.Session.LoadAndSave(server)
@@ -50,8 +52,8 @@ func main() {
 	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/booking.go

@@ -116,11 +116,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 +135,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 +161,14 @@ func (b Booking) Save() {
 }
 
 func (b *Booking) GetBookingType() string {
-	switch b.CheckInOut{
-		case 1,3: //manuelle Änderung
+	switch b.CheckInOut {
+	case 1, 3: //manuelle Änderung
 		return "kommen"
-		case 2, 4: //manuelle Änderung
+	case 2, 4: //manuelle Änderung
 		return "gehen"
-		case 255:
+	case 255:
 		return "abgemeldet"
-		default:
+	default:
 		return "Buchungs Typ unbekannt"
 	}
 }
@@ -181,7 +183,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,25 +203,25 @@ 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, time.Local)
+	if b.CheckInOut < 3 {
 		newBooking.CheckInOut = b.CheckInOut + 2
 	}
-	if(b.CheckInOut == 255){
+	if b.CheckInOut == 255 {
 		newBooking.CheckInOut = 4
 	}
 	b.Update(newBooking)

Backend/models/user.go

@@ -1,15 +1,42 @@
 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"`
-	PersonalNummer			int		`json:"personal_nummer"`
+	CardUID        string  `json:"card_uid"`
+	Name           string  `json:"name"`
+	Vorname        string  `json:"vorname"`
+	PersonalNummer int     `json:"personal_nummer"`
+	Arbeitszeit    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) {
@@ -66,34 +93,139 @@ 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 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)
-	if err != nil{
-		return user, err
-	}
-	return user, nil
-}
+	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit)
 
-func (u *User) GetByPersonalNummer (personalNummer int) (User, error) {
-	var user User
-
-	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname 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)
-	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) 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.Arbeitszeit); 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 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,166 @@
 package models
 
 import (
+	"fmt"
+	"log"
 	"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
+}
+
+func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay {
+	var workDays []WorkDay
+	var workSec, pauseSec float64
+	qStr, err := DB.Prepare(`
+	WITH ordered_bookings AS (
+    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;`)
+
+	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()
+	for rows.Next() {
+		var workDay WorkDay
+		if err := rows.Scan(&workDay.Day, &workSec, &pauseSec); err != nil {
+			log.Println("Error scanning row!", err)
+			return workDays
+		}
+		workDay.workTime = time.Duration(workSec * float64(time.Second))
+		workDay.pauseTime = time.Duration(pauseSec * float64(time.Second))
+		workDay.calcPauseTime()
+		workDays = append(workDays, workDay)
+	}
+	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() {
+	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())
+	}
+	d.workTime = workTime
+	d.pauseTime = pauseTime
+
+	d.calcPauseTime()
+}
+
+func formatDuration(d time.Duration) string {
+	hours := int(d.Abs().Hours())
+	minutes := int(d.Abs().Minutes()) % 60
+	switch {
+	case hours > 0:
+		return fmt.Sprintf("%dh %dmin", hours, minutes)
+	case minutes > 0:
+		return fmt.Sprintf("%dmin", minutes)
+	default:
+		return ""
 	}
-	return d.workTime
 }
 
 // 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
-	}
-	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 {
+func (d *WorkDay) RequiresAction() bool {
 	return d.Bookings[len(d.Bookings)-1].CheckInOut == 255
 }
 
 // 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.Arbeitszeit * float32(time.Hour))
+	progress := (d.workTime.Seconds() / defaultWorkTime.Seconds()) * 100
 	return uint8(progress)
 }

Backend/models/workWeek.go

@@ -0,0 +1,107 @@
+package models
+
+import (
+	"errors"
+	"log"
+	"time"
+)
+
+type WorkWeek struct {
+	Id        int
+	WorkDays  []WorkDay
+	User      User
+	WeekStart time.Time
+	WorkHours time.Duration
+}
+
+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) 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 {
+	if time.Since(w.WeekStart) < 5*24*time.Hour {
+		log.Println("Cannot send week, because it's the running week!")
+		return ErrRunningWeek
+	}
+	qStr, err := DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start) VALUES ($1, $2);`)
+	if 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

@@ -2,27 +2,62 @@
 @source "../templates/*.templ";
 
 @theme {
-  --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;
+    --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 components {
+    .grid-main {
+        display: grid;
+        grid-template-columns: repeat(6, 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

@@ -541,12 +541,6 @@
   }
 }
 @layer utilities {
-  .collapse {
-    visibility: collapse;
-  }
-  .relative {
-    position: relative;
-  }
   .static {
     position: static;
   }
@@ -556,36 +550,24 @@
   .col-span-3 {
     grid-column: span 3 / span 3;
   }
-  .col-span-full {
-    grid-column: 1 / -1;
-  }
   .-my-1 {
     margin-block: calc(var(--spacing) * -1);
   }
   .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;
   }
@@ -600,27 +582,21 @@
   .h-4 {
     height: calc(var(--spacing) * 4);
   }
-  .h-\[90vh\] {
-    height: 90vh;
-  }
   .h-\[100vh\] {
     height: 100vh;
   }
   .h-full {
     height: 100%;
   }
-  .w-1 {
-    width: calc(var(--spacing) * 1);
-  }
-  .w-1\/2 {
-    width: calc(1/2 * 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;
   }
@@ -633,23 +609,11 @@
   .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-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;
@@ -657,6 +621,9 @@
   .flex-row {
     flex-direction: row;
   }
+  .content-end {
+    align-content: flex-end;
+  }
   .items-center {
     align-items: center;
   }
@@ -689,10 +656,13 @@
       border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
     }
   }
-  .divide-neutral-400 {
-    :where(& > :not(:last-child)) {
-      border-color: var(--color-neutral-400);
-    }
+  .justify-self-end {
+    justify-self: flex-end;
+  }
+  .truncate {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
   .overflow-hidden {
     overflow: hidden;
@@ -707,25 +677,18 @@
     border-style: var(--tw-border-style);
     border-width: 1px;
   }
-  .border-r-0 {
-    border-right-style: var(--tw-border-style);
-    border-right-width: 0px;
-  }
   .border-neutral-200 {
     border-color: var(--color-neutral-200);
   }
   .border-neutral-300 {
     border-color: var(--color-neutral-300);
   }
-  .border-neutral-400 {
-    border-color: var(--color-neutral-400);
+  .border-neutral-800 {
+    border-color: var(--color-neutral-800);
   }
   .border-neutral-900 {
     border-color: var(--color-neutral-900);
   }
-  .border-red-600 {
-    border-color: var(--color-red-600);
-  }
   .bg-accent {
     background-color: var(--color-accent);
   }
@@ -744,9 +707,6 @@
   .bg-purple-600 {
     background-color: var(--color-purple-600);
   }
-  .bg-red-200 {
-    background-color: var(--color-red-200);
-  }
   .bg-red-600 {
     background-color: var(--color-red-600);
   }
@@ -766,9 +726,9 @@
     font-size: var(--text-sm);
     line-height: var(--tw-leading, var(--text-sm--line-height));
   }
-  .text-xs {
-    font-size: var(--text-xs);
-    line-height: var(--tw-leading, var(--text-xs--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);
@@ -792,20 +752,9 @@
   .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));
@@ -863,6 +812,13 @@
       }
     }
   }
+  .hover\:text-accent {
+    &:hover {
+      @media (hover: hover) {
+        color: var(--color-accent);
+      }
+    }
+  }
   .hover\:text-white {
     &:hover {
       @media (hover: hover) {
@@ -901,6 +857,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;
@@ -926,9 +897,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 +925,33 @@
     }
   }
 }
+@layer components {
+  .grid-main {
+    display: grid;
+    grid-template-columns: repeat(6, 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%;
+    }
+  }
+}
 @keyframes spin {
   to {
     transform: rotate(360deg);
@@ -975,31 +978,6 @@
     animation-timing-function: cubic-bezier(0, 0, 0.2, 1);
   }
 }
-@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;
@@ -1019,11 +997,6 @@
   syntax: "*";
   inherits: false;
 }
-@property --tw-outline-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}
 @property --tw-blur {
   syntax: "*";
   inherits: false;
@@ -1060,42 +1033,6 @@
   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 {
-  syntax: "*";
-  inherits: false;
-}
 @property --tw-duration {
   syntax: "*";
   inherits: false;

Backend/static/script.js

@@ -1,6 +1,6 @@
 function editDay(element, event, formId) {
   var form = element
-    .closest(".grid-cols-subgrid")
+    .closest(".grid-sub")
     .querySelector(".time-component > form");
   form.classList.toggle("edit");
   element.classList.toggle("edit");

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/headerComponent.templ

@@ -0,0 +1,9 @@
+package templates
+
+templ headerComponent() {
+	<div class="flex flex-row justify-between md:mx-[10%] py-2">
+		<a href="/time">Zeitverwaltung</a>
+		<a href="/team">Mitarbeiter</a>
+		<a href="/user">Nutzer</a>
+	</div>
+}

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 Style() 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,7 +29,7 @@ func Style() templ.Component {
 			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>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-row justify-between md:mx-[10%] py-2\"><a href=\"/time\">Zeitverwaltung</a> <a href=\"/team\">Mitarbeiter</a> <a href=\"/user\">Nutzer</a></div>")
 		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.go

@@ -1,53 +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 Hello(name string) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div>Hello, ")
-		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}
-		}
-		_, 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>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

Backend/templates/pages.templ

@@ -0,0 +1,117 @@
+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 _, bookingGroup := range workDays {
+			@dayComponent(bookingGroup)
+		}
+	</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 == 200:
+						<p class="text-accent text-sm">Passwortänderung erfolgreich</p>
+				}
+			</div>
+			<div class="grid-cell">
+				<button type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Ändern</button>
+			</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>
+			<form class="grid-cell flex flex-col gap-2" method="post">
+				<div>
+					<p class="text-sm"><span class="">Woche:</span> { fmt.Sprintf("%02d-%d", kw, year) }</p>
+					<p class="text-sm">an Vorgesetzten senden</p>
+				</div>
+				<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) }/>
+				// if failed {
+				// 	<p>Fehlgeschlagen</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">Senden</button>
+			</form>
+		</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>
+}

Backend/templates/pages_templ.go

@@ -0,0 +1,347 @@
+// 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 _, 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, 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 == 200:
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\"text-accent text-sm\">Passwortänderung erfolgreich</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div><div class=\"grid-cell\"><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Ändern</button></div></form></div>")
+		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: 82, 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><form class=\"grid-cell flex flex-col gap-2\" method=\"post\"><div><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 90, Col: 87}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</p><p class=\"text-sm\">an Vorgesetzten senden</p></div><input type=\"hidden\" name=\"method\" value=\"send\"> <input type=\"hidden\" name=\"user\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(userWeek.User.PersonalNummer))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 94, Col: 87}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(userWeek.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 95, Col: 85}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "\"><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-800 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Senden</button></form></div>")
+		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, 18, "</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_Var10 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var10 == nil {
+			templ_7745c5c3_Var10 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><div class=\"flex flex-col justify-between w-full md:w-1/2 py-2\"><a class=\"text-xl hover:text-accent transition-colors1\" href=\"/time\">Zeitverwaltung</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/team\">Mitarbeiter</a> <a class=\"text-xl hover:text-accent transition-colors1\" href=\"/user\">Nutzer</a></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/teamComponents.templ

@@ -0,0 +1,49 @@
+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>
+	</div>
+}
+
+templ employeComponent(week models.WorkWeek) {
+	{{
+		year, kw := week.WeekStart.ISOWeek()
+	}}
+	<div class="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>
+}

Backend/templates/teamComponents_templ.go

@@ -0,0 +1,227 @@
+// 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></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_Var6 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var6 == nil {
+			templ_7745c5c3_Var6 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		year, kw := week.WeekStart.ISOWeek()
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div class=\"grid-sub divide-x-1\"><div class=\"grid-cell\"><p class=\"font-bold uppercase\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 30, Col: 53}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 30, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p><p class=\"text-sm\">Arbeitszeit</p><p class=\"text-accent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(week.GetWorkHourString())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 32, Col: 52}
+		}
+		_, 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, 10, "</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, 11, "</div><form class=\"grid-cell flex flex-col justify-between gap-2\" method=\"post\"><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 40, Col: 85}
+		}
+		_, 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, 12, "</p><input type=\"hidden\" name=\"method\" value=\"accept\"> <input type=\"hidden\" name=\"user\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(week.User.PersonalNummer))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 42, Col: 82}
+		}
+		_, 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, 13, "\"> <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(week.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 43, Col: 80}
+		}
+		_, 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, 14, "\"> <button type=\"submit\" class=\"w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><p class=\"\">Bestätigen</p></button></form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

Backend/templates/timeComponents.templ

@@ -2,138 +2,140 @@ 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="col-span-full grid grid-cols-subgrid divide-x-1 divide-neutral-400">
-	<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-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 class="grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col">
+		<div class="grid-cell col-span-2 md:col-span-1 max-md:grid grid-cols-2">
+			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
+			<div class="justify-self-end">
+				<p class="text-sm">Überstunden</p>
+				<p class="text-accent">4h 32min</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>
-		</div>
-}
-
-templ dayComponent(workDay models.WorkDay){
-	<div class="col-span-full grid grid-cols-subgrid divide-x-1 divide-neutral-400 hover:bg-neutral-200 transition-colors">
-	<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 col-span-3 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>
+templ dayComponent(workDay models.WorkDay) {
+	{{
+		work, pause := workDay.GetWorkTimeString()
+	}}
+	<div class="grid-sub divide-x-1 hover:bg-neutral-200 transition-colors">
+		<div class="grid-cell col-span-2 md:col-span-1 flex flex-row gap-2">
+			@timeGaugeComponent(workDay.GetWorkDayProgress(ctx.Value("user").(models.User)), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction())
+			<div>
+				<p class=""><span class="font-bold uppercase hidden md:inline">{ workDay.Day.Format("Mon") }:</span> { workDay.Day.Format("02.01.2006") }</p>
+				<p class=" text-sm mt-1">Arbeitszeit:</p>
+				if (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="time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full grid-cell">
+			@lineComponent()
+			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 justify-between group w-full" method="post">
+				for _, booking := range workDay.Bookings {
+					@bookingComponent(booking)
+				}
+			</form>
+		</div>
+		<div class="grid-cell">
+			@changeButtonComponent("time-" + workDay.Day.Format("2006-01-02"))
+		</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>
+			<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 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-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>
-
+		<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 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 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=\"col-span-full grid grid-cols-subgrid divide-x-1 divide-neutral-400\"><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 col-span-2 md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname + " " + user.Name)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 18, Col: 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\">4h 32min</p></div></div><form id=\"timeRangeForm\" method=\"GET\" class=\"grid-cell flex flex-row col-span-3 md:col-span-3 gap-2 \">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -68,7 +68,7 @@ func inputForm() templ.Component {
 		var templ_7745c5c3_Var3 string
 		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_from"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 26, 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 {
@@ -81,13 +81,13 @@ func inputForm() templ.Component {
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_to"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 27, 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></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,24 @@ 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-full grid grid-cols-subgrid divide-x-1 divide-neutral-400 hover:bg-neutral-200 transition-colors\"><div class=\"p-2 col-span-2 md:col-span-1 flex flex-row gap-2\">")
+
+		work, pause := workDay.GetWorkTimeString()
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"grid-sub divide-x-1 hover:bg-neutral-200 transition-colors\"><div class=\"grid-cell col-span-2 md:col-span-1 flex flex-row gap-2\">")
 		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: 46, Col: 77}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 47, Col: 94}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -144,13 +146,13 @@ 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: 46, Col: 120}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 47, 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><p class=\" text-sm mt-1\">Arbeitszeit:</p>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -165,9 +167,9 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var8 string
-			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.GetWorkTimeString())
+			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: 51, Col: 56}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 52, Col: 35}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 			if templ_7745c5c3_Err != nil {
@@ -178,7 +180,20 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 				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, 13, "<p class=\"text-neutral-500\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(pause)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 54, Col: 39}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</p></div></div><div class=\"time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full grid-cell\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -186,20 +201,20 @@ 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, 15, "<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: 57, Col: 54}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 59, 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, 16, "\" class=\"flex flex-col gap-2 justify-between group w-full\" method=\"post\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -209,7 +224,7 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</form></div><div class=\"p-2\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</form></div><div class=\"grid-cell\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -217,7 +232,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, 18, "</div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -241,25 +256,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_Var11 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var11 == nil {
+			templ_7745c5c3_Var11 = 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, 19, "<button type=\"button\" class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group\" type=\"button\" onclick=\"")
 		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_Var12 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 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, 20, "\"><p class=\"hidden md:block group-[.edit]:hidden\">Ändern</p><p class=\"hidden group-[.edit]:md:block\">Submit</p><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"w-4 h-4 md:hidden\"><path d=\"m11.645 20.91-.007-.003-.022-.012a15.247 15.247 0 0 1-.383-.218 25.18 25.18 0 0 1-4.244-3.17C4.688 15.36 2.25 12.174 2.25 8.25 2.25 5.322 4.714 3 7.688 3A5.5 5.5 0 0 1 12 5.052 5.5 5.5 0 0 1 16.313 3c2.973 0 5.437 2.322 5.437 5.25 0 3.925-2.438 7.111-4.739 9.256a25.175 25.175 0 0 1-4.244 3.17 15.247 15.247 0 0 1-.383.219l-.022.012-.007.004-.003.001a.752.752 0 0 1-.704 0l-.003-.001Z\"></path></svg></button>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -283,9 +298,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_Var13 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var13 == nil {
+			templ_7745c5c3_Var13 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
@@ -294,10 +309,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,65 +323,65 @@ 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-300 print:hidden\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden\">")
 			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...)
+			var templ_7745c5c3_Var14 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var14...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 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=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var15 string
-			templ_7745c5c3_Var15, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(fmt.Sprintf("height: %d%%", int(progress)))
+			templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var14).String())
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 102, Col: 146}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\"></div></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\" style=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var16 string
+			templ_7745c5c3_Var16, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(fmt.Sprintf("height: %d%%", int(progress)))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 104, Col: 149}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\"></div></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		} else {
-			var templ_7745c5c3_Var16 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var16...)
+			var templ_7745c5c3_Var17 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var17...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var17 string
-			templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var16).String())
+			var templ_7745c5c3_Var18 string
+			templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var17).String())
 			if templ_7745c5c3_Err != nil {
 				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
 			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, 26, "\"></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -391,12 +406,12 @@ 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_Var19 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var19 == nil {
+			templ_7745c5c3_Var19 = 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, 27, "<div class=\"flex flex-col w-2 py-2 items-center text-accent print:hidden\"><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg><div class=\"w-[2px] bg-accent flex-grow -my-1\"></div><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -420,64 +435,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_Var20 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var20 == nil {
+			templ_7745c5c3_Var20 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<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"))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 125, Col: 103}
-		}
-		_, 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, 28, "</span> <input name=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div><p class=\"text-neutral-500\"><span class=\"text-neutral-700 group-[.edit]:hidden inline\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs("booking_" + strconv.Itoa(booking.CounterId))
+		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 126, Col: 59}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 126, Col: 97}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 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, 29, "</span> <input name=\"")
 		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"))
+		templ_7745c5c3_Var22, 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: 126, Col: 342}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 127, Col: 61}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "\"> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "\" type=\"time\" value=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 127, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 127, Col: 117}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 128, Col: 29}
+		}
+		_, 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, 32, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -501,12 +516,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_Var25 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var25 == nil {
+			templ_7745c5c3_Var25 = 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, 33, "<div class=\"flex flex-row gap-4 md:mx-[10%] print:hidden\"><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-red-600\"></div><span>Fehler</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-orange-500\"></div><span>Arbeitszeit unter regulär</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-accent\"></div><span>Arbeitszeit vollständig</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-purple-600\"></div><span>Überstunden</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-neutral-400\"></div><span>Keine Buchungen</span></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

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/user.templ

@@ -1,22 +0,0 @@
-package templates
-
-templ LoginForm(failed bool){
-	{{
-		failedClass := ""
-		if(failed){
-			failedClass = "border border-red-600"
-		}
-	}}
-	@Style()
-	<div class="w-full h-[100vh] flex flex-col justify-center items-center">
-
-	<form method="POST" class={"w-1/2 flex flex-col gap-4 p-2", failedClass}>
-		<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>
-}

Backend/templates/user_templ.go

@@ -1,81 +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(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_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-
-		failedClass := ""
-		if failed {
-			failedClass = "border border-red-600"
-		}
-		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=\"w-full h-[100vh] flex flex-col justify-center items-center\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 = []any{"w-1/2 flex flex-col gap-4 p-2", failedClass}
-		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var2...)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<form method=\"POST\" class=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var2).String())
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/user.templ`, Line: 1, Col: 0}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "\"><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, 4, "<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, 5, "<button type=\"submit\" class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Login</button></form></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-var _ = templruntime.GeneratedTemplate

DB/initdb/01_create_tables.sql

@@ -4,7 +4,7 @@
 DROP TABLE IF EXISTS "anwesenheit";
 CREATE TABLE "anwesenheit" (
     "counter_id" bigserial PRIMARY KEY,
-    "timestamp" timestamp(6) DEFAULT CURRENT_TIMESTAMP,
+    "timestamp" timestamptz(6) DEFAULT CURRENT_TIMESTAMP,
     "card_uid" varchar(255),
     "check_in_out" int2,
     "geraet_id" int2
@@ -34,7 +34,51 @@ CREATE TABLE "personal_daten" (
 );
 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")
+);
+
+-- 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

@@ -7,8 +7,10 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
     CREATE USER $POSTGRES_API_USER WITH ENCRYPTED PASSWORD '$POSTGRES_API_PASSWORD';
     GRANT CONNECT ON DATABASE $POSTGRES_DB TO $POSTGRES_API_USER;
     GRANT USAGE ON SCHEMA public TO $POSTGRES_API_USER;
-    GRANT SELECT, INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO $POSTGRES_API_USER;
+    GRANT SELECT, INSERT, UPDATE ON anwesenheit, 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.example

@@ -1,7 +1,10 @@
-POSTGRES_ADMIN=root
-POSTGRES_ADMIN_PASS=very_secure
-POSTGRES_USER=api_nuter
-POSTGRES_PASSWORD=password
+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

Docker/arbeitszeitmessung.json

@@ -1,292 +1,493 @@
 {
-	"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,
+                                255
+                              ]
+                            },
+                            "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,
+                255
+              ]
+            }
+          }
+        ],
+        "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,
+                        255
+                      ]
+                    },
+                    "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,
+                255
+              ]
+            }
+          }
+        ],
+        "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,
+                        255
+                      ]
+                    },
+                    "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=255)",
+        "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,
+                    255
+                  ]
+                },
+                "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,
+              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
+          }
+        }
+      }
+    }
+  }
 }

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
@@ -101,13 +90,13 @@ paths:
               - 2
               - 255
       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
@@ -139,13 +139,15 @@ paths:
               - 2
               - 255
       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:
@@ -155,16 +157,26 @@ paths:
       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':
+        "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:
@@ -188,7 +200,7 @@ components:
         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

@@ -20,18 +20,16 @@ services:
       - 8001:8080
   backend:
     build: ../Backend
-    image: git.letsstein.de/tom/arbeitszeit-backend
+    image: git.letsstein.de/tom/arbeitszeit-backend:0.1.1
     env_file:
       - .env
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_API_USER}
-      POSTGRES_PASS: ${POSTGRES_API_PASSWORD}
       EXPOSED_PORT: ${EXPOSED_PORT}
-      DEBUG: true
+      NO_CORS: true
     ports:
-      - 8000:8080
+      - ${EXPOSED_PORT}:8080
     depends_on:
       - db
   swagger:

Docker/docker-compose.yml

@@ -13,6 +13,8 @@ services:
     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
@@ -21,10 +23,9 @@ services:
     environment:
       POSTGRES_HOST: db
       POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_API_USER}
-      POSTGRES_PASS: ${POSTGRES_API_PASSWORD}
       EXPOSED_PORT: ${EXPOSED_PORT}
     ports:
       - ${EXPOSED_PORT}:8080
     depends_on:
       - db
+    restart: unless-stopped

Makefile

@@ -37,6 +37,11 @@ full_%:
 	make build_$*
 	make push_$*
 
-backend: login_registry
+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

db.sql

@@ -62,3 +62,87 @@ VALUES (
 -- @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;