Versendung: doppelseitiges Sammel PDF und diverse Verbesserungen
This commit is contained in:
1 parent
4b88aca958
commit
feab6135ff
31 files changed
+1302
-96
No files matched your search
@@ -227,6 +227,7 @@ final class PlanModel: ObservableObject {
|
||||
@Published var dispatchLog: [DispatchLogEntry] = []
|
||||
@Published var dispatchIntro: String = PlanModel.defaultDispatchIntro
|
||||
@Published var dispatchGreeting: String = PlanModel.defaultDispatchGreeting
|
||||
@Published var dispatchDuplex: Bool = true
|
||||
|
||||
private var toastTask: Task<Void, Never>?
|
||||
|
||||
@@ -1066,23 +1067,35 @@ final class PlanModel: ObservableObject {
|
||||
}
|
||||
|
||||
func dispatchAssignments(for personID: String) -> [DispatchAssignment] {
|
||||
var result: [DispatchAssignment] = []
|
||||
var grouped: [String: DispatchAssignment] = [:]
|
||||
var order: [String] = []
|
||||
for row in rows {
|
||||
for service in row.services {
|
||||
for assignment in service.assignments where assignment.personID == personID {
|
||||
result.append(DispatchAssignment(
|
||||
id: assignment.id,
|
||||
date: row.date,
|
||||
timeMinutes: service.service.timeMinutes,
|
||||
church: service.church.shortName,
|
||||
place: service.service.placeName(church: service.church),
|
||||
title: service.service.title,
|
||||
role: assignment.role
|
||||
))
|
||||
// One person can serve as lector and helper in the same
|
||||
// service. Combine both assignments into one overview row
|
||||
// and one calendar event.
|
||||
if var existing = grouped[service.id] {
|
||||
if !existing.roles.contains(assignment.role) {
|
||||
existing.roles.append(assignment.role)
|
||||
grouped[service.id] = existing
|
||||
}
|
||||
} else {
|
||||
grouped[service.id] = DispatchAssignment(
|
||||
id: service.id,
|
||||
date: row.date,
|
||||
timeMinutes: service.service.timeMinutes,
|
||||
church: service.church.shortName,
|
||||
place: service.service.placeName(church: service.church),
|
||||
title: service.service.title,
|
||||
roles: [assignment.role]
|
||||
)
|
||||
order.append(service.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return result.sorted {
|
||||
return order.compactMap { grouped[$0] }.sorted {
|
||||
if $0.date != $1.date { return $0.date < $1.date }
|
||||
return $0.timeMinutes < $1.timeMinutes
|
||||
}
|
||||
@@ -1104,7 +1117,7 @@ final class PlanModel: ObservableObject {
|
||||
durationMinutes: 60,
|
||||
summary: assignment.title,
|
||||
location: assignment.place,
|
||||
description: "Dienst: \(assignment.role.title)"
|
||||
description: "Dienst: \(assignment.roleLabel)"
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1172,7 +1185,7 @@ final class PlanModel: ObservableObject {
|
||||
return "Für Sie sind in diesem Zeitraum keine Einsätze eingetragen."
|
||||
}
|
||||
return assignments
|
||||
.map { "\($0.dateLabel) · \($0.timeLabel) · \($0.church) · \($0.role.title) · \($0.title)" }
|
||||
.map { "\($0.dateLabel) · \($0.timeLabel) · \($0.church) · \($0.roleLabel) · \($0.title)" }
|
||||
.joined(separator: "\n")
|
||||
}
|
||||
|
||||
@@ -1311,11 +1324,14 @@ final class PlanModel: ObservableObject {
|
||||
assignments: recipient.assignments,
|
||||
generatedAt: Date()
|
||||
))
|
||||
if !cover.isEmpty { documents.append(cover) }
|
||||
if !cover.isEmpty {
|
||||
documents.append(dispatchDuplex ? PDFMerger.paddedToEvenPages(cover) : cover)
|
||||
}
|
||||
}
|
||||
let variant = recipient.preference.variant
|
||||
if planCache[variant] == nil {
|
||||
planCache[variant] = dispatchPlanData(variant: variant)
|
||||
let plan = dispatchPlanData(variant: variant)
|
||||
planCache[variant] = dispatchDuplex ? PDFMerger.paddedToEvenPages(plan) : plan
|
||||
}
|
||||
if let planData = planCache[variant], !planData.isEmpty {
|
||||
documents.append(planData)
|
||||
|
||||
Reference in new issue
Block a user