reworked pdf exporter to use typst

Reviewed-on: #51

.gitea/workflows/test.yaml

@@ -23,7 +23,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
+        with:
+          # Disabling shallow clone is recommended for improving relevancy of reporting
+          fetch-depth: 0
       - name: Setup go
         uses: actions/setup-go@v5
         with:
@@ -45,4 +47,25 @@ jobs:
           restore-keys: |-
             arbeitszeitmessung-
       - name: Run Go Tests
-        run: cd Backend && go test ./...
+        run: cd Backend && mkdir .test && go test ./... -coverprofile=.test/coverage.out -json > .test/report.json
+      - name: Verify coverage report exists
+        run: |
+          if [ -f "Backend/.test/coverage.out" ]; then
+            echo "Coverage report found"
+          else
+            echo "Coverage report not found"
+          fi
+      - uses: SonarSource/sonarqube-scan-action@v6
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+        with:
+          projectBaseDir: Backend
+          args: >
+            -Dsonar.projectVersion=${{ gitea.sha_short }}
+      - uses: SonarSource/sonarqube-quality-gate-action@v1
+        timeout-minutes: 5
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          scanMetadataReportFile: Backend/.scannerwork/report-task.txt

Backend/Dockerfile

@@ -13,7 +13,7 @@ RUN go mod download && go mod verify
 COPY . .
 RUN go build -o server .
 
-FROM alpine
+FROM alpine:3.22
 RUN apk add --no-cache tzdata
 WORKDIR /app
 COPY --from=build /app/server /app/server

Backend/endpoints/pdf.go

@@ -9,9 +9,62 @@ import (
 	"time"
 )
 
+type typstMetadata struct {
+	ISOWeek       string `json:"iso-week"`
+	EmployeeName  string `json:"employee-name"`
+	WorkTime      string `json:"worktime"`
+	Overtime      string `json:"overtime"`
+	OvertimeTotal string `json:"overtime-total"`
+}
+
+type typstDayPart struct {
+	BookingFrom string `json:"booking-from"`
+	BookingTo   string `json:"booking-to"`
+	WorkType    string `json:"worktype"`
+	IsWorkDay   bool   `json:"is-workday"`
+}
+
+type typstDay struct {
+	Date      string         `json:"date"`
+	DayParts  []typstDayPart `json:"day-parts"`
+	Worktime  string         `json:"worktime"`
+	Pausetime string         `json:"pausetime"`
+	Overtime  string         `json:"overtime"`
+}
+
+func ConvertDaysToTypst(days []models.IWorkDay, u models.User) ([]typstDay, error) {
+	var typstDays []typstDay
+	for _, day := range days {
+		var typstDay typstDay
+		var typstDayParts []typstDayPart
+		work, pause, overtime := day.GetAllWorkTimesVirtual(u)
+		typstDay.Date = day.Date().Format("01.02.2006")
+		typstDay.Worktime = helper.FormatDuration(work)
+		typstDay.Pausetime = helper.FormatDuration(pause)
+		typstDay.Overtime = helper.FormatDuration(overtime)
+		if day.IsWorkDay() {
+			workDay, _ := day.(*models.WorkDay)
+			for i := 0; i < len(workDay.Bookings); i += 2 {
+				var typstDayPart typstDayPart
+				typstDayPart.BookingFrom = workDay.Bookings[i].Timestamp.Format("15:04")
+				typstDayPart.BookingTo = workDay.Bookings[i+1].Timestamp.Format("15:04")
+				typstDayPart.WorkType = workDay.Bookings[i].BookingType.Name
+				typstDayPart.IsWorkDay = true
+				typstDayParts = append(typstDayParts, typstDayPart)
+			}
+		} else {
+			absentDay, _ := day.(*models.Absence)
+			typstDayParts = append(typstDayParts, typstDayPart{IsWorkDay: false, WorkType: absentDay.AbwesenheitTyp.Name})
+		}
+		typstDay.DayParts = typstDayParts
+		typstDays = append(typstDays, typstDay)
+	}
+	return typstDays, nil
+}
+
 func PDFHandler(w http.ResponseWriter, r *http.Request) {
 	helper.RequiresLogin(Session, w, r)
-	startDate, err := parseTimestamp(r, "start", time.Now().Format("2006-01-02"))
+	startDate, err := parseTimestamp(r, "start_date", time.Now().Format("2006-01-02"))
 	if err != nil {
 		log.Println("Error parsing 'start_date' time", err)
 		http.Error(w, "Timestamp 'start_date' cannot be parsed!", http.StatusBadRequest)
@@ -30,7 +83,12 @@ func PDFHandler(w http.ResponseWriter, r *http.Request) {
 	//TODO: only accepted weeks
 
 	weeks := models.GetDays(user, startDate, endDate, false)
+	var aggregatedOvertime, aggregatedWorkTime time.Duration
+	for _, day := range weeks {
+		aggregatedOvertime += day.TimeOvertimeReal(user)
+		aggregatedWorkTime += day.TimeWorkVirtual(user)
+	}
 
 	// log.Printf("Using Dates: %s - %s\n", startDate.String(), endDate.String())
-	templates.PDFReportEmploye(user, weeks, startDate, endDate).Render(r.Context(), w)
+	templates.PDFReportEmploye(user, aggregatedOvertime, aggregatedWorkTime, weeks, startDate, endDate).Render(r.Context(), w)
 }

Backend/endpoints/team.go

@@ -79,5 +79,5 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
 		workWeeks = append(workWeeks, weeks...)
 	}
 	// isRunningWeek := time.Since(lastSub) < 24*5*time.Hour //the last submission is this week and cannot be send yet
-	templates.TeamPage([]models.WorkWeek{userWeek, userWeek}, userWeek).Render(r.Context(), w)
+	templates.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
 }

Backend/endpoints/team_presence.go

@@ -28,10 +28,9 @@ func teamPresence(w http.ResponseWriter, r *http.Request) {
 		log.Println("Error getting user!", err)
 	}
 	team, err := user.GetTeamMembers()
-	teamPresence := make(map[bool][]models.User)
+	teamPresence := make(map[models.User]bool)
 	for _, user := range team {
-		present := user.CheckAnwesenheit()
+		teamPresence[user] = user.CheckAnwesenheit()
-		teamPresence[present] = append(teamPresence[present], user)
 	}
 
 	if err != nil {

Backend/endpoints/time.go

@@ -5,6 +5,7 @@ import (
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
 	"context"
+	"database/sql"
 	"encoding/json"
 	"log"
 	"net/http"
@@ -30,6 +31,22 @@ func TimeHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func AbsencHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+	helper.SetCors(w)
+	switch r.Method {
+	case http.MethodPost:
+		err := updateAbsence(r)
+		if err != nil {
+			http.Error(w, "Internal error", http.StatusInternalServerError)
+			return
+		}
+		http.Redirect(w, r, "/time", 301)
+	default:
+		http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
+	}
+}
+
 func parseTimestamp(r *http.Request, getKey string, fallback string) (time.Time, error) {
 	getTimestamp := r.URL.Query().Get(getKey)
 	if getTimestamp == "" {
@@ -110,6 +127,7 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 		log.Println("No user found!", err)
 		return
 	}
+
 	switch r.FormValue("action") {
 	case "add":
 		timestamp, err := time.ParseInLocation("2006-01-02|15:04", r.FormValue("date")+"|"+r.FormValue("timestamp"), loc)
@@ -132,14 +150,14 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 			log.Printf("Error inserting booking %v -> %v\n", newBooking, err)
 		}
 	case "change":
-		absenceType, err := strconv.Atoi(r.FormValue("absence"))
+		// absenceType, err := strconv.Atoi(r.FormValue("absence"))
-		if err != nil {
+		// if err != nil {
-			log.Println("Error parsing absence type.", err)
+		// 	log.Println("Error parsing absence type.", err)
-			absenceType = 0
+		// 	absenceType = 0
-		}
+		// }
-		if absenceType != 0 {
+		// if absenceType != 0 {
-			createAbsence(absenceType, user, loc, r)
+		// 	createAbsence(absenceType, user, loc, r)
-		}
+		// }
 		for index, possibleBooking := range r.PostForm {
 			if len(index) > 7 && index[:7] == "booking" {
 				booking_id, err := strconv.Atoi(index[8:])
@@ -157,14 +175,93 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
 					log.Println("Error parsing time!", err)
 					continue
 				}
-				// log.Println("Parsing time", parsedTime)
 				booking.UpdateTime(parsedTime)
 			}
 		}
+	default:
+		log.Println("No action from /time found")
 	}
 	getBookings(w, r)
 }
 
+func updateAbsence(r *http.Request) error {
+	r.ParseForm()
+	var loc *time.Location
+	loc, err := time.LoadLocation(helper.GetEnv("TZ", "Europe/Berlin"))
+	if err != nil {
+		log.Println("Error loading location", err)
+		loc = time.Local
+	}
+
+	dateFrom, err := time.ParseInLocation("2006-01-02", r.FormValue("date_from"), loc)
+	if err != nil {
+		log.Println("Error parsing date_from input for absence", err)
+		return err
+	}
+
+	dateTo, err := time.ParseInLocation("2006-01-02", r.FormValue("date_to"), loc)
+	if err != nil {
+		log.Println("Error parsing date_to input for absence", err)
+		return err
+	}
+
+	absenceTypeId, err := strconv.Atoi(r.FormValue("aw_type"))
+	if err != nil {
+		log.Println("Error parsing aw_type", err)
+		return err
+	}
+
+	absenceId, err := strconv.Atoi(r.FormValue("aw_id"))
+	if err != nil && r.FormValue("aw_id") == "" {
+		absenceId = 0
+	} else if err != nil {
+		log.Println("Error parsing aw_id", err)
+		return err
+	}
+
+	absenceType, err := models.GetAbsenceTypeById(int8(absenceTypeId))
+	if err != nil {
+		log.Println("No matching absence type found!")
+		return err
+	}
+
+	newAbsence := models.Absence{DateFrom: dateFrom, DateTo: dateTo, AbwesenheitTyp: absenceType}
+
+	absence, err := models.GetAbsenceById(absenceId)
+	if err == sql.ErrNoRows {
+		err = nil
+		log.Println("Absence not found creating new!")
+
+		user, err := models.GetUserFromSession(Session, r.Context())
+		if err != nil {
+			log.Println("No user found!", err)
+			return err
+		}
+		newAbsence.CardUID = user.CardUID
+		newAbsence.Insert()
+	}
+	if err != nil {
+		log.Println("Cannot get Absence for id: ", absenceId, err)
+		return err
+	}
+	if r.FormValue("action") == "delete" {
+		log.Println("Deleting Absence!", "Not implemented")
+		// TODO
+		//absence.Delete()
+		return nil
+	}
+
+	if absence.Update(newAbsence) {
+		err = absence.Save()
+		if err != nil {
+			log.Println("Error saving updated absence!", err)
+			return err
+		}
+	}
+	return nil
+
+}
+
 func createAbsence(absenceType int, user models.User, loc *time.Location, r *http.Request) {
 	absenceDate, err := time.ParseInLocation("2006-01-02", r.FormValue("date"), loc)
 	if err != nil {

Backend/endpoints/user-settings.go

@@ -3,6 +3,7 @@ package endpoints
 import (
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
+	"context"
 	"log"
 	"net/http"
 )
@@ -38,5 +39,9 @@ func changePassword(w http.ResponseWriter, r *http.Request) {
 }
 
 func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
-	templates.UserPage(status).Render(r.Context(), w)
+	var ctx context.Context
+	if user, err := models.GetUserFromSession(Session, r.Context()); err == nil {
+		ctx = context.WithValue(r.Context(), "user", user)
+	}
+	templates.UserPage(status).Render(ctx, w)
 }

Backend/endpoints/user.go

@@ -29,6 +29,7 @@ func LoginHandler(w http.ResponseWriter, r *http.Request) {
 
 func UserSettingsHandler(w http.ResponseWriter, r *http.Request) {
 	helper.RequiresLogin(Session, w, r)
+
 	switch r.Method {
 	case http.MethodGet:
 		showUserPage(w, r, 0)

Backend/go.mod

@@ -14,8 +14,11 @@ require (
 )
 
 require (
+	github.com/Dadido3/go-typst v0.3.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/smasher164/xid v0.1.2 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
 )

Backend/go.sum

@@ -1,5 +1,7 @@
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Dadido3/go-typst v0.3.0 h1:Itix2FtQgBiOuHUNqgGUAK11Oo2WMlZGGGpCiQNK1IA=
+github.com/Dadido3/go-typst v0.3.0/go.mod h1:QYis9sT70u65kn1SkFfyPRmHsPxgoxWbAixwfPReOZA=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/a-h/templ v0.3.943 h1:o+mT/4yqhZ33F3ootBiHwaY4HM5EVaOJfIshvd5UNTY=
@@ -54,6 +56,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/smasher164/xid v0.1.2 h1:erplXSdBRIIw+MrwjJ/m8sLN2XY16UGzpTA0E2Ru6HA=
+github.com/smasher164/xid v0.1.2/go.mod h1:tgivm8CQl19fH1c5y+8F4mA+qY6n2i6qDRBlY/6nm+I=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
@@ -70,5 +74,9 @@ go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
 golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

Backend/helper/types.go

@@ -3,7 +3,23 @@ package helper
 import "time"
 
 type TimeFormValue struct {
-	TsFrom time.Time
+	TsFrom  time.Time
-	TsTo time.Time
+	TsTo    time.Time
 	CardUID string
 }
+
+func BoolToInt(b bool) int {
+	var i int = 0
+	if b {
+		i = 1
+	}
+	return i
+}
+
+func BoolToInt8(b bool) int8 {
+	var i int8 = 0
+	if b {
+		i = 1
+	}
+	return i
+}

Backend/main.go

@@ -5,8 +5,7 @@ import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"context"
-	"fmt"
+	"log/slog"
-	"log"
 	"net/http"
 	"os"
 	"time"
@@ -17,23 +16,25 @@ import (
 
 func main() {
 	var err error
+	var logLevel slog.LevelVar
+	logLevel.Set(slog.LevelWarn)
+
+	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: &logLevel}))
+	slog.SetDefault(logger)
 
 	err = godotenv.Load(".env")
 	if err != nil {
-		log.Println("No .env file found in directory!")
+		slog.Info("No .env file found in directory!")
 	}
 	if helper.GetEnv("GO_ENV", "production") == "debug" {
-		log.Println("Debug mode enabled")
+		logLevel.Set(slog.LevelDebug)
-		log.Println("Environment Variables")
 		envs := os.Environ()
-		for _, e := range envs {
+		slog.Debug("Debug mode enabled", "Environment Variables", envs)
-			fmt.Println(e)
-		}
 	}
 
 	models.DB, err = OpenDatabase()
 	if err != nil {
-		log.Fatal(err)
+		slog.Error("Error while opening the database", "Error", err)
 	}
 
 	fs := http.FileServer(http.Dir("./static"))
@@ -43,6 +44,7 @@ func main() {
 
 	// handles the different http routes
 	server.HandleFunc("/time/new", endpoints.TimeCreateHandler)
+	server.Handle("/absence", ParamsMiddleware(endpoints.AbsencHandler))
 	server.Handle("/time", ParamsMiddleware(endpoints.TimeHandler))
 	server.HandleFunc("/logout", endpoints.LogoutHandler)
 	server.HandleFunc("/user/{action}", endpoints.UserHandler)
@@ -57,14 +59,15 @@ func main() {
 	serverSessionMiddleware := endpoints.Session.LoadAndSave(server)
 
 	// starting the http server
-	fmt.Printf("Server is running at http://localhost:%s\n", helper.GetEnv("EXPOSED_PORT", "8080"))
+	slog.Info("Server is running at http://localhost:8080")
-	log.Fatal(http.ListenAndServe(":8080", serverSessionMiddleware))
+	slog.Error("Error starting Server", "Error", http.ListenAndServe(":8080", serverSessionMiddleware))
 }
 
 func ParamsMiddleware(next http.HandlerFunc) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		queryParams := r.URL.Query()
 		ctx := context.WithValue(r.Context(), "urlParams", queryParams)
+		slog.Debug("ParamsMiddleware added urlParams", slog.Any("urlParams", queryParams))
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})
 }

Backend/models/absence.go

@@ -45,6 +45,10 @@ func (a *Absence) Date() time.Time {
 	return a.Day.Truncate(24 * time.Hour)
 }
 
+func (a *Absence) IsMultiDay() bool {
+	return !a.DateFrom.Equal(a.DateTo)
+}
+
 func (a *Absence) TimeWorkVirtual(u User) time.Duration {
 	return a.TimeWorkReal(u)
 }
@@ -109,6 +113,23 @@ func (a *Absence) Insert() error {
 	return nil
 }
 
+func (a *Absence) Save() error {
+	qStr, err := DB.Prepare(`
+		UPDATE abwesenheit SET card_uid = $2, abwesenheit_typ = $3, datum_from = $4, datum_to = $5 WHERE counter_id = $1;
+	`)
+	if err != nil {
+		log.Println("Error preparing sql Statement (Absence Save)", err)
+		return err
+	}
+	defer qStr.Close()
+	_, err = qStr.Query(a.CounterId, a.CardUID, a.AbwesenheitTyp.Id, a.DateFrom, a.DateTo)
+	if err != nil {
+		log.Println("Error executing update statement", err)
+		return err
+	}
+	return nil
+}
+
 func GetAbsenceById(counterId int) (Absence, error) {
 	var absence Absence = Absence{CounterId: counterId}
 	qStr, err := DB.Prepare("SELECT card_uid, abwesenheit_typ, datum_from, datum_to FROM abwesenheit WHERE counter_id = $1;")
@@ -179,6 +200,27 @@ func GetAbsencesByCardUID(card_uid string, tsFrom time.Time, tsTo time.Time) ([]
 	return absences, nil
 }
 
+func (a *Absence) Update(na Absence) bool {
+	change := false
+	if a.CardUID != na.CardUID && na.CardUID != "" {
+		a.CardUID = na.CardUID
+		change = true
+	}
+	if a.AbwesenheitTyp != na.AbwesenheitTyp && na.AbwesenheitTyp.Id != 0 {
+		a.AbwesenheitTyp = na.AbwesenheitTyp
+		change = true
+	}
+	if !a.DateFrom.Equal(na.DateFrom) && !na.DateFrom.IsZero() {
+		a.DateFrom = na.DateFrom
+		change = true
+	}
+	if !a.DateTo.Equal(na.DateTo) && !na.DateTo.IsZero() {
+		a.DateTo = na.DateTo
+		change = true
+	}
+	return change
+}
+
 func GetAbsenceTypes() (map[int8]AbsenceType, error) {
 	var types = make(map[int8]AbsenceType)
 	qStr, err := DB.Prepare("SELECT abwesenheit_id, abwesenheit_name, arbeitszeit_equivalent FROM s_abwesenheit_typen;")

Backend/models/booking.go

@@ -6,6 +6,7 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"log/slog"
 	"net/url"
 	"strconv"
 	"time"
@@ -87,6 +88,27 @@ func (b *Booking) Verify() bool {
 	return true
 }
 
+func (b *Booking) IsSubmittedAndChecked() bool {
+	qStr, err := DB.Prepare(`SELECT bestaetigt from wochen_report WHERE $1 = ANY(anwesenheiten);`)
+	if err != nil {
+		slog.Warn("Error when preparing SQL Statement", "error", err)
+		return false
+	}
+	defer qStr.Close()
+	var isSubmittedAndChecked bool = false
+
+	err = qStr.QueryRow(b.CounterId).Scan(&isSubmittedAndChecked)
+	if err == sql.ErrNoRows {
+		// No rows found ==> not even submitted
+		return false
+	}
+
+	if err != nil {
+		slog.Warn("Unexpected error when executing SQL Statement", "error", err)
+	}
+	return isSubmittedAndChecked
+}
+
 func (b *Booking) Insert() error {
 	if !checkLastBooking(*b) {
 		return SameBookingError{}

Backend/models/user.go

@@ -173,7 +173,7 @@ func (u *User) ChangePass(password, newPassword string) (bool, error) {
 
 func (u *User) GetTeamMembers() ([]User, error) {
 	var teamMembers []User
-	qStr, err := DB.Prepare(`SELECT personal_nummer FROM s_personal_daten WHERE vorgesetzter_pers_nr = $1`)
+	qStr, err := DB.Prepare(`SELECT personal_nummer FROM s_personal_daten WHERE vorgesetzter_pers_nr = $1 ORDER BY "nachname";`)
 	if err != nil {
 		return teamMembers, err
 	}

Backend/models/workDay.go

@@ -3,9 +3,10 @@ package models
 import (
 	"arbeitszeitmessung/helper"
 	"encoding/json"
+	"fmt"
 	"log"
+	"log/slog"
 	"sort"
-	"strconv"
 	"time"
 )
 
@@ -24,15 +25,16 @@ type IWorkDay interface {
 }
 
 type WorkDay struct {
-	Day           time.Time `json:"day"`
+	Day               time.Time `json:"day"`
-	Bookings      []Booking `json:"bookings"`
+	Bookings          []Booking `json:"bookings"`
-	workTime      time.Duration
+	workTime          time.Duration
-	pauseTime     time.Duration
+	pauseTime         time.Duration
-	realWorkTime  time.Duration
+	realWorkTime      time.Duration
-	realPauseTime time.Duration
+	realPauseTime     time.Duration
-	TimeFrom      time.Time
+	TimeFrom          time.Time
-	TimeTo        time.Time
+	TimeTo            time.Time
-	kurzArbeit    bool
+	kurzArbeit        bool
+	kurzArbeitAbsence Absence
 }
 
 func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay {
@@ -52,7 +54,10 @@ func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay
 		}
 		if day.AbwesenheitTyp.WorkTime == 1 {
 			if workDay, ok := allDays[day.Date().Format("2006-01-02")].(*WorkDay); ok {
-				workDay.kurzArbeit = true
+				if len(workDay.Bookings) > 0 {
+					workDay.kurzArbeit = true
+					workDay.kurzArbeitAbsence = day
+				}
 			}
 		} else {
 			allDays[day.Date().Format("2006-01-02")] = &day
@@ -78,6 +83,19 @@ func (d *WorkDay) Date() time.Time {
 	return d.Day
 }
 
+func (d *WorkDay) GenerateKurzArbeitBookings(u User) (time.Time, time.Time) {
+	var timeFrom, timeTo time.Time
+	if d.workTime >= u.ArbeitszeitProTag() {
+		return timeFrom, timeTo
+	}
+
+	timeFrom = d.Bookings[len(d.Bookings)-1].Timestamp.Add(time.Minute)
+	timeTo = timeFrom.Add(u.ArbeitszeitProTag() - d.workTime)
+	slog.Debug("Added duration as Kurzarbeit", "date", d.Date().String(), "duration", timeTo.Sub(timeFrom).String())
+
+	return timeFrom, timeTo
+}
+
 func (d *WorkDay) TimeWorkVirtual(u User) time.Duration {
 	if d.IsKurzArbeit() {
 		return u.ArbeitszeitProTag()
@@ -85,6 +103,10 @@ func (d *WorkDay) TimeWorkVirtual(u User) time.Duration {
 	return d.workTime
 }
 
+func (d *WorkDay) GetKurzArbeit() *Absence {
+	return &d.kurzArbeitAbsence
+}
+
 func (d *WorkDay) TimeWorkReal(u User) time.Duration {
 	d.realWorkTime, d.realPauseTime = 0, 0
 	var lastBooking Booking
@@ -101,6 +123,7 @@ func (d *WorkDay) TimeWorkReal(u User) time.Duration {
 	if helper.IsSameDate(d.Date(), time.Now()) && len(d.Bookings)%2 == 1 {
 		d.realWorkTime += time.Since(lastBooking.Timestamp.Local())
 	}
+	slog.Debug("Calculated RealWorkTime for user", "user", u, slog.String("worktime", d.realWorkTime.String()))
 	return d.realWorkTime
 }
 
@@ -138,7 +161,7 @@ func (d *WorkDay) TimePauseReal(u User) (work, pause time.Duration) {
 }
 
 func (d *WorkDay) ToString() string {
-	return "WorkDay"
+	return fmt.Sprintf("WorkDay: %s with %d bookings and worktime: %s", d.Date().Format("2006-01-02"), len(d.Bookings), helper.FormatDuration(d.workTime))
 }
 
 func (d *WorkDay) IsWorkDay() bool {
@@ -225,7 +248,7 @@ func GetWorkDays(user User, tsFrom, tsTo time.Time) []WorkDay {
 		return workDays
 	}
 	defer rows.Close()
-	emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false"))
+	// emptyDays, _ := strconv.ParseBool(helper.GetEnv("EMPTY_DAYS", "false"))
 	for rows.Next() {
 		var workDay WorkDay
 		var bookings []byte
@@ -245,11 +268,12 @@ func GetWorkDays(user User, tsFrom, tsTo time.Time) []WorkDay {
 			workDay.Bookings = []Booking{}
 		}
 		workDay.TimePauseReal(user)
-		if emptyDays && !helper.IsWeekend(workDay.Date()) {
+		if len(workDay.Bookings) > 1 || !helper.IsWeekend(workDay.Date()) {
 			workDays = append(workDays, workDay)
 		}
 	}
 	if err = rows.Err(); err != nil {
+		log.Println("Error in workday rows!", err)
 		return workDays
 	}
 	return workDays

Backend/models/workWeek.go

@@ -4,23 +4,25 @@ import (
 	"database/sql"
 	"errors"
 	"log"
+	"log/slog"
 	"time"
+
+	"github.com/lib/pq"
 )
 
 // Workweeks are
 
 type WorkWeek struct {
-	Id           int
+	Id              int
-	WorkDays     []WorkDay
+	WorkDays        []WorkDay
-	Absences     []Absence
+	Absences        []Absence
-	Days         []IWorkDay
+	Days            []IWorkDay
-	User         User
+	User            User
-	WeekStart    time.Time
+	WeekStart       time.Time
-	Worktime     time.Duration
+	Worktime        time.Duration
-	Overtime     time.Duration
+	WorkTimeVirtual time.Duration
-	Status       WeekStatus
+	Overtime        time.Duration
-	overtimeDiff time.Duration
+	Status          WeekStatus
-	worktimeDiff time.Duration
 }
 
 type WeekStatus int8
@@ -45,12 +47,17 @@ func NewWorkWeek(user User, tsMonday time.Time, populate bool) WorkWeek {
 }
 
 func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Duration) {
+	slog.Debug("Got Days with overtime and worktime", slog.String("worktime", worktime.String()), slog.String("overtime", overtime.String()))
 	w.Days = GetDays(w.User, w.WeekStart, w.WeekStart.Add(6*24*time.Hour), false)
 
 	for _, day := range w.Days {
-		w.Worktime += day.TimeWorkVirtual(w.User)
+		work, _ := day.TimePauseReal(w.User)
+		w.Worktime += work
+		w.WorkTimeVirtual += day.TimeWorkVirtual(w.User)
 	}
-	w.Overtime = w.Worktime - w.User.ArbeitszeitProWoche()
+	slog.Debug("Got worktime for user", "user", w.User, "worktime", w.Worktime.String(), "virtualWorkTime", w.WorkTimeVirtual.String())
+
+	w.Overtime = w.WorkTimeVirtual - w.User.ArbeitszeitProWoche()
 
 	w.Worktime = w.Worktime.Round(time.Minute)
 	w.Overtime = w.Overtime.Round(time.Minute)
@@ -61,8 +68,6 @@ func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Durati
 
 	if overtime != w.Overtime || worktime != w.Worktime {
 		w.Status = WeekStatusDifferences
-		w.overtimeDiff = overtime
-		w.worktimeDiff = worktime
 	}
 }
 
@@ -127,12 +132,13 @@ func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
 	defer rows.Close()
 	for rows.Next() {
 		var week WorkWeek = WorkWeek{User: user}
-		if err := rows.Scan(&week.Id, &week.WeekStart, &week.Worktime, &week.Overtime); err != nil {
+		var workTime, overTime time.Duration
+		if err := rows.Scan(&week.Id, &week.WeekStart, &workTime, &overTime); err != nil {
 			log.Println("Error scanning row!", err)
 			return weeks
 		}
 
-		week.PopulateWithDays(week.Worktime, week.Overtime)
+		week.PopulateWithDays(workTime, overTime)
 		weeks = append(weeks, week)
 	}
 	if err = rows.Err(); err != nil {
@@ -144,30 +150,70 @@ func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
 
 var ErrRunningWeek = errors.New("Week is in running week")
 
+func (w *WorkWeek) GetBookingIds() (anwesenheitsIds, abwesenheitsIds []int64, err error) {
+	qStr, err := DB.Prepare(`
+		SELECT
+  (SELECT array_agg(counter_id ORDER BY counter_id)
+   FROM anwesenheit
+   WHERE card_uid = $1
+     AND timestamp::DATE >= $2
+     AND timestamp::DATE < $3) AS anwesenheit,
+
+  (SELECT array_agg(counter_id ORDER BY counter_id)
+   FROM abwesenheit
+   WHERE card_uid = $1
+     AND datum_from < $3
+     AND datum_to >= $2) AS abwesenheit;
+     `)
+	if err != nil {
+		return nil, nil, err
+	}
+	defer qStr.Close()
+
+	slog.Debug("Inserting parameters into qStr:", "user card_uid", w.User.CardUID, "week_start", w.WeekStart, "week_end", w.WeekStart.AddDate(0, 0, 5))
+
+	err = qStr.QueryRow(w.User.CardUID, w.WeekStart, w.WeekStart.AddDate(0, 0, 5)).Scan(pq.Array(&anwesenheitsIds), pq.Array(&abwesenheitsIds))
+	if err != nil {
+		return anwesenheitsIds, abwesenheitsIds, err
+	}
+	return anwesenheitsIds, abwesenheitsIds, nil
+}
+
 // creates a new entry in the woche_report table with the given workweek
 func (w *WorkWeek) SendWeek() error {
 	var qStr *sql.Stmt
 	var err error
 
+	slog.Info("Sending workWeek to team head", "week", w.WeekStart.String())
+
+	anwBookings, awBookings, err := w.GetBookingIds()
+	if err != nil {
+		slog.Warn("Error querying bookings from work week", slog.Any("error", err))
+		return err
+	}
+
+	slog.Debug("Recieved Booking Ids", "anwesenheiten", anwBookings)
+
 	if time.Since(w.WeekStart) < 5*24*time.Hour {
-		log.Println("Cannot send week, because it's the running week!")
+		slog.Warn("Cannot send week, because it's the running week!")
 		return ErrRunningWeek
 	}
 
 	if w.CheckStatus() != WeekStatusNone {
-		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE, arbeitszeit = make_interval(secs => $3::numeric / 1000000000), ueberstunden = make_interval(secs => $4::numeric / 1000000000) WHERE personal_nummer = $1 AND woche_start = $2;`)
+		qStr, err = DB.Prepare(`UPDATE "wochen_report" SET bestaetigt = FALSE, arbeitszeit = make_interval(secs => $3::numeric / 1000000000), ueberstunden = make_interval(secs => $4::numeric / 1000000000), anwesenheiten=$5, abwesenheiten=$6 WHERE personal_nummer = $1 AND woche_start = $2;`)
 		if err != nil {
-			log.Println("Error preparing SQL statement", err)
+			slog.Warn("Error preparing SQL statement", "error", err)
 			return err
 		}
 	} else {
-		qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start, arbeitszeit, ueberstunden) VALUES ($1, $2, make_interval(secs => $3::numeric / 1000000000), make_interval(secs => $4::numeric / 1000000000));`)
+		qStr, err = DB.Prepare(`INSERT INTO wochen_report (personal_nummer, woche_start, arbeitszeit, ueberstunden, anwesenheiten, abwesenheiten) VALUES ($1, $2, make_interval(secs => $3::numeric / 1000000000), make_interval(secs => $4::numeric / 1000000000), $5, $6);`)
 		if err != nil {
-			log.Println("Error preparing SQL statement", err)
+			slog.Warn("Error preparing SQL statement", "error", err)
 			return err
 		}
 	}
-	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart, int64(w.Worktime), int64(w.Overtime))
+
+	_, err = qStr.Exec(w.User.PersonalNummer, w.WeekStart, int64(w.Worktime), int64(w.Overtime), pq.Array(anwBookings), pq.Array(awBookings))
 	if err != nil {
 		log.Println("Error executing query!", err)
 		return err

Backend/sonar-project.properties

@@ -1,6 +1,6 @@
-sonar.projectKey=Arbeitszeitmessung
+sonar.projectKey=arbeitszeitmessung
 sonar.sources=.
-sonar.exclusions=**/*_test.go
+sonar.exclusions=**/*_test.go, **/*_templ.go
 
 sonar.tests=.
 sonar.test.inclusions=**/*_test.go

Backend/src/main.css

@@ -34,13 +34,14 @@
   body {
     -webkit-print-color-adjust: exact !important;
     print-color-adjust: exact !important;
+    background-color: white;
   }
 }
 
 @layer components {
   .grid-main {
     display: grid;
-    grid-template-columns: 2fr auto 1fr;
+    grid-template-columns: 4fr 3fr 3fr 1fr;
     align-items: stretch;
   }
 
@@ -88,6 +89,11 @@
     transition-duration: var(--tw-duration, var(--default-transition-duration));
   }
 
+  input.btn,
+  select.btn {
+    transition-duration: 300ms;
+  }
+
   .btn:hover {
     color: var(--color-white);
     background-color: var(--color-neutral-700);
@@ -98,9 +104,46 @@
     pointer-events: none;
   }
 
-  .btn:active,
+  input.btn,
-  .btn:focus {
+  select.btn {
-    background-color: var(--color-neutral-700);
+    text-align: left;
+  }
+
+  input.btn:hover,
+  select.btn:hover {
+    border-color: var(--color-neutral-300);
+    background-color: var(--color-neutral-100);
+    color: var(--color-neutral-800);
+  }
+
+  .edit-box {
+    border-radius: var(--radius-md);
+    overflow: hidden;
+    border-color: var(--color-neutral-500);
+    transition-property: background-color, border-color;
+    transition-timing-function: var(--default-transition-timing-function) * 2;
+    transition-duration: var(--default-transition-duration);
+    outline: none;
+
+    &:is(:where(.group):is(.edit) *) {
+      border-width: 1px;
+    }
+  }
+
+  .edit-box:hover {
+    &:is(:where(.group):is(.edit) *) {
+      background-color: var(--color-white);
+      border-color: var(--color-neutral-300);
+    }
+  }
+
+  .edit-box input:focus {
+    outline: none;
+  }
+
+  div.edit {
+    border-width: 1px;
+    background-color: var(--color-neutral-300);
   }
 
   @media (width >=48rem) {

Backend/static/css/styles.css

@@ -9,8 +9,10 @@
       "Courier New", monospace;
     --color-red-500: oklch(63.7% 0.237 25.331);
     --color-red-600: oklch(57.7% 0.245 27.325);
+    --color-red-700: oklch(50.5% 0.213 27.518);
     --color-orange-500: oklch(70.5% 0.213 47.604);
     --color-purple-600: oklch(55.8% 0.288 302.321);
+    --color-slate-700: oklch(37.2% 0.044 257.287);
     --color-neutral-100: oklch(97% 0 0);
     --color-neutral-200: oklch(92.2% 0 0);
     --color-neutral-300: oklch(87% 0 0);
@@ -19,7 +21,6 @@
     --color-neutral-600: oklch(43.9% 0 0);
     --color-neutral-700: oklch(37.1% 0 0);
     --color-neutral-800: oklch(26.9% 0 0);
-    --color-neutral-900: oklch(20.5% 0 0);
     --color-black: #000;
     --color-white: #fff;
     --spacing: 0.25rem;
@@ -190,9 +191,24 @@
   .\@container {
     container-type: inline-size;
   }
+  .absolute {
+    position: absolute;
+  }
   .relative {
     position: relative;
   }
+  .top-2\.5 {
+    top: calc(var(--spacing) * 2.5);
+  }
+  .top-\[0\.125rem\] {
+    top: 0.125rem;
+  }
+  .right-1 {
+    right: calc(var(--spacing) * 1);
+  }
+  .right-2\.5 {
+    right: calc(var(--spacing) * 2.5);
+  }
   .col-span-2 {
     grid-column: span 2 / span 2;
   }
@@ -211,10 +227,16 @@
   .mt-1 {
     margin-top: calc(var(--spacing) * 1);
   }
+  .mb-1 {
+    margin-bottom: calc(var(--spacing) * 1);
+  }
   .mb-2 {
     margin-bottom: calc(var(--spacing) * 2);
   }
-  .icon-\[material-symbols-light--add-circle-outline\] {
+  .ml-1 {
+    margin-left: calc(var(--spacing) * 1);
+  }
+  .icon-\[material-symbols-light--cancel-outline\] {
     display: inline-block;
     width: 1.25em;
     height: 1.25em;
@@ -225,7 +247,7 @@
     mask-repeat: no-repeat;
     -webkit-mask-size: 100% 100%;
     mask-size: 100% 100%;
-    --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M11.5 16.5h1v-4h4v-1h-4v-4h-1v4h-4v1h4zm.503 4.5q-1.867 0-3.51-.708q-1.643-.709-2.859-1.924t-1.925-2.856T3 12.003t.709-3.51Q4.417 6.85 5.63 5.634t2.857-1.925T11.997 3t3.51.709q1.643.708 2.859 1.922t1.925 2.857t.709 3.509t-.708 3.51t-1.924 2.859t-2.856 1.925t-3.509.709M12 20q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4T6.325 6.325T4 12t2.325 5.675T12 20m0-8'/%3E%3C/svg%3E");
+    --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='m8.4 16.308l3.6-3.6l3.6 3.6l.708-.708l-3.6-3.6l3.6-3.6l-.708-.708l-3.6 3.6l-3.6-3.6l-.708.708l3.6 3.6l-3.6 3.6zM12.003 21q-1.866 0-3.51-.708q-1.643-.709-2.859-1.924t-1.925-2.856T3 12.003t.709-3.51Q4.417 6.85 5.63 5.634t2.857-1.925T11.997 3t3.51.709q1.643.708 2.859 1.922t1.925 2.857t.709 3.509t-.708 3.51t-1.924 2.859t-2.856 1.925t-3.509.709M12 20q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4T6.325 6.325T4 12t2.325 5.675T12 20m0-8'/%3E%3C/svg%3E");
   }
   .icon-\[material-symbols-light--check-circle-outline\] {
     display: inline-block;
@@ -253,6 +275,19 @@
     mask-size: 100% 100%;
     --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M12.003 21q-1.866 0-3.51-.708q-1.643-.709-2.859-1.924t-1.925-2.856T3 12.003t.709-3.51Q4.417 6.85 5.63 5.634t2.857-1.925T11.997 3t3.51.709q1.643.708 2.859 1.922t1.925 2.857t.709 3.509t-.708 3.51t-1.924 2.859t-2.856 1.925t-3.509.709M12 20q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4T6.325 6.325T4 12t2.325 5.675T12 20m0-8'/%3E%3C/svg%3E");
   }
+  .icon-\[material-symbols-light--delete-outline\] {
+    display: inline-block;
+    width: 1.25em;
+    height: 1.25em;
+    background-color: currentColor;
+    -webkit-mask-image: var(--svg);
+    mask-image: var(--svg);
+    -webkit-mask-repeat: no-repeat;
+    mask-repeat: no-repeat;
+    -webkit-mask-size: 100% 100%;
+    mask-size: 100% 100%;
+    --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M7.616 20q-.672 0-1.144-.472T6 18.385V6H5V5h4v-.77h6V5h4v1h-1v12.385q0 .69-.462 1.153T16.384 20zM17 6H7v12.385q0 .269.173.442t.443.173h8.769q.23 0 .423-.192t.192-.424zM9.808 17h1V8h-1zm3.384 0h1V8h-1zM7 6v13z'/%3E%3C/svg%3E");
+  }
   .icon-\[material-symbols-light--more-time\] {
     display: inline-block;
     width: 1.25em;
@@ -279,7 +314,7 @@
     mask-size: 100% 100%;
     --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M9.808 14.616h1V9.385h-1zm3.384 0h1V9.385h-1zM12.003 21q-1.866 0-3.51-.705q-1.643-.706-2.859-1.915t-1.925-2.843T3 12.039q0-.905.167-1.778t.497-1.713l.78.78q-.219.65-.331 1.32T4 12q0 3.35 2.325 5.675T12 20t5.675-2.325T20 12t-2.325-5.675T12 4q-.675 0-1.332.112t-1.3.332l-.776-.775q.789-.315 1.606-.492T11.885 3q1.887 0 3.546.701t2.894 1.926t1.955 2.866t.72 3.505t-.708 3.509t-1.924 2.859t-2.856 1.925t-3.509.709M5.923 6.808q-.356 0-.62-.265q-.264-.264-.264-.62t.264-.62t.62-.264t.62.264t.265.62t-.265.62t-.62.265M12 12'/%3E%3C/svg%3E");
   }
-  .icon-\[material-symbols-light--nest-clock-farsight-analog-outline\] {
+  .icon-\[material-symbols-light--schedule-outline\] {
     display: inline-block;
     width: 1.25em;
     height: 1.25em;
@@ -290,7 +325,10 @@
     mask-repeat: no-repeat;
     -webkit-mask-size: 100% 100%;
     mask-size: 100% 100%;
-    --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='M14.935 16.223L11.5 12.789V7.923h1v4.464l3.123 3.123zM11.5 6V4h1v2zm6.5 6.5v-1h2v1zM11.5 20v-2h1v2zM4 12.5v-1h2v1zm8.003 8.5q-1.867 0-3.51-.708q-1.643-.709-2.859-1.924t-1.925-2.856T3 12.003t.709-3.51Q4.417 6.85 5.63 5.634t2.857-1.925T11.997 3t3.51.709q1.643.708 2.859 1.922t1.925 2.857t.709 3.509t-.708 3.51t-1.924 2.859t-2.856 1.925t-3.509.709M12 20q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4T6.325 6.325T4 12t2.325 5.675T12 20m0-8'/%3E%3C/svg%3E");
+    --svg: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' width='24' height='24'%3E%3Cpath fill='black' d='m15.646 16.354l.708-.708l-3.854-3.854V7h-1v5.208zM12.003 21q-1.866 0-3.51-.708q-1.643-.709-2.859-1.924t-1.925-2.856T3 12.003t.709-3.51Q4.417 6.85 5.63 5.634t2.857-1.925T11.997 3t3.51.709q1.643.708 2.859 1.922t1.925 2.857t.709 3.509t-.708 3.51t-1.924 2.859t-2.856 1.925t-3.509.709M12 20q3.325 0 5.663-2.337T20 12t-2.337-5.663T12 4T6.337 6.338T4 12t2.338 5.663T12 20'/%3E%3C/svg%3E");
+  }
+  .block {
+    display: block;
   }
   .flex {
     display: flex;
@@ -315,12 +353,19 @@
     width: calc(var(--spacing) * 4);
     height: calc(var(--spacing) * 4);
   }
+  .size-5 {
+    width: calc(var(--spacing) * 5);
+    height: calc(var(--spacing) * 5);
+  }
   .h-2 {
     height: calc(var(--spacing) * 2);
   }
   .h-4 {
     height: calc(var(--spacing) * 4);
   }
+  .h-5 {
+    height: calc(var(--spacing) * 5);
+  }
   .h-8 {
     height: calc(var(--spacing) * 8);
   }
@@ -336,6 +381,9 @@
   .w-4 {
     width: calc(var(--spacing) * 4);
   }
+  .w-5 {
+    width: calc(var(--spacing) * 5);
+  }
   .w-9\/10 {
     width: calc(9/10 * 100%);
   }
@@ -354,15 +402,24 @@
   .flex-grow {
     flex-grow: 1;
   }
-  .grow {
+  .grow-0 {
-    flex-grow: 1;
+    flex-grow: 0;
   }
   .grow-1 {
     flex-grow: 1;
   }
+  .basis-\[content\] {
+    flex-basis: content;
+  }
   .cursor-pointer {
     cursor: pointer;
   }
+  .scroll-m-2 {
+    scroll-margin: calc(var(--spacing) * 2);
+  }
+  .appearance-none {
+    appearance: none;
+  }
   .break-after-page {
     break-after: page;
   }
@@ -399,6 +456,9 @@
   .items-center {
     align-items: center;
   }
+  .items-end {
+    align-items: flex-end;
+  }
   .justify-around {
     justify-content: space-around;
   }
@@ -451,30 +511,42 @@
   .rounded-md {
     border-radius: var(--radius-md);
   }
+  .rounded-none {
+    border-radius: 0;
+  }
   .border {
     border-style: var(--tw-border-style);
     border-width: 1px;
   }
+  .border-0 {
+    border-style: var(--tw-border-style);
+    border-width: 0px;
+  }
   .border-r-0 {
     border-right-style: var(--tw-border-style);
     border-right-width: 0px;
   }
+  .border-r-1 {
+    border-right-style: var(--tw-border-style);
+    border-right-width: 1px;
+  }
   .border-b-0 {
     border-bottom-style: var(--tw-border-style);
     border-bottom-width: 0px;
   }
-  .border-neutral-200 {
+  .border-dashed {
-    border-color: var(--color-neutral-200);
+    --tw-border-style: dashed;
+    border-style: dashed;
   }
   .border-neutral-300 {
     border-color: var(--color-neutral-300);
   }
+  .border-neutral-500 {
+    border-color: var(--color-neutral-500);
+  }
   .border-neutral-600 {
     border-color: var(--color-neutral-600);
   }
-  .border-neutral-900 {
-    border-color: var(--color-neutral-900);
-  }
   .bg-accent {
     background-color: var(--color-accent);
   }
@@ -539,6 +611,9 @@
   .text-accent {
     color: var(--color-accent);
   }
+  .text-black {
+    color: var(--color-black);
+  }
   .text-neutral-300 {
     color: var(--color-neutral-300);
   }
@@ -557,6 +632,9 @@
   .text-red-600 {
     color: var(--color-red-600);
   }
+  .text-slate-700 {
+    color: var(--color-slate-700);
+  }
   .uppercase {
     text-transform: uppercase;
   }
@@ -603,9 +681,9 @@
       }
     }
   }
-  .group-\[\.edit\]\:block {
+  .group-\[\.edit\]\:ml-2 {
     &:is(:where(.group):is(.edit) *) {
-      display: block;
+      margin-left: calc(var(--spacing) * 2);
     }
   }
   .group-\[\.edit\]\:flex {
@@ -623,18 +701,21 @@
       display: inline;
     }
   }
+  .group-\[\.edit\]\/button\:block {
+    &:is(:where(.group\/button):is(.edit) *) {
+      display: block;
+    }
+  }
+  .group-\[\.edit\]\/button\:hidden {
+    &:is(:where(.group\/button):is(.edit) *) {
+      display: none;
+    }
+  }
   .placeholder\:text-neutral-400 {
     &::placeholder {
       color: var(--color-neutral-400);
     }
   }
-  .hover\:border-neutral-300 {
-    &:hover {
-      @media (hover: hover) {
-        border-color: var(--color-neutral-300);
-      }
-    }
-  }
   .hover\:border-neutral-500 {
     &:hover {
       @media (hover: hover) {
@@ -656,17 +737,10 @@
       }
     }
   }
-  .hover\:bg-red-600 {
+  .hover\:bg-red-700 {
     &:hover {
       @media (hover: hover) {
-        background-color: var(--color-red-600);
+        background-color: var(--color-red-700);
-      }
-    }
-  }
-  .hover\:text-accent {
-    &:hover {
-      @media (hover: hover) {
-        color: var(--color-accent);
       }
     }
   }
@@ -677,11 +751,6 @@
       }
     }
   }
-  .focus\:border-neutral-400 {
-    &:focus {
-      border-color: var(--color-neutral-400);
-    }
-  }
   .focus\:bg-neutral-700 {
     &:focus {
       background-color: var(--color-neutral-700);
@@ -708,11 +777,6 @@
       opacity: 50%;
     }
   }
-  .max-md\:flex {
-    @media (width < 48rem) {
-      display: flex;
-    }
-  }
   .max-md\:grid {
     @media (width < 48rem) {
       display: grid;
@@ -723,11 +787,6 @@
       display: none;
     }
   }
-  .max-md\:flex-col {
-    @media (width < 48rem) {
-      flex-direction: column;
-    }
-  }
   .max-md\:divide-y-1 {
     @media (width < 48rem) {
       :where(& > :not(:last-child)) {
@@ -800,8 +859,8 @@
       color: transparent;
     }
   }
-  .group-\[\.edit\]\:md\:block {
+  .group-\[\.edit\]\/button\:md\:block {
-    &:is(:where(.group):is(.edit) *) {
+    &:is(:where(.group\/button):is(.edit) *) {
       @media (width >= 48rem) {
         display: block;
       }
@@ -853,12 +912,13 @@
   body {
     -webkit-print-color-adjust: exact !important;
     print-color-adjust: exact !important;
+    background-color: white;
   }
 }
 @layer components {
   .grid-main {
     display: grid;
-    grid-template-columns: 2fr auto 1fr;
+    grid-template-columns: 4fr 3fr 3fr 1fr;
     align-items: stretch;
   }
   .grid-sub {
@@ -894,6 +954,9 @@
     transition-timing-function: var( --tw-ease, var(--default-transition-timing-function) );
     transition-duration: var(--tw-duration, var(--default-transition-duration));
   }
+  input.btn, select.btn {
+    transition-duration: 300ms;
+  }
   .btn:hover {
     color: var(--color-white);
     background-color: var(--color-neutral-700);
@@ -902,8 +965,38 @@
     opacity: 50%;
     pointer-events: none;
   }
-  .btn:active, .btn:focus {
+  input.btn, select.btn {
-    background-color: var(--color-neutral-700);
+    text-align: left;
+  }
+  input.btn:hover, select.btn:hover {
+    border-color: var(--color-neutral-300);
+    background-color: var(--color-neutral-100);
+    color: var(--color-neutral-800);
+  }
+  .edit-box {
+    border-radius: var(--radius-md);
+    overflow: hidden;
+    border-color: var(--color-neutral-500);
+    transition-property: background-color, border-color;
+    transition-timing-function: var(--default-transition-timing-function) * 2;
+    transition-duration: var(--default-transition-duration);
+    outline: none;
+    &:is(:where(.group):is(.edit) *) {
+      border-width: 1px;
+    }
+  }
+  .edit-box:hover {
+    &:is(:where(.group):is(.edit) *) {
+      background-color: var(--color-white);
+      border-color: var(--color-neutral-300);
+    }
+  }
+  .edit-box input:focus {
+    outline: none;
+  }
+  div.edit {
+    border-width: 1px;
+    background-color: var(--color-neutral-300);
   }
   @media (width >=48rem) {
     .grid-main {

Backend/static/script.js

@@ -1,34 +1,81 @@
-function editDay(element, event, formId) {
+function clearEditState() {
-  var form = element.closest(".grid-sub").querySelector(".all-booking-component > form");
+  for (let e of document.querySelectorAll(".edit")) {
-  form.classList.toggle("edit");
+    e.classList.remove("edit");
-  element.classList.toggle("edit");
+  }
-  if (element.classList.contains("edit")) {
+  toggleAbsenceEdit(false);
-    event.preventDefault();
+}
-    form.querySelectorAll("input, select").forEach((input) => {
+
-      input.disabled = false;
+function clearButtonState() {
-    });
+  for (let b of document.querySelectorAll(".change-button-component")) {
-  } else {
+    b.type = "button";
-    form.submit();
   }
 }
 
-function editAbwesenheit(element, event) {
+function editWorkday(element, event, id, isWorkDay) {
-  var newBookingComponent = element.closest(".grid-sub").querySelector(".new-booking-component");
+  event.preventDefault();
-  if (element.value == 0) {
+  let form = document.getElementById(id);
-    newBookingComponent.style.display = "";
+  if (form == null) {
+    form = element.closest(".grid-sub").querySelector(".all-booking-component > form");
+  }
+
+  clearEditState();
+  element.closest(".grid-sub").classList.add("edit");
+  toggleAbsenceEdit(!isWorkDay);
+
+  if (isWorkDay) {
+    element.classList.add("edit");
+    if (element.type == "button") {
+      for (let input of form.querySelectorAll("input, select")) {
+        input.disabled = false;
+      }
+      clearButtonState();
+      element.type = "submit";
+    } else {
+      form.submit();
+    }
   } else {
-    newBookingComponent.style.display = "none";
+    const absenceForm = document.getElementById("absence_form");
+
+    if (id == 0) {
+      absenceForm.querySelector("[name=date_from]").value = form.id.replace("time-", "");
+      absenceForm.querySelector("[name=date_to]").value = form.id.replace("time-", "");
+    } else {
+      syncFields(form, absenceForm, ["date_from", "date_to", "aw_type", "aw_id"]);
+    }
+  }
+}
+
+function toggleAbsenceEdit(state) {
+  const form = document.getElementById("absence_form");
+  if (state) {
+    form.classList.remove("hidden");
+    form.scrollIntoView({
+      behavior: "smooth",
+      block: "start",
+      inline: "nearest",
+    });
+  } else {
+    form.classList.add("hidden");
+  }
+}
+
+function syncFields(from, to, fieldsToSync) {
+  for (let field of fieldsToSync) {
+    const src = from.querySelector(`[name=${field}]`);
+    const target = to.querySelector(`[name=${field}]`);
+    if (!src || !target) return;
+    target.value = src.value;
   }
 }
 
 function navigateWeek(element, event, direction) {
-  var dateInput = element.closest("form").querySelector("input[type=date]");
+  const dateInput = element.closest("form").querySelector("input[type=date]");
-  var date = dateInput.valueAsDate;
+  const date = dateInput.valueAsDate;
   date.setDate(date.getDate() + 7 * direction);
   date.setHours(10);
   dateInput.valueAsDate = date;
 }
 
 function logoutUser() {
-  fetch("/user/logout", {}).then(() => window.location.reload());
+  fetch("/user/logout", {}).then(() => globalThis.location.reload());
 }

Backend/templates/headerComponent_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.943
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.

Backend/templates/pages.templ

@@ -1,9 +1,7 @@
 package templates
 
-import (
+import "arbeitszeitmessung/models"
-	"arbeitszeitmessung/models"
+import "arbeitszeitmessung/helper"
-	"time"
-)
 
 templ Base() {
 	<!DOCTYPE html>
@@ -15,25 +13,6 @@ templ Base() {
 	</head>
 }
 
-templ TimePage(workDays []models.WorkDay, lastSub time.Time) {
-	{{
-		allDays := ctx.Value("days").([]models.IWorkDay)
-	}}
-	@Base()
-	@headerComponent()
-	<div class="grid-main divide-y-1">
-		@inputForm()
-		for _, day := range allDays {
-			@defaultDayComponent(day)
-			// @dayComponent(day, day.Day.Before(lastSub))
-			if (day.Date().Weekday() == time.Monday) {
-				<div class="grid-sub responsive bg-neutral-300 h-2"></div>
-			}
-		}
-	</div>
-	@LegendComponent()
-}
-
 templ LoginPage(success bool, errorMsg string) {
 	@Base()
 	<div class="w-full h-[100vh] flex flex-col justify-center items-center">
@@ -51,6 +30,9 @@ templ LoginPage(success bool, errorMsg string) {
 }
 
 templ UserPage(status int) {
+	{{
+		user := ctx.Value("user").(models.User)
+	}}
 	@Base()
 	@headerComponent()
 	<div class="grid-main divide-y-1">
@@ -73,6 +55,14 @@ templ UserPage(status int) {
 				<button name="action" value="change-pass" type="submit" class="btn">Ändern</button>
 			</div>
 		</form>
+		<div class="grid-sub responsive lg:divide-x-1">
+			<h1 class="grid-cell font-bold uppercase text-xl text-center">Nutzerdaten</h1>
+			<div class="grid-cell col-span-3">
+				<p>Nutzername: <span class="text-neutral-500">{ user.Vorname } { user.Name }</span></p>
+				<p>Personalnummer: <span class="text-neutral-500">{ user.PersonalNummer }</span></p>
+			</div>
+			<div></div>
+		</div>
 		<div class="grid-sub responsive lg:divide-x-1">
 			<h1 class="grid-cell font-bold uppercase text-xl text-center">Nutzer abmelden</h1>
 			<div class="grid-cell col-span-3">
@@ -103,61 +93,6 @@ templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
 			</div>
 		</div>
 		@workWeekComponent(userWeek, false)
-		// <div class="grid-sub lg:divide-x-1 max-md:divide-y-1 responsive @container">
-		// 	<div class="grid-cell col-span-full bg-neutral-300 lg:border-0">
-		// 		<h2 class="text-2xl uppercase font-bold">Eigene Abrechnung</h2>
-		// 	</div>
-		// 	<div class="grid-cell flex flex-col max-md:border-b-1 max-md:bg-neutral-300 gap-2 ">
-		// 		<div class="lg:hidden">
-		// 			@weekPicker(userWeek.WeekStart)
-		// 		</div>
-		// 		<h2 class="uppercase font-bold">{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }</h2>
-		// 		<div class="grid grid-cols-5 gap-2 lg:grid-cols-1">
-		// 			<div class="col-span-2">
-		// 				<span class="flex flex-row gap-2 items-center">
-		// 					@statusCheckMark(userWeek.CheckStatus(), models.WeekStatusSent)
-		// 					Gesendet
-		// 				</span>
-		// 				<span class="flex flex-row gap-2 items-center">
-		// 					@statusCheckMark(userWeek.CheckStatus(), models.WeekStatusAccepted)
-		// 					Akzeptiert
-		// 				</span>
-		// 			</div>
-		// 			<div class="flex flex-row gap-2 col-span-3">
-		// 				@timeGaugeComponent(int8(progress), false)
-		// 				<div>
-		// 					<p>Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDuration(userWeek.Worktime)) }</p>
-		// 					<p>Überstunden: { fmt.Sprintf("%s", helper.FormatDurationFill(userWeek.Overtime, true)) }</p>
-		// 				</div>
-		// 			</div>
-		// 		</div>
-		// 	</div>
-		// 	<div class="grid-cell col-span-3 flex flex-col @7xl:grid @7xl:grid-cols-5 gap-2 py-4 content-baseline">
-		// 		for _, day := range userWeek.Days {
-		// 			@defaultWeekDayComponent(userWeek.User, day)
-		// 		}
-		// 	</div>
-		// 	<div class="grid-cell flex flex-col gap-2 justify-between">
-		// 		<div class="max-md:hidden">
-		// 			@weekPicker(userWeek.WeekStart)
-		// 		</div>
-		// 		<form method="post" class="flex flex-col gap-2">
-		// 			<input type="hidden" name="method" value="send"/>
-		// 			<input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
-		// 			<input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
-		// 			switch userWeek.CheckStatus() {
-		// 				case models.WeekStatusNone:
-		// 					<p class="text-sm">an Vorgesetzten senden</p>
-		// 				case models.WeekStatusSent:
-		// 					<p class="text-sm">an Vorgesetzten gesendet</p>
-		// 				case models.WeekStatusAccepted:
-		// 					<p class="text-sm">vom Vorgesetzten bestätigt</p>
-		// 			}
-		// 			<button disabled?={ userWeek.Status < models.WeekStatusSent } type="submit" class="btn">Korrigieren</button>
-		// 			<button disabled?={ time.Since(userWeek.WeekStart) < 24*7*time.Hour || userWeek.Status >= models.WeekStatusSent || userWeek.RequiresAction() } type="submit" class="btn">Senden</button>
-		// 		</form>
-		// 	</div>
-		// </div>
 		if len(weeks) > 0 {
 			<div class="grid-cell col-span-full bg-neutral-300">
 				<h2 class="text-2xl uppercase font-bold">Abrechnung Mitarbeiter</h2>
@@ -169,26 +104,36 @@ templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
 	</div>
 }
 
-templ TeamPresencePage(teamPresence map[bool][]models.User) {
+templ TeamPresencePage(teamPresence map[models.User]bool) {
 	@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>
+			<h2 class="grid-cell font-bold uppercase">Mitarbeiter</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">
+		for user, present := range teamPresence {
-			<h2 class="grid-cell font-bold uppercase">Nicht Anwesend</h2>
+			<div class="grid-sub">
-			<div class="flex flex-col col-span-2 md:col-span-4">
+				<div class="grid-cell flex flex-row gap-2 col-span-2 md:col-span-1">
-				for _, user := range teamPresence[false] {
+					@timeGaugeComponent(helper.BoolToInt8(present)*100-1, false)
-					@userPresenceComponent(user, false)
+					<p>{ user.Vorname } { user.Name }</p>
-				}
+				</div>
+				<div class="grid-cell col-span-2">
+					if present {
+						<span class="text-neutral-500">Anwesend</span>
+					} else {
+						<span class="text-neutral-500">Abwesend</span>
+					}
+				</div>
 			</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

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.943
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -8,10 +8,8 @@ package templates
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import (
+import "arbeitszeitmessung/models"
-	"arbeitszeitmessung/models"
+import "arbeitszeitmessung/helper"
-	"time"
-)
 
 func Base() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
@@ -42,7 +40,7 @@ func Base() templ.Component {
 	})
 }
 
-func TimePage(workDays []models.WorkDay, lastSub time.Time) templ.Component {
+func LoginPage(success bool, errorMsg string) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -63,101 +61,34 @@ func TimePage(workDays []models.WorkDay, lastSub time.Time) templ.Component {
 			templ_7745c5c3_Var2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-
-		allDays := ctx.Value("days").([]models.IWorkDay)
 		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><form method=\"POST\" class=\"w-9/10 md:w-1/2 flex flex-col gap-4 p-2 mb-2\"><h1 class=\"font-bold uppercase text-xl text-center mb-2\">Benutzer Anmelden</h1><input name=\"personal_nummer\" placeholder=\"Personalnummer\" type=\"text\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"password\" placeholder=\"Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<div class=\"grid-main divide-y-1\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = inputForm().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, day := range allDays {
-			templ_7745c5c3_Err = defaultDayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "  ")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if day.Date().Weekday() == time.Monday {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"grid-sub responsive bg-neutral-300 h-2\"></div>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = LegendComponent().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		return nil
-	})
-}
-
-func LoginPage(success bool, errorMsg string) templ.Component {
-	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
-		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
-			return templ_7745c5c3_CtxErr
-		}
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
-		if !templ_7745c5c3_IsBuffer {
-			defer func() {
-				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
-				if templ_7745c5c3_Err == nil {
-					templ_7745c5c3_Err = templ_7745c5c3_BufErr
-				}
-			}()
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var3 == nil {
-			templ_7745c5c3_Var3 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"w-full h-[100vh] flex flex-col justify-center items-center\"><form method=\"POST\" class=\"w-9/10 md:w-1/2 flex flex-col gap-4 p-2 mb-2\"><h1 class=\"font-bold uppercase text-xl text-center mb-2\">Benutzer Anmelden</h1><input name=\"personal_nummer\" placeholder=\"Personalnummer\" type=\"text\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"password\" placeholder=\"Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		if !success {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<p class=\"text-red-600 text-sm\">Login fehlgeschlagen, bitte erneut versuchen!</p><p class=\"text-red-600 text-sm\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<p class=\"text-red-600 text-sm\">Login fehlgeschlagen, bitte erneut versuchen!</p><p class=\"text-red-600 text-sm\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var4 string
+			var templ_7745c5c3_Var3 string
-			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(errorMsg)
+			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(errorMsg)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 46, Col: 46}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 25, Col: 46}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</p>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<button type=\"submit\" class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Login</button></form></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<button type=\"submit\" class=\"cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm hover:text-white transition-colors  border-neutral-300 focus:bg-neutral-700 active:bg-neutral-700 hover:bg-neutral-700 disabled:pointer-events-none disabled:opacity-50\">Login</button></form></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -181,11 +112,13 @@ func UserPage(status int) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var5 == nil {
+		if templ_7745c5c3_Var4 == nil {
-			templ_7745c5c3_Var5 = templ.NopComponent
+			templ_7745c5c3_Var4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+
+		user := ctx.Value("user").(models.User)
 		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -194,28 +127,67 @@ func UserPage(status int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<div class=\"grid-main divide-y-1\"><form method=\"POST\" class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Passwort ändern</h1><div class=\"grid-cell col-span-3 flex flex-col gap-2\"><input name=\"password\" placeholder=\"Aktuelles Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password\" placeholder=\"Neues Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password_repeat\" placeholder=\"Neues Passwort wiederholen\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"grid-main divide-y-1\"><form method=\"POST\" class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Passwort ändern</h1><div class=\"grid-cell col-span-3 flex flex-col gap-2\"><input name=\"password\" placeholder=\"Aktuelles Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password\" placeholder=\"Neues Passwort\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> <input name=\"new_password_repeat\" placeholder=\"Neues Passwort wiederholen\" type=\"password\" class=\"w-full placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-300  rounded-md px-3 py-2 transition duration-300 ease focus:outline-none hover:border-neutral-500\"> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		switch {
 		case status == 401:
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<p class=\"text-red-600 text-sm\">Aktuelles Passwort nicht korrekt!</p>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<p class=\"text-red-600 text-sm\">Aktuelles Passwort nicht korrekt!</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		case status >= 400:
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<p class=\"text-red-600 text-sm\">Passwortwechsel fehlgeschlagen, bitte erneut versuchen!</p>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<p class=\"text-red-600 text-sm\">Passwortwechsel fehlgeschlagen, bitte erneut versuchen!</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		case status == 202:
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<p class=\"text-accent text-sm\">Passwortänderung erfolgreich</p>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<p class=\"text-accent text-sm\">Passwortänderung erfolgreich</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div><div class=\"grid-cell\"><button name=\"action\" value=\"change-pass\" type=\"submit\" class=\"btn\">Ändern</button></div></form><div class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Nutzer abmelden</h1><div class=\"grid-cell col-span-3\"><p>Nutzer von Weboberfläche abmelden.</p></div><div class=\"grid-cell\"><button onclick=\"logoutUser\" type=\"button\" class=\"btn\">Abmelden</button></div></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</div><div class=\"grid-cell\"><button name=\"action\" value=\"change-pass\" type=\"submit\" class=\"btn\">Ändern</button></div></form><div class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Nutzerdaten</h1><div class=\"grid-cell col-span-3\"><p>Nutzername: <span class=\"text-neutral-500\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 61, Col: 64}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 61, Col: 78}
+		}
+		_, 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, 12, "</span></p><p>Personalnummer: <span class=\"text-neutral-500\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(user.PersonalNummer)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 62, Col: 75}
+		}
+		_, 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, 13, "</span></p></div><div></div></div><div class=\"grid-sub responsive lg:divide-x-1\"><h1 class=\"grid-cell font-bold uppercase text-xl text-center\">Nutzer abmelden</h1><div class=\"grid-cell col-span-3\"><p>Nutzer von Weboberfläche abmelden.</p></div><div class=\"grid-cell\"><button onclick=\"logoutUser\" type=\"button\" class=\"btn\">Abmelden</button></div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -239,18 +211,18 @@ func statusCheckMark(status models.WeekStatus, target models.WeekStatus) templ.C
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var8 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var6 == nil {
+		if templ_7745c5c3_Var8 == nil {
-			templ_7745c5c3_Var6 = templ.NopComponent
+			templ_7745c5c3_Var8 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		if status >= target {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"icon-[material-symbols-light--check-circle-outline]\"></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"icon-[material-symbols-light--check-circle-outline]\"></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		} else {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<div class=\"icon-[material-symbols-light--circle-outline]\"></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"icon-[material-symbols-light--circle-outline]\"></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -275,9 +247,9 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var7 == nil {
+		if templ_7745c5c3_Var9 == nil {
-			templ_7745c5c3_Var7 = templ.NopComponent
+			templ_7745c5c3_Var9 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
@@ -288,7 +260,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub lg:divide-x-1 max-md:divide-y-1 responsive @container\"><div class=\"grid-cell col-span-full bg-neutral-300 lg:border-0\"><h2 class=\"text-2xl uppercase font-bold\">Eigene Abrechnung</h2></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub lg:divide-x-1 max-md:divide-y-1 responsive @container\"><div class=\"grid-cell col-span-full bg-neutral-300 lg:border-0\"><h2 class=\"text-2xl uppercase font-bold\">Eigene Abrechnung</h2></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -297,7 +269,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 			return templ_7745c5c3_Err
 		}
 		if len(weeks) > 0 {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<div class=\"grid-cell col-span-full bg-neutral-300\"><h2 class=\"text-2xl uppercase font-bold\">Abrechnung Mitarbeiter</h2></div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"grid-cell col-span-full bg-neutral-300\"><h2 class=\"text-2xl uppercase font-bold\">Abrechnung Mitarbeiter</h2></div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -308,7 +280,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 				return templ_7745c5c3_Err
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -316,7 +288,7 @@ func TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) templ.Component
 	})
 }
 
-func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
+func TeamPresencePage(teamPresence map[models.User]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 {
@@ -332,9 +304,9 @@ func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var8 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var8 == nil {
+		if templ_7745c5c3_Var10 == nil {
-			templ_7745c5c3_Var8 = templ.NopComponent
+			templ_7745c5c3_Var10 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
@@ -345,27 +317,66 @@ func TeamPresencePage(teamPresence map[bool][]models.User) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 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\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1\"><h2 class=\"grid-cell font-bold uppercase\">Mitarbeiter</h2></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for _, user := range teamPresence[true] {
+		for user, present := range teamPresence {
-			templ_7745c5c3_Err = userPresenceComponent(user, true).Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<div class=\"grid-sub\"><div class=\"grid-cell flex flex-row gap-2 col-span-2 md:col-span-1\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = timeGaugeComponent(helper.BoolToInt8(present)*100-1, false).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var11 string
+			templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 118, Col: 22}
+			}
+			_, 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, 22, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var12 string
+			templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 118, Col: 36}
+			}
+			_, 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, 23, "</p></div><div class=\"grid-cell col-span-2\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if present {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<span class=\"text-neutral-500\">Anwesend</span>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<span class=\"text-neutral-500\">Abwesend</span>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "</div></div>")
 			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\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</div>")
-		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
 		}
@@ -389,12 +400,12 @@ func LogoutButton() templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var13 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var9 == nil {
+		if templ_7745c5c3_Var13 == nil {
-			templ_7745c5c3_Var9 = templ.NopComponent
+			templ_7745c5c3_Var13 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<button onclick=\"logoutUser()\" type=\"button\" class=\"cursor-pointer\">Abmelden</button>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<button onclick=\"logoutUser()\" type=\"button\" class=\"cursor-pointer\">Abmelden</button>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/pdf.templ

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-templ PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) {
+templ PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) {
 	{{
 		_, kw := tsStart.ISOWeek()
 		noBorder := ""
@@ -14,10 +14,10 @@ templ PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.T
 	@Base()
 	<content class="p-8 relative flex flex-col gap-4 break-after-page">
 		<div>
-			<h1 class="text-2xl font-bold">Kim Mustermensch</h1>
+			<h1 class="text-2xl font-bold">{ e.Vorname } { e.Name }</h1>
 			<p>Zeitraum: <span>{ tsStart.Format("02.01.2006") }</span> - <span>{ tsEnd.Format("02.01.2006") }</span></p>
-			<p>Arbeitszeit: <span></span></p>
+			<p>Arbeitszeit: <span>{ helper.FormatDuration(worktime) }</span></p>
-			<p>Überstunden: <span></span></p>
+			<p>Überstunden: <span>{ helper.FormatDuration(overtime) }</span></p>
 		</div>
 		<div class="grid grid-rows-6 grid-cols-[3fr_2fr_2fr_2fr_3fr_3fr_3fr] *:not-print:p-2 *:text-center auto-rows-min divide-neutral-300 divide-x-1 divide-y-1">
 			<p class="bg-neutral-300 border-neutral-600">{ kw }</p>
@@ -45,7 +45,12 @@ templ PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.T
 							<p>{ workDay.Bookings[bookingI].BookingType.Name } </p>
 						}
 						if workDay.IsKurzArbeit() {
-							<p class="col-span-full">Kurzarbeit</p>
+							{{
+								timeFrom, timeTo := workDay.GenerateKurzArbeitBookings(e)
+							}}
+							<p>{ timeFrom.Format("15:04") }</p>
+							<p>{ timeTo.Format("15:04") }</p>
+							<p>Kurzarbeit</p>
 						}
 					} else {
 						{{

Backend/templates/pdf_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.943
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -14,7 +14,7 @@ import (
 	"time"
 )
 
-func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) templ.Component {
+func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -42,46 +42,98 @@ func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Ti
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<content class=\"p-8 relative flex flex-col gap-4 break-after-page\"><div><h1 class=\"text-2xl font-bold\">Kim Mustermensch</h1><p>Zeitraum: <span>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<content class=\"p-8 relative flex flex-col gap-4 break-after-page\"><div><h1 class=\"text-2xl font-bold\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(tsStart.Format("02.01.2006"))
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(e.Vorname)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 18, Col: 52}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 17, Col: 45}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</span> - <span>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(tsEnd.Format("02.01.2006"))
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(e.Name)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 18, Col: 98}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 17, Col: 56}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span></p><p>Arbeitszeit: <span></span></p><p>Überstunden: <span></span></p></div><div class=\"grid grid-rows-6 grid-cols-[3fr_2fr_2fr_2fr_3fr_3fr_3fr] *:not-print:p-2 *:text-center auto-rows-min divide-neutral-300 divide-x-1 divide-y-1\"><p class=\"bg-neutral-300 border-neutral-600\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</h1><p>Zeitraum: <span>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(kw)
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(tsStart.Format("02.01.2006"))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 23, Col: 52}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 18, Col: 52}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</p><p class=\"bg-neutral-300 border-neutral-600\">Kommen</p><p class=\"bg-neutral-300 border-neutral-600\">Gehen</p><p class=\"bg-neutral-300 border-neutral-600\">Arbeitsart</p><p class=\"bg-neutral-300 border-neutral-600\">Stunden</p><p class=\"bg-neutral-300 border-neutral-600\">Pause</p><p class=\"bg-neutral-300 border-neutral-600 border-r-0\">Überstunden</p>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</span> - <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(tsEnd.Format("02.01.2006"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 18, Col: 98}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</span></p><p>Arbeitszeit: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(worktime))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 19, Col: 58}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</span></p><p>Überstunden: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(overtime))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 20, Col: 59}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</span></p></div><div class=\"grid grid-rows-6 grid-cols-[3fr_2fr_2fr_2fr_3fr_3fr_3fr] *:not-print:p-2 *:text-center auto-rows-min divide-neutral-300 divide-x-1 divide-y-1\"><p class=\"bg-neutral-300 border-neutral-600\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(kw)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 23, Col: 52}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</p><p class=\"bg-neutral-300 border-neutral-600\">Kommen</p><p class=\"bg-neutral-300 border-neutral-600\">Gehen</p><p class=\"bg-neutral-300 border-neutral-600\">Arbeitsart</p><p class=\"bg-neutral-300 border-neutral-600\">Stunden</p><p class=\"bg-neutral-300 border-neutral-600\">Pause</p><p class=\"bg-neutral-300 border-neutral-600 border-r-0\">Überstunden</p>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -90,60 +142,60 @@ func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Ti
 			if index == len(workDays)-1 {
 				noBorder = "border-b-0"
 			}
-			var templ_7745c5c3_Var5 = []any{noBorder}
+			var templ_7745c5c3_Var9 = []any{noBorder}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var5...)
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var9...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<p class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<p class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var6 string
+			var templ_7745c5c3_Var10 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var5).String())
+			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var9).String())
 			if templ_7745c5c3_Err != nil {
 				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+			_, 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, 6, "\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var7 string
+			var templ_7745c5c3_Var11 string
-			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("02.01.2006"))
+			templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("02.01.2006"))
 			if templ_7745c5c3_Err != nil {
 				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 36, Col: 59}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+			_, 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, 7, "</p>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var8 = []any{"grid grid-cols-subgrid col-span-3 " + noBorder}
+			var templ_7745c5c3_Var12 = []any{"grid grid-cols-subgrid col-span-3 " + noBorder}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var8...)
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var12...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var9 string
+			var templ_7745c5c3_Var13 string
-			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var8).String())
+			templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var12).String())
 			if templ_7745c5c3_Err != nil {
 				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+			_, 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, 9, "\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -151,56 +203,84 @@ func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Ti
 
 				workDay, _ := day.(*models.WorkDay)
 				for bookingI := 0; bookingI < len(workDay.Bookings); bookingI += 2 {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					var templ_7745c5c3_Var10 string
+					var templ_7745c5c3_Var14 string
-					templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].Timestamp.Format("15:04"))
+					templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].Timestamp.Format("15:04"))
 					if templ_7745c5c3_Err != nil {
 						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 43, Col: 64}
 					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+					_, 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, 11, "</p><p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</p><p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					var templ_7745c5c3_Var11 string
+					var templ_7745c5c3_Var15 string
-					templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI+1].Timestamp.Format("15:04"))
+					templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI+1].Timestamp.Format("15:04"))
 					if templ_7745c5c3_Err != nil {
 						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 44, Col: 66}
 					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+					_, 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, 12, "</p><p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p><p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					var templ_7745c5c3_Var12 string
+					var templ_7745c5c3_Var16 string
-					templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].BookingType.Name)
+					templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].BookingType.Name)
 					if templ_7745c5c3_Err != nil {
 						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 45, Col: 55}
 					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+					_, 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, 13, "</p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, " ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, " ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				if workDay.IsKurzArbeit() {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<p class=\"col-span-full\">Kurzarbeit</p>")
+
+					timeFrom, timeTo := workDay.GenerateKurzArbeitBookings(e)
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var17 string
+					templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(timeFrom.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 51, Col: 36}
+					}
+					_, 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, 20, "</p><p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var18 string
+					templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(timeTo.Format("15:04"))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 52, Col: 34}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</p><p>Kurzarbeit</p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
@@ -208,25 +288,25 @@ func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Ti
 			} else {
 
 				absentDay, _ := day.(*models.Absence)
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<p class=\"col-span-full\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<p class=\"col-span-full\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				var templ_7745c5c3_Var13 string
+				var templ_7745c5c3_Var19 string
-				templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(absentDay.AbwesenheitTyp.Name)
+				templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(absentDay.AbwesenheitTyp.Name)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 54, Col: 62}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 59, Col: 62}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+				_, 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, 17, "</p>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</p>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -235,7 +315,7 @@ func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Ti
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, " ")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, " ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -243,7 +323,7 @@ func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Ti
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, " ")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -251,18 +331,18 @@ func PDFReportEmploye(e models.User, workDays []models.IWorkDay, tsStart time.Ti
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, " ")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, " ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			if day.Date().Weekday() == time.Friday {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<p class=\"col-span-full bg-neutral-300\">Wochenende</p>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<p class=\"col-span-full bg-neutral-300\">Wochenende</p>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</div></content>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</div></content>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -286,9 +366,9 @@ func ColorDuration(d time.Duration, classes string) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
+		templ_7745c5c3_Var20 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var14 == nil {
+		if templ_7745c5c3_Var20 == nil {
-			templ_7745c5c3_Var14 = templ.NopComponent
+			templ_7745c5c3_Var20 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 
@@ -296,38 +376,38 @@ func ColorDuration(d time.Duration, classes string) templ.Component {
 		if d.Abs() < time.Minute {
 			color = "text-neutral-300"
 		}
-		var templ_7745c5c3_Var15 = []any{color + " " + classes}
+		var templ_7745c5c3_Var21 = []any{color + " " + classes}
-		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var15...)
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var21...)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<p class=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<p class=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var16 string
+		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var15).String())
+		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var21).String())
 		if templ_7745c5c3_Err != nil {
 			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var17 string
+		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDurationFill(d, true))
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDurationFill(d, true))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 76, Col: 72}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 81, Col: 72}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "</p>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "</p>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}

Backend/templates/teamComponents.templ

@@ -44,7 +44,7 @@ templ defaultWeekDayComponent(u models.User, day models.IWorkDay) {
 						<span class="text-neutral-500">{ helper.FormatDuration(pause) }</span>
 					</div>
 					<div class="flex flex-row gap-2 items-center">
-						<span class="icon-[material-symbols-light--nest-clock-farsight-analog-outline] flex-shrink-0"></span>
+						<span class="icon-[material-symbols-light--schedule-outline] flex-shrink-0"></span>
 						switch  {
 							case !workDay.TimeFrom.Equal(workDay.TimeTo):
 								<span>{ workDay.TimeFrom.Format("15:04") }</span>
@@ -81,7 +81,7 @@ templ weekDayComponent(user models.User, day models.WorkDay) {
 templ workWeekComponent(week models.WorkWeek, onlyAccept bool) {
 	{{
 		year, kw := week.WeekStart.ISOWeek()
-		progress := (float32(week.Worktime.Hours()) / week.User.ArbeitszeitPerWoche) * 100
+		progress := (float32(week.WorkTimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
 	}}
 	<div class="employeComponent grid-sub responsive lg:divide-x-1 max-md:divide-y-1 @container">
 		<div class="grid-cell flex flex-col max-md:bg-neutral-300 gap-2">

Backend/templates/teamComponents_templ.go

@@ -1,6 +1,6 @@
 // Code generated by templ - DO NOT EDIT.
 
-// templ: version: v0.3.943
+// templ: version: v0.3.924
 package templates
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
@@ -207,7 +207,7 @@ func defaultWeekDayComponent(u models.User, day models.IWorkDay) templ.Component
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</span></div><div class=\"flex flex-row gap-2 items-center\"><span class=\"icon-[material-symbols-light--nest-clock-farsight-analog-outline] flex-shrink-0\"></span> ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</span></div><div class=\"flex flex-row gap-2 items-center\"><span class=\"icon-[material-symbols-light--schedule-outline] flex-shrink-0\"></span> ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
@@ -346,7 +346,7 @@ func workWeekComponent(week models.WorkWeek, onlyAccept bool) templ.Component {
 		ctx = templ.ClearChildren(ctx)
 
 		year, kw := week.WeekStart.ISOWeek()
-		progress := (float32(week.Worktime.Hours()) / week.User.ArbeitszeitPerWoche) * 100
+		progress := (float32(week.WorkTimeVirtual.Hours()) / week.User.ArbeitszeitPerWoche) * 100
 		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<div class=\"employeComponent grid-sub responsive lg:divide-x-1 max-md:divide-y-1 @container\"><div class=\"grid-cell flex flex-col max-md:bg-neutral-300 gap-2\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err

Backend/templates/timeComponents.templ

@@ -1,137 +1,34 @@
 package templates
 
 import (
-	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"fmt"
-	"net/url"
 	"strconv"
 	"time"
 )
 
-templ inputForm() {
+templ lineComponent() {
-	{{
+	<div class="flex flex-col w-2 py-2 items-center text-accent print:hidden">
-		urlParams := ctx.Value("urlParams").(url.Values)
+		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
-		user := ctx.Value("user").(models.User)
+			<polygon points="12,2 22,12 12,22 2,12"></polygon>
-	}}
+		</svg>
-	<div class="grid-sub divide-x-1 bg-neutral-300 max-md:flex max-md:flex-col">
+		<div class="w-[2px] bg-accent flex-grow -my-1"></div>
-		<div class="grid-cell md:col-span-1 max-md:grid grid-cols-2">
+		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
-			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
+			<polygon points="12,2 22,12 12,22 2,12"></polygon>
-			<div class="justify-self-end">
+		</svg>
-				<p class="text-sm">Überstunden</p>
-				<p class="text-accent">{ user.Overtime }</p>
-			</div>
-		</div>
-		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row md:col-span-3 gap-2 ">
-			@lineComponent()
-			<div class="flex flex-col gap-2 justify-between grow-1">
-				<input type="date" value={ urlParams.Get("time_from") } name="time_from" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum von..."/>
-				<input type="date" value={ urlParams.Get("time_to") } name="time_to" class="w-full bg-neutral-100 placeholder:text-neutral-400 text-neutral-700 text-sm border border-neutral-0 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300" placeholder="Zeitraum bis..."/>
-			</div>
-		</form>
-		<div class="grid-cell content-end">
-			<button type="submit" form="timeRangeForm" class="btn bg-neutral-100 hover:bg-neutral-700 color-neutral-700">
-				<p class="">Anzeigen</p>
-			</button>
-		</div>
 	</div>
 }
 
-templ defaultDayComponent(day models.IWorkDay) {
+templ changeButtonComponent(id string, workDay bool) {
-	if day.IsWorkDay() {
+	<button class="change-button-component btn w-auto group/button" type="button" onclick={ templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), id, workDay) }>
-		{{
+		<p class="hidden md:block group-[.edit]/button:hidden">Ändern</p>
-			workDay, _ := day.(*models.WorkDay)
+		<p class="hidden group-[.edit]/button:md:block">Absenden</p>
-		}}
-		@workDayComponent(*workDay, false)
-	} else {
-		{{
-			absentDay, _ := day.(*models.Absence)
-		}}
-		<div class={ "grid-sub divide-x-1 hover:bg-neutral-200 transition-colors" }>
-			<div class="grid-cell md:col-span-1 flex flex-row gap-2">
-				@timeGaugeComponent(100, false)
-				<p><span class="font-bold uppercase hidden md:inline">{ day.Date().Format("Mon") }:</span> { day.Date().Format("02.01.2006") }</p>
-			</div>
-			<div class="grid-cell flex flex-row md:col-span-3 gap-2 w-full">
-				@lineComponent()
-				<div class="flex flex-col gap-2 group w-full justify-center">
-					<p>{ absentDay.AbwesenheitTyp.Name } <span class="text-neutral-700">bis { absentDay.DateTo.Format("02.01.2006") }</span></p>
-				</div>
-			</div>
-			<div class="grid-cell">
-				@changeButtonComponent("time-" + absentDay.Date().Format("2006-01-02"))
-			</div>
-		</div>
-	}
-}
-
-templ workDayComponent(workDay models.WorkDay, submitted bool) {
-	{{
-		// work, pause := workDay.GetWorkTimeString()
-		user := ctx.Value("user").(models.User)
-		work, pause, overtime := workDay.GetAllWorkTimesReal(user)
-		// overtime := helper.FormatDuration(workDay.CalcOvertime(user))
-		justify := ""
-		if len(workDay.Bookings) <= 1 {
-			justify = "justify-content: center"
-		}
-	}}
-	<div class={ "grid-sub divide-x-1 hover:bg-neutral-200 transition-colors", templ.KV("bg-neutral-100", submitted) }>
-		<div class="grid-cell md:col-span-1 flex flex-row gap-2">
-			@timeGaugeComponent(workDay.GetDayProgress(user), workDay.Day.Equal(time.Now().Truncate(24*time.Hour)))
-			<div>
-				<p class=""><span class="font-bold uppercase hidden md:inline">{ workDay.Day.Format("Mon") }:</span> { workDay.Day.Format("02.01.2006") }</p>
-				if (workDay.RequiresAction()) {
-					<p class="text-red-600">Bitte anpassen</p>
-				} else {
-					if work > 0 {
-						<p class=" text-sm mt-1">Arbeitszeit:</p>
-						<p class="text-accent flex flex-row items-center"><span class="icon-[material-symbols-light--nest-clock-farsight-analog-outline]"></span>{ helper.FormatDuration(work) }</p>
-					}
-					if pause > 0 {
-						<p class="text-neutral-500 flex flex-row items-center"><span class="icon-[material-symbols-light--motion-photos-paused-outline]"></span>{ helper.FormatDuration(pause) }</p>
-					}
-					if overtime > 0 {
-						<p class="text-neutral-500 flex flex-row items-center"><span class="icon-[material-symbols-light--more-time]"></span>{ helper.FormatDuration(overtime) }</p>
-					}
-				}
-			</div>
-		</div>
-		<div class="all-booking-component flex flex-row md:col-span-3 gap-2 w-full grid-cell">
-			@lineComponent()
-			<form id={ "time-" + workDay.Day.Format("2006-01-02") } class="flex flex-col gap-2 group w-full justify-between" style={ justify } method="post">
-				if len(workDay.Bookings) < 1 {
-					<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
-					@absenceComponent(workDay)
-					@newBookingComponent(workDay)
-				} else {
-					@absenceComponent(workDay)
-					for _, booking := range workDay.Bookings {
-						@bookingComponent(booking)
-					}
-					if workDay.IsKurzArbeit() {
-						<p>Kurzarbeit</p>
-					}
-					@newBookingComponent(workDay)
-				}
-				<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
-			</form>
-		</div>
-		<div class="grid-cell">
-			@changeButtonComponent("time-" + workDay.Day.Format("2006-01-02"))
-		</div>
-	</div>
-}
-
-templ changeButtonComponent(id string) {
-	<button class="btn w-auto group" type="submit" onclick={ templ.JSFuncCall("editDay", templ.JSExpression("this"), templ.JSExpression("event"), id) }>
-		<p class="hidden md:block group-[.edit]:hidden">Ändern</p>
-		<p class="hidden group-[.edit]:md:block">Absenden</p>
 		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4 md:hidden">
-			<path class="group-[.edit]:hidden md:hidden" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325"></path>
+			<path class="group-[.edit]/button: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>
+			<path class="hidden group-[.edit]/button: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>
+	<button class="hidden group-[.edit]:flex btn  basis-[content] items-center" onclick={ templ.JSFuncCall("clearEditState") }><span class="size-5 icon-[material-symbols-light--cancel-outline]"></span></button>
 }
 
 templ timeGaugeComponent(progress int8, today bool) {
@@ -164,49 +61,68 @@ templ timeGaugeComponent(progress int8, today bool) {
 	}
 }
 
-templ lineComponent() {
+templ newAbsenceComponent() {
-	<div class="flex flex-col w-2 py-2 items-center text-accent print:hidden">
+	<div class="no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center ">
-		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
+		<button type="button" name="absence" onclick={ templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), 0, false) } class="btn border-neutral-500">
-			<polygon points="12,2 22,12 12,22 2,12"></polygon>
+			Neue Abwesenheit
-		</svg>
+		</button>
-		<div class="w-[2px] bg-accent flex-grow -my-1"></div>
-		<svg class="size-2" viewBox="0 0 24 24" fill="currentColor">
-			<polygon points="12,2 22,12 12,22 2,12"></polygon>
-		</svg>
 	</div>
 }
 
-templ absenceComponent(d models.WorkDay) {
+templ absenceComponent(a *models.Absence, isKurzarbeit bool) {
-	<div class="no-booking-component hidden group-[.edit]:flex flex-col gap-2 align-center">
+	{{
-		<select name="absence" onchange={ templ.JSFuncCall("editAbwesenheit", templ.JSExpression("this"), templ.JSExpression("event")) } class="grow cursor-pointer rounded-md text-neutral-800 p-2 md:px-4 border text-center text-sm transition-colors border-neutral-900" disabled>
+		editBox := ""
-			<option value="0">Abwesenheit?</option>
+		if isKurzarbeit {
-			for _, absence := range models.GetAbsenceTypesCached() {
+			editBox = "edit-box"
-				<option value={ strconv.Itoa(int(absence.Id)) }>{ absence.Name }</option>
+		}
+	}}
+	<div class={ "flex flex-row items-center gap-2", editBox }>
+		<input type="hidden" name="date_from" value={ a.DateFrom.Format("2006-01-02") }/>
+		<input type="hidden" name="date_to" value={ a.DateTo.Format("2006-01-02") }/>
+		<input type="hidden" name="aw_type" value={ a.AbwesenheitTyp.Id }/>
+		<input type="hidden" name="aw_id" value={ a.CounterId }/>
+		<p class="whitespace-nowrap group-[.edit]:ml-2">
+			{ a.AbwesenheitTyp.Name }
+			if a.IsMultiDay() {
+				<span class="text-neutral-500">bis { a.DateTo.Format("02.01.2006") }</span>
 			}
-		</select>
+		</p>
+		<div class="w-full"></div>
+		if isKurzarbeit {
+			<button type="button" onclick={ templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format("2006-01-02"), false) } class="hidden btn border-0 rounded-none grow-0 w-auto group-[.edit]:inline">Bearbeiten</button>
+		}
 	</div>
 }
 
-templ newBookingComponent(d models.WorkDay) {
+templ newBookingComponent(d *models.WorkDay) {
-	<div class="new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center">
+	<div class="new-booking-component hidden group-[.edit]:flex flex-row gap-2 items-center edit-box border-dashed">
-		<button name="action" value="add" type="submit" class="hover:text-accent cursor-pointer icon-[material-symbols-light--add-circle-outline]"></button>
+		<input name="timestamp" type="time" value={ time.Now().Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm px-3 py-2 cursor-pointer"/>
-		<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">
+		<div class="relative">
-			<option value="0" disabled>Kommen/Gehen</option>
+			<select class="cursor-pointer appearance-none" name="check_in_out">
-			<option value="3" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 }>Kommen</option>
+				<option value="0" disabled>Kommen/Gehen</option>
-			<option value="4" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 }>Gehen</option>
+				<option value="3" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 0 }>Kommen</option>
-		</select>
+				<option value="4" selected?={ len(d.Bookings) > 0 && d.Bookings[len(d.Bookings)-1].CheckInOut%2 == 1 }>Gehen</option>
+			</select>
+			<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.2" stroke="currentColor" class="h-5 w-5 ml-1 absolute right-1 top-[0.125rem] text-slate-700">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 15 12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9"></path>
+			</svg>
+		</div>
+		<div class="w-full"></div>
+		<button name="action" value="add" type="submit" class="hidden btn border-0 rounded-none grow-0 w-auto group-[.edit]:inline"><span class="hidden md:inline">Hinzufügen</span><span class="md:hidden">+</span></button>
 	</div>
 }
 
 templ bookingComponent(booking models.Booking) {
 	<div>
-		<p class="text-neutral-500">
+		<p class="text-neutral-500 edit-box">
-			<span class="text-neutral-700 group-[.edit]:hidden inline">{ booking.Timestamp.Format("15:04") }</span>
+			<span class="text-black group-[.edit]:hidden inline">{ booking.Timestamp.Format("15:04") }</span>
-			<input disabled name={ "booking_" + strconv.Itoa(booking.CounterId) } type="time" value={ booking.Timestamp.Format("15:04") } class="text-neutral-700 group-[.edit]:inline hidden bg-neutral-100 text-sm border border-neutral-200 rounded-md px-3 py-2 transition duration-300 ease focus:outline-none focus:border-neutral-400 hover:border-neutral-300"/>
+			<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 px-3 py-2 cursor-pointer"/>
 			{ booking.GetBookingType() }
 		</p>
+		if booking.IsSubmittedAndChecked() {
+			<p>submitted</p>
+		}
 	</div>
 }
 

Backend/templates/timePage.templ

@@ -0,0 +1,166 @@
+package templates
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"net/url"
+	"strconv"
+	"time"
+)
+
+templ TimePage(workDays []models.WorkDay, lastSub time.Time) {
+	{{
+		allDays := ctx.Value("days").([]models.IWorkDay)
+	}}
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		@inputForm()
+		for _, day := range allDays {
+			@defaultDayComponent(day)
+			if (day.Date().Weekday() == time.Monday) {
+				<div class="grid-sub responsive bg-neutral-300 h-2"></div>
+			}
+		}
+	</div>
+	@LegendComponent()
+}
+
+templ inputForm() {
+	{{
+		urlParams := ctx.Value("urlParams").(url.Values)
+		user := ctx.Value("user").(models.User)
+	}}
+	<div class="grid-sub divide-x-1 bg-neutral-300 responsive">
+		<div class="grid-cell md:col-span-1 max-md:grid grid-cols-2">
+			<p class="font-bold uppercase">{ user.Vorname + " " + user.Name }</p>
+			<div class="justify-self-end">
+				<p class="text-sm">Überstunden</p>
+				<p class="text-accent">{ user.Overtime }</p>
+			</div>
+		</div>
+		<form id="timeRangeForm" method="GET" class="grid-cell flex flex-row md:col-span-3 gap-2 ">
+			@lineComponent()
+			<div class="flex flex-col gap-2 justify-between grow-1">
+				<input type="date" value={ urlParams.Get("time_from") } name="time_from" class="btn bg-neutral-100" placeholder="Zeitraum von..."/>
+				<input type="date" value={ urlParams.Get("time_to") } name="time_to" class="btn bg-neutral-100" placeholder="Zeitraum bis..."/>
+			</div>
+		</form>
+		<div class="grid-cell content-end">
+			<button type="submit" form="timeRangeForm" class="btn bg-neutral-100 hover:bg-neutral-700 color-neutral-700">
+				<p class="">Anzeigen</p>
+			</button>
+		</div>
+	</div>
+	<form id="absence_form" method="POST" action="/absence" class="grid-sub responsive scroll-m-2 bg-neutral-300 hidden">
+		<input type="hidden" name="aw_id" value=""/>
+		<div class="grid-cell border-r-1"><p class="font-bold uppercase">Abwesenheit</p></div>
+		<div class="grid-cell">
+			<label class="block mb-1 text-sm text-neutral-700">Abwesenheitsart</label>
+			<div class="relative">
+				<select name="aw_type" class="btn appearance-none cursor-pointer bg-neutral-100">
+					for _, absence := range models.GetAbsenceTypesCached() {
+						<option value={ strconv.Itoa(int(absence.Id)) }>{ absence.Name }</option>
+					}
+				</select>
+				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.2" stroke="currentColor" class="h-5 w-5 ml-1 absolute top-2.5 right-2.5 text-slate-700">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 15 12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9"></path>
+				</svg>
+			</div>
+		</div>
+		<div class="grid-cell">
+			<label class="block mb-1 text-sm text-neutral-700">Abwesenheit ab</label>
+			<input name="date_from" type="date" class="btn bg-neutral-100"/>
+		</div>
+		<div class="grid-cell border-r-1">
+			<label class="block mb-1 text-sm text-neutral-700">Abwesenheit bis</label>
+			<input name="date_to" type="date" class="btn bg-neutral-100"/>
+		</div>
+		<div class="grid-cell flex flex-row items-end">
+			<div class="flex flex-row gap-2 w-full">
+				<button name="action" value="insert" type="submit" class="bg-neutral-100 btn hover:bg-neutral-700">Speichern</button>
+				<button name="action" value="delete" type="submit" class="bg-neutral-100 btn hover:bg-red-700 flex basis-[content] items-center"><span class="size-5 icon-[material-symbols-light--delete-outline]"></span></button>
+			</div>
+		</div>
+	</form>
+}
+
+templ defaultDayComponent(day models.IWorkDay) {
+	{{
+		user := ctx.Value("user").(models.User)
+		justify := "justify-center"
+		if day.IsWorkDay() && len(day.(*models.WorkDay).Bookings) > 1 {
+			justify = "justify-between"
+		}
+	}}
+	<div class={ "grid-sub divide-x-1 hover:bg-neutral-200 transition-colors group" }>
+		<div class="grid-cell md:col-span-1 flex flex-row gap-2">
+			@timeGaugeComponent(day.GetDayProgress(user), day.Date().Equal(time.Now().Truncate(24*time.Hour)))
+			<div>
+				<p>
+					<span class="font-bold uppercase hidden md:inline">{ day.Date().Format("Mon") }:</span> { day.Date().Format("02.01.2006") }
+				</p>
+				if day.IsWorkDay() {
+					{{
+						workDay, _ := day.(*models.WorkDay)
+						work, pause, overtime := workDay.GetAllWorkTimesReal(user)
+					}}
+					if day.RequiresAction() {
+						<p class="text-red-600">Bitte anpassen</p>
+					} else {
+						if work > 0 {
+							<p class=" text-sm mt-1">Arbeitszeit:</p>
+							<p class="text-accent flex flex-row items-center"><span class="icon-[material-symbols-light--schedule-outline]"></span>{ helper.FormatDuration(work) }</p>
+						}
+						if pause > 0 {
+							<p class="text-neutral-500 flex flex-row items-center"><span class="icon-[material-symbols-light--motion-photos-paused-outline]"></span>{ helper.FormatDuration(pause) }</p>
+						}
+						if overtime != 0 && len(workDay.Bookings) > 0 {
+							<p class="text-neutral-500 flex flex-row items-center">
+								<span class="icon-[material-symbols-light--more-time]"></span>
+								{ helper.FormatDuration(overtime) }
+							</p>
+						}
+					}
+				}
+			</div>
+		</div>
+		<div class="all-booking-component grid-cell flex flex-row md:col-span-3 col-span-2 gap-2 w-full">
+			@lineComponent()
+			<form id={ "time-" + day.Date().Format("2006-01-02") } class={ "flex flex-col gap-2 w-full", justify } method="post">
+				if day.IsWorkDay() {
+					{{
+					workDay, _ := day.(*models.WorkDay)
+					}}
+					@newAbsenceComponent()
+					if len(workDay.Bookings) < 1 {
+						<p class="text group-[.edit]:hidden">Keine Buchung gefunden. Bitte Arbeitsstunden oder Grund der Abwesenheit eingeben!</p>
+					}
+					if workDay.IsKurzArbeit() {
+						@absenceComponent(workDay.GetKurzArbeit(), true)
+					}
+					for _, booking := range workDay.Bookings {
+						@bookingComponent(booking)
+					}
+					@newBookingComponent(workDay)
+				} else {
+					{{
+						absentDay, _ := day.(*models.Absence)
+					}}
+					@absenceComponent(absentDay, false)
+				}
+				<input type="hidden" name="action" value="change"/> <!-- default action value for ändern button -->
+			</form>
+		</div>
+		<div class="grid-cell flex flex-row gap-2 items-end">
+			@changeButtonComponent("time-"+day.Date().Format("2006-01-02"), day.IsWorkDay())
+		</div>
+	</div>
+}
+
+templ absentInput(a models.Absence) {
+	<input type="hidden" name="date_from" value={ a.DateFrom.Format("2006-01-02") }/>
+	<input type="hidden" name="date_to" value={ a.DateTo.Format("2006-01-02") }/>
+	<input type="hidden" name="aw_type" value={ a.AbwesenheitTyp.Id }/>
+	<input type="hidden" name="aw_id" value={ a.CounterId }/>
+}

Backend/templates/timePage_templ.go

@@ -0,0 +1,563 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.3.924
+package templates
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"arbeitszeitmessung/helper"
+	"arbeitszeitmessung/models"
+	"net/url"
+	"strconv"
+	"time"
+)
+
+func TimePage(workDays []models.WorkDay, lastSub time.Time) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		allDays := ctx.Value("days").([]models.IWorkDay)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-main divide-y-1\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = inputForm().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, day := range allDays {
+			templ_7745c5c3_Err = defaultDayComponent(day).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if day.Date().Weekday() == time.Monday {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<div class=\"grid-sub responsive bg-neutral-300 h-2\"></div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = LegendComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func inputForm() templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		urlParams := ctx.Value("urlParams").(url.Values)
+		user := ctx.Value("user").(models.User)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<div class=\"grid-sub divide-x-1 bg-neutral-300 responsive\"><div class=\"grid-cell md:col-span-1 max-md:grid grid-cols-2\"><p class=\"font-bold uppercase\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname + " " + user.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 36, Col: 66}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</p><div class=\"justify-self-end\"><p class=\"text-sm\">Überstunden</p><p class=\"text-accent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(user.Overtime)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 39, Col: 42}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</p></div></div><form id=\"timeRangeForm\" method=\"GET\" class=\"grid-cell flex flex-row md:col-span-3 gap-2 \">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = lineComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"flex flex-col gap-2 justify-between grow-1\"><input type=\"date\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_from"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 45, Col: 57}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\" name=\"time_from\" class=\"btn bg-neutral-100\" placeholder=\"Zeitraum von...\"> <input type=\"date\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(urlParams.Get("time_to"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 46, Col: 55}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "\" name=\"time_to\" class=\"btn bg-neutral-100\" placeholder=\"Zeitraum bis...\"></div></form><div class=\"grid-cell content-end\"><button type=\"submit\" form=\"timeRangeForm\" class=\"btn bg-neutral-100 hover:bg-neutral-700 color-neutral-700\"><p class=\"\">Anzeigen</p></button></div></div><form id=\"absence_form\" method=\"POST\" action=\"/absence\" class=\"grid-sub responsive scroll-m-2 bg-neutral-300 hidden\"><input type=\"hidden\" name=\"aw_id\" value=\"\"><div class=\"grid-cell border-r-1\"><p class=\"font-bold uppercase\">Abwesenheit</p></div><div class=\"grid-cell\"><label class=\"block mb-1 text-sm text-neutral-700\">Abwesenheitsart</label><div class=\"relative\"><select name=\"aw_type\" class=\"btn appearance-none cursor-pointer bg-neutral-100\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, absence := range models.GetAbsenceTypesCached() {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<option value=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(absence.Id)))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 63, Col: 51}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(absence.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 63, Col: 68}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</option>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</select> <svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke-width=\"1.2\" stroke=\"currentColor\" class=\"h-5 w-5 ml-1 absolute top-2.5 right-2.5 text-slate-700\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M8.25 15 12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9\"></path></svg></div></div><div class=\"grid-cell\"><label class=\"block mb-1 text-sm text-neutral-700\">Abwesenheit ab</label> <input name=\"date_from\" type=\"date\" class=\"btn bg-neutral-100\"></div><div class=\"grid-cell border-r-1\"><label class=\"block mb-1 text-sm text-neutral-700\">Abwesenheit bis</label> <input name=\"date_to\" type=\"date\" class=\"btn bg-neutral-100\"></div><div class=\"grid-cell flex flex-row items-end\"><div class=\"flex flex-row gap-2 w-full\"><button name=\"action\" value=\"insert\" type=\"submit\" class=\"bg-neutral-100 btn hover:bg-neutral-700\">Speichern</button> <button name=\"action\" value=\"delete\" type=\"submit\" class=\"bg-neutral-100 btn hover:bg-red-700 flex basis-[content] items-center\"><span class=\"size-5 icon-[material-symbols-light--delete-outline]\"></span></button></div></div></form>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func defaultDayComponent(day models.IWorkDay) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var9 == nil {
+			templ_7745c5c3_Var9 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+
+		user := ctx.Value("user").(models.User)
+		justify := "justify-center"
+		if day.IsWorkDay() && len(day.(*models.WorkDay).Bookings) > 1 {
+			justify = "justify-between"
+		}
+		var templ_7745c5c3_Var10 = []any{"grid-sub divide-x-1 hover:bg-neutral-200 transition-colors group"}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var10...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var10).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\"><div class=\"grid-cell md:col-span-1 flex flex-row gap-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = timeGaugeComponent(day.GetDayProgress(user), day.Date().Equal(time.Now().Truncate(24*time.Hour))).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div><p><span class=\"font-bold uppercase hidden md:inline\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("Mon"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 101, Col: 82}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, ":</span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("02.01.2006"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 101, Col: 126}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if day.IsWorkDay() {
+
+			workDay, _ := day.(*models.WorkDay)
+			work, pause, overtime := workDay.GetAllWorkTimesReal(user)
+			if day.RequiresAction() {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"text-red-600\">Bitte anpassen</p>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				if work > 0 {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<p class=\" text-sm mt-1\">Arbeitszeit:</p><p class=\"text-accent flex flex-row items-center\"><span class=\"icon-[material-symbols-light--schedule-outline]\"></span>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var14 string
+					templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(work))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 113, Col: 155}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, " ")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				if pause > 0 {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<p class=\"text-neutral-500 flex flex-row items-center\"><span class=\"icon-[material-symbols-light--motion-photos-paused-outline]\"></span>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var15 string
+					templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(pause))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 116, Col: 173}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " ")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				if overtime != 0 && len(workDay.Bookings) > 0 {
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<p class=\"text-neutral-500 flex flex-row items-center\"><span class=\"icon-[material-symbols-light--more-time]\"></span> ")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var16 string
+					templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDuration(overtime))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 121, Col: 41}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "</div></div><div class=\"all-booking-component grid-cell flex flex-row md:col-span-3 col-span-2 gap-2 w-full\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = lineComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 = []any{"flex flex-col gap-2 w-full", justify}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var17...)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<form id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs("time-" + day.Date().Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 130, Col: 55}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\" class=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var17).String())
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 1, Col: 0}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "\" method=\"post\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if day.IsWorkDay() {
+
+			workDay, _ := day.(*models.WorkDay)
+			templ_7745c5c3_Err = newAbsenceComponent().Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if len(workDay.Bookings) < 1 {
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<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 = templruntime.WriteString(templ_7745c5c3_Buffer, 35, " ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if workDay.IsKurzArbeit() {
+				templ_7745c5c3_Err = absenceComponent(workDay.GetKurzArbeit(), true).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			for _, booking := range workDay.Bookings {
+				templ_7745c5c3_Err = bookingComponent(booking).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, " ")
+			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 {
+
+			absentDay, _ := day.(*models.Absence)
+			templ_7745c5c3_Err = absenceComponent(absentDay, false).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<input type=\"hidden\" name=\"action\" value=\"change\"><!-- default action value for ändern button --></form></div><div class=\"grid-cell flex flex-row gap-2 items-end\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = changeButtonComponent("time-"+day.Date().Format("2006-01-02"), day.IsWorkDay()).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func absentInput(a models.Absence) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_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, 39, "<input type=\"hidden\" name=\"date_from\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var21 string
+		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateFrom.Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 162, Col: 78}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\"> <input type=\"hidden\" name=\"date_to\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var22 string
+		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(a.DateTo.Format("2006-01-02"))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 163, Col: 74}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "\"> <input type=\"hidden\" name=\"aw_type\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(a.AbwesenheitTyp.Id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 164, Col: 64}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "\"> <input type=\"hidden\" name=\"aw_id\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(a.CounterId)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/timePage.templ`, Line: 165, Col: 54}
+		}
+		_, 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, 43, "\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+var _ = templruntime.GeneratedTemplate

DB/initdb/01_schema.sql

@@ -22,7 +22,7 @@ COMMENT ON COLUMN "anwesenheit"."geraet_id" IS 'ID des Lesegerätes';
 DROP TABLE IF EXISTS "s_anwesenheit_typen";
 CREATE TABLE "s_anwesenheit_typen" (
     "anwesenheit_id" int2 PRIMARY KEY,
-    "anwesenheit_name" varchar(255)
+    "anwesenheit_name" varchar(255) NOT NULL
 );
 
 -- ----------------------------
@@ -40,11 +40,11 @@ CREATE TABLE "s_personal_daten" (
     "geschlecht" int2,
     "card_uid" varchar(255),
     "hauptbeschaeftigungs_ort" int2,
-    "arbeitszeit_per_tag" float4 NOT NULL,
+    "arbeitszeit_per_tag" float4,
-    "arbeitszeit_per_woche" float4 NOT NULL,
+    "arbeitszeit_per_woche" float4,
     "arbeitszeit_min_start" time(6),
     "arbeitszeit_max_ende" time(6),
-    "vorgesetzter_pers_nr" int4 NOT NULL
+    "vorgesetzter_pers_nr" int4
 );
 COMMENT ON COLUMN "s_personal_daten"."geschlecht" IS '1==weiblich, 2==maennlich, 3==divers';
 
@@ -78,30 +78,34 @@ EXECUTE FUNCTION update_zuletzt_geandert();
 DROP TABLE IF EXISTS "wochen_report";
 CREATE TABLE "wochen_report" (
     "id" serial PRIMARY KEY,
-    "personal_nummer" int4,
+    "personal_nummer" int4 NOT NULL,
-    "woche_start" date,
+    "woche_start" date NOT NULL,
     "bestaetigt" bool DEFAULT FALSE,
-    "arbeitszeit" interval,
+    "arbeitszeit" interval NOT NULL,
-    "ueberstunden" interval,
+    "ueberstunden" interval NOT NULL,
+    "anwesenheiten" int ARRAY,
+    "abwesenheiten" int ARRAY,
     UNIQUE ("personal_nummer", "woche_start")
 );
 
 DROP TABLE IF EXISTS "abwesenheit";
 CREATE TABLE "abwesenheit" (
     "counter_id" bigserial PRIMARY KEY,
-    "card_uid" varchar(255),
+    "card_uid" varchar(255) NOT NULL,
-    "abwesenheit_typ" int2,
+    "abwesenheit_typ" int2 NOT NULL,
-    "datum_from" timestamptz DEFAULT NOW()::DATE,
+    "datum_from" timestamptz DEFAULT NOW()::DATE NOT NULL,
-    "datum_to" timestamptz
+    "datum_to" timestamptz NOT NULL
     );
 
 DROP TABLE IF EXISTS "s_abwesenheit_typen";
 CREATE TABLE "s_abwesenheit_typen" (
-    "abwesenheit_id" int2 PRIMARY KEY,
+    "abwesenheit_id" int2 PRIMARY KEY NOT NULL,
-    "abwesenheit_name" varchar(255),
+    "abwesenheit_name" varchar(255) NOT NULL,
-    "arbeitszeit_equivalent" float4
+    "arbeitszeit_equivalent" float4 NOT NULL
 );
 
+COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS '0=keine Arbeitszeit; 1=Arbeitszeit auffüllen; 2=Arbeitszeit austauschen';
+
 -- Adds crypto extension
 
 CREATE EXTENSION IF NOT EXISTS pgcrypto;

Makefile

@@ -45,7 +45,7 @@ generateFrontend:
 
 backend: generateFrontend login_registry
 	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeitmessung:latest Backend --push
-	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeitmessung:${GIT_COMMIT} Backend --push
+	# docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeitmessung:${GIT_COMMIT} Backend //--push
 
 test:
 	$(MAKE) -C Backend test

Readme.md

@@ -1,5 +1,7 @@
 # Arbeitszeitmessung
 
+[![Quality Gate Status](https://sonar.letsstein.de/api/project_badges/measure?project=arbeitszeitmessung&metric=alert_status&token=sqb_f8e5ad702b23aa4631a29b99c2f8030caf7d4e05)](https://sonar.letsstein.de/dashboard?id=arbeitszeitmessung)
+
 bis jetzt ein einfaches Backend mit PostgreSQL Datenbank und GO Webserver um Arbeitszeitbuchungen per HTTP PUT einzufügen
 
 ## Installation

WIR-typst/main.typ

@@ -0,0 +1,63 @@
+#set page("a4")
+#set text(font: "Lato")
+
+= Stunden
+
+== Kim Mustermensch
+
+Zeitraum: 01.10.2025 - 31.10.2025
+
+Arbeitszeit: 136h 19min
+
+Überstunden: -39h 41min
+
+
+
+
+
+// #show table.cell: it => {
+//   if it.y == 0 {
+//     set text(white)
+//     strong(it)
+//   } else if it.body == [] {
+//     // Replace empty cells with 'N/A'
+//      pad(..it.inset)[0min]
+    
+//   } else {
+//     it
+//   }
+// }
+
+#let subgrid(body) = {
+  table.cell(colspan: 3, inset: 0em)[
+    #table(
+        columns: (1fr, 1fr, 1fr),
+        gutter: 0em,
+        stroke: black,
+        [..#body]
+    )
+  ]
+}
+
+
+  "01.09.2025",
+  "08:07",
+  "16:28",
+  "Büro",
+  "7h 51min",
+  "30min",
+  "-9min",
+    "02.09.2025",
+    	// return work, pause, overtime
+table.cell(colspan: 3, inset: 0em)[#table(
+        columns: (1fr, 1fr, 1fr),
+        gutter: 0em,
+        stroke: black,
+        [08:12], [16:24], [Büro],
+        [16:30], [17:24], [Homeoffice]
+      )],
+  "6h",
+  "0min",
+  "-1h 15min"
+
+)

WIR-typst/template.typ

@@ -0,0 +1,58 @@
+#let table-header(..headers) = {
+  table.header(
+    ..headers.pos().map(h => strong(text(fill: white, h)))
+  )
+}
+
+#set table(
+  stroke: black,
+  inset: .5em,
+  align: center,
+)
+
+#let abrechnung(meta, days) = {
+  set page(paper: "a4")
+
+  [= Abrechnung Arbeitszeit -- #meta.employee-name]
+
+  [Zeitraum: #meta.Zeitraum
+
+  Arbeitszeit: #user.Arbeitszeit
+
+  Überstunden: #user.Überstunden
+]
+
+  table(
+  columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, 1.25fr),
+  fill: (x, y) =>
+    if y == 0 { gray },
+  align: center,
+  table-header(
+    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Pause], [Überstunden]
+  ),
+  .. for day in days {
+    (
+    [#day.Date],
+    table.cell(colspan: 3, inset: 0em)[
+      #table(
+        columns: (1fr, 1fr, 1fr),
+        gutter: 0em,
+        stroke: black,
+        .. for Zeit in day.Zeiten {
+      (
+      [#Zeit.Kommen],
+      [#Zeit.Gehen],
+      [#Zeit.Art],
+      )
+    },
+      )
+    ],
+    [#day.Arbeitszeit],
+    [#day.Pause],
+    [#day.Überstunden],
+
+    )
+
+  }
+  )
+}

WIR-typst/test.typ

@@ -0,0 +1,36 @@
+#let user = (
+  Name: "Mustermensch",
+  Vorname: "Kim",
+  Arbeitszeit: "139h 12min",
+  Überstunden: "-14h 12min"
+)
+
+#let meta = (
+  Zeitraum: "01.09.2025 - 30.09.2025",
+  KW: "26"
+)
+
+#let days = (
+  (
+    Date: "01.09.2025", 
+    Zeiten: (
+      (Kommen: "07:17", Gehen: "14:13", Art: "Büro"),
+      (Kommen: "14:24", Gehen: "16:13", Art: "Homeoffice")
+    ),
+    Arbeitszeit: "7h 32min",
+    Pause: "34min",
+    Überstunden: "12min"
+  ),(
+    Date: "02.09.2025", 
+    Zeiten: (
+      (Kommen: "07:23", Gehen: "14:21", Art: "Büro"),
+      (Kommen: "14:38", Gehen: "17:13", Art: "Homeoffice")
+    ),
+    Arbeitszeit: "6h 22min",
+    Pause: "45min",
+    Überstunden: "-23min"
+  )
+)
+
+#import "template.typ": abrechnung
+#show: doc => abrechnung(meta, user, days)

db.sql

@@ -203,7 +203,7 @@ WITH params AS (
         14::int AS start_days_ago,  -- how many days back to start
         0::int  AS end_days_ahead,  -- how many days forward (0 = today)
         0::float AS pause_probability,
-        0.2::float AS absence_probability
+        0.0::float AS absence_probability
 ),
 days AS (
     SELECT gs::date AS work_date, p.card_uid, p.geraet_id, p.pause_probability, p.absence_probability

migrations/20250904114004_intervals.up.sql

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

migrations/20250916093608_kurzarbeit.down.sql

@@ -1,8 +1,6 @@
 -- reverse: modify "wochen_report" table
 ALTER TABLE "wochen_report" ALTER COLUMN "personal_nummer" DROP NOT NULL;
 -- reverse: modify "s_personal_daten" table
-ALTER TABLE "s_personal_daten" ALTER COLUMN "arbeitszeit_per_woche" DROP NOT NULL, ALTER COLUMN "vorgesetzter_pers_nr" DROP NOT NULL, ALTER COLUMN "arbeitszeit_per_tag" DROP NOT NULL;
--- reverse: modify "s_anwesenheit_typen" table
 ALTER TABLE "s_anwesenheit_typen" ALTER COLUMN "anwesenheit_name" DROP NOT NULL;
 -- reverse: set comment to column: "arbeitszeit_equivalent" on table: "s_abwesenheit_typen"
 COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS NULL;

migrations/20250916093608_kurzarbeit.up.sql

@@ -8,6 +8,4 @@ COMMENT ON COLUMN "s_abwesenheit_typen"."arbeitszeit_equivalent" IS '0=keine Arb
 -- modify "s_anwesenheit_typen" table
 ALTER TABLE "s_anwesenheit_typen" ALTER COLUMN "anwesenheit_name" SET NOT NULL;
 -- modify "s_personal_daten" table
-ALTER TABLE "s_personal_daten" ALTER COLUMN "arbeitszeit_per_tag" SET NOT NULL, ALTER COLUMN "vorgesetzter_pers_nr" SET NOT NULL, ALTER COLUMN "arbeitszeit_per_woche" SET NOT NULL;
--- modify "wochen_report" table
 ALTER TABLE "wochen_report" ALTER COLUMN "personal_nummer" SET NOT NULL;

migrations/20251013212224_buchungs_array.down.sql

@@ -0,0 +1,4 @@
+-- reverse: modify "wochen_report" table
+ALTER TABLE "wochen_report" DROP COLUMN "abwesenheiten", DROP COLUMN "anwesenheiten", ALTER COLUMN "arbeitszeit" DROP NOT NULL, ALTER COLUMN "ueberstunden" DROP NOT NULL, ALTER COLUMN "woche_start" DROP NOT NULL;
+-- reverse: modify "abwesenheit" table
+ALTER TABLE "abwesenheit" ALTER COLUMN "datum_to" DROP NOT NULL;

migrations/20251013212224_buchungs_array.up.sql

@@ -0,0 +1,4 @@
+-- modify "abwesenheit" table
+ALTER TABLE "abwesenheit" ALTER COLUMN "datum_to" SET NOT NULL;
+-- modify "wochen_report" table
+ALTER TABLE "wochen_report" ALTER COLUMN "woche_start" SET NOT NULL, ALTER COLUMN "ueberstunden" SET NOT NULL, ALTER COLUMN "arbeitszeit" SET NOT NULL, ADD COLUMN "anwesenheiten" integer[] NULL, ADD COLUMN "abwesenheiten" integer[] NULL;

migrations/atlas.sum

@@ -1,7 +1,9 @@
-h1:31y/DB0ca2cm603nNckNvVCwm+XuMaVsoGUB+JvrOKs=
+h1:gE7ikkZS7bQbedAjVspQKftSo5ODij2eiQGWbfQEYmI=
 20250901201159_initial.up.sql h1:Mb1RlVdFvcxqU9HrSK6oNeURqFa3O4KzB3rDa+6+3gc=
 20250901201250_control_tables.up.sql h1:a5LATgR/CRiC4GsqxkJ94TyJOxeTcW74eCnodIy+c1E=
 20250901201710_triggers_extension.up.sql h1:z9b6Hk9btE2Ns4mU7B16HjvYBP6EEwHAXVlvPpkn978=
 20250903221313_overtime.up.sql h1:t/B435ShW5ZEnzC81jRABWVZ5gNm7tPZPnOO6/ZY6ow=
-20250903233030_non_null_contraints.up.sql h1:e7d+6ZdpEjPh2cc65N3S06oD2e6diMuG7+klhgYsym8=
+20250903233030_non_null_contraints.up.sql h1:YKeYgazfh+jPyh7hFT/pV+By8eHnk1taXnlgSLyXSA0=
-20250904114004_intervals.up.sql h1:Sz8FIVvvcCIS3aIuSjyzFYLs32fjMcMMHk62shj6Qpw=
+20250904114004_intervals.up.sql h1:gDdN8cJ4xH1vQhAbbhqD5lwdyEO1N9EIqEYkmWGiWIU=
+20250916093608_kurzarbeit.up.sql h1:yDAAMLyUXz6b7+MI6XK/HZMPzutKoT2NNNOCjFaqSts=
+20251013212224_buchungs_array.up.sql h1:mbhvnwMUkEFFQQ41NC47auqxbtvNkztziWvpLDFm6tA=