Gastansicht, Verbesserungen bei Planung

This commit is contained in:
concierge committed 2026-11-18 07:57:00 +01:00
1 parent b3afa3ef32
commit c08d43e7dd
38 files changed
+3845 -219

No files matched your search

+57 -11
View File
@@ -68,6 +68,7 @@ enum PlanFilter: String, CaseIterable, Identifiable {
case all
case services
case open
case beyond
var id: String { rawValue }
@@ -76,6 +77,7 @@ enum PlanFilter: String, CaseIterable, Identifiable {
case .all: "Alle Tage"
case .services: "Mit Gottesdiensten"
case .open: "Nur offene"
case .beyond: "Über Präferenzen"
}
}
}
@@ -144,6 +146,7 @@ struct CandidateSuggestion: Identifiable {
var warnings: [String]
var blocked: Bool
var preferred: Bool
var beyondPreferences: Bool
var totalAssignments: Int
var id: String { person.id }
@@ -347,6 +350,8 @@ final class PlanModel: ObservableObject {
if !row.hasServices { return false }
case .open:
if row.openSlots == 0 { return false }
case .beyond:
if !row.hasBeyondPreferences { return false }
}
guard !query.isEmpty else { return true }
if row.liturgicalDay?.title.lowercased().contains(query) == true { return true }
@@ -382,7 +387,7 @@ final class PlanModel: ObservableObject {
// MARK: - Planning
func autoPlan(replaceExisting: Bool) -> PlanResult? {
func autoPlan(replaceExisting: Bool, allowBeyond: Bool = false) -> PlanResult? {
guard !isPlanning else { return nil }
isPlanning = true
defer { isPlanning = false }
@@ -390,8 +395,11 @@ final class PlanModel: ObservableObject {
let rangeServices = try db.services(in: range)
let existing = try db.assignments(in: range)
let options = PlannerOptions(
replaceExisting: replaceExisting,
// A follow-up pass keeps the result of the first pass and only
// adds assignments for volunteers who allowed them.
replaceExisting: allowBeyond ? false : replaceExisting,
respectPreferredWeekdays: db.setting("respectPreferredWeekdays") != "0",
allowBeyondPreferences: allowBeyond,
weightFairness: Double(db.setting("fairnessWeight") ?? "") ?? 2.2,
maxAssignmentsPerDay: 1
)
@@ -401,11 +409,12 @@ final class PlanModel: ObservableObject {
services: rangeServices,
existingAssignments: existing,
churches: churches,
liturgicalDays: Array(liturgicalDays.values),
options: options
)
let result = planner.plan()
if result.filledCount > 0 || replaceExisting {
try db.savePlan(result.assignments, in: range, replaceUnlocked: replaceExisting)
try db.savePlan(result.assignments, in: range, replaceUnlocked: allowBeyond ? false : replaceExisting)
}
loadAll()
planResult = result
@@ -429,6 +438,7 @@ final class PlanModel: ObservableObject {
services: [service],
existingAssignments: existing.filter { $0.serviceID == serviceID },
churches: churches,
liturgicalDays: Array(liturgicalDays.values),
options: PlannerOptions(replaceExisting: false, respectPreferredWeekdays: false)
)
let result = planner.plan()
@@ -448,7 +458,27 @@ final class PlanModel: ObservableObject {
func assign(serviceID: String, role: Role, personID: String?) {
do {
try db.setAssignment(serviceID: serviceID, role: role, personID: personID)
var beyond = false
if let personID, let person = peopleByID[personID], let service = try db.service(id: serviceID) {
let highFeast = liturgicalDays[service.dateKey]?.isHighFeast ?? false
let fits = person.matchesWeekdayPreference(
weekday: DayMath.weekday(service.date),
timeMinutes: service.timeMinutes,
highFeast: highFeast
)
beyond = !fits
if !beyond, person.maxPerMonth > 0 {
let monthAssignments = try db.assignments(in: DayRange.month(containing: service.date))
let used = monthAssignments.filter {
$0.personID == personID && $0.serviceID != serviceID
}.count
beyond = used >= person.maxPerMonth
}
}
try db.setAssignment(
serviceID: serviceID, role: role, personID: personID,
beyondPreferences: beyond
)
loadAll()
if let personID, let person = peopleByID[personID] {
showToast("\(person.fullName) als \(role.title) eingetragen.", kind: .success)
@@ -501,6 +531,7 @@ final class PlanModel: ObservableObject {
assignedRolesByPerson[assignment.personID, default: []].insert(assignment.role)
}
let weekday = DayMath.weekday(service.date)
let highFeast = liturgicalDays[service.dateKey]?.isHighFeast ?? false
let eligiblePeople = people.filter { person in
guard person.active, person.canFill(role) else { return false }
@@ -515,19 +546,33 @@ final class PlanModel: ObservableObject {
.map { person in
var warnings: [String] = []
var blocked = false
var beyond = false
if absences.contains(where: { $0.personID == person.id && $0.overlaps(service.date) }) {
warnings.append("abwesend")
blocked = true
}
if !ignorePreferredWeekdays,
!person.preferredWeekdays.isEmpty,
!person.preferredWeekdays.contains(weekday) {
warnings.append("Einsatztag passt nicht")
blocked = true
let weekdayMatch = person.matchesWeekdayPreference(
weekday: weekday,
timeMinutes: service.timeMinutes,
highFeast: highFeast
)
if !weekdayMatch {
if ignorePreferredWeekdays {
beyond = true
} else if person.allowBeyondPreferences {
beyond = true
} else {
warnings.append("Einsatztag oder Uhrzeit passt nicht")
blocked = true
}
}
if person.maxPerMonth > 0, monthlyCounts["\(person.id)|\(monthKey)", default: 0] >= person.maxPerMonth {
warnings.append("Monatslimit")
blocked = true
if person.allowBeyondPreferences {
beyond = true
} else {
blocked = true
}
}
let servicesThisDay = dayServices["\(person.id)|\(service.dateKey)", default: []]
if !servicesThisDay.isEmpty, !servicesThisDay.isSubset(of: [service.id]) {
@@ -554,7 +599,7 @@ final class PlanModel: ObservableObject {
if !person.preferredChurchIDs.isEmpty && !person.preferredChurchIDs.contains(service.churchID) {
score -= 2
}
if person.preferredWeekdays.contains(weekday) {
if weekdayMatch, !person.preferredWeekdays.isEmpty {
score += 3
preferred = true
}
@@ -574,6 +619,7 @@ final class PlanModel: ObservableObject {
warnings: warnings,
blocked: blocked,
preferred: preferred,
beyondPreferences: beyond,
totalAssignments: totalCounts[person.id, default: 0]
)
}