Merge remote-tracking branch 'origin/dev/main' into dev/main

to sql

Backend/database.go

@@ -10,7 +10,7 @@ import (
 func OpenDatabase() (*sql.DB, error) {
 	dbHost := helper.GetEnv("POSTGRES_HOST", "localhost")
 	dbName := helper.GetEnv("POSTGRES_DB", "arbeitszeitmessung")
-	dbUser := helper.GetEnv("POSTGRES_API_USER", "arbeit_zeit")
+	dbUser := helper.GetEnv("POSTGRES_API_USER", "api_nutzer")
 	dbPassword := helper.GetEnv("POSTGRES_API_PASS", "password")
 
 	connStr := fmt.Sprintf("postgres://%s:%s@%s:5432/%s?sslmode=disable&TimeZone=Europe/Berlin", dbUser, dbPassword, dbHost, dbName)

Backend/endpoints/auto_logout.go

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

Backend/endpoints/team_presence.go

@@ -0,0 +1,45 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"log"
+	"net/http"
+)
+
+func TeamPresenceHandler(w http.ResponseWriter, r *http.Request){
+	helper.RequiresLogin(Session, w, r)
+	helper.SetCors(w)
+	switch r.Method {
+	case http.MethodGet:
+		teamPresence(w, r)
+		break
+	case http.MethodOptions:
+		// just support options header for non GET Requests from SWAGGER
+		w.WriteHeader(http.StatusOK)
+		break
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
+	}
+}
+
+func teamPresence(w http.ResponseWriter, r *http.Request){
+	user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+	if err != nil {
+		log.Println("Error getting user!", err)
+	}
+	team, err := user.GetTeamMembers()
+	teamPresence := make(map[bool][]models.User)
+	for _, user := range team {
+		present := user.CheckAnwesenheit()
+		teamPresence[present] = append(teamPresence[present], user)
+	}
+
+
+	if(err != nil){
+		log.Println("Error getting team", err)
+	}
+	templates.TeamPresencePage(teamPresence).Render(r.Context(), w)
+}

Backend/endpoints/time-create.go

@@ -69,6 +69,5 @@ func checkPassword(r *http.Request) bool {
 			return false
 		}
 	}
-	log.Println(authHeaders)
 	return authToken == authHeaders[_authStart:]
 }

Backend/endpoints/time.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
+	"sort"
 	"strconv"
 	"time"
 )
@@ -69,26 +70,63 @@ func getBookings(w http.ResponseWriter, r *http.Request) {
 	}
 	tsTo = tsTo.AddDate(0, 0, 1) // so that today is inside
 
-	bookings, err := (*models.Booking).GetBookingsGrouped(nil, user.CardUID, tsFrom, tsTo)
-	if err != nil {
-		log.Println("Error getting bookings: ", err)
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
+	workDays := (*models.WorkDay).GetWorkDays(nil, user.CardUID, tsFrom, tsTo)
+	sort.Slice(workDays, func(i, j int) bool {
+		return workDays[i].Day.After(workDays[j].Day)
+	})
+
 	if r.Header.Get("Accept") == "application/json" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(bookings)
+		json.NewEncoder(w).Encode(workDays)
 		return
 	}
+
 	ctx := context.WithValue(r.Context(), "user", user)
-	templates.TimePage(bookings).Render(ctx, w)
+	templates.TimePage(workDays).Render(ctx, w)
 }
 
 func updateBooking(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
+	var loc *time.Location
+	loc, err := time.LoadLocation(helper.GetEnv("TZ", "Europe/Berlin"))
+	if err != nil {
+		log.Println("Error loading location", err)
+		loc = time.Local
+	}
+	switch r.FormValue("action") {
+	case "add":
+		log.Println("Adding Booking")
+		user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
+		if err != nil {
+			log.Println("No user found!", err)
+		}
+
+		timestamp, err := time.ParseInLocation("2006-01-02|15:04", r.FormValue("date")+"|"+r.FormValue("timestamp"), loc)
+		log.Println(timestamp)
+		if err != nil {
+			log.Println("Error parsing timestamp", err)
+			return
+		}
+
+		var check_in_out int
+		check_in_out, err = strconv.Atoi(r.FormValue("check_in_out"))
+		if err != nil {
+			log.Println("Error parsing check_in_out", err)
+			return
+		}
+
+		newBooking := (*models.Booking).New(nil, user.CardUID, 0, int16(check_in_out))
+		newBooking.Timestamp = timestamp
+		err = newBooking.InsertTimestamp()
+		if err != nil {
+			log.Println("Error inserting booking", err)
+		}
+		break
+	case "change":
+		log.Println("Changing Booking")
 		for index, possibleBooking := range r.PostForm {
-		if index[:7] == "booking" {
+			if len(index) > 7 && index[:7] == "booking" {
 				booking_id, err := strconv.Atoi(index[8:])
 				if err != nil {
 					log.Println("Error parsing bookingId", err)
@@ -99,15 +137,18 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 					log.Println("Error getting booking!", err)
 					continue
 				}
-			parsedTime, err := time.ParseInLocation("15:04", possibleBooking[0], time.Local)
+				parsedTime, err := time.ParseInLocation("15:04", possibleBooking[0], booking.Timestamp.Location())
 				if err != nil {
 					log.Println("Error parsing time!", err)
 					continue
 				}
-			log.Println("Parsing time", parsedTime)
+				// log.Println("Parsing time", parsedTime)
 				booking.UpdateTime(parsedTime)
 			}
 		}
+		break
+	}
+
 	getBookings(w, r)
 }
 

Backend/endpoints/user-login.go

@@ -4,6 +4,7 @@ import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
+	"context"
 	"log"
 	"net/http"
 	"strconv"
@@ -34,22 +35,15 @@ func LoginHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-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 showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
+	r = r.WithContext(context.WithValue(r.Context(), "session", Session))
+	if helper.GetEnv("GO_ENV", "production") == "debug" {
+		// http.Redirect(w, r, "/time", http.StatusSeeOther)
+		templates.LoginPage(failed).Render(r.Context(), w)
+	}
+	if Session.Exists(r.Context(), "user") {
+		http.Redirect(w, r, "/time", http.StatusSeeOther)
+	}
 	templates.LoginPage(failed).Render(r.Context(), w)
 }
 
@@ -91,38 +85,3 @@ func loginUser(w http.ResponseWriter, r *http.Request) {
 	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/endpoints/user-settings.go

@@ -0,0 +1,76 @@
+package endpoints
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"arbeitszeitmessung/templates"
+	"log"
+	"net/http"
+)
+
+func UserSettingsHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	switch r.Method {
+	case http.MethodGet:
+		showUserPage(w, r, 0)
+		break
+	case http.MethodPost:
+		switch r.FormValue("action") {
+		case "change-pass":
+			changePassword(w, r)
+			break
+		case "logout-user":
+			logoutUser(w, r)
+			break
+		}
+
+		break
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+		break
+	}
+}
+
+// change user password and store salted hash in db
+func changePassword(w http.ResponseWriter, r *http.Request) {
+	err := r.ParseForm()
+	if err != nil {
+		log.Println("Error parsing form!", err)
+		http.Error(w, "Error parsing form error", http.StatusBadRequest)
+		return
+	}
+	password := r.FormValue("password")
+	newPassword := r.FormValue("new_password")
+	if password == "" || newPassword == "" || newPassword != r.FormValue("new_password_repeat") {
+		showUserPage(w, r, http.StatusBadRequest)
+		return
+	}
+	user, err := (*models.User).GetByPersonalNummer(nil, Session.GetInt(r.Context(), "user"))
+	if err != nil {
+		log.Println("Error getting user!", err)
+		showUserPage(w, r, http.StatusBadRequest)
+	}
+	auth, err := user.ChangePass(password, newPassword)
+	if err != nil {
+		log.Println("Error when changing password!", err)
+	}
+	if auth {
+		showUserPage(w, r, http.StatusAccepted)
+		return
+	}
+	showUserPage(w, r, http.StatusUnauthorized)
+}
+
+func logoutUser(w http.ResponseWriter, r *http.Request) {
+
+	err := Session.Destroy(r.Context())
+	if err != nil {
+		log.Println("Error destroying session!", err)
+	}
+	http.Redirect(w, r, "/user/login", http.StatusSeeOther)
+}
+
+func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
+	templates.UserPage(status).Render(r.Context(), w)
+	return
+}

Backend/helper/system.go

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

Backend/helper/web.go

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

Backend/main.go

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

Backend/models/booking.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"arbeitszeitmessung/helper"
 	"database/sql"
 	"fmt"
 	"log"
@@ -46,8 +47,9 @@ func (b *Booking) FromUrlParams(params url.Values) Booking {
 	return booking
 }
 
-func (b Booking) Verify() bool {
-	if b.CardUID == "" || b.GeraetID == 0 || b.CheckInOut == 0 {
+func (b *Booking) Verify() bool {
+	//check for overlapping time + arbeitszeit verstoß
+	if b.CardUID == "" { //|| b.GeraetID == 0 || b.CheckInOut == 0 {
 		return false
 	}
 	return true
@@ -68,6 +70,21 @@ func (b *Booking) Insert() error {
 	return nil
 }
 
+func (b *Booking) InsertTimestamp() error {
+	if b.Timestamp.IsZero() {
+		return b.Insert()
+	}
+	stmt, err := DB.Prepare((`INSERT INTO anwesenheit (card_uid, geraet_id, check_in_out, timestamp) VALUES ($1, $2, $3, $4) RETURNING counter_id`))
+	if err != nil {
+		return err
+	}
+	err = stmt.QueryRow(b.CardUID, b.GeraetID, b.CheckInOut, b.Timestamp).Scan(&b.CounterId)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (b *Booking) GetBookingById(booking_id int) (Booking, error) {
 	var booking Booking
 	qStr, err := DB.Prepare((`SELECT counter_id, timestamp, card_uid, geraet_id, check_in_out FROM anwesenheit WHERE counter_id = $1`))
@@ -78,10 +95,10 @@ func (b *Booking) GetBookingById(booking_id int) (Booking, error) {
 	if err != nil {
 		return booking, err
 	}
-	if !booking.Verify() {
-		fmt.Printf("Booking verification failed")
-		return booking, nil
-	}
+	// if !booking.Verify() {
+	// 	fmt.Printf("Booking verification failed! %d", )
+	// 	return booking, nil
+	// }
 	return booking, nil
 }
 
@@ -136,7 +153,7 @@ func (b *Booking) GetBookingsGrouped(card_uid string, tsFrom time.Time, tsTo tim
 			return bookings[i].Timestamp.Before(bookings[j].Timestamp)
 		})
 		workDay := WorkDay{Day: day, Bookings: bookings}
-		workDay.GetWorkTime()
+		workDay.getWorkTime()
 		result = append(result, workDay)
 	}
 
@@ -161,12 +178,23 @@ func (b Booking) Save() {
 }
 
 func (b *Booking) GetBookingType() string {
+	debug := (helper.GetEnv("GO_ENV", "production") == "debug")
 	switch b.CheckInOut {
-	case 1, 3: //manuelle Änderung
+	case 1: //manuelle Änderung
 		return "kommen"
-	case 2, 4: //manuelle Änderung
+	case 3:
+		if debug {
+			return "kommen manuell"
+		}
+		return "kommen"
+	case 2: //manuelle Änderung
 		return "gehen"
-	case 255:
+	case 4:
+		if debug {
+			return "gehen manuell"
+		}
+		return "gehen"
+	case 254:
 		return "abgemeldet"
 	default:
 		return "Buchungs Typ unbekannt"
@@ -217,13 +245,19 @@ func (b *Booking) UpdateTime(newTime time.Time) {
 	// TODO: add check for time overlap
 
 	var newBooking Booking
-	newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, time.Local)
+	newBooking.Timestamp = time.Date(b.Timestamp.Year(), b.Timestamp.Month(), b.Timestamp.Day(), hour, minute, 0, 0, b.Timestamp.Location())
 	if b.CheckInOut < 3 {
 		newBooking.CheckInOut = b.CheckInOut + 2
 	}
-	if b.CheckInOut == 255 {
+	if b.CheckInOut == 254 {
 		newBooking.CheckInOut = 4
 	}
+	log.Println("Updating")
 	b.Update(newBooking)
+	b.Verify()
 	b.Save()
 }
+
+func (b *Booking) ToString() string {
+	return fmt.Sprintf("Booking %d: at: %s, as type: %d", b.CounterId, b.Timestamp.Format("15:04"), b.CheckInOut)
+}

Backend/models/user.go

@@ -17,7 +17,7 @@ type User struct {
 	Name              string  `json:"name"`
 	Vorname           string  `json:"vorname"`
 	PersonalNummer    int     `json:"personal_nummer"`
-	Arbeitszeit    float32 `json:"arbeitszeit"`
+	ArbeitszeitPerTag float32 `json:"arbeitszeit"`
 }
 
 func (u *User) GetUserFromSession(Session *scs.SessionManager, ctx context.Context) (User, error) {
@@ -68,7 +68,7 @@ func (u *User) GetAll() ([]User, error) {
 // Returns true if there is a booking 1 for today -> meaning the user is at work
 // Returns false if there is no booking today or the user is already booked out of the system
 func (u *User) CheckAnwesenheit() bool {
-	qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp" >= now()::date + interval '1h' ORDER BY "timestamp" DESC`))
+	qStr, err := DB.Prepare((`SELECT check_in_out FROM anwesenheit WHERE card_uid = $1 AND "timestamp"::date = now()::date ORDER BY "timestamp" DESC LIMIT 1;`))
 	if err != nil {
 		fmt.Printf("Error preparing query statement %v\n", err)
 		return false
@@ -79,12 +79,12 @@ func (u *User) CheckAnwesenheit() bool {
 	if err != nil {
 		return false
 	}
-	return check_in_out == 1
+	return check_in_out%2 == 1
 }
 
-// Creates a new booking for the user -> check_in_out will be 255 for automatic check out
-func (u *User) Logout() error {
-	booking := (*Booking).New(nil, u.CardUID, 0, 255)
+// Creates a new booking for the user -> check_in_out will be 254 for automatic check out
+func (u *User) CheckOut() error {
+	booking := (*Booking).New(nil, u.CardUID, 0, 254)
 	err := booking.Insert()
 	if err != nil {
 		fmt.Printf("Error inserting booking %v\n", err)
@@ -100,7 +100,7 @@ func (u *User) GetByPersonalNummer(personalNummer int) (User, error) {
 	if err != nil {
 		return user, err
 	}
-	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit)
+	err = qStr.QueryRow(personalNummer).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag)
 
 	if err != nil {
 		return user, err
@@ -167,6 +167,15 @@ func (u *User) GetTeamMembers() ([]User, error) {
 	return teamMembers, nil
 }
 
+func (u *User) IsTeamLeader() bool {
+	team, err := u.GetTeamMembers()
+	if err != nil {
+		log.Println("Error getting team Members", err)
+		return false
+	}
+	return len(team) > 0
+}
+
 func (u *User) GetWeek(tsFrom time.Time) WorkWeek {
 	var bookings []WorkDay
 	weekStart := tsFrom.AddDate(0, 0, -1*int(tsFrom.Local().Weekday())-1)
@@ -187,7 +196,7 @@ func (u *User) GetNextWeek() WorkWeek {
 
 func parseUser(rows *sql.Rows) (User, error) {
 	var user User
-	if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.Arbeitszeit); err != nil {
+	if err := rows.Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag); err != nil {
 		log.Println("Error scanning row!", err)
 		return user, err
 	}
@@ -219,6 +228,22 @@ func (u *User) GetLastSubmission() time.Time {
 	return lastSub
 }
 
+func (u *User) GetFromCardUID(card_uid string) (User, error) {
+	user := User{}
+	var err error
+
+	qStr, err := DB.Prepare((`SELECT personal_nummer, card_uid, vorname, nachname, arbeitszeit_per_tag FROM personal_daten WHERE card_uid = $1;`))
+	if err != nil {
+		return user, err
+	}
+	err = qStr.QueryRow(card_uid).Scan(&user.PersonalNummer, &user.CardUID, &user.Vorname, &user.Name, &user.ArbeitszeitPerTag)
+
+	if err != nil {
+		return user, err
+	}
+	return user, nil
+}
+
 func getMonday(ts time.Time) time.Time {
 	if ts.Weekday() != time.Monday {
 		if ts.Weekday() == time.Sunday {

Backend/models/workDay.go

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

Backend/src/main.css

@@ -30,7 +30,7 @@
 @layer components {
   .grid-main {
     display: grid;
-        grid-template-columns: repeat(6, 1fr);
+    grid-template-columns: 2fr auto 1fr;
     align-items: stretch;
   }
 

Backend/static/css/styles.css

@@ -582,6 +582,9 @@
   .h-4 {
     height: calc(var(--spacing) * 4);
   }
+  .h-8 {
+    height: calc(var(--spacing) * 8);
+  }
   .h-\[100vh\] {
     height: 100vh;
   }
@@ -606,6 +609,9 @@
   .flex-grow {
     flex-grow: 1;
   }
+  .grow {
+    flex-grow: 1;
+  }
   .grow-1 {
     flex-grow: 1;
   }
@@ -710,6 +716,9 @@
   .bg-red-600 {
     background-color: var(--color-red-600);
   }
+  .p-1 {
+    padding: calc(var(--spacing) * 1);
+  }
   .p-2 {
     padding: calc(var(--spacing) * 2);
   }
@@ -769,6 +778,30 @@
     --tw-duration: 300ms;
     transition-duration: 300ms;
   }
+  .group-hover\:text-black {
+    &:is(:where(.group):hover *) {
+      @media (hover: hover) {
+        color: var(--color-black);
+      }
+    }
+  }
+  .group-hover\:text-white {
+    &:is(:where(.group):hover *) {
+      @media (hover: hover) {
+        color: var(--color-white);
+      }
+    }
+  }
+  .group-\[\.edit\]\:block {
+    &:is(:where(.group):is(.edit) *) {
+      display: block;
+    }
+  }
+  .group-\[\.edit\]\:flex {
+    &:is(:where(.group):is(.edit) *) {
+      display: flex;
+    }
+  }
   .group-\[\.edit\]\:hidden {
     &:is(:where(.group):is(.edit) *) {
       display: none;
@@ -882,6 +915,11 @@
       grid-column: span 3 / span 3;
     }
   }
+  .md\:col-span-4 {
+    @media (width >= 48rem) {
+      grid-column: span 4 / span 4;
+    }
+  }
   .md\:mx-\[10\%\] {
     @media (width >= 48rem) {
       margin-inline: 10%;
@@ -912,6 +950,11 @@
       padding-inline: calc(var(--spacing) * 4);
     }
   }
+  .md\:text-transparent {
+    @media (width >= 48rem) {
+      color: transparent;
+    }
+  }
   .group-\[\.edit\]\:md\:block {
     &:is(:where(.group):is(.edit) *) {
       @media (width >= 48rem) {
@@ -928,7 +971,7 @@
 @layer components {
   .grid-main {
     display: grid;
-    grid-template-columns: repeat(6, 1fr);
+    grid-template-columns: 2fr auto 1fr;
     align-items: stretch;
   }
   .grid-sub {

Backend/static/script.js

@@ -1,12 +1,26 @@
 function editDay(element, event, formId) {
   var form = element
     .closest(".grid-sub")
-    .querySelector(".time-component > form");
+    .querySelector(".all-booking-component > form");
   form.classList.toggle("edit");
   element.classList.toggle("edit");
   if (element.classList.contains("edit")) {
     event.preventDefault();
+    form.querySelectorAll("input, select").forEach((input) => {
+      input.disabled = false;
+    });
   } else {
     form.submit();
   }
 }
+
+function editAbwesenheit(element, event) {
+  var newBookingComponent = element
+    .closest(".grid-sub")
+    .querySelector(".new-booking-component");
+  if (element.value == 0) {
+    newBookingComponent.style.display = "";
+  } else {
+    newBookingComponent.style.display = "none";
+  }
+}

Backend/templates/headerComponent.templ

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

Backend/templates/headerComponent_templ.go

@@ -29,7 +29,17 @@ func headerComponent() templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-row justify-between md:mx-[10%] py-2\"><a href=\"/time\">Zeitverwaltung</a> <a href=\"/team\">Mitarbeiter</a> <a href=\"/user\">Nutzer</a></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"flex flex-row justify-between md:mx-[10%] py-2\"><a href=\"/time\">Zeitverwaltung</a> <a href=\"/team\">Abrechnung</a> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if true {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<a href=\"/team/presence\">Anwesenheit</a> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<a href=\"/user/settings\">Einstellungen</a></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/pages.templ

@@ -22,8 +22,8 @@ templ TimePage(workDays []models.WorkDay) {
 	@headerComponent()
 	<div class="grid-main divide-y-1">
 		@inputForm()
-		for _, bookingGroup := range workDays {
-			@dayComponent(bookingGroup)
+		for _, day := range workDays {
+			@dayComponent(day)
 		}
 	</div>
 	@LegendComponent()
@@ -60,12 +60,21 @@ templ UserPage(status int) {
 						<p class="text-red-600 text-sm">Aktuelles Passwort nicht korrekt!</p>
 					case status >= 400:
 						<p class="text-red-600 text-sm">Passwortwechsel fehlgeschlagen, bitte erneut versuchen!</p>
-					case status == 200:
+					case status == 202:
 						<p class="text-accent text-sm">Passwortänderung erfolgreich</p>
 				}
 			</div>
 			<div class="grid-cell">
-				<button type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Ändern</button>
+				<button name="action" value="change-pass" type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Ändern</button>
+			</div>
+		</form>
+		<form method="POST" class="grid-sub divide-x-1">
+			<h1 class="grid-cell font-bold uppercase text-xl text-center">Nutzer abmelden</h1>
+			<div class="grid-cell col-span-3">
+				<p>Nutzer von Weboberfläche abmelden.</p>
+			</div>
+			<div class="grid-cell">
+				<button name="action" value="logout-user" type="submit" class="w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50">Abmelden</button>
 			</div>
 		</form>
 	</div>
@@ -115,3 +124,26 @@ templ NavPage() {
 		</div>
 	</div>
 }
+
+templ TeamPresencePage(teamPresence map[bool][]models.User) {
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		<div class="grid-sub divide-x-1">
+			<h2 class="grid-cell font-bold uppercase">Anwesend</h2>
+			<div class="flex flex-col col-span-2 md:col-span-4">
+				for _, user := range teamPresence[true] {
+					@userPresenceComponent(user, true)
+				}
+			</div>
+		</div>
+		<div class="grid-sub divide-x-1">
+			<h2 class="grid-cell font-bold uppercase">Nicht Anwesend</h2>
+			<div class="flex flex-col col-span-2 md:col-span-4">
+				for _, user := range teamPresence[false] {
+					@userPresenceComponent(user, false)
+				}
+			</div>
+		</div>
+	</div>
+}

Backend/templates/pages_templ.go

@@ -81,8 +81,8 @@ func TimePage(workDays []models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for _, bookingGroup := range workDays {
-			templ_7745c5c3_Err = dayComponent(bookingGroup).Render(ctx, templ_7745c5c3_Buffer)
+		for _, day := range workDays {
+			templ_7745c5c3_Err = dayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -186,13 +186,13 @@ func UserPage(status int) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-		case status == 200:
+		case status == 202:
 			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\"text-accent text-sm\">Passwortänderung erfolgreich</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div><div class=\"grid-cell\"><button type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Ändern</button></div></form></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div><div class=\"grid-cell\"><button name=\"action\" value=\"change-pass\" type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Ändern</button></div></form><form method=\"POST\" class=\"grid-sub divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Nutzer abmelden</h1><div class=\"grid-cell col-span-3\"><p>Nutzer von Weboberfläche abmelden.</p></div><div class=\"grid-cell\"><button name=\"action\" value=\"logout-user\" type=\"submit\" class=\"w-full cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Abmelden</button></div></form></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -238,7 +238,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 		var templ_7745c5c3_Var6 string
 		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 82, Col: 111}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 91, Col: 111}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -287,7 +287,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 		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}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 109, Col: 85}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
@@ -344,4 +344,61 @@ func NavPage() templ.Component {
 	})
 }
 
+func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var11 == nil {
+			templ_7745c5c3_Var11 = 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, 20, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1\"><h2 class=\"grid-cell font-bold uppercase\">Anwesend</h2><div class=\"flex flex-col col-span-2 md:col-span-4\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, user := range teamPresence[true] {
+			templ_7745c5c3_Err = userPresenceComponent(user, true).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</div></div><div class=\"grid-sub divide-x-1\"><h2 class=\"grid-cell font-bold uppercase\">Nicht Anwesend</h2><div class=\"flex flex-col col-span-2 md:col-span-4\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, user := range teamPresence[false] {
+			templ_7745c5c3_Err = userPresenceComponent(user, false).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
 var _ = templruntime.GeneratedTemplate

Backend/templates/teamComponents.templ

@@ -17,6 +17,15 @@ templ weekDayComponent(user models.User, day models.WorkDay) {
 				<span class="text-accent">{ work }</span>
 				<span class="text-neutral-500">{ pause }</span>
 			</div>
+			<div class="flex flex-row gap-2 items-center">
+				<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="size-4" viewBox="0 0 16 16">
+					<path d="M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z"></path>
+					<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0"></path>
+				</svg>
+				<span>{ day.TimeFrom.Format("15:04") }</span>
+				<span>-</span>
+				<span>{ day.TimeTo.Format("15:04") }</span>
+			</div>
 		</div>
 	</div>
 }
@@ -25,7 +34,7 @@ templ employeComponent(week models.WorkWeek) {
 	{{
 		year, kw := week.WeekStart.ISOWeek()
 	}}
-	<div class="grid-sub divide-x-1">
+	<div class="employeComponent grid-sub divide-x-1">
 		<div class="grid-cell">
 			<p class="font-bold uppercase">{ week.User.Vorname } { week.User.Name }</p>
 			<p class="text-sm">Arbeitszeit</p>
@@ -47,3 +56,14 @@ templ employeComponent(week models.WorkWeek) {
 		</form>
 	</div>
 }
+
+templ userPresenceComponent(user models.User, present bool) {
+	<div class="grid-cell group flex flex-row gap-2">
+		if present {
+			<div class="h-8 bg-accent rounded-md group-hover:text-black md:text-transparent text-center p-1">Anwesend</div>
+		} else {
+			<div class="h-8 bg-red-600 rounded-md group-hover:text-white md:text-transparent text-center p-1">Abwesend</div>
+		}
+		<p>{ user.Vorname } { user.Name }</p>
+	</div>
+}

Backend/templates/teamComponents_templ.go

@@ -97,7 +97,33 @@ func weekDayComponent(user models.User, day models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</span></div></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</span></div><div class=\"flex flex-row gap-2 items-center\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"size-4\" viewBox=\"0 0 16 16\"><path d=\"M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z\"></path> <path d=\"M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0\"></path></svg> <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeFrom.Format("15:04"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 25, Col: 40}
+		}
+		_, 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, 7, "</span> <span>-</span> <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(day.TimeTo.Format("15:04"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 27, Col: 38}
+		}
+		_, 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, "</span></div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -121,53 +147,53 @@ func employeComponent(week models.WorkWeek) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var6 == nil {
-			templ_7745c5c3_Var6 = templ.NopComponent
+		templ_7745c5c3_Var8 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var8 == nil {
+			templ_7745c5c3_Var8 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
 		year, kw := week.WeekStart.ISOWeek()
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 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\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<div class=\"employeComponent grid-sub divide-x-1\"><div class=\"grid-cell\"><p class=\"font-bold uppercase\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(week.GetWorkHourString())
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Vorname)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 32, Col: 52}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 39, Col: 53}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</p></div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(week.User.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 39, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</p><p class=\"text-sm\">Arbeitszeit</p><p class=\"text-accent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(week.GetWorkHourString())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 41, Col: 52}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</p></div><div class=\"grid-cell col-span-3 flex flex-col gap-2\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -177,46 +203,116 @@ func employeComponent(week models.WorkWeek) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div><form class=\"grid-cell flex flex-col justify-between gap-2\" method=\"post\"><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
-		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=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div><form class=\"grid-cell flex flex-col justify-between gap-2\" method=\"post\"><p class=\"text-sm\"><span class=\"\">Woche:</span> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(week.WeekStart.Format(time.DateOnly))
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%02d-%d", kw, year))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 43, Col: 80}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 49, Col: 85}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\"> <button type=\"submit\" class=\"w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><p class=\"\">Bestätigen</p></button></form></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</p><input type=\"hidden\" name=\"method\" value=\"accept\"> <input type=\"hidden\" name=\"user\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(week.User.PersonalNummer))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 51, Col: 82}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "\"> <input type=\"hidden\" name=\"week\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var14 string
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(week.WeekStart.Format(time.DateOnly))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 52, Col: 80}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"> <button type=\"submit\" class=\"w-full bg-neutral-100 cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\"><p class=\"\">Bestätigen</p></button></form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func userPresenceComponent(user models.User, present bool) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var15 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var15 == nil {
+			templ_7745c5c3_Var15 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"grid-cell group flex flex-row gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if present {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<div class=\"h-8 bg-accent rounded-md group-hover:text-black md:text-transparent text-center p-1\">Anwesend</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<div class=\"h-8 bg-red-600 rounded-md group-hover:text-white md:text-transparent text-center p-1\">Abwesend</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 67, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/teamComponents.templ`, Line: 67, Col: 33}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/timeComponents.templ

@@ -14,14 +14,14 @@ templ inputForm() {
 		user := ctx.Value("user").(models.User)
 	}}
 	<div class="grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col">
-		<div class="grid-cell col-span-2 md:col-span-1 max-md:grid grid-cols-2">
+		<div class="grid-cell md:col-span-1 max-md:grid grid-cols-2">
 			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
 			<div class="justify-self-end">
 				<p class="text-sm">Überstunden</p>
-				<p class="text-accent">4h 32min</p>
+				<p class="text-accent">0h 0min (statisch)</p>
 			</div>
 		</div>
-		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row col-span-3 md:col-span-3 gap-2 ">
+		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row md:col-span-3 gap-2 ">
 			@lineComponent()
 			<div class="flex flex-col gap-2 justify-between grow-1">
 				<input type="date" value={ urlParams.Get("time_from") } name="time_from" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum von..."/>
@@ -39,12 +39,17 @@ templ inputForm() {
 templ dayComponent(workDay models.WorkDay) {
 	{{
 		work, pause := workDay.GetWorkTimeString()
+		justify := ""
+		if len(workDay.Bookings) <= 1 {
+			justify = "justify-content: center"
+		}
 	}}
 	<div class="grid-sub divide-x-1 hover:bg-neutral-200 transition-colors">
-		<div class="grid-cell col-span-2 md:col-span-1 flex flex-row gap-2">
+		<div class="grid-cell md:col-span-1 flex flex-row gap-2">
 			@timeGaugeComponent(workDay.GetWorkDayProgress(ctx.Value("user").(models.User)), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)), workDay.RequiresAction())
 			<div>
 				<p class=""><span class="font-bold uppercase hidden md:inline">{ workDay.Day.Format("Mon") }:</span> { workDay.Day.Format("02.01.2006") }</p>
+				if work!="" {
 					<p class=" text-sm mt-1">Arbeitszeit:</p>
 					if (workDay.RequiresAction()) {
 						<p class="text-red-600">Bitte anpassen</p>
@@ -52,14 +57,24 @@ templ dayComponent(workDay models.WorkDay) {
 						<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">
+		<div class="all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell">
 			@lineComponent()
-			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 justify-between group w-full" method="post">
+			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 group w-full justify-between" style={ justify } method="post">
+				if len(workDay.Bookings) <= 1 && workDay.Bookings[len(workDay.Bookings)-1].CounterId == 0 {
+					<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+					@absenceComponent(workDay)
+					@newBookingComponent(workDay)
+				} else {
+					@absenceComponent(workDay)
 					for _, booking := range workDay.Bookings {
 						@bookingComponent(booking)
 					}
+					@newBookingComponent(workDay)
+				}
+				<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
 			</form>
 		</div>
 		<div class="grid-cell">
@@ -69,11 +84,12 @@ templ dayComponent(workDay models.WorkDay) {
 }
 
 templ changeButtonComponent(id string) {
-	<button type="button" class="cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group" type="button" onclick={ templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id) }>
+	<button class="cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group" type="submit" onclick={ templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id) }>
 		<p class="hidden md:block group-[.edit]:hidden">Ändern</p>
-		<p class="hidden group-[.edit]:md:block">Submit</p>
-		<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>
+		<p class="hidden group-[.edit]:md:block">Absenden</p>
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4 md:hidden">
+			<path class="group-[.edit]:hidden md:hidden" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325"></path>
+			<path class="hidden group-[.edit]:block md:hidden" d="M12.736 3.97a.733.733 0 0 1 j1.047 0c.286.289.29.756.01 1.05L7.88 12.01a.733.733 0 0 1-1.065.02L3.217 8.384a.757.757 0 0 1 0-1.06.733.733 0 0 1 1.047 0l3.052 3.093 5.4-6.425z"></path>
 		</svg>
 	</button>
 }
@@ -120,11 +136,41 @@ templ lineComponent() {
 	</div>
 }
 
+templ absenceComponent(d models.WorkDay) {
+	<div class="no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center">
+		<select name="abwesenheit" onchange={ templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event")) } class="grow cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm transition-colors border-neutral-900" disabled>
+			<option value="0">Abwesenheit?</option>
+			<option value="1">Urlaub</option>
+			<option value="2">Kurzarbeit</option>
+			<option value="3">Krank</option>
+			<option value="4">Kindkrank</option>
+		</select>
+	</div>
+}
+
+templ newBookingComponent(d models.WorkDay) {
+	<div class="new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center">
+		<button name="action" value="add" type="submit" class="hover:text-accent cursor-pointer">
+			<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="size-4 transition-colors" viewBox="0 0 16 16">
+				<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"></path>
+				<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4"></path>
+			</svg>
+		</button>
+		<input name="timestamp" type="time" value={ time.Now().Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300"/>
+		<input name="date" type="hidden" value={ d.Day.Format("2006-01-02") }/>
+		<select name="check_in_out">
+			<option value="0" disabled>Kommen/Gehen</option>
+			<option value="3" selected?={ d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 }>Kommen</option>
+			<option value="4" selected?={ d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 }>Gehen</option>
+		</select>
+	</div>
+}
+
 templ bookingComponent(booking models.Booking) {
 	<div>
 		<p class="text-neutral-500">
 			<span class="text-neutral-700 group-[.edit]:hidden inline">{ booking.Timestamp.Format("15:04") }</span>
-			<input name={ "booking_" + strconv.Itoa(booking.CounterId) } type="time" value={ booking.Timestamp.Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300"/>
+			<input disabled name={ "booking_" + strconv.Itoa(booking.CounterId) } type="time" value={ booking.Timestamp.Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300"/>
 			{ booking.GetBookingType() }
 		</p>
 	</div>

Backend/templates/timeComponents_templ.go

@@ -40,7 +40,7 @@ func inputForm() templ.Component {
 
 		urlParams := ctx.Value("urlParams").(url.Values)
 		user := ctx.Value("user").(models.User)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col\"><div class=\"grid-cell col-span-2 md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col\"><div class=\"grid-cell md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -53,7 +53,7 @@ func inputForm() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</p><div class=\"justify-self-end\"><p class=\"text-sm\">Überstunden</p><p class=\"text-accent\">4h 32min</p></div></div><form id=\"timeRangeForm\" method=\"GET\" class=\"grid-cell flex flex-row col-span-3 md:col-span-3 gap-2 \">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</p><div class=\"justify-self-end\"><p class=\"text-sm\">Überstunden</p><p class=\"text-accent\">0h 0min (statisch)</p></div></div><form id=\"timeRangeForm\" method=\"GET\" class=\"grid-cell flex flex-row md:col-span-3 gap-2 \">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -118,7 +118,11 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		ctx = templ.ClearChildren(ctx)
 
 		work, pause := workDay.GetWorkTimeString()
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"grid-sub divide-x-1 hover:bg-neutral-200 transition-colors\"><div class=\"grid-cell col-span-2 md:col-span-1 flex flex-row gap-2\">")
+		justify := ""
+		if len(workDay.Bookings) <= 1 {
+			justify = "justify-content: center"
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"grid-sub divide-x-1 hover:bg-neutral-200 transition-colors\"><div class=\"grid-cell md:col-span-1 flex flex-row gap-2\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -133,7 +137,7 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		var templ_7745c5c3_Var6 string
 		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Day.Format("Mon"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 47, Col: 94}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 94}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -146,54 +150,64 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		var templ_7745c5c3_Var7 string
 		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Day.Format("02.01.2006"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 47, Col: 139}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 51, Col: 139}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p><p class=\" text-sm mt-1\">Arbeitszeit:</p>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if work != "" {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\" text-sm mt-1\">Arbeitszeit:</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			if workDay.RequiresAction() {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p class=\"text-red-600\">Bitte anpassen</p>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<p class=\"text-red-600\">Bitte anpassen</p>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<p class=\" text-accent\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<p class=\" text-accent\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var8 string
 				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(work)
 				if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 52, Col: 35}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 57, Col: 36}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</p>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</p>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<p class=\"text-neutral-500\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " <p class=\"text-neutral-500\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var9 string
 			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(pause)
 			if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 54, Col: 39}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 59, Col: 40}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</p></div></div><div class=\"time-component flex flex-row col-span-3 md:col-span-3 gap-2 w-full grid-cell\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</div></div><div class=\"all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -201,20 +215,55 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<form id=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<form id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var10 string
 		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("time-" + workDay.Day.Format("2006-01-02"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 59, Col: 56}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 65, Col: 56}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\" class=\"flex flex-col gap-2 justify-between group w-full\" method=\"post\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "\" class=\"flex flex-col gap-2 group w-full justify-between\" style=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(justify)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 65, Col: 131}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\" method=\"post\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(workDay.Bookings) <= 1 && workDay.Bookings[len(workDay.Bookings)-1].CounterId == 0 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"text group-[.edit]:hidden\">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = absenceComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			templ_7745c5c3_Err = absenceComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -224,7 +273,16 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 					return templ_7745c5c3_Err
 				}
 			}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</form></div><div class=\"grid-cell\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = newBookingComponent(workDay).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<input type=\"hidden\" name=\"action\" value=\"change\"><!-- default action value for ändern button --></form></div><div class=\"grid-cell\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -232,7 +290,7 @@ func dayComponent(workDay models.WorkDay) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -256,25 +314,25 @@ func changeButtonComponent(id string) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var11 == nil {
-			templ_7745c5c3_Var11 = templ.NopComponent
+		templ_7745c5c3_Var12 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var12 == nil {
+			templ_7745c5c3_Var12 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<button type=\"button\" class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group\" type=\"button\" onclick=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<button class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors border-neutral-900 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50 group\" type=\"submit\" onclick=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var12 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
+		var templ_7745c5c3_Var13 templ.ComponentScript = templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\"><p class=\"hidden md:block group-[.edit]:hidden\">Ändern</p><p class=\"hidden group-[.edit]:md:block\">Submit</p><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\" fill=\"currentColor\" class=\"w-4 h-4 md:hidden\"><path d=\"m11.645 20.91-.007-.003-.022-.012a15.247 15.247 0 0 1-.383-.218 25.18 25.18 0 0 1-4.244-3.17C4.688 15.36 2.25 12.174 2.25 8.25 2.25 5.322 4.714 3 7.688 3A5.5 5.5 0 0 1 12 5.052 5.5 5.5 0 0 1 16.313 3c2.973 0 5.437 2.322 5.437 5.25 0 3.925-2.438 7.111-4.739 9.256a25.175 25.175 0 0 1-4.244 3.17 15.247 15.247 0 0 1-.383.219l-.022.012-.007.004-.003.001a.752.752 0 0 1-.704 0l-.003-.001Z\"></path></svg></button>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\"><p class=\"hidden md:block group-[.edit]:hidden\">Ändern</p><p class=\"hidden group-[.edit]:md:block\">Absenden</p><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\" fill=\"currentColor\" class=\"w-4 h-4 md:hidden\"><path class=\"group-[.edit]:hidden md:hidden\" d=\"M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325\"></path> <path class=\"hidden group-[.edit]:block md:hidden\" d=\"M12.736 3.97a.733.733 0 0 1 j1.047 0c.286.289.29.756.01 1.05L7.88 12.01a.733.733 0 0 1-1.065.02L3.217 8.384a.757.757 0 0 1 0-1.06.733.733 0 0 1 1.047 0l3.052 3.093 5.4-6.425z\"></path></svg></button>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -298,9 +356,9 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var13 == nil {
-			templ_7745c5c3_Var13 = templ.NopComponent
+		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var14 == nil {
+			templ_7745c5c3_Var14 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
@@ -323,65 +381,65 @@ func timeGaugeComponent(progress uint8, today bool, warning bool) templ.Componen
 			break
 		}
 		if today {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<div class=\"flex-start flex w-2 h-full overflow-hidden rounded-full bg-neutral-300 print:hidden\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var14 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var14...)
+			var templ_7745c5c3_Var15 = []any{"flex w-full items-center justify-center overflow-hidden  rounded-full", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var15...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<div class=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var15 string
-			templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var14).String())
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 1, Col: 0}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\" style=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div class=\"")
 			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)))
+			templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var15).String())
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 104, Col: 149}
+				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_Var16))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\"></div></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\" style=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var17 string
+			templ_7745c5c3_Var17, 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: 120, Col: 149}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "\"></div></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		} else {
-			var templ_7745c5c3_Var17 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var17...)
+			var templ_7745c5c3_Var18 = []any{"w-2 h-full bg-accent rounded-md", bgColor}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var18...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var18 string
-			templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var17).String())
+			var templ_7745c5c3_Var19 string
+			templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var18).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_Var18))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\"></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "\"></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -406,12 +464,133 @@ func lineComponent() 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 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, 33, "<div class=\"flex flex-col w-2 py-2 items-center text-accent print:hidden\"><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg><div class=\"w-[2px] bg-accent flex-grow -my-1\"></div><svg class=\"size-2\" viewBox=\"0 0 24 24\" fill=\"currentColor\"><polygon points=\"12,2 22,12 12,22 2,12\"></polygon></svg></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func absenceComponent(d models.WorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var21 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var21 == nil {
+			templ_7745c5c3_Var21 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event")))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<select name=\"abwesenheit\" onchange=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var22 templ.ComponentScript = templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event"))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "\" class=\"grow cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm transition-colors border-neutral-900\" disabled><option value=\"0\">Abwesenheit?</option> <option value=\"1\">Urlaub</option> <option value=\"2\">Kurzarbeit</option> <option value=\"3\">Krank</option> <option value=\"4\">Kindkrank</option></select></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func newBookingComponent(d models.WorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var23 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var23 == nil {
+			templ_7745c5c3_Var23 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<div class=\"new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center\"><button name=\"action\" value=\"add\" type=\"submit\" class=\"hover:text-accent cursor-pointer\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" class=\"size-4 transition-colors\" viewBox=\"0 0 16 16\"><path d=\"M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16\"></path> <path d=\"M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4\"></path></svg></button> <input name=\"timestamp\" type=\"time\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(time.Now().Format("15:04"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 159, Col: 72}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> <input name=\"date\" type=\"hidden\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var25 string
+		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(d.Day.Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 160, Col: 69}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "\"> <select name=\"check_in_out\"><option value=\"0\" disabled>Kommen/Gehen</option> <option value=\"3\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, ">Kommen</option> <option value=\"4\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, " selected")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, ">Gehen</option></select></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -435,64 +614,64 @@ func bookingComponent(booking models.Booking) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var20 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var20 == nil {
-			templ_7745c5c3_Var20 = templ.NopComponent
+		templ_7745c5c3_Var26 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var26 == nil {
+			templ_7745c5c3_Var26 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div><p class=\"text-neutral-500\"><span class=\"text-neutral-700 group-[.edit]:hidden inline\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<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.Timestamp.Format("15:04"))
+		var templ_7745c5c3_Var27 string
+		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 126, Col: 97}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 172, Col: 97}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</span> <input name=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "</span> <input disabled name=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs("booking_" + strconv.Itoa(booking.CounterId))
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs("booking_" + strconv.Itoa(booking.CounterId))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 127, Col: 61}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 173, Col: 70}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "\" type=\"time\" value=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "\" 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.Timestamp.Format("15:04"))
+		var templ_7745c5c3_Var29 string
+		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(booking.Timestamp.Format("15:04"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 127, Col: 117}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 173, Col: 126}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\" class=\"text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300\"> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "\" 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())
+		var templ_7745c5c3_Var30 string
+		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(booking.GetBookingType())
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 128, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timeComponents.templ`, Line: 174, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "</p></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -516,12 +695,12 @@ func LegendComponent() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var25 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var25 == nil {
-			templ_7745c5c3_Var25 = templ.NopComponent
+		templ_7745c5c3_Var31 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var31 == nil {
+			templ_7745c5c3_Var31 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<div class=\"flex flex-row gap-4 md:mx-[10%] print:hidden\"><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-red-600\"></div><span>Fehler</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-orange-500\"></div><span>Arbeitszeit unter regulär</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-accent\"></div><span>Arbeitszeit vollständig</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-purple-600\"></div><span>Überstunden</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-neutral-400\"></div><span>Keine Buchungen</span></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "<div class=\"flex flex-row gap-4 md:mx-[10%] print:hidden\"><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-red-600\"></div><span>Fehler</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-orange-500\"></div><span>Arbeitszeit unter regulär</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-accent\"></div><span>Arbeitszeit vollständig</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-purple-600\"></div><span>Überstunden</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-neutral-400\"></div><span>Keine Buchungen</span></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

DB/initdb/01_create_tables.sql

@@ -70,6 +70,14 @@ CREATE TABLE "wochen_report" (
     UNIQUE ("personal_nummer", "woche_start")
 );
 
+DROP TABLE IF EXISTS "abwesenheiten";
+CREATE TABLE "abwesenheiten" (
+    "counter_id" bigserial PRIMARY KEY,
+    "card_uid" varchar(255),
+    "abwesenheit_typ" int2,
+    "datum" timestamptz(6) DEFAULT NOW()::DATE
+    );
+
 -- Adds crypto extension
 
 CREATE EXTENSION IF NOT EXISTS pgcrypto;

DB/initdb/02_create_user.sh

@@ -4,7 +4,7 @@ set -e  # Exit on error
 echo "Creating PostgreSQL user and setting permissions... $POSTGRES_USER for API user $POSTGRES_API_USER"
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-    CREATE USER $POSTGRES_API_USER WITH ENCRYPTED PASSWORD '$POSTGRES_API_PASSWORD';
+    CREATE USER $POSTGRES_API_USER WITH ENCRYPTED PASSWORD '$POSTGRES_API_PASS';
     GRANT CONNECT ON DATABASE $POSTGRES_DB TO $POSTGRES_API_USER;
     GRANT USAGE ON SCHEMA public TO $POSTGRES_API_USER;
     GRANT SELECT, INSERT, UPDATE ON anwesenheit, personal_daten, user_password, wochen_report TO $POSTGRES_API_USER;

Docker/.env.example

@@ -8,3 +8,4 @@ EXPOSED_PORT=8000
 TZ=Europe/Berlin
 PGTZ=Europe/Berlin
 API_TOKEN=dont_access
+EMPTY_DAYS=false

Docker/arbeitszeitmessung.json

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

Docker/arbeitszeitmessung.yaml

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

Docker/docker-compose.dev.yml

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

Readme.md

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

db.sql

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