UI verbessert, 2. PDF als kompakte Variante

This commit is contained in:
concierge committed 2026-11-12 19:59:51 +01:00
1 parent 1bf3283029
commit f9e3e94629
23 files changed
+1009 -146

No files matched your search

+150 -35
View File
@@ -111,6 +111,26 @@ struct PDFPreview: Identifiable {
var data: Data
var title: String
var filename: String
var formatLabel: String
}
enum PlanPDFVariant {
case full
case compact
var formatLabel: String {
switch self {
case .full: "A4 quer · Kirchenspalten"
case .compact: "A4 hoch · kompakte Liste"
}
}
var filenameComponent: String {
switch self {
case .full: "Plan"
case .compact: "Liste"
}
}
}
struct CandidateSuggestion: Identifiable {
@@ -162,6 +182,7 @@ final class PlanModel: ObservableObject {
@Published var pdfPreview: PDFPreview?
@Published var databasePath: String
@Published var startupWarning: String?
@Published var isResettingData = false
private var toastTask: Task<Void, Never>?
@@ -302,6 +323,8 @@ final class PlanModel: ObservableObject {
if row.liturgicalDay?.readings.shortLabel.lowercased().contains(query) == true { return true }
for service in row.services {
if service.church.name.lowercased().contains(query) { return true }
if let location = service.service.location,
location.lowercased().contains(query) { return true }
if service.service.title.lowercased().contains(query) { return true }
for assignment in service.assignments {
if let person = peopleByID[assignment.personID],
@@ -418,26 +441,47 @@ final class PlanModel: ObservableObject {
}
}
func candidateSuggestions(for service: ServiceOccurrence, role: Role) -> [CandidateSuggestion] {
func candidateSuggestions(
for service: ServiceOccurrence,
role: Role,
ignorePreferredWeekdays: Bool = false
) -> [CandidateSuggestion] {
let rangeAssignments = assignments
let monthKey = DayMath.monthKey(service.date)
let serviceDateByID = Dictionary(uniqueKeysWithValues: services.map { ($0.id, $0) })
var monthlyCounts: [String: Int] = [:]
var totalCounts: [String: Int] = [:]
var dayCounts: [String: Int] = [:]
var dayServices: [String: Set<String>] = [:]
for assignment in rangeAssignments {
guard let assignedService = serviceDateByID[assignment.serviceID] else { continue }
monthlyCounts["\(assignment.personID)|\(DayMath.monthKey(assignedService.date))", default: 0] += 1
totalCounts[assignment.personID, default: 0] += 1
dayCounts["\(assignment.personID)|\(assignedService.dateKey)", default: 0] += 1
dayServices["\(assignment.personID)|\(assignedService.dateKey)", default: []].insert(assignment.serviceID)
}
let assignedToService = Set(assignments.filter { $0.serviceID == service.id }.map(\.personID))
// Lector and helper do not exclude each other: a person may be suggested
// for the complementary role even when already serving this service.
// Read the service assignments directly so this also works when the
// service is outside the currently loaded range.
let serviceAssignments = (try? db.assignments(serviceIDs: [service.id]))
?? assignments.filter { $0.serviceID == service.id }
var assignedRolesByPerson: [String: Set<Role>] = [:]
for assignment in serviceAssignments {
assignedRolesByPerson[assignment.personID, default: []].insert(assignment.role)
}
let weekday = DayMath.weekday(service.date)
return people
.filter { $0.active && $0.canFill(role) && !assignedToService.contains($0.id) }
let eligiblePeople = people.filter { person in
guard person.active, person.canFill(role) else { return false }
return !(assignedRolesByPerson[person.id]?.contains(role) ?? false)
}
// Only prefer a dual-role assignment while the person is not already
// noticeably ahead of others. Otherwise fairness wins.
let minimumTotal = eligiblePeople.map { totalCounts[$0.id, default: 0] }.min() ?? 0
let fairnessSlack = 1
return eligiblePeople
.map { person in
var warnings: [String] = []
var blocked = false
@@ -445,7 +489,9 @@ final class PlanModel: ObservableObject {
warnings.append("abwesend")
blocked = true
}
if !person.preferredWeekdays.isEmpty && !person.preferredWeekdays.contains(weekday) {
if !ignorePreferredWeekdays,
!person.preferredWeekdays.isEmpty,
!person.preferredWeekdays.contains(weekday) {
warnings.append("Einsatztag passt nicht")
blocked = true
}
@@ -453,12 +499,24 @@ final class PlanModel: ObservableObject {
warnings.append("Monatslimit")
blocked = true
}
if dayCounts["\(person.id)|\(service.dateKey)", default: 0] > 0 {
let servicesThisDay = dayServices["\(person.id)|\(service.dateKey)", default: []]
if !servicesThisDay.isEmpty, !servicesThisDay.isSubset(of: [service.id]) {
warnings.append("bereits an diesem Tag")
blocked = true
}
let total = totalCounts[person.id, default: 0]
let withinFairnessReach = total - minimumTotal <= fairnessSlack
var score = 0.0
var preferred = false
if withinFairnessReach, assignedRolesByPerson[person.id]?.contains(role.complementary) == true {
score += 14
preferred = true
} else if withinFairnessReach,
service.rolesNeeded.count > 1,
person.roles.contains(where: { $0 != role && service.requiredCount(for: $0) > 0 }) {
score += 14
preferred = true
}
if person.preferredChurchIDs.contains(service.churchID) {
score += 8
preferred = true
@@ -476,7 +534,7 @@ final class PlanModel: ObservableObject {
preferred = true
}
}
score -= Double(totalCounts[person.id, default: 0]) * 1.4
score -= Double(total) * 1.4
if absences.contains(where: { $0.personID == person.id && $0.overlaps(service.date) }) {
score -= 100
}
@@ -780,18 +838,32 @@ final class PlanModel: ObservableObject {
// MARK: - PDF & print
func createPDFPreview() {
let data = PlanPDFRenderer.render(
range: range,
rows: rows,
churches: churches,
people: peopleByID,
generatedAt: Date()
)
func createPDFPreview(variant: PlanPDFVariant = .full) {
let data: Data
switch variant {
case .full:
data = PlanPDFRenderer.render(
range: range,
rows: rows,
churches: churches,
people: peopleByID,
generatedAt: Date()
)
case .compact:
data = CompactPlanPDFRenderer.render(
range: range,
rows: rows,
people: peopleByID,
generatedAt: Date()
)
}
pdfPreview = PDFPreview(
data: data,
title: "Lektorenplan \(range.shortTitle)",
filename: "LektorenPlan_\(DayMath.key(range.start))_\(DayMath.key(range.end)).pdf"
title: variant == .compact
? "Gottesdienstliste \(range.shortTitle)"
: "Lektorenplan \(range.shortTitle)",
filename: "LektorenPlan_\(variant.filenameComponent)_\(DayMath.key(range.start))_\(DayMath.key(range.end)).pdf",
formatLabel: variant.formatLabel
)
}
@@ -811,21 +883,34 @@ final class PlanModel: ObservableObject {
}
}
func printPDF(data: Data? = nil) {
let pdfData = data ?? PlanPDFRenderer.render(
range: range,
rows: rows,
churches: churches,
people: peopleByID,
generatedAt: Date()
)
func printPDF(data: Data? = nil, variant: PlanPDFVariant = .full) {
let pdfData = data ?? {
switch variant {
case .full:
return PlanPDFRenderer.render(
range: range,
rows: rows,
churches: churches,
people: peopleByID,
generatedAt: Date()
)
case .compact:
return CompactPlanPDFRenderer.render(
range: range,
rows: rows,
people: peopleByID,
generatedAt: Date()
)
}
}()
guard let document = PDFDocument(data: pdfData) else {
alertTitle = "Drucken nicht möglich"
alertMessage = "Das PDF konnte nicht erzeugt werden."
return
}
let info = NSPrintInfo.shared.copy() as? NSPrintInfo ?? NSPrintInfo.shared
info.orientation = .landscape
let bounds = document.page(at: 0)?.bounds(for: .mediaBox) ?? .zero
info.orientation = bounds.width > bounds.height ? .landscape : .portrait
info.topMargin = 0
info.bottomMargin = 0
info.leftMargin = 0
@@ -840,13 +925,43 @@ final class PlanModel: ObservableObject {
// MARK: - Demo
func resetDemoData() {
do {
try db.resetDemoData()
loadAll()
showToast("Demo-Daten neu aufgebaut.", kind: .success)
} catch {
alertTitle = "Demo-Daten konnten nicht zurückgesetzt werden"
alertMessage = error.localizedDescription
rebuildContent(deleteOnly: false)
}
func deleteAllData() {
rebuildContent(deleteOnly: true)
}
private func rebuildContent(deleteOnly: Bool) {
guard !isResettingData else { return }
isResettingData = true
let database = db
Task {
do {
try await Task.detached(priority: .userInitiated) {
if deleteOnly {
try database.deleteAllData()
} else {
try database.resetDemoData()
}
}.value
range = .quarter(containing: DayMath.today())
db.setSetting("rangeStart", value: DayMath.key(range.start))
db.setSetting("rangeEnd", value: DayMath.key(range.end))
loadAll()
isResettingData = false
showToast(
deleteOnly ? "Alle Daten wurden gelöscht." : "Demo-Daten neu aufgebaut.",
kind: .success
)
} catch {
isResettingData = false
alertTitle = deleteOnly
? "Daten konnten nicht gelöscht werden"
: "Demo-Daten konnten nicht zurückgesetzt werden"
alertMessage = error.localizedDescription
}
}
}