UI verbessert

This commit is contained in:
concierge committed 2026-11-19 08:14:13 +01:00
1 parent cc2e85c111
commit a5d4251868
10 files changed
+136 -83

No files matched your search

+16 -16
View File
@@ -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]) {