small refactor of sonarqube issue

added pdf generation with typst, working on pdf input form
reworked pdf exporter to use typst
2025-10-24 12:20:05 +02:00 · 2025-10-24 00:20:51 +02:00 · 2025-10-23 16:18:22 +02:00 · 2025-10-14 01:05:02 +02:00 · 2025-10-13 22:33:48 +02:00 · 2025-10-09 16:42:49 +02:00
28 changed files with 1123 additions and 281 deletions
--- a/Backend/endpoints/pdf.go
+++ b/Backend/endpoints/pdf.go
@@ -4,14 +4,135 @@ import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"arbeitszeitmessung/templates"
+	"bytes"
+	"fmt"
 	"log"
+	"log/slog"
 	"net/http"
 	"time"
+
+	"github.com/Dadido3/go-typst"
 )

+type typstMetadata struct {
+	TimeRange        string `json:"time-range"`
+	EmployeeName     string `json:"employee-name"`
+	WorkTime         string `json:"worktime"`
+	Overtime         string `json:"overtime"`
+	OvertimeTotal    string `json:"overtime-total"`
+	CurrentTimestamp string `json:"current-timestamp"`
+}
+
+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"`
+	IsFriday  bool           `json:"is-weekend"`
+}
+
+func convertDaysToTypst(days []models.IWorkDay, u models.User) ([]typstDay, error) {
+	var typstDays []typstDay
+	for _, day := range days {
+		var thisTypstDay typstDay
+		work, pause, overtime := day.GetAllWorkTimesVirtual(u)
+		thisTypstDay.Date = day.Date().Format("02.01.2006")
+		thisTypstDay.Worktime = helper.FormatDurationFill(work, true)
+		thisTypstDay.Pausetime = helper.FormatDurationFill(pause, true)
+		thisTypstDay.Overtime = helper.FormatDurationFill(overtime, true)
+		thisTypstDay.IsFriday = day.Date().Weekday() == time.Friday
+
+		thisTypstDay.DayParts = convertDayToTypstDayParts(day, u)
+		typstDays = append(typstDays, thisTypstDay)
+	}
+	return typstDays, nil
+}
+
+func convertDayToTypstDayParts(day models.IWorkDay, user models.User) []typstDayPart {
+	var typstDayParts []typstDayPart
+	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)
+		}
+		if day.IsKurzArbeit() {
+			tsFrom, tsTo := workDay.GenerateKurzArbeitBookings(user)
+			typstDayParts = append(typstDayParts, typstDayPart{
+				BookingFrom: tsFrom.Format("15:04"),
+				BookingTo:   tsTo.Format("15:04"),
+				WorkType:    "Kurzarbeit",
+				IsWorkDay:   true,
+			})
+		}
+	} else {
+		absentDay, _ := day.(*models.Absence)
+		typstDayParts = append(typstDayParts, typstDayPart{IsWorkDay: false, WorkType: absentDay.AbwesenheitTyp.Name})
+	}
+	return typstDayParts
+}
+
+func renderPDF(days []typstDay, metadata typstMetadata) (bytes.Buffer, error) {
+	var markup bytes.Buffer
+	var output bytes.Buffer
+
+	if err := typst.InjectValues(&markup, map[string]any{"meta": metadata, "days": days}); err != nil {
+		return output, err
+	}
+
+	// Import the template and invoke the template function with the custom data.
+	// Show is used to replace the current document with whatever content the template function in `template.typ` returns.
+	markup.WriteString(`
+		#import "template.typ": abrechnung
+		#show: doc => abrechnung(meta, days)
+		`)
+
+	// Compile the prepared markup with Typst and write the result it into `output.pdf`.
+	// f, err := os.Create("output.pdf")
+	// if err != nil {
+	// 	log.Panicf("Failed to create output file: %v.", err)
+	// }
+	// defer f.Close()
+	//
+
+	typstCLI := typst.CLI{}
+	if err := typstCLI.Compile(&markup, &output, nil); err != nil {
+		return output, err
+	}
+	return output, nil
+}
+
+func PDFFormHandler(w http.ResponseWriter, r *http.Request) {
+	helper.RequiresLogin(Session, w, r)
+
+	user, err := models.GetUserFromSession(Session, r.Context())
+	if err != nil {
+		slog.Warn("Error getting user!", slog.Any("Error", err))
+		// TODO add error handling
+	}
+
+	teamMembers, err := user.GetTeamMembers()
+	if err != nil {
+		slog.Warn("Error getting team members!", slog.Any("Error", err))
+	}
+	templates.PDFForm(teamMembers).Render(r.Context(), w)
+}
+
 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)
@@ -36,6 +157,25 @@ func PDFHandler(w http.ResponseWriter, r *http.Request) {
 		aggregatedWorkTime += day.TimeWorkVirtual(user)
 	}

-	// log.Printf("Using Dates: %s - %s\n", startDate.String(), endDate.String())
-	templates.PDFReportEmploye(user, aggregatedOvertime, aggregatedWorkTime, weeks, startDate, endDate).Render(r.Context(), w)
+	typstDays, err := convertDaysToTypst(weeks, user)
+	if err != nil {
+		log.Panicf("Failed to convert days!")
+	}
+	metadata := typstMetadata{
+		EmployeeName:     fmt.Sprintf("%s %s", user.Vorname, user.Name),
+		TimeRange:        fmt.Sprintf("%s - %s", startDate.Format("02.01.2006"), endDate.Format("02.01.2006")),
+		Overtime:         helper.FormatDurationFill(aggregatedOvertime, true),
+		WorkTime:         helper.FormatDurationFill(aggregatedWorkTime, true),
+		OvertimeTotal:    "",
+		CurrentTimestamp: time.Now().Format("02.01.2006 - 15:04 Uhr"),
+	}
+
+	output, err := renderPDF(typstDays, metadata)
+	if err != nil {
+		slog.Warn("Could not create pdf report", slog.Any("Error", err))
+	}
+
+	w.Header().Set("Content-type", "application/pdf")
+	output.WriteTo(w)
+	w.WriteHeader(200)
 }
--- a/Backend/endpoints/time.go
+++ b/Backend/endpoints/time.go
@@ -261,22 +261,3 @@ func updateAbsence(r *http.Request) error {
 	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 {
-		log.Println("Cannot get date from input! Skipping absence creation", err)
-		return
-	}
-
-	absence, err := models.NewAbsence(user.CardUID, absenceType, absenceDate)
-	if err != nil {
-		log.Println("Error creating absence!", err)
-		return
-	}
-	err = absence.Insert()
-	if err != nil {
-		log.Println("Error inserting absence!", err)
-		return
-	}
-}
--- a/Backend/go.mod
+++ b/Backend/go.mod
@@ -9,6 +9,7 @@ require github.com/a-h/templ v0.3.943
 require github.com/alexedwards/scs/v2 v2.8.0

 require (
+	github.com/Dadido3/go-typst v0.3.0
 	github.com/golang-migrate/migrate/v4 v4.18.3
 	github.com/joho/godotenv v1.5.1
 )
@@ -16,6 +17,14 @@ require (
 require (
 	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/mod v0.29.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
 )
+
+tool golang.org/x/tools/cmd/deadcode
--- a/Backend/go.sum
+++ b/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=
@@ -68,7 +72,19 @@ go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt3
 go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
+golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
+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=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/Backend/main.go
+++ b/Backend/main.go
@@ -5,8 +5,7 @@ import (
 	"arbeitszeitmessung/helper"
 	"arbeitszeitmessung/models"
 	"context"
-	"fmt"
-	"log"
+	"log/slog"
 	"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")
-		log.Println("Environment Variables")
+		logLevel.Set(slog.LevelDebug)
 		envs := os.Environ()
-		for _, e := range envs {
-			fmt.Println(e)
-		}
+		slog.Debug("Debug mode enabled", "Environment Variables", envs)
 	}

 	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"))
@@ -51,21 +52,23 @@ func main() {
 	// server.HandleFunc("/user/settings", endpoints.UserSettingsHandler)
 	server.HandleFunc("/team", endpoints.TeamHandler)
 	server.HandleFunc("/team/presence", endpoints.TeamPresenceHandler)
-	server.HandleFunc("/pdf", endpoints.PDFHandler)
+	server.Handle("/pdf", ParamsMiddleware(endpoints.PDFFormHandler))
+	server.HandleFunc("/pdf/generate", endpoints.PDFHandler)
 	server.Handle("/", http.RedirectHandler("/time", http.StatusPermanentRedirect))
 	server.Handle("/static/", http.StripPrefix("/static/", fs))

 	serverSessionMiddleware := endpoints.Session.LoadAndSave(server)

 	// starting the http server
-	fmt.Printf("Server is running at http://localhost:%s\n", helper.GetEnv("EXPOSED_PORT", "8080"))
-	log.Fatal(http.ListenAndServe(":8080", serverSessionMiddleware))
+	slog.Info("Server is running at http://localhost:8080")
+	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))
 	})
 }
--- a/Backend/models/booking.go
+++ b/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{}
--- a/Backend/models/workDay.go
+++ b/Backend/models/workDay.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"log/slog"
 	"sort"
 	"time"
 )
@@ -38,21 +39,21 @@ type WorkDay struct {

 func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay {
 	var allDays map[string]IWorkDay = make(map[string]IWorkDay)
-	var sortedDays []IWorkDay
+
 	for _, day := range GetWorkDays(user, tsFrom, tsTo) {
 		allDays[day.Date().Format("2006-01-02")] = &day
 	}
 	absences, err := GetAbsencesByCardUID(user.CardUID, tsFrom, tsTo)
 	if err != nil {
 		log.Println("Error gettings absences for all Days!", err)
-		return sortedDays
+		return nil
 	}
 	for _, day := range absences {
 		if helper.IsWeekend(day.Date()) {
 			continue
 		}
 		if day.AbwesenheitTyp.WorkTime == 1 {
-			if workDay, ok := allDays[day.Date().Format("2006-01-02")].(*WorkDay); ok {
+			if workDay, ok := allDays[day.Date().Format("2006-01-02")].(*WorkDay); ok && len(workDay.Bookings) > 0 {
 				workDay.kurzArbeit = true
 				workDay.kurzArbeitAbsence = day
 			}
@@ -61,10 +62,16 @@ func GetDays(user User, tsFrom, tsTo time.Time, orderedForward bool) []IWorkDay
 		}
 	}

-	for _, day := range allDays {
+	sortedDays := sortDays(allDays, orderedForward)
+	return sortedDays
+}
+
+func sortDays(days map[string]IWorkDay, forward bool) []IWorkDay {
+	var sortedDays []IWorkDay
+	for _, day := range days {
 		sortedDays = append(sortedDays, day)
 	}
-	if orderedForward {
+	if forward {
 		sort.Slice(sortedDays, func(i, j int) bool {
 			return sortedDays[i].Date().After(sortedDays[j].Date())
 		})
@@ -80,11 +87,23 @@ 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()
 	}
-
 	return d.workTime
 }

@@ -108,6 +127,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
 }

--- a/Backend/models/workWeek.go
+++ b/Backend/models/workWeek.go
@@ -4,7 +4,10 @@ import (
 	"database/sql"
 	"errors"
 	"log"
+	"log/slog"
 	"time"
+
+	"github.com/lib/pq"
 )

 // Workweeks are
@@ -17,10 +20,9 @@ type WorkWeek struct {
 	User            User
 	WeekStart       time.Time
 	Worktime        time.Duration
+	WorkTimeVirtual time.Duration
 	Overtime        time.Duration
 	Status          WeekStatus
-	overtimeDiff time.Duration
-	worktimeDiff time.Duration
 }

 type WeekStatus int8
@@ -45,16 +47,17 @@ func NewWorkWeek(user User, tsMonday time.Time, populate bool) WorkWeek {
 }

 func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Duration) {
-	log.Println("Got Days with overtime and worktime", worktime, overtime)
+	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)
-	log.Println(w.Worktime)

 	for _, day := range w.Days {
-		log.Println(day.TimeWorkVirtual(w.User))
-		w.Worktime += day.TimeWorkVirtual(w.User)
+		work, _ := day.TimePauseReal(w.User)
+		w.Worktime += work
+		w.WorkTimeVirtual += day.TimeWorkVirtual(w.User)
 	}
-	log.Println("Calculated new worktime", w.Worktime)
-	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)
@@ -65,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
 	}
 }

@@ -149,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
--- a/Backend/static/css/styles.css
+++ b/Backend/static/css/styles.css
@@ -12,7 +12,10 @@
    --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-300: oklch(86.9% 0.022 252.894);
+    --color-slate-600: oklch(44.6% 0.043 257.281);
    --color-slate-700: oklch(37.2% 0.044 257.287);
+    --color-slate-800: oklch(27.9% 0.041 260.031);
    --color-neutral-100: oklch(97% 0 0);
    --color-neutral-200: oklch(92.2% 0 0);
    --color-neutral-300: oklch(87% 0 0);
@@ -197,6 +200,15 @@
  .relative {
    position: relative;
  }
+  .top-1 {
+    top: calc(var(--spacing) * 1);
+  }
+  .top-1\/2 {
+    top: calc(1/2 * 100%);
+  }
+  .top-2 {
+    top: calc(var(--spacing) * 2);
+  }
  .top-2\.5 {
    top: calc(var(--spacing) * 2.5);
  }
@@ -206,9 +218,18 @@
  .right-1 {
    right: calc(var(--spacing) * 1);
  }
+  .right-2 {
+    right: calc(var(--spacing) * 2);
+  }
  .right-2\.5 {
    right: calc(var(--spacing) * 2.5);
  }
+  .left-1 {
+    left: calc(var(--spacing) * 1);
+  }
+  .left-1\/2 {
+    left: calc(1/2 * 100%);
+  }
  .col-span-2 {
    grid-column: span 2 / span 2;
  }
@@ -236,6 +257,9 @@
  .ml-1 {
    margin-left: calc(var(--spacing) * 1);
  }
+  .ml-2 {
+    margin-left: calc(var(--spacing) * 2);
+  }
  .icon-\[material-symbols-light--cancel-outline\] {
    display: inline-block;
    width: 1.25em;
@@ -342,6 +366,9 @@
  .inline {
    display: inline;
  }
+  .inline-flex {
+    display: inline-flex;
+  }
  .table {
    display: table;
  }
@@ -360,6 +387,12 @@
  .h-2 {
    height: calc(var(--spacing) * 2);
  }
+  .h-3 {
+    height: calc(var(--spacing) * 3);
+  }
+  .h-3\.5 {
+    height: calc(var(--spacing) * 3.5);
+  }
  .h-4 {
    height: calc(var(--spacing) * 4);
  }
@@ -378,12 +411,21 @@
  .w-2 {
    width: calc(var(--spacing) * 2);
  }
+  .w-3 {
+    width: calc(var(--spacing) * 3);
+  }
+  .w-3\.5 {
+    width: calc(var(--spacing) * 3.5);
+  }
  .w-4 {
    width: calc(var(--spacing) * 4);
  }
  .w-5 {
    width: calc(var(--spacing) * 5);
  }
+  .w-9 {
+    width: calc(var(--spacing) * 9);
+  }
  .w-9\/10 {
    width: calc(9/10 * 100%);
  }
@@ -396,6 +438,9 @@
  .w-full {
    width: 100%;
  }
+  .flex-shrink {
+    flex-shrink: 1;
+  }
  .flex-shrink-0 {
    flex-shrink: 0;
  }
@@ -411,9 +456,34 @@
  .basis-\[content\] {
    flex-basis: content;
  }
+  .border-collapse {
+    border-collapse: collapse;
+  }
+  .-translate-x-1 {
+    --tw-translate-x: calc(var(--spacing) * -1);
+    translate: var(--tw-translate-x) var(--tw-translate-y);
+  }
+  .-translate-x-1\/2 {
+    --tw-translate-x: calc(calc(1/2 * 100%) * -1);
+    translate: var(--tw-translate-x) var(--tw-translate-y);
+  }
+  .-translate-y-1 {
+    --tw-translate-y: calc(var(--spacing) * -1);
+    translate: var(--tw-translate-x) var(--tw-translate-y);
+  }
+  .-translate-y-1\/2 {
+    --tw-translate-y: calc(calc(1/2 * 100%) * -1);
+    translate: var(--tw-translate-x) var(--tw-translate-y);
+  }
+  .transform {
+    transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
+  }
  .cursor-pointer {
    cursor: pointer;
  }
+  .resize {
+    resize: both;
+  }
  .scroll-m-2 {
    scroll-margin: calc(var(--spacing) * 2);
  }
@@ -547,6 +617,9 @@
  .border-neutral-600 {
    border-color: var(--color-neutral-600);
  }
+  .border-slate-300 {
+    border-color: var(--color-slate-300);
+  }
  .bg-accent {
    background-color: var(--color-accent);
  }
@@ -568,6 +641,9 @@
  .bg-red-600 {
    background-color: var(--color-red-600);
  }
+  .mask-repeat {
+    mask-repeat: repeat;
+  }
  .p-1 {
    padding: calc(var(--spacing) * 1);
  }
@@ -632,12 +708,32 @@
  .text-red-600 {
    color: var(--color-red-600);
  }
+  .text-slate-600 {
+    color: var(--color-slate-600);
+  }
  .text-slate-700 {
    color: var(--color-slate-700);
  }
+  .text-white {
+    color: var(--color-white);
+  }
  .uppercase {
    text-transform: uppercase;
  }
+  .underline {
+    text-decoration-line: underline;
+  }
+  .opacity-0 {
+    opacity: 0%;
+  }
+  .shadow {
+    --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+  }
+  .outline {
+    outline-style: var(--tw-outline-style);
+    outline-width: 1px;
+  }
  .filter {
    filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
  }
@@ -646,6 +742,11 @@
    transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
    transition-duration: var(--tw-duration, var(--default-transition-duration));
  }
+  .transition-all {
+    transition-property: all;
+    transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+    transition-duration: var(--tw-duration, var(--default-transition-duration));
+  }
  .transition-colors {
    transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
    transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -655,6 +756,10 @@
    --tw-duration: 300ms;
    transition-duration: 300ms;
  }
+  .select-none {
+    -webkit-user-select: none;
+    user-select: none;
+  }
  .\*\:text-center {
    :is(& > *) {
      text-align: center;
@@ -711,11 +816,26 @@
      display: none;
    }
  }
+  .peer-checked\:opacity-100 {
+    &:is(:where(.peer):checked ~ *) {
+      opacity: 100%;
+    }
+  }
  .placeholder\:text-neutral-400 {
    &::placeholder {
      color: var(--color-neutral-400);
    }
  }
+  .checked\:border-slate-800 {
+    &:checked {
+      border-color: var(--color-slate-800);
+    }
+  }
+  .checked\:bg-slate-800 {
+    &:checked {
+      background-color: var(--color-slate-800);
+    }
+  }
  .hover\:border-neutral-500 {
    &:hover {
      @media (hover: hover) {
@@ -751,6 +871,14 @@
      }
    }
  }
+  .hover\:shadow-md {
+    &:hover {
+      @media (hover: hover) {
+        --tw-shadow: 0 4px 6px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 2px 4px -2px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+        box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+      }
+    }
+  }
  .focus\:bg-neutral-700 {
    &:focus {
      background-color: var(--color-neutral-700);
@@ -798,12 +926,6 @@
      }
    }
  }
-  .max-md\:border-b-1 {
-    @media (width < 48rem) {
-      border-bottom-style: var(--tw-border-style);
-      border-bottom-width: 1px;
-    }
-  }
  .max-md\:bg-neutral-300 {
    @media (width < 48rem) {
      background-color: var(--color-neutral-300);
@@ -1011,6 +1133,41 @@
    }
  }
 }
+@property --tw-translate-x {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0;
+}
+@property --tw-translate-y {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0;
+}
+@property --tw-translate-z {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0;
+}
+@property --tw-rotate-x {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-rotate-y {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-rotate-z {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-skew-x {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-skew-y {
+  syntax: "*";
+  inherits: false;
+}
@property --tw-divide-x-reverse {
  syntax: "*";
  inherits: false;
@@ -1030,6 +1187,76 @@
  syntax: "*";
  inherits: false;
 }
+@property --tw-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-shadow-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-shadow-alpha {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 100%;
+}
+@property --tw-inset-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-inset-shadow-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-inset-shadow-alpha {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 100%;
+}
+@property --tw-ring-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-ring-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-inset-ring-color {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-inset-ring-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-ring-inset {
+  syntax: "*";
+  inherits: false;
+}
+@property --tw-ring-offset-width {
+  syntax: "<length>";
+  inherits: false;
+  initial-value: 0px;
+}
+@property --tw-ring-offset-color {
+  syntax: "*";
+  inherits: false;
+  initial-value: #fff;
+}
+@property --tw-ring-offset-shadow {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0 0 #0000;
+}
+@property --tw-outline-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
@property --tw-blur {
  syntax: "*";
  inherits: false;
@@ -1090,10 +1317,33 @@
@layer properties {
  @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
    *, ::before, ::after, ::backdrop {
+      --tw-translate-x: 0;
+      --tw-translate-y: 0;
+      --tw-translate-z: 0;
+      --tw-rotate-x: initial;
+      --tw-rotate-y: initial;
+      --tw-rotate-z: initial;
+      --tw-skew-x: initial;
+      --tw-skew-y: initial;
      --tw-divide-x-reverse: 0;
      --tw-border-style: solid;
      --tw-divide-y-reverse: 0;
      --tw-font-weight: initial;
+      --tw-shadow: 0 0 #0000;
+      --tw-shadow-color: initial;
+      --tw-shadow-alpha: 100%;
+      --tw-inset-shadow: 0 0 #0000;
+      --tw-inset-shadow-color: initial;
+      --tw-inset-shadow-alpha: 100%;
+      --tw-ring-color: initial;
+      --tw-ring-shadow: 0 0 #0000;
+      --tw-inset-ring-color: initial;
+      --tw-inset-ring-shadow: 0 0 #0000;
+      --tw-ring-inset: initial;
+      --tw-ring-offset-width: 0px;
+      --tw-ring-offset-color: #fff;
+      --tw-ring-offset-shadow: 0 0 #0000;
+      --tw-outline-style: solid;
      --tw-blur: initial;
      --tw-brightness: initial;
      --tw-contrast: initial;
--- a/Backend/static/logo.png
+++ b/Backend/static/logo.png
--- a/Backend/static/script.js
+++ b/Backend/static/script.js
@@ -15,9 +15,7 @@ function editWorkday(element, event, id, isWorkDay) {
  event.preventDefault();
  let form = document.getElementById(id);
  if (form == null) {
-    form = element
-      .closest(".grid-sub")
-      .querySelector(".all-booking-component > form");
+    form = element.closest(".grid-sub").querySelector(".all-booking-component > form");
  }

  clearEditState();
@@ -39,21 +37,10 @@ function editWorkday(element, event, id, isWorkDay) {
    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-",
-        "",
-      );
+      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",
-      ]);
+      syncFields(form, absenceForm, ["date_from", "date_to", "aw_type", "aw_id"]);
    }
  }
 }
--- a/Backend/template.typ
+++ b/Backend/template.typ
@@ -0,0 +1,92 @@
+#let table-header(..headers) = {
+  table.header(
+    ..headers.pos().map(h => strong(h))
+  )
+}
+
+
+#let abrechnung(meta, days) = {
+  set page(paper: "a4", margin: (x:1.5cm, y:2.25cm),
+    footer:[#grid(
+      columns: (3fr,  .65fr),
+      align: left + horizon,
+      inset: .5em,
+      [#meta.EmployeeName -- #meta.TimeRange], grid.cell(rowspan: 2)[#image("static/logo.png")],
+      [Arbeitszeitrechnung maschinell erstellt am #meta.CurrentTimestamp],
+    )
+      ])
+  set text(font: "Noto Sans", size:10pt, fill: luma(10%))
+  set table(
+    stroke: 0.5pt + luma(10%),
+    inset: .5em,
+    align: center + horizon,
+  )
+  show text: it => {
+    if it.text == "0min"{
+      text(oklch(70.8%, 0, 0deg))[#it]
+    }else if it.text.starts-with("-"){
+      text(red)[#it]
+    }else{
+      it
+    }
+  }
+
+
+  [= Abrechnung Arbeitszeit -- #meta.EmployeeName]
+
+  [Zeitraum: #meta.TimeRange]
+
+  table(
+  columns: (1fr, 1fr, 1fr, 1fr, 1fr, 1fr, 1.25fr),
+  fill: (x, y) =>
+    if y == 0 { oklch(87%, 0, 0deg) },
+  table-header(
+    [Datum], [Kommen], [Gehen], [Arbeitsart], [Stunden], [Pause], [Überstunden]
+  ),
+  .. for day in days {
+    (
+    [#day.Date],
+    if day.DayParts.len() == 0{
+        table.cell(colspan: 3)[Keine Buchungen]
+    }else if not day.DayParts.first().IsWorkDay{
+      table.cell(colspan: 3)[#day.DayParts.first().WorkType]
+    }
+    else {
+
+    table.cell(colspan: 3, inset: 0em)[
+
+      #table(
+        columns: (1fr, 1fr, 1fr),
+        .. for Zeit in day.DayParts {
+      (
+      [#Zeit.BookingFrom],
+      [#Zeit.BookingTo],
+      [#Zeit.WorkType],
+      )
+    },
+      )
+    ]
+    },
+    [#day.Worktime],
+    [#day.Pausetime],
+    [#day.Overtime],
+    )
+    if day.IsFriday {
+      ( table.cell(colspan: 7, fill: oklch(87%, 0, 0deg))[Wochenende], )   // note the trailing comma
+    }
+  }
+  )
+
+  table(
+    columns: (3fr, 1fr),
+    align: right,
+    inset: (x: .25em, y:.75em),
+    stroke: none,
+    table.hline(start: 0, end: 2, stroke: stroke(dash:"dashed", thickness:.5pt)),
+  [Arbeitszeit :], table.cell(align: left)[#meta.WorkTime],
+  [Überstunden :], table.cell(align: left)[#meta.Overtime],
+  [Überstunden :],table.cell(align: left)[#meta.OvertimeTotal],
+  table.hline(start: 0, end: 2),
+
+)
+}
--- a/Backend/templates/headerComponent_templ.go
+++ b/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.
--- a/Backend/templates/pages_templ.go
+++ b/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.
--- a/Backend/templates/pdf.templ
+++ b/Backend/templates/pdf.templ
@@ -6,6 +6,46 @@ import (
 	"time"
 )

+templ PDFForm(teamMembers []models.User) {
+	@Base()
+	@headerComponent()
+	<div class="grid-main divide-y-1">
+		<div class="grid-sub divide-x-1">
+			<div>Zeitraum wählen</div>
+			<div class="grid-cell col-span-3">
+				<label class="block mb-1 text-sm text-neutral-700">Abrechnungsmonat</label>
+				<input name="start_date" type="date" value="" class="btn bg-neutral-100"/>
+			</div>
+			<div></div>
+		</div>
+		<div class="grid-sub divide-x-1">
+			<div>Mitarbeiter wählen</div>
+			<div class="grid-cell col-span-3 flex flex-col gap-2">
+				<div class="flex flex-row gap-2">
+					<button class="btn" type="button">Alle</button>
+					<button class="btn" type="button">Keine</button>
+				</div>
+				@CheckboxComponent("pdf-123", "Kim Mustermensch")
+			</div>
+			<div></div>
+		</div>
+		<div class="grid-sub divide-x-1"><div>Direktvorschau oder Download</div></div>
+	</div>
+}
+
+templ CheckboxComponent(id, label string) {
+	<div class="inline-flex items-center">
+		<label class="flex items-center cursor-pointer relative" for={ id }>
+			<input type="checkbox" checked="" class="peer h-5 w-5 cursor-pointer transition-all appearance-none rounded border border-slate-300 checked:bg-slate-800 checked:border-slate-800" id={ id }/>
+			<span class="absolute text-white opacity-0 peer-checked:opacity-100 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-3.5 w-3.5" viewBox="0 0 20 20" fill="currentColor" stroke="currentColor" stroke-width="1">
+					<path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
+				</svg>
+			</span>
+		</label> <label class="cursor-pointer ml-2 text-slate-600 select-none" for={ id }>{ label }</label>
+	</div>
+}
+
 templ PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) {
 	{{
 		_, kw := tsStart.ISOWeek()
@@ -45,7 +85,12 @@ templ PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 							<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 {
 						{{
--- a/Backend/templates/pdf_templ.go
+++ b/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, overtime, worktime time.Duration, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) templ.Component {
+func PDFForm(teamMembers []models.User) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -35,6 +35,132 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = Base().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = headerComponent().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"grid-main divide-y-1\"><div class=\"grid-sub divide-x-1\"><div>Zeitraum wählen</div><div class=\"grid-cell col-span-3\"><label class=\"block mb-1 text-sm text-neutral-700\">Abrechnungsmonat</label> <input name=\"start_date\" type=\"date\" value=\"\" class=\"btn bg-neutral-100\"></div><div></div></div><div class=\"grid-sub divide-x-1\"><div>Mitarbeiter wählen</div><div class=\"grid-cell col-span-3 flex flex-col gap-2\"><div class=\"flex flex-row gap-2\"><button class=\"btn\" type=\"button\">Alle</button> <button class=\"btn\" type=\"button\">Keine</button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = CheckboxComponent("pdf-123", "Kim Mustermensch").Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div><div></div></div><div class=\"grid-sub divide-x-1\"><div>Direktvorschau oder Download</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+func CheckboxComponent(id, label 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_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<div class=\"inline-flex items-center\"><label class=\"flex items-center cursor-pointer relative\" for=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 38, Col: 67}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\"><input type=\"checkbox\" checked=\"\" class=\"peer h-5 w-5 cursor-pointer transition-all appearance-none rounded border border-slate-300 checked:bg-slate-800 checked:border-slate-800\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 39, Col: 189}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\"> <span class=\"absolute text-white opacity-0 peer-checked:opacity-100 top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2\"><svg xmlns=\"http://www.w3.org/2000/svg\" class=\"h-3.5 w-3.5\" viewBox=\"0 0 20 20\" fill=\"currentColor\" stroke=\"currentColor\" stroke-width=\"1\"><path fill-rule=\"evenodd\" d=\"M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z\" clip-rule=\"evenodd\"></path></svg></span></label> <label class=\"cursor-pointer ml-2 text-slate-600 select-none\" for=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 45, Col: 81}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(label)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 45, Col: 91}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</label></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return nil
+	})
+}
+
+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 {
+			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_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)

 		_, kw := tsStart.ISOWeek()
 		noBorder := ""
@@ -42,98 +168,98 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 		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\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		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: 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, " ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		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: 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, "</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(tsStart.Format("02.01.2006"))
-		if templ_7745c5c3_Err != nil {
-			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, "</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\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<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_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(kw)
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(e.Vorname)
 		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: 57, Col: 45}
 		}
 		_, 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>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, " ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(e.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 57, Col: 56}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</h1><p>Zeitraum: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, 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: 58, Col: 52}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</span> - <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, 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: 58, Col: 98}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</span></p><p>Arbeitszeit: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, 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: 59, Col: 58}
+		}
+		_, 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, 13, "</span></p><p>Überstunden: <span>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, 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: 60, Col: 59}
+		}
+		_, 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, 14, "</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_Var14 string
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(kw)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 63, Col: 52}
+		}
+		_, 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, 15, "</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
 		}
@@ -142,60 +268,60 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 			if index == len(workDays)-1 {
 				noBorder = "border-b-0"
 			}
-			var templ_7745c5c3_Var9 = []any{noBorder}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var9...)
+			var templ_7745c5c3_Var15 = []any{noBorder}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var15...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<p class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<p class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var10 string
-			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var9).String())
+			var templ_7745c5c3_Var16 string
+			templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var15).String())
 			if templ_7745c5c3_Err != nil {
 				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+			_, 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, 10, "\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var11 string
-			templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(day.Date().Format("02.01.2006"))
+			var templ_7745c5c3_Var17 string
+			templ_7745c5c3_Var17, 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}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 76, Col: 59}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+			_, 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, 11, "</p>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</p>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var12 = []any{"grid grid-cols-subgrid col-span-3 " + noBorder}
-			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var12...)
+			var templ_7745c5c3_Var18 = []any{"grid grid-cols-subgrid col-span-3 " + noBorder}
+			templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var18...)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<div class=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<div class=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var13 string
-			templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var12).String())
+			var templ_7745c5c3_Var19 string
+			templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var18).String())
 			if templ_7745c5c3_Err != nil {
 				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 1, Col: 0}
 			}
-			_, 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, 13, "\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -203,56 +329,84 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays

 				workDay, _ := day.(*models.WorkDay)
 				for bookingI := 0; bookingI < len(workDay.Bookings); bookingI += 2 {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					var templ_7745c5c3_Var14 string
-					templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].Timestamp.Format("15:04"))
+					var templ_7745c5c3_Var20 string
+					templ_7745c5c3_Var20, 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}
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 83, Col: 64}
 					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</p><p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</p><p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					var templ_7745c5c3_Var15 string
-					templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI+1].Timestamp.Format("15:04"))
+					var templ_7745c5c3_Var21 string
+					templ_7745c5c3_Var21, 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}
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 84, Col: 66}
 					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+					_, 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, 16, "</p><p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</p><p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					var templ_7745c5c3_Var16 string
-					templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(workDay.Bookings[bookingI].BookingType.Name)
+					var templ_7745c5c3_Var22 string
+					templ_7745c5c3_Var22, 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}
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pdf.templ`, Line: 85, Col: 55}
 					}
-					_, 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, 17, "</p>")
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, " ")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, " ")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				if workDay.IsKurzArbeit() {
-					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<p class=\"col-span-full\">Kurzarbeit</p>")
+
+					timeFrom, timeTo := workDay.GenerateKurzArbeitBookings(e)
+					templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var23 string
+					templ_7745c5c3_Var23, 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: 91, Col: 36}
+					}
+					_, 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, 27, "</p><p>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var24 string
+					templ_7745c5c3_Var24, 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: 92, Col: 34}
+					}
+					_, 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, 28, "</p><p>Kurzarbeit</p>")
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
@@ -260,25 +414,25 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 			} else {

 				absentDay, _ := day.(*models.Absence)
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"col-span-full\">")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<p class=\"col-span-full\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				var templ_7745c5c3_Var17 string
-				templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(absentDay.AbwesenheitTyp.Name)
+				var templ_7745c5c3_Var25 string
+				templ_7745c5c3_Var25, 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: 99, Col: 62}
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</p>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</p>")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</div>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</div>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -287,7 +441,7 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, " ")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, " ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -295,7 +449,7 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, " ")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, " ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -303,18 +457,18 @@ func PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays
 			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, 34, " ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			if day.Date().Weekday() == time.Friday {
-				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<p class=\"col-span-full bg-neutral-300\">Wochenende</p>")
+				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<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, 27, "</div></content>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</div></content>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -338,9 +492,9 @@ func ColorDuration(d time.Duration, classes string) templ.Component {
 			}()
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var18 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var18 == nil {
-			templ_7745c5c3_Var18 = templ.NopComponent
+		templ_7745c5c3_Var26 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var26 == nil {
+			templ_7745c5c3_Var26 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)

@@ -348,38 +502,38 @@ func ColorDuration(d time.Duration, classes string) templ.Component {
 		if d.Abs() < time.Minute {
 			color = "text-neutral-300"
 		}
-		var templ_7745c5c3_Var19 = []any{color + " " + classes}
-		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var19...)
+		var templ_7745c5c3_Var27 = []any{color + " " + classes}
+		templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var27...)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<p class=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "<p class=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var20 string
-		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var19).String())
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var27).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_Var20))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(helper.FormatDurationFill(d, true))
+		var templ_7745c5c3_Var29 string
+		templ_7745c5c3_Var29, 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: 121, Col: 72}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</p>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</p>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/Backend/templates/teamComponents.templ
+++ b/Backend/templates/teamComponents.templ
@@ -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">
--- a/Backend/templates/teamComponents_templ.go
+++ b/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.
@@ -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
--- a/Backend/templates/timeComponents.templ
+++ b/Backend/templates/timeComponents.templ
@@ -89,7 +89,7 @@ templ absenceComponent(a *models.Absence, isKurzarbeit bool) {
 		</p>
 		<div class="w-full"></div>
 		if isKurzarbeit {
-			<button onclick={ templ.JSFuncCall("editAbsence", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format("2006-01-02")) } class="hidden btn border-0 rounded-none grow-0 w-auto group-[.edit]:inline">Bearbeiten</button>
+			<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>
 }
@@ -120,6 +120,9 @@ templ bookingComponent(booking models.Booking) {
 			<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>
 }

--- a/Backend/templates/timeComponents_templ.go
+++ b/Backend/templates/timeComponents_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.
@@ -394,15 +394,15 @@ func absenceComponent(a *models.Absence, isKurzarbeit bool) templ.Component {
 			return templ_7745c5c3_Err
 		}
 		if isKurzarbeit {
-			templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editAbsence", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format("2006-01-02")))
+			templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format("2006-01-02"), false))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<button onclick=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<button type=\"button\" onclick=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var22 templ.ComponentScript = templ.JSFuncCall("editAbsence", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format("2006-01-02"))
+			var templ_7745c5c3_Var22 templ.ComponentScript = templ.JSFuncCall("editWorkday", templ.JSExpression("this"), templ.JSExpression("event"), "time-"+a.Date().Format("2006-01-02"), false)
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
@@ -568,7 +568,17 @@ func bookingComponent(booking models.Booking) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</p></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if booking.IsSubmittedAndChecked() {
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "<p>submitted</p>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -597,7 +607,7 @@ func LegendComponent() templ.Component {
 			templ_7745c5c3_Var31 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "<div class=\"flex flex-row gap-4 md:mx-[10%] print:hidden\"><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-red-600\"></div><span>Fehler</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-orange-500\"></div><span>Arbeitszeit unter regulär</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-accent\"></div><span>Arbeitszeit vollständig</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-purple-600\"></div><span>Überstunden</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-neutral-400\"></div><span>Keine Buchungen</span></div></div>")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "<div class=\"flex flex-row gap-4 md:mx-[10%] print:hidden\"><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-red-600\"></div><span>Fehler</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-orange-500\"></div><span>Arbeitszeit unter regulär</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-accent\"></div><span>Arbeitszeit vollständig</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-purple-600\"></div><span>Überstunden</span></div><div class=\"flex flex-row items-center gap-2\"><div class=\"rounded-full size-4 bg-neutral-400\"></div><span>Keine Buchungen</span></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/Backend/templates/timePage_templ.go
+++ b/Backend/templates/timePage_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.
--- a/DB/initdb/01_schema.sql
+++ b/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
 );

 -- ----------------------------
@@ -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,
-    "woche_start" date,
+    "personal_nummer" int4 NOT NULL,
+    "woche_start" date NOT NULL,
    "bestaetigt" bool DEFAULT FALSE,
-    "arbeitszeit" interval,
-    "ueberstunden" interval,
+    "arbeitszeit" interval NOT NULL,
+    "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),
-    "abwesenheit_typ" int2,
-    "datum_from" timestamptz DEFAULT NOW()::DATE,
-    "datum_to" timestamptz
+    "card_uid" varchar(255) NOT NULL,
+    "abwesenheit_typ" int2 NOT NULL,
+    "datum_from" timestamptz DEFAULT NOW()::DATE NOT NULL,
+    "datum_to" timestamptz NOT NULL
    );

 DROP TABLE IF EXISTS "s_abwesenheit_typen";
 CREATE TABLE "s_abwesenheit_typen" (
-    "abwesenheit_id" int2 PRIMARY KEY,
-    "abwesenheit_name" varchar(255),
-    "arbeitszeit_equivalent" float4
+    "abwesenheit_id" int2 PRIMARY KEY NOT NULL,
+    "abwesenheit_name" varchar(255) NOT NULL,
+    "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;
--- a/2
+++ b/2
@@ -44,7 +44,7 @@ generateFrontend:


 backend: generateFrontend login_registry
-	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeitmessung:latest Backend --load #--push
+	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

 test:
--- a/WIR-typst/main.typ
+++ b/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"
+
+)
--- a/WIR-typst/template.pdf
+++ b/WIR-typst/template.pdf
--- a/migrations/20251013212224_buchungs_array.down.sql
+++ b/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;
--- a/migrations/20251013212224_buchungs_array.up.sql
+++ b/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;
--- a/migrations/atlas.sum
+++ b/migrations/atlas.sum
@@ -1,15 +1,9 @@
-h1:3AxgD8mnu/F+JGtJu9FZvA9Ro0UUtGPgyjskKtfTYUQ=
-20250901201159_initial.down.sql h1:cmF5CvNGqEfcmbRgiqaqDWERdNNRaMzarbNLJ/Y35o4=
-20250901201159_initial.up.sql h1:Yrak/+wfQ4Tu/dVR/cUZ/75DlAcv4G/OJXDqpgSw47U=
-20250901201250_control_tables.down.sql h1:f/KmhO9pOI45J8ZRjFonvD3CypB+rOoGOPN2WMFHvOw=
-20250901201250_control_tables.up.sql h1:of5E07p0N1aen9CdQNEOrO7ffbKZC6kp4oK5KPzU9+g=
-20250901201710_triggers_extension.down.sql h1:a9va3FSfHBWzODJSJO+ywNa2hiZwjG/vmvYGb3L1lnM=
-20250901201710_triggers_extension.up.sql h1:nUBPd2eDssi/TwMVF/nOJkIM5rUM0iINdg1K9pZRZN0=
-20250903221313_overtime.down.sql h1:X+jJESqcZ6ZTd2H563z6kRaXb4dn4sA02D3ck2795v8=
-20250903221313_overtime.up.sql h1:C3DSiNVpe9v0Un1DEQ0lsy5yToR8iqcggv91GSr6tRE=
-20250903233030_non_null_contraints.down.sql h1:42TZzPsji2Ze50k6sLwgIuNo4Trk3m3ni/aIfQJ97dE=
-20250903233030_non_null_contraints.up.sql h1:k6zR5YNSAP4fo5QEc58KZ0LxvEz1nl0X/AAcZ+TG3I4=
-20250904114004_intervals.down.sql h1:SquJAPinzFIRN6fJjLLIRsz59Tyr4RwGiGuOFI/N1SQ=
-20250904114004_intervals.up.sql h1:AFqncTGOiEZVBbhWFqN2zlQ7DyhybB5wJr6a36Atk1E=
-20250916093608_kurzarbeit.down.sql h1:ljM1a1pQCxOQiXRaXU04GC4V9yy2y20x5eUNQ/zyx+o=
-20250916093608_kurzarbeit.up.sql h1:pTiw0VfGaf26mhJg4wf98Fqwn1kShJ+PiN2PiM4q1kk=
+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:YKeYgazfh+jPyh7hFT/pV+By8eHnk1taXnlgSLyXSA0=
+20250904114004_intervals.up.sql h1:gDdN8cJ4xH1vQhAbbhqD5lwdyEO1N9EIqEYkmWGiWIU=
+20250916093608_kurzarbeit.up.sql h1:yDAAMLyUXz6b7+MI6XK/HZMPzutKoT2NNNOCjFaqSts=
+20251013212224_buchungs_array.up.sql h1:mbhvnwMUkEFFQQ41NC47auqxbtvNkztziWvpLDFm6tA=
Author	SHA1	Message	Date
Tom Tröger	e1f0f85401	small refactor of sonarqube issue Some checks failed Tests / Run Go Tests (push) Failing after 1m37s Details	2025-10-24 12:20:05 +02:00
Tom Tröger	b6644f3584	added pdf generation with typst, working on pdf input form	2025-10-24 00:20:51 +02:00
tom	7eda8eb538	reworked pdf exporter to use typst Some checks failed Tests / Run Go Tests (push) Failing after 1m44s Details	2025-10-23 16:18:22 +02:00
Tom Tröger	0d7696cbc6	adding more logging + working on displaying if a workday was submitted Some checks failed Tests / Run Go Tests (push) Failing after 1m55s Details	2025-10-14 01:05:02 +02:00
tom	5001f24d9b	implemented log levels and structured log with slog Some checks failed Tests / Run Go Tests (push) Failing after 1m36s Details	2025-10-13 22:33:48 +02:00
Tom Tröger	ea8e78fd9f	fixed #56 Some checks failed Tests / Run Go Tests (push) Failing after 1m22s Details	2025-10-09 16:42:49 +02:00