From b6644f358441fe5c38b5b9a0d9065303de62a97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Tr=C3=B6ger?= Date: Fri, 24 Oct 2025 00:20:51 +0200 Subject: [PATCH] added pdf generation with typst, working on pdf input form --- Backend/endpoints/pdf.go | 147 ++++++++--- Backend/main.go | 3 +- Backend/static/css/styles.css | 262 +++++++++++++++++++- Backend/static/logo.png | Bin 0 -> 17585 bytes Backend/template.typ | 92 +++++++ Backend/templates/pdf.templ | 40 +++ Backend/templates/pdf_templ.go | 440 +++++++++++++++++++++------------ WIR-typst/template.typ | 58 ----- WIR-typst/test.typ | 36 --- 9 files changed, 790 insertions(+), 288 deletions(-) create mode 100644 Backend/static/logo.png create mode 100644 Backend/template.typ delete mode 100644 WIR-typst/template.typ delete mode 100644 WIR-typst/test.typ diff --git a/Backend/endpoints/pdf.go b/Backend/endpoints/pdf.go index 4bb8d53..eb36e9f 100644 --- a/Backend/endpoints/pdf.go +++ b/Backend/endpoints/pdf.go @@ -4,17 +4,23 @@ import ( "arbeitszeitmessung/helper" "arbeitszeitmessung/models" "arbeitszeitmessung/templates" + "bytes" + "fmt" "log" + "log/slog" "net/http" "time" + + "github.com/Dadido3/go-typst" ) 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"` + 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 { @@ -30,38 +36,100 @@ type typstDay struct { 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) { +func convertDaysToTypst(days []models.IWorkDay, u models.User) ([]typstDay, error) { var typstDays []typstDay for _, day := range days { - var typstDay typstDay - var typstDayParts []typstDayPart + var thisTypstDay typstDay 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) + 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_date", time.Now().Format("2006-01-02")) @@ -89,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) } diff --git a/Backend/main.go b/Backend/main.go index 15d4a96..abccfd0 100644 --- a/Backend/main.go +++ b/Backend/main.go @@ -52,7 +52,8 @@ 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)) diff --git a/Backend/static/css/styles.css b/Backend/static/css/styles.css index 8b42ab0..9098dd5 100644 --- 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: ""; + 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: ""; + 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: ""; + 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; diff --git a/Backend/static/logo.png b/Backend/static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..53694f96af0ec6289ac91689eed61ed30607890c GIT binary patch literal 17585 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 b{{ 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), + +) +} diff --git a/Backend/templates/pdf.templ b/Backend/templates/pdf.templ index e740c5e..c21a232 100644 --- a/Backend/templates/pdf.templ +++ b/Backend/templates/pdf.templ @@ -6,6 +6,46 @@ import ( "time" ) +templ PDFForm(teamMembers []models.User) { + @Base() + @headerComponent() +
+
+
Zeitraum wählen
+
+ + +
+
+
+
+
Mitarbeiter wählen
+
+
+ + +
+ @CheckboxComponent("pdf-123", "Kim Mustermensch") +
+
+
+
Direktvorschau oder Download
+
+} + +templ CheckboxComponent(id, label string) { +
+ +
+} + templ PDFReportEmploye(e models.User, overtime, worktime time.Duration, workDays []models.IWorkDay, tsStart time.Time, tsEnd time.Time) { {{ _, kw := tsStart.ISOWeek() diff --git a/Backend/templates/pdf_templ.go b/Backend/templates/pdf_templ.go index a7ee638..05986fe 100644 --- a/Backend/templates/pdf_templ.go +++ b/Backend/templates/pdf_templ.go @@ -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, "
Zeitraum wählen
Mitarbeiter wählen
") + 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, "
Direktvorschau oder Download
") + 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, "
") + 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, "

") - 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, "

Zeitraum: ") - 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, " - ") - 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, "

Arbeitszeit: ") - 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, "

Überstunden: ") - 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, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var8 string - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(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, "

Kommen

Gehen

Arbeitsart

Stunden

Pause

Überstunden

") + 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, "

Zeitraum: ") + 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, " - ") + 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, "

Arbeitszeit: ") + 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, "

Überstunden: ") + 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, "

") + 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, "

Kommen

Gehen

Arbeitsart

Stunden

Pause

Überstunden

") 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, "

") + 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, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "

") 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, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -203,84 +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, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "

") 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, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "

") 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, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "

") 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, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "

") 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() { timeFrom, timeTo := workDay.GenerateKurzArbeitBookings(e) - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "

") 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")) + 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: 51, Col: 36} + 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_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, 20, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "

") 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")) + 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: 52, Col: 34} + 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_Var18)) + _, 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, 21, "

Kurzarbeit

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "

Kurzarbeit

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -288,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, 22, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var19 string - templ_7745c5c3_Var19, 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: 59, 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_Var19)) + _, 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, 23, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "

") 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, 31, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -315,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, 25, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -323,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, 26, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -331,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, 27, " ") + 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, 28, "

Wochenende

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "

Wochenende

") 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, 36, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -366,9 +492,9 @@ func ColorDuration(d time.Duration, classes string) templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var20 := templ.GetChildren(ctx) - if templ_7745c5c3_Var20 == nil { - templ_7745c5c3_Var20 = templ.NopComponent + templ_7745c5c3_Var26 := templ.GetChildren(ctx) + if templ_7745c5c3_Var26 == nil { + templ_7745c5c3_Var26 = templ.NopComponent } ctx = templ.ClearChildren(ctx) @@ -376,38 +502,38 @@ func ColorDuration(d time.Duration, classes string) templ.Component { if d.Abs() < time.Minute { color = "text-neutral-300" } - var templ_7745c5c3_Var21 = []any{color + " " + classes} - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var21...) + 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, 30, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var23 string - templ_7745c5c3_Var23, 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: 81, 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_Var23)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/WIR-typst/template.typ b/WIR-typst/template.typ deleted file mode 100644 index e98da26..0000000 --- a/WIR-typst/template.typ +++ /dev/null @@ -1,58 +0,0 @@ -#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], - - ) - - } - ) -} diff --git a/WIR-typst/test.typ b/WIR-typst/test.typ deleted file mode 100644 index 555ce61..0000000 --- a/WIR-typst/test.typ +++ /dev/null @@ -1,36 +0,0 @@ -#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) \ No newline at end of file