From a5d425186835c74b0e05d783aff2574764159f47 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 19 Nov 2026 08:14:13 +0100 Subject: [PATCH] UI verbessert --- .../PDF/CompactPlanPDFRenderer.swift | 23 ++++------- Sources/LektorenPlan/PlanModel.swift | 32 +++++++-------- .../Views/ServiceDetailSheet.swift | 41 +++++++++++++------ web/domain/planner.go | 23 +++-------- web/domain/planner_test.go | 33 ++++++++++++--- web/pdf/pdf.go | 19 +++------ web/pdf/pdf_test.go | 29 +++++++++++++ web/web/service_handlers.go | 13 +++++- web/web/templates/plan.html | 2 +- web/web/templates/service.html | 4 +- 10 files changed, 136 insertions(+), 83 deletions(-) diff --git a/Sources/LektorenPlan/PDF/CompactPlanPDFRenderer.swift b/Sources/LektorenPlan/PDF/CompactPlanPDFRenderer.swift index db8cc95..ab7965e 100644 --- a/Sources/LektorenPlan/PDF/CompactPlanPDFRenderer.swift +++ b/Sources/LektorenPlan/PDF/CompactPlanPDFRenderer.swift @@ -87,13 +87,13 @@ enum CompactPlanPDFRenderer { pageIndex += 1 } - func startPage(continuation: Bool) { + func startPage() { beginPage() - drawHeader(range: range, generatedAt: generatedAt, continuation: continuation) + drawHeader(range: range, generatedAt: generatedAt) drawColumnHeader() } - startPage(continuation: false) + startPage() var cursorY = contentTop for day in days { @@ -108,7 +108,7 @@ enum CompactPlanPDFRenderer { let height = rowHeight(service: service, people: people) if cursorY + height > contentBottom { endPage() - startPage(continuation: true) + startPage() cursorY = contentTop } drawServiceRow( @@ -149,7 +149,7 @@ enum CompactPlanPDFRenderer { // MARK: - Page furniture - private static func drawHeader(range: DayRange, generatedAt: Date, continuation: Bool) { + private static func drawHeader(range: DayRange, generatedAt: Date) { let top = margin drawText( @@ -159,7 +159,7 @@ enum CompactPlanPDFRenderer { color: accent ) drawText( - continuation ? "Gottesdienstliste · Fortsetzung" : "Gottesdienstliste", + "Gottesdienstliste", in: CGRect(x: margin, y: top + 12, width: 340, height: 23), font: serif(19, bold: true), color: ink @@ -172,23 +172,16 @@ enum CompactPlanPDFRenderer { ) let rightX = pageWidth - margin - 170 - drawText( - "A4 hoch · kompakte Liste", - in: CGRect(x: rightX, y: top, width: 170, height: 11), - font: sans(7.5, weight: .semibold), - color: tertiaryInk, - alignment: .right - ) drawText( "Erstellt am \(DayMath.mediumString(generatedAt))", - in: CGRect(x: rightX, y: top + 14, width: 170, height: 11), + in: CGRect(x: rightX, y: top, width: 170, height: 11), font: sans(7.5), color: tertiaryInk, alignment: .right ) drawText( "Daten von www.eucharistiefeier.de", - in: CGRect(x: rightX, y: top + 27, width: 170, height: 11), + in: CGRect(x: rightX, y: top + 13, width: 170, height: 11), font: sans(7), color: tertiaryInk, alignment: .right diff --git a/Sources/LektorenPlan/PlanModel.swift b/Sources/LektorenPlan/PlanModel.swift index ec75a43..859f911 100644 --- a/Sources/LektorenPlan/PlanModel.swift +++ b/Sources/LektorenPlan/PlanModel.swift @@ -450,7 +450,11 @@ final class PlanModel: ObservableObject { existingAssignments: existing.filter { $0.serviceID == serviceID }, churches: churches, liturgicalDays: Array(liturgicalDays.values), - options: PlannerOptions(replaceExisting: false, respectPreferredWeekdays: false) + options: PlannerOptions( + replaceExisting: false, + respectPreferredWeekdays: true, + allowBeyondPreferences: true + ) ) let result = planner.plan() _ = servicesOfDay @@ -471,6 +475,11 @@ final class PlanModel: ObservableObject { do { var beyond = false if let personID, let person = peopleByID[personID], let service = try db.service(id: serviceID) { + if absences.contains(where: { $0.personID == personID && $0.overlaps(service.date) }) { + alertTitle = "Zuweisung nicht möglich" + alertMessage = "\(person.fullName) ist an diesem Tag als abwesend eingetragen." + return + } let highFeast = liturgicalDays[service.dateKey]?.isHighFeast ?? false let fits = person.matchesWeekdayPreference( weekday: DayMath.weekday(service.date), @@ -514,8 +523,7 @@ final class PlanModel: ObservableObject { func candidateSuggestions( for service: ServiceOccurrence, - role: Role, - ignorePreferredWeekdays: Bool = false + role: Role ) -> [CandidateSuggestion] { let rangeAssignments = assignments let monthKey = DayMath.monthKey(service.date) @@ -568,22 +576,14 @@ final class PlanModel: ObservableObject { highFeast: highFeast ) if !weekdayMatch { - if ignorePreferredWeekdays { - beyond = true - } else if person.allowBeyondPreferences { - beyond = true - } else { - warnings.append("Einsatztag oder Uhrzeit passt nicht") - blocked = true - } + // Manual assignments may always override preferences, but + // the UI asks for confirmation before doing so. + warnings.append("Einsatztag oder Uhrzeit passt nicht") + beyond = true } if person.maxPerMonth > 0, monthlyCounts["\(person.id)|\(monthKey)", default: 0] >= person.maxPerMonth { warnings.append("Monatslimit") - if person.allowBeyondPreferences { - beyond = true - } else { - blocked = true - } + beyond = true } let servicesThisDay = dayServices["\(person.id)|\(service.dateKey)", default: []] if !servicesThisDay.isEmpty, !servicesThisDay.isSubset(of: [service.id]) { diff --git a/Sources/LektorenPlan/Views/ServiceDetailSheet.swift b/Sources/LektorenPlan/Views/ServiceDetailSheet.swift index 94735da..10d410d 100644 --- a/Sources/LektorenPlan/Views/ServiceDetailSheet.swift +++ b/Sources/LektorenPlan/Views/ServiceDetailSheet.swift @@ -8,7 +8,7 @@ struct ServiceDetailSheet: View { let serviceID: String @State private var selectedRole: Role = .lector - @State private var ignorePreferredWeekdays = false + @State private var pendingBeyondCandidate: CandidateSuggestion? @State private var confirmDelete = false private var item: ServiceWithAssignments? { @@ -79,6 +79,28 @@ struct ServiceDetailSheet: View { selectedRole = .helper } } + .confirmationDialog( + "Über Präferenzen einteilen?", + isPresented: Binding( + get: { pendingBeyondCandidate != nil }, + set: { if !$0 { pendingBeyondCandidate = nil } } + ), + titleVisibility: .visible + ) { + Button("Trotzdem einteilen") { + if let candidate = pendingBeyondCandidate { + model.assign(serviceID: serviceID, role: selectedRole, personID: candidate.person.id) + } + pendingBeyondCandidate = nil + } + Button("Abbrechen", role: .cancel) { + pendingBeyondCandidate = nil + } + } message: { + if let candidate = pendingBeyondCandidate { + Text("\(candidate.person.fullName) ist bereit, auch über ihre Präferenzen oder ihr Monatslimit hinaus eingeplant zu werden.") + } + } .confirmationDialog( "Gottesdienst löschen?", isPresented: $confirmDelete, @@ -150,14 +172,6 @@ struct ServiceDetailSheet: View { .font(.system(size: 9, weight: .medium)) .foregroundStyle(LP.inkTertiary) } - Toggle(isOn: $ignorePreferredWeekdays) { - Text("Präferenztage ignorieren") - .font(.system(size: 9, weight: .medium)) - .foregroundStyle(LP.inkSecondary) - } - .toggleStyle(.switch) - .controlSize(.mini) - .help("Auch Personen anbieten, deren bevorzugte Einsatztage diesen Termin ausschließen. Ausschlusstermine bleiben gesperrt.") } } .padding(.horizontal, 22) @@ -366,8 +380,7 @@ struct ServiceDetailSheet: View { let suggestions = model.candidateSuggestions( for: item.service, - role: selectedRole, - ignorePreferredWeekdays: ignorePreferredWeekdays + role: selectedRole ) if suggestions.isEmpty { EmptyStateView( @@ -442,7 +455,11 @@ struct ServiceDetailSheet: View { Spacer(minLength: 4) Button { - model.assign(serviceID: item.service.id, role: selectedRole, personID: candidate.person.id) + if candidate.beyondPreferences { + pendingBeyondCandidate = candidate + } else { + model.assign(serviceID: item.service.id, role: selectedRole, personID: candidate.person.id) + } } label: { HStack(spacing: 3) { Image(systemName: "plus") diff --git a/web/domain/planner.go b/web/domain/planner.go index f6ac9f6..433591e 100644 --- a/web/domain/planner.go +++ b/web/domain/planner.go @@ -440,7 +440,6 @@ func CandidateSuggestions( rangeAssignments []Assignment, services []ServiceOccurrence, serviceAssignments []Assignment, - ignorePreferredWeekdays bool, liturgicalDay *LiturgicalDay, ) []CandidateSuggestion { monthKey := MonthKey(service.Date) @@ -505,24 +504,14 @@ func CandidateSuggestions( } weekdayMatch := person.MatchesWeekdayPreference(weekday, service.TimeMinutes, highFeast) if !weekdayMatch { - switch { - case ignorePreferredWeekdays: - beyond = true - case person.AllowBeyondPreferences: - beyond = true - default: - warnings = append(warnings, "Einsatztag oder Uhrzeit passt nicht") - blocked = true - } + // Manual assignments may always override preferences, but the UI + // asks for confirmation before doing so. + warnings = append(warnings, "Einsatztag oder Uhrzeit passt nicht") + beyond = true } if person.MaxPerMonth > 0 && monthlyCounts[person.ID+"|"+monthKey] >= person.MaxPerMonth { - if person.AllowBeyondPreferences { - warnings = append(warnings, "Monatslimit") - beyond = true - } else { - warnings = append(warnings, "Monatslimit") - blocked = true - } + warnings = append(warnings, "Monatslimit") + beyond = true } used := dayServices[person.ID+"|"+service.DateKey()] if len(used) > 0 && !subsetOfSingle(used, service.ID) { diff --git a/web/domain/planner_test.go b/web/domain/planner_test.go index 7a38a34..55eb94d 100644 --- a/web/domain/planner_test.go +++ b/web/domain/planner_test.go @@ -130,7 +130,7 @@ func TestPlannerTreatsHighFeastAsSunday(t *testing.T) { } } -func TestCandidateSuggestionsMarkBeyondPreferences(t *testing.T) { +func TestCandidateSuggestionsAllowPreferenceOverrides(t *testing.T) { service := ServiceOccurrence{ ID: "s1", ChurchID: "c1", Date: MustDate("2026-11-16"), TimeMinutes: 18 * 60, Title: "Abendmesse", LectorsNeeded: 1, @@ -140,14 +140,17 @@ func TestCandidateSuggestionsMarkBeyondPreferences(t *testing.T) { PreferredWeekdays: []int{1}, Active: true, MaxPerMonth: 6, } suggestions := CandidateSuggestions(service, RoleLector, - []Person{sundayOnly}, nil, nil, []ServiceOccurrence{service}, nil, false, nil) - if len(suggestions) != 1 || !suggestions[0].Blocked || suggestions[0].BeyondPreferences { - t.Fatalf("person without permission should be blocked, got %#v", suggestions) + []Person{sundayOnly}, nil, nil, []ServiceOccurrence{service}, nil, nil) + if len(suggestions) != 1 || suggestions[0].Blocked || !suggestions[0].BeyondPreferences { + t.Fatalf("manual suggestions should allow preference overrides with a warning, got %#v", suggestions) + } + if len(suggestions[0].Warnings) == 0 { + t.Fatal("preference override should carry a warning") } sundayOnly.AllowBeyondPreferences = true suggestions = CandidateSuggestions(service, RoleLector, - []Person{sundayOnly}, nil, nil, []ServiceOccurrence{service}, nil, false, nil) + []Person{sundayOnly}, nil, nil, []ServiceOccurrence{service}, nil, nil) if len(suggestions) != 1 || suggestions[0].Blocked || !suggestions[0].BeyondPreferences { t.Fatalf("flagged person should be suggested beyond preferences, got %#v", suggestions) } @@ -155,3 +158,23 @@ func TestCandidateSuggestionsMarkBeyondPreferences(t *testing.T) { t.Fatal("unexpected preference note") } } + +func TestCandidateSuggestionsBlockAbsences(t *testing.T) { + service := ServiceOccurrence{ + ID: "s1", ChurchID: "c1", Date: MustDate("2026-11-16"), + TimeMinutes: 18 * 60, Title: "Abendmesse", LectorsNeeded: 1, + } + person := Person{ + ID: "p1", FirstName: "Anna", LastName: "Berg", Roles: []Role{RoleLector}, + PreferredWeekdays: []int{1}, Active: true, MaxPerMonth: 6, + } + absences := []Absence{{ + ID: "a1", PersonID: person.ID, + Start: MustDate("2026-11-16"), End: MustDate("2026-11-16"), + }} + suggestions := CandidateSuggestions(service, RoleLector, + []Person{person}, absences, nil, []ServiceOccurrence{service}, nil, nil) + if len(suggestions) != 1 || !suggestions[0].Blocked { + t.Fatalf("absence must remain a hard block, got %#v", suggestions) + } +} diff --git a/web/pdf/pdf.go b/web/pdf/pdf.go index ec5147b..a21d875 100644 --- a/web/pdf/pdf.go +++ b/web/pdf/pdf.go @@ -623,7 +623,7 @@ func CompactPlan(w io.Writer, r domain.DayRange, rows []domain.DayPlanRow, peopl contentTop := margin + headerH + colH + 2 contentBottom := pageHeight - margin - footerH - drawHeader := func(continuation bool) { + drawHeader := func() { setColor(pdf, colors.accent) pdf.SetFont("Helvetica", "B", 6.2) pdf.SetXY(margin, margin) @@ -631,12 +631,8 @@ func CompactPlan(w io.Writer, r domain.DayRange, rows []domain.DayPlanRow, peopl setColor(pdf, colors.ink) pdf.SetFont("Times", "B", 17) - title := "Gottesdienstliste" - if continuation { - title = "Gottesdienstliste · Fortsetzung" - } pdf.SetXY(margin, margin+4.4) - pdf.CellFormat(130, 6.5, tr(title), "", 0, "L", false, 0, "") + pdf.CellFormat(130, 6.5, tr("Gottesdienstliste"), "", 0, "L", false, 0, "") setColor(pdf, colors.secondary) pdf.SetFont("Helvetica", "", 7.8) @@ -645,13 +641,10 @@ func CompactPlan(w io.Writer, r domain.DayRange, rows []domain.DayPlanRow, peopl rightX := pageWidth - margin - 62 setColor(pdf, colors.tertiary) - pdf.SetFont("Helvetica", "B", 6.4) - pdf.SetXY(rightX, margin) - pdf.CellFormat(62, 3.2, tr("A4 hoch · kompakte Liste"), "", 0, "R", false, 0, "") pdf.SetFont("Helvetica", "", 6.4) - pdf.SetXY(rightX, margin+4.5) + pdf.SetXY(rightX, margin) pdf.CellFormat(62, 3.2, tr("Erstellt am "+domain.MediumString(opts.generated())), "", 0, "R", false, 0, "") - pdf.SetXY(rightX, margin+9) + pdf.SetXY(rightX, margin+4.5) pdf.CellFormat(62, 3.2, tr("Daten von www.eucharistiefeier.de"), "", 0, "R", false, 0, "") setDraw(pdf, colors.line) @@ -714,7 +707,7 @@ func CompactPlan(w io.Writer, r domain.DayRange, rows []domain.DayPlanRow, peopl } pdf.AddPage() - drawHeader(false) + drawHeader() drawColumnHeader() page := 1 y := contentTop @@ -744,7 +737,7 @@ func CompactPlan(w io.Writer, r domain.DayRange, rows []domain.DayPlanRow, peopl drawFooter(page) page++ pdf.AddPage() - drawHeader(true) + drawHeader() drawColumnHeader() y = contentTop } diff --git a/web/pdf/pdf_test.go b/web/pdf/pdf_test.go index 8b3ef0a..e718342 100644 --- a/web/pdf/pdf_test.go +++ b/web/pdf/pdf_test.go @@ -279,3 +279,32 @@ func TestCompactPlan(t *testing.T) { t.Fatalf("unexpected PDF output (%d bytes)", buf.Len()) } } + +func TestCompactPlanPaginatesWithoutContinuationTitle(t *testing.T) { + r, rows, _, people := multiPageRows() + var buf bytes.Buffer + if err := CompactPlan(&buf, r, rows, people, Options{TenantName: "Bad Godesberg"}); err != nil { + t.Fatalf("render: %v", err) + } + content := string(pdfContentStreams(t, buf.Bytes())) + if strings.Contains(content, "Fortsetzung") { + t.Fatal("continuation title must not appear on later pages") + } + if strings.Contains(content, "A4 hoch") { + t.Fatal("paper hint must not appear in the compact header") + } + match := regexp.MustCompile(`Seite 1 von (\d+)`).FindStringSubmatch(content) + if match == nil { + t.Fatalf("first page footer is missing the total page count:\n%s", content) + } + total, err := strconv.Atoi(match[1]) + if err != nil || total < 2 { + t.Fatalf("total pages = %q, want at least 2", match[1]) + } + if !strings.Contains(content, fmt.Sprintf("Seite %d von %d", total, total)) { + t.Fatalf("last page footer is missing: want Seite %d von %d", total, total) + } + if got := strings.Count(content, "Seite "); got != total { + t.Fatalf("footer count = %d, want %d", got, total) + } +} diff --git a/web/web/service_handlers.go b/web/web/service_handlers.go index e8cfeef..64f9717 100644 --- a/web/web/service_handlers.go +++ b/web/web/service_handlers.go @@ -229,11 +229,11 @@ func (s *Server) handleServiceDetail(w http.ResponseWriter, r *http.Request, use } if detail.LectorOpen > 0 { detail.LectorCandidates = domain.CandidateSuggestions(*service, domain.RoleLector, people, absences, - rangeAssignments, rangeServices, assignments, false, s.liturgicalDay(r, service.Date)) + rangeAssignments, rangeServices, assignments, s.liturgicalDay(r, service.Date)) } if detail.HelperOpen > 0 { detail.HelperCandidates = domain.CandidateSuggestions(*service, domain.RoleHelper, people, absences, - rangeAssignments, rangeServices, assignments, false, s.liturgicalDay(r, service.Date)) + rangeAssignments, rangeServices, assignments, s.liturgicalDay(r, service.Date)) } data.Data = detail s.renderPage(w, r, "service", data) @@ -288,6 +288,15 @@ func (s *Server) handleAssign(w http.ResponseWriter, r *http.Request, user *stor s.redirectBack(w, r, "/services/"+service.ID) return } + if absences, err := s.store.AbsencesForPerson(r.Context(), tenant.ID, person.ID); err == nil { + for _, absence := range absences { + if absence.Overlaps(service.Date) { + s.setFlash(w, person.FullName()+" ist an diesem Tag als abwesend eingetragen und kann nicht eingeteilt werden.", "error") + s.redirectBack(w, r, "/services/"+service.ID) + return + } + } + } assignments, _ := s.store.AssignmentsForServices(r.Context(), tenant.ID, []string{service.ID}) filled := 0 for _, assignment := range assignments { diff --git a/web/web/templates/plan.html b/web/web/templates/plan.html index 60441b9..77c552a 100644 --- a/web/web/templates/plan.html +++ b/web/web/templates/plan.html @@ -97,7 +97,7 @@
Rückfrage zur Planung -

{{.Data.BeyondOpen}} {{plural .Data.BeyondOpen "Dienst bleibt" "Dienste bleiben"}} offen

+

{{plural .Data.BeyondOpen "Dienst bleibt" "Dienste bleiben"}} offen

Es gibt Personen, die ausdrücklich bereit sind, auch über ihre Präferenzen hinaus eingeplant zu werden. Sollen sie für die verbleibenden Dienste eingesetzt werden? Die Einsätze werden im Plan besonders gekennzeichnet.

diff --git a/web/web/templates/service.html b/web/web/templates/service.html index 85260b7..9610db9 100644 --- a/web/web/templates/service.html +++ b/web/web/templates/service.html @@ -79,7 +79,7 @@ {{if .Preferred}}Präferenz{{end}} {{range .Warnings}}{{.}}{{end}} - + @@ -141,7 +141,7 @@ {{if .Preferred}}Präferenz{{end}} {{range .Warnings}}{{.}}{{end}} - +