Versendung mit .ics Kalenderdatei

This commit is contained in:
concierge committed 2026-11-18 08:13:10 +01:00
1 parent c08d43e7dd
commit dc20d7ec5a
13 files changed
+650 -54

No files matched your search

+71 -8
View File
@@ -174,6 +174,17 @@ final class PlanModel: ObservableObject {
Ihr Pfarreiteam
"""
/// The editable dispatch wording is stored per local user so several people
/// sharing one installation keep their own style. The unsuffixed keys are
/// the legacy shared value and remain the fallback.
static var dispatchUserIntroKey: String { "dispatch.intro.user.\(dispatchLocalUserKey)" }
static var dispatchUserGreetingKey: String { "dispatch.greeting.user.\(dispatchLocalUserKey)" }
private static var dispatchLocalUserKey: String {
let name = NSUserName().trimmingCharacters(in: .whitespacesAndNewlines)
return name.isEmpty ? "local" : name
}
let db: AppDatabase
@Published var section: AppSection = .planning
@@ -1062,6 +1073,7 @@ final class PlanModel: ObservableObject {
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
))
@@ -1074,6 +1086,27 @@ final class PlanModel: ObservableObject {
}
}
/// Builds calendar events for one recipient. Service times are wall-clock
/// times in the parish, so they stay floating local times in the `.ics`.
func dispatchCalendarEvents(_ assignments: [DispatchAssignment]) -> [CalendarEvent] {
assignments.map { assignment in
let start = DayMath.calendar.date(
bySettingHour: assignment.timeMinutes / 60,
minute: assignment.timeMinutes % 60,
second: 0,
of: assignment.date
) ?? assignment.date
return CalendarEvent(
uid: assignment.id,
start: start,
durationMinutes: 60,
summary: assignment.title,
location: assignment.place,
description: "Dienst: \(assignment.role.title)"
)
}
}
func loadDispatch() {
do {
dispatchPreferences = try db.dispatchPreferences()
@@ -1082,18 +1115,22 @@ final class PlanModel: ObservableObject {
alertTitle = "Versendung konnte nicht geladen werden"
alertMessage = error.localizedDescription
}
if let stored = db.setting("dispatch.intro"), !stored.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
if let stored = db.setting(Self.dispatchUserIntroKey), !stored.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
dispatchIntro = stored
} else if let stored = db.setting("dispatch.intro"), !stored.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
dispatchIntro = stored
} else {
dispatchIntro = Self.defaultDispatchIntro
}
dispatchGreeting = db.setting("dispatch.greeting") ?? Self.defaultDispatchGreeting
dispatchGreeting = db.setting(Self.dispatchUserGreetingKey)
?? db.setting("dispatch.greeting")
?? Self.defaultDispatchGreeting
}
/// Persists the texts and every currently visible preference.
func saveDispatchSettings(showConfirmation: Bool = true) {
db.setSetting("dispatch.intro", value: dispatchIntro)
db.setSetting("dispatch.greeting", value: dispatchGreeting)
db.setSetting(Self.dispatchUserIntroKey, value: dispatchIntro)
db.setSetting(Self.dispatchUserGreetingKey, value: dispatchGreeting)
for recipient in dispatchRecipients {
db.saveDispatchPreference(recipient.preference, personID: recipient.id)
}
@@ -1117,6 +1154,7 @@ final class PlanModel: ObservableObject {
func dispatchEmailBody(for recipient: DispatchRecipient) -> String {
var parts: [String] = [resolvedDispatchText(dispatchIntro)]
parts.append("Ihre Einsätze im Zeitraum:\n\n" + dispatchAssignmentLines(recipient.assignments))
parts.append(Self.dispatchAttachmentHint)
let greeting = resolvedDispatchText(dispatchGreeting)
if !greeting.isEmpty {
parts.append(greeting)
@@ -1124,6 +1162,9 @@ final class PlanModel: ObservableObject {
return parts.joined(separator: "\n\n")
}
static let dispatchAttachmentHint = "Im Anhang finden Sie den Plan als PDF sowie eine Kalenderdatei (.ics), "
+ "die Sie in Ihren Kalender importieren können."
func dispatchAssignmentLines(_ assignments: [DispatchAssignment]) -> String {
guard !assignments.isEmpty else {
return "Für Sie sind in diesem Zeitraum keine Einsätze eingetragen."
@@ -1189,18 +1230,30 @@ final class PlanModel: ObservableObject {
continue
}
let calendarURL = directory.appendingPathComponent(dispatchCalendarFilename(for: recipient))
let calendar = CalendarExport.ics(
calendarName: "Gottesdienstplan \(range.shortTitle)",
events: dispatchCalendarEvents(recipient.assignments)
)
do {
try Data(calendar.utf8).write(to: calendarURL, options: .atomic)
} catch {
failure("Kalenderdatei konnte nicht gespeichert werden: \(error.localizedDescription)")
continue
}
service.recipients = [email]
service.subject = dispatchSubject()
let body = dispatchEmailBody(for: recipient)
DispatchQueue.main.asyncAfter(deadline: .now() + Double(index) * 0.4) {
service.perform(withItems: [body, fileURL])
service.perform(withItems: [body, fileURL, calendarURL])
}
opened += 1
entries.append(DispatchLogEntry(
batchID: batchID, rangeStart: range.start, rangeEnd: range.end,
personID: recipient.id, personName: recipient.person.fullName,
channel: .email, variant: variant, email: email,
status: .mail, detail: "Anhang: \(variant.shortTitle)", createdAt: createdAt
status: .mail, detail: "Anhänge: \(variant.shortTitle), Kalender (.ics)", createdAt: createdAt
))
}
@@ -1311,12 +1364,22 @@ final class PlanModel: ObservableObject {
}
private func dispatchFilename(for recipient: DispatchRecipient, variant: PlanListVariant) -> String {
let base = recipient.person.fullName
"LektorenPlan-\(dispatchPersonFileComponent(recipient))-\(variant.rawValue)-\(DayMath.key(range.start)).pdf"
}
/// The calendar file is generated per person, so its name carries the same
/// person component as the PDF to avoid overwriting files in the shared
/// temporary dispatch directory.
private func dispatchCalendarFilename(for recipient: DispatchRecipient) -> String {
"LektorenPlan-\(dispatchPersonFileComponent(recipient))-Kalender-\(DayMath.key(range.start)).ics"
}
private func dispatchPersonFileComponent(_ recipient: DispatchRecipient) -> String {
recipient.person.fullName
.folding(options: .diacriticInsensitive, locale: .current)
.replacingOccurrences(of: " ", with: "-")
.components(separatedBy: CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-_")).inverted)
.joined()
return "LektorenPlan-\(base)-\(variant.rawValue)-\(DayMath.key(range.start)).pdf"
}
private func dispatchTempDirectory() -> URL {