Bug fix, über Präferenz hinazs besetzen

This commit is contained in:
concierge committed 2026-11-19 15:57:06 +01:00
1 parent a5d4251868
commit 4b88aca958
9 files changed
+162 -48

No files matched your search

+11 -9
View File
@@ -94,7 +94,7 @@ enum PlanPDFRenderer {
}
beginPage()
drawHeader(range: range, generatedAt: generatedAt)
drawHeader(range: range, generatedAt: generatedAt, showTitle: true)
drawColumnHeader(churches: churches, churchWidth: churchWidth)
var cursorY = contentTop
@@ -104,7 +104,7 @@ enum PlanPDFRenderer {
if cursorY + height > contentBottom {
endPage()
beginPage()
drawHeader(range: range, generatedAt: generatedAt)
drawHeader(range: range, generatedAt: generatedAt, showTitle: false)
drawColumnHeader(churches: churches, churchWidth: churchWidth)
cursorY = contentTop
}
@@ -145,7 +145,7 @@ enum PlanPDFRenderer {
// MARK: - Page furniture
private static func drawHeader(range: DayRange, generatedAt: Date) {
private static func drawHeader(range: DayRange, generatedAt: Date, showTitle: Bool) {
let top = margin
drawText(
@@ -154,12 +154,14 @@ enum PlanPDFRenderer {
font: sans(7.5, weight: .bold),
color: accent
)
drawText(
"Gottesdienstplan",
in: CGRect(x: margin, y: top + 13, width: 500, height: 22),
font: serif(17.5, bold: true),
color: ink
)
if showTitle {
drawText(
"Gottesdienstplan",
in: CGRect(x: margin, y: top + 13, width: 500, height: 22),
font: serif(17.5, bold: true),
color: ink
)
}
drawText(
range.longTitle,
in: CGRect(x: margin, y: top + 40, width: 460, height: 14),
+3 -1
View File
@@ -217,6 +217,7 @@ final class PlanModel: ObservableObject {
@Published var specialServiceEditor: SpecialServiceRequest?
@Published var serviceDetail: ServiceDetailRequest?
@Published var planResult: PlanResult?
@Published var planResultUsedBeyond = false
@Published var importPreview: ImportPreview?
@Published var pdfPreview: PDFPreview?
@Published var databasePath: String
@@ -429,6 +430,7 @@ final class PlanModel: ObservableObject {
}
loadAll()
planResult = result
planResultUsedBeyond = allowBeyond
return result
} catch {
alertTitle = "Planung fehlgeschlagen"
@@ -587,8 +589,8 @@ final class PlanModel: ObservableObject {
}
let servicesThisDay = dayServices["\(person.id)|\(service.dateKey)", default: []]
if !servicesThisDay.isEmpty, !servicesThisDay.isSubset(of: [service.id]) {
// Only explicit absences remain hard blocks for manual assignments.
warnings.append("bereits an diesem Tag")
blocked = true
}
let total = totalCounts[person.id, default: 0]
let withinFairnessReach = total - minimumTotal <= fairnessSlack
@@ -9,7 +9,7 @@ struct PlanResultSheet: View {
VStack(spacing: 0) {
if let result = model.planResult {
let canOfferBeyond = !result.unfilled.isEmpty
&& !result.assignments.contains(where: \.beyondPreferences)
&& !model.planResultUsedBeyond
&& model.people.contains { $0.active && $0.allowBeyondPreferences }
SheetHeader(
icon: result.unfilled.isEmpty ? "checkmark.seal" : "exclamationmark.triangle",
@@ -8,13 +8,37 @@ struct ServiceDetailSheet: View {
let serviceID: String
@State private var selectedRole: Role = .lector
@State private var pendingBeyondCandidate: CandidateSuggestion?
@State private var confirmDelete = false
@State private var confirmation: Confirmation?
private enum Confirmation: Identifiable {
case deleteService
case beyondPreferences(CandidateSuggestion)
var id: String {
switch self {
case .deleteService:
"delete-service"
case .beyondPreferences(let candidate):
"beyond-\(candidate.id)"
}
}
}
private var item: ServiceWithAssignments? {
model.serviceWithAssignments(id: serviceID)
}
private var confirmationTitle: String {
switch confirmation {
case .deleteService:
"Gottesdienst löschen?"
case .beyondPreferences:
"Über Präferenzen einteilen?"
case nil:
""
}
}
var body: some View {
VStack(spacing: 0) {
if let item {
@@ -48,7 +72,7 @@ struct ServiceDetailSheet: View {
}
Button {
confirmDelete = true
confirmation = .deleteService
} label: {
Image(systemName: "trash")
.font(.system(size: 11.5, weight: .medium))
@@ -80,42 +104,40 @@ struct ServiceDetailSheet: View {
}
}
.confirmationDialog(
"Über Präferenzen einteilen?",
confirmationTitle,
isPresented: Binding(
get: { pendingBeyondCandidate != nil },
set: { if !$0 { pendingBeyondCandidate = nil } }
get: { confirmation != nil },
set: { if !$0 { confirmation = nil } }
),
titleVisibility: .visible
) {
Button("Trotzdem einteilen") {
if let candidate = pendingBeyondCandidate {
model.assign(serviceID: serviceID, role: selectedRole, personID: candidate.person.id)
titleVisibility: .visible,
presenting: confirmation
) { pending in
switch pending {
case .deleteService:
Button("Endgültig löschen", role: .destructive) {
if let item {
model.deleteService(item.service)
}
confirmation = nil
dismiss()
}
case .beyondPreferences(let candidate):
Button("Trotzdem einteilen") {
model.assign(serviceID: serviceID, role: selectedRole, personID: candidate.person.id)
confirmation = nil
}
pendingBeyondCandidate = nil
}
Button("Abbrechen", role: .cancel) {
pendingBeyondCandidate = nil
confirmation = nil
}
} message: {
if let candidate = pendingBeyondCandidate {
} message: { pending in
switch pending {
case .deleteService:
Text("Der Termin und alle zugehörigen Einsätze werden entfernt. Die Gottesdienstordnung bleibt unverändert.")
case .beyondPreferences(let candidate):
Text("\(candidate.person.fullName) ist bereit, auch über ihre Präferenzen oder ihr Monatslimit hinaus eingeplant zu werden.")
}
}
.confirmationDialog(
"Gottesdienst löschen?",
isPresented: $confirmDelete,
titleVisibility: .visible
) {
Button("Endgültig löschen", role: .destructive) {
if let item {
model.deleteService(item.service)
}
dismiss()
}
Button("Abbrechen", role: .cancel) {}
} message: {
Text("Der Termin und alle zugehörigen Einsätze werden entfernt. Die Gottesdienstordnung bleibt unverändert.")
}
}
// MARK: - Header
@@ -456,7 +478,7 @@ struct ServiceDetailSheet: View {
Button {
if candidate.beyondPreferences {
pendingBeyondCandidate = candidate
confirmation = .beyondPreferences(candidate)
} else {
model.assign(serviceID: item.service.id, role: selectedRole, personID: candidate.person.id)
}