reglas: los avisos se calculan del plan actual, no de una marca guardada

Un plato aparecia en la lista de incumplimientos sin explicacion (captura
del usuario: "Ensalada campera"): findViolations listaba los slots con
isRuleOverridden, una marca puesta al asignar que quedaba obsoleta cuando
el conflicto ya se habia resuelto. Y al reves, editar una regla despues
de planificar no detectaba nada.

- findViolations recorre el plan y reporta solo lo que incumple AHORA,
  siempre con sus razones (nunca una entrada vacia)
- MealSlot.isRuleIgnored: "Ignorar" pasa a ser persistente, porque si no
  el aviso recalculado volveria enseguida; se resetea al cambiar o
  quitar el plato del hueco
- El triangulo del calendario usa tambien el estado real
- Campo en el payload KV (opcional, retrocompatible) y en el esquema
  CloudKit de Development
- 3 tests: marca obsoleta no se lista, regla endurecida despues se
  detecta, y lo ignorado no reaparece

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013H6bXqGX1ygwib1Dm3n3UG
This commit is contained in:
alexandrev-tibco
2026-09-10 21:54:37 +02:00
parent 7b340be305
commit 24a6743ed2
8 changed files with 83 additions and 9 deletions
+7 -1
View File
@@ -17,6 +17,10 @@ final class MealSlot {
/// "Don't plan this meal": counts as resolved (like eating out) but shows
/// as intentionally blank autocomplete leaves it alone.
var isSkipped: Bool = false
/// The user dismissed the rule warning for this assignment. Violations are
/// recomputed from the current plan, so without this the warning would
/// come straight back after being ignored.
var isRuleIgnored: Bool = false
var weekPlan: WeekPlan?
@@ -29,7 +33,8 @@ final class MealSlot {
calendarEventId: String? = nil,
isRuleOverridden: Bool = false,
isEatingOut: Bool = false,
isSkipped: Bool = false
isSkipped: Bool = false,
isRuleIgnored: Bool = false
) {
self.id = id
self.dayOfWeek = dayOfWeek
@@ -40,6 +45,7 @@ final class MealSlot {
self.isRuleOverridden = isRuleOverridden
self.isEatingOut = isEatingOut
self.isSkipped = isSkipped
self.isRuleIgnored = isRuleIgnored
}
var mealTypeEnum: MealType {