From 1817cb50d4d31cd32fb4b9031356d8d0bfba1ed1 Mon Sep 17 00:00:00 2001 From: iamdoubz <> Date: Mon, 9 Nov 2026 08:10:53 -0600 Subject: [PATCH 1/2] Timed pack lunch with two alerts, one-tap delete, multi-day events in the list, merge consecutive days --- CHANGELOG.md | 7 ++++++ frontend/src/routes/CalendarPage.svelte | 16 +++++++++---- frontend/src/routes/EventEditor.svelte | 7 +----- parentcalendar/app.py | 6 ++--- parentcalendar/extraction.py | 24 ++++++++++++++++++- parentcalendar/ics.py | 13 +++++++--- .../migrations/003_pack_lunch_time.sql | 5 ++++ tests/test_phase1.py | 2 +- 8 files changed, 61 insertions(+), 19 deletions(-) create mode 100644 parentcalendar/migrations/003_pack_lunch_time.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index da77f26..0fdb47d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and ## [Unreleased] +### Changed + +- "Pack lunch" events are 8:00–8:30 AM instead of all day, with alerts 12 hours before and when they start (instead of the calendar's usual alert). Database migration 003 moves existing ones, and the next "New and changed" download updates them on your device. +- Deleting an event takes one tap on Delete, with no second confirm button. +- A multi-day event is listed under each of its days in the Calendar list, not only its first. +- The same all-day event read on consecutive days (No School on Wed, Thu and Fri) becomes one event from the first day to the last. + ## [0.0.5] - 2026-11-06 ### Added diff --git a/frontend/src/routes/CalendarPage.svelte b/frontend/src/routes/CalendarPage.svelte index 9cf4ed2..5f66f9d 100644 --- a/frontend/src/routes/CalendarPage.svelte +++ b/frontend/src/routes/CalendarPage.svelte @@ -26,6 +26,8 @@ let events = $state(null); let editing = $state(null); let newDate = $state(''); + let editDay = $state(''); // a multi-day event is listed on each day; its editor opens under the one tapped + const isOpen = (e: CalEvent, day: string) => editing === e.id && editDay === day; let error = $state(''); $effect(() => { @@ -36,10 +38,14 @@ const colorFor = (e: CalEvent) => children.get(e.child_ids[0])?.color ?? calendar?.color ?? 'var(--primary)'; const byDay = $derived.by(() => { const days = new Map(); + const last = monthEnd(month); for (const e of events ?? []) { - const key = e.date < `${month}-01` ? `${month}-01` : e.date; // multi-day events that began last month - if (!days.has(key)) days.set(key, []); - days.get(key)!.push(e); + // A multi-day event shows on each of its days in this month. + for (let d = parse(e.date < `${month}-01` ? `${month}-01` : e.date); iso(d) <= (e.end_date ?? e.date) && iso(d) <= last; d.setDate(d.getDate() + 1)) { + const key = iso(d); + if (!days.has(key)) days.set(key, []); + days.get(key)!.push(e); + } } return [...days.entries()].sort(); }); @@ -156,14 +162,14 @@ {#each list as e (e.id)} {@const KindIcon = KIND_ICONS[e.kind]}
  • - - {#if editing === e.id} + {#if isOpen(e, day)} (editing = null)} ondelete={remove(e.id)} /> {/if}
    • diff --git a/frontend/src/routes/EventEditor.svelte b/frontend/src/routes/EventEditor.svelte index 9cd122b..42bc4cf 100644 --- a/frontend/src/routes/EventEditor.svelte +++ b/frontend/src/routes/EventEditor.svelte @@ -35,7 +35,6 @@ child_ids: [...(initial.child_ids ?? [])], }); let saving = $state(false); - let confirmDelete = $state(false); const kinds = $derived(Object.entries(KINDS).filter(([k]) => k !== 'pack_lunch' || f.kind === 'pack_lunch')); const uid = untrack(() => event?.id ?? 'new'); @@ -130,11 +129,7 @@ {#if ondelete} - {#if confirmDelete} - - {:else} - - {/if} + {/if} diff --git a/parentcalendar/app.py b/parentcalendar/app.py index d7bc88f..02e8f09 100644 --- a/parentcalendar/app.py +++ b/parentcalendar/app.py @@ -541,7 +541,7 @@ class PicksIn(BaseModel): def set_pick(conn, child, day, picked): - """A pick is a 'Pack lunch' event for that child: picking creates or restores it (same UID), unpicking deletes it. + """A pick is a 'Pack lunch' event for that child, 8:00-8:30: picking creates or restores it (same UID), unpicking deletes it. The event's notes are the menu's first line (the main dish), so the calendar shows what's being skipped. Returns False when picking a day with no school lunch (no menu, no school, or no lunch).""" entry = next(iter(lunch_days(conn, child["id"], day, day)), None) @@ -557,8 +557,8 @@ def set_pick(conn, child, day, picked): " updated_at = strftime('%Y-%m-%d %H:%M:%f', 'now') WHERE id = ?", (status, notes if picked else None, existing["id"])) elif not existing and picked: event_id = conn.execute( - "INSERT INTO event (uid, source_id, date, all_day, title, notes, kind, status)" - " VALUES (?, ?, ?, 1, ?, ?, 'pack_lunch', 'confirmed')", + "INSERT INTO event (uid, source_id, date, all_day, start_time, end_time, title, notes, kind, status)" + " VALUES (?, ?, ?, 0, '08:00', '08:30', ?, ?, 'pack_lunch', 'confirmed')", # ponytail: fixed time (scans.new_uid(), entry["menus"][0]["source_id"], day.isoformat(), f"Pack lunch — {child['display_name']}", notes)).lastrowid conn.execute("INSERT INTO event_child VALUES (?, ?)", (event_id, child["id"])) return True diff --git a/parentcalendar/extraction.py b/parentcalendar/extraction.py index 5189da2..cf7e231 100644 --- a/parentcalendar/extraction.py +++ b/parentcalendar/extraction.py @@ -242,12 +242,28 @@ def cleanup(result, ignore=None): item[key] = iso(item[key]) drop_stray_scripts(result) result["events"] = [e for e in result["events"] if re.sub(r"[^a-z]", "", e["title"].lower()) not in ("", "event")] - result["events"] = [e for e in result["events"] if not ignored(e["title"], ignore)] + result["events"] = merge_days([e for e in result["events"] if not ignored(e["title"], ignore)]) for m in result["menu_items"]: m["items"] = [i for i in m["items"] if not ignored(i, ignore)] return result +def merge_days(events): + """The same all-day event (title and kind) on consecutive days becomes one event with an end date, + for example No School on Wed, Thu and Fri, read cell by cell. The first day's crop and text stay.""" + out, last = [], {} + for e in sorted(events, key=lambda e: e.get("date") or ""): + key = (e["title"].strip().lower(), e["kind"]) + prev = last.get(key) + start, prev_end = parse_date(e.get("date")), prev and parse_date(prev.get("end_date") or prev["date"]) + if prev and prev.get("all_day") and e.get("all_day") and start and prev_end and start <= prev_end + timedelta(days=1): + prev["end_date"] = max(prev.get("end_date") or prev["date"], e.get("end_date") or e["date"]) + continue + last[key] = e + out.append(e) + return out + + def flags_for(item, page_range): """Code-level checks from the spec. Any flag puts the item in 'Needs a look'.""" flags = [] @@ -540,6 +556,12 @@ def selftest(): "events": [{"date": "2026-11-04", "title": "BHS", "kind": "event"}, {"date": "2026-11-04", "title": "No School", "kind": "no_school"}]}, {"bhs"}) assert r["menu_items"][0]["items"] == ["Grapes"] and [e["title"] for e in r["events"]] == ["No School"], r + ns = lambda d, **kw: {"date": d, "end_date": None, "all_day": True, "title": "No School", "kind": "no_school", **kw} + m = merge_days([ns("2026-11-27"), ns("2026-11-25"), ns("2026-11-26"), ns("2026-11-30"), + {**ns("2026-11-26"), "title": "Thanksgiving"}, ns("2026-12-01", all_day=False)]) + assert [(e["title"], e["date"], e["end_date"]) for e in m] == [ + ("No School", "2026-11-25", "2026-11-27"), ("Thanksgiving", "2026-11-26", None), + ("No School", "2026-11-30", None), ("No School", "2026-12-01", None)], m # a weekend between, or a time: separate # Double read: agreement adds nothing, a moved date and a one-sided item are flagged ev = lambda d, t, **kw: {"date": d, "end_date": None, "all_day": True, "start_time": None, "end_time": None, "kind": "event", "title": t, **kw} diff --git a/parentcalendar/ics.py b/parentcalendar/ics.py index 9d6d433..7b8dfb4 100644 --- a/parentcalendar/ics.py +++ b/parentcalendar/ics.py @@ -3,8 +3,10 @@ from datetime import date, datetime, time, timedelta, timezone from zoneinfo import ZoneInfo from icalendar import Alarm, Calendar, Event +from icalendar.prop import vDuration, vInline PRODID = "-//ParentCalendar//ParentCalendar//EN" +PACK_LUNCH_ALARMS = (12 * 60, 0) # minutes before: the evening before, and when it starts def utc(stamp): @@ -44,11 +46,13 @@ def build(name, events, tz_name, alarm_minutes=None): ev.add("description", e["notes"]) if e.get("location"): ev.add("location", e["location"]) - if alarm_minutes and e["status"] != "deleted": + alarms = PACK_LUNCH_ALARMS if e["kind"] == "pack_lunch" else (alarm_minutes,) if alarm_minutes else () + for minutes in alarms if e["status"] != "deleted" else (): alarm = Alarm() alarm.add("action", "DISPLAY") alarm.add("description", e["title"]) - alarm.add("trigger", timedelta(minutes=-alarm_minutes)) + # icalendar writes zero as P0D; PT0S is what Apple calendars write for "at time of event" + alarm["TRIGGER"] = vInline("PT0S") if minutes == 0 else vDuration(timedelta(minutes=-minutes)) ev.add_component(alarm) cal.add_component(ev) cal.add_missing_timezones() @@ -66,6 +70,7 @@ if __name__ == "__main__": ev(uid="c@x", title="Trunk or Treat", all_day=False, start_time="17:00", end_time="18:30", date="2026-10-29"), ev(uid="d@x", title="PTO", all_day=False, start_time="16:00", date="2026-10-20", location="Library"), ev(uid="e@x", title="Spirit Day", status="deleted", sequence=2), + ev(uid="f@x", title="Pack lunch", kind="pack_lunch", all_day=False, start_time="08:00", end_time="08:30", date="2026-11-11"), ], "America/Chicago", alarm_minutes=60).decode() assert "\r\n" in out and "VERSION:2.0" in out and "X-WR-TIMEZONE:America/Chicago" in out assert "DTSTART;VALUE=DATE:20261030" in out and "DTEND;VALUE=DATE:20261031" in out # exclusive end @@ -78,5 +83,7 @@ if __name__ == "__main__": assert "SUMMARY:No School\\, Fall Break" in out # commas escaped spirit = block("e@x") assert "STATUS:CANCELLED" in spirit and "SEQUENCE:2" in spirit and "VALARM" not in spirit - assert out.count("BEGIN:VALARM") == 4 and "TRIGGER:-PT1H" in out + assert out.count("BEGIN:VALARM") == 6 and "TRIGGER:-PT1H" in out + lunch = block("f@x") + assert "TRIGGER:-PT12H" in lunch and "TRIGGER:PT0S" in lunch and "PT1H" not in lunch, lunch print("ics selftest ok") diff --git a/parentcalendar/migrations/003_pack_lunch_time.sql b/parentcalendar/migrations/003_pack_lunch_time.sql new file mode 100644 index 0000000..6f1bac1 --- /dev/null +++ b/parentcalendar/migrations/003_pack_lunch_time.sql @@ -0,0 +1,5 @@ +-- Pack lunch events move from all day to 8:00-8:30. The new SEQUENCE and updated_at make the next +-- "New and changed" download carry the change to calendar apps. +UPDATE event SET all_day = 0, start_time = '08:00', end_time = '08:30', sequence = sequence + 1, + updated_at = strftime('%Y-%m-%d %H:%M:%f', 'now') +WHERE kind = 'pack_lunch' AND all_day = 1; diff --git a/tests/test_phase1.py b/tests/test_phase1.py index bb160f3..31615fa 100644 --- a/tests/test_phase1.py +++ b/tests/test_phase1.py @@ -158,7 +158,7 @@ def test(): days = c.post("/api/lunch", json={"child_id": sam, "date": "2026-10-05", "picked": True}).json() assert next(d for d in days if d["date"] == "2026-10-05")["picked"] is True pack = [e for e in c.get("/api/events", params={"calendar_id": cal}).json() if e["kind"] == "pack_lunch"] - assert len(pack) == 1 and pack[0]["title"] == "Pack lunch — Sam" and pack[0]["all_day"] is True and pack[0]["notes"] == "Pork Chopette" + assert len(pack) == 1 and pack[0]["title"] == "Pack lunch — Sam" and pack[0]["all_day"] is False and pack[0]["start_time"] == "08:00" and pack[0]["notes"] == "Pork Chopette" c.post("/api/lunch", json={"child_id": sam, "date": "2026-10-05", "picked": False}) c.post("/api/lunch", json={"child_id": sam, "date": "2026-10-05", "picked": True}) pack2 = [e for e in c.get("/api/events", params={"calendar_id": cal}).json() if e["kind"] == "pack_lunch"] -- 2.34.1 From ef436288e6cd034e6ce3d4df2e88ad3eec2c4797 Mon Sep 17 00:00:00 2001 From: iamdoubz <> Date: Mon, 9 Nov 2026 08:11:17 -0600 Subject: [PATCH 2/2] Update changelog for 0.0.6 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fdb47d..407e6e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and ## [Unreleased] +## [0.0.6] - 2026-11-09 + ### Changed - "Pack lunch" events are 8:00–8:30 AM instead of all day, with alerts 12 hours before and when they start (instead of the calendar's usual alert). Database migration 003 moves existing ones, and the next "New and changed" download updates them on your device. @@ -73,7 +75,8 @@ First test release: the Phase 1 MVP. - Runs with plain Python or as a Docker image, with SQLite and a `backup` command. - Release workflow that pushes the image to the Gitea container registry: stable releases tag `X.Y.Z`, `X.Y`, `X` and `latest`; pre-releases tag `X.Y.Z` and `dev`. -[Unreleased]: https://git.dou.bet/iamdoubz/parentcalendar/compare/v0.0.5...main +[Unreleased]: https://git.dou.bet/iamdoubz/parentcalendar/compare/v0.0.6...main +[0.0.6]: https://git.dou.bet/iamdoubz/parentcalendar/compare/v0.0.5...v0.0.6 [0.0.5]: https://git.dou.bet/iamdoubz/parentcalendar/compare/v0.0.4...v0.0.5 [0.0.4]: https://git.dou.bet/iamdoubz/parentcalendar/compare/v0.0.3...v0.0.4 [0.0.3]: https://git.dou.bet/iamdoubz/parentcalendar/compare/v0.0.2...v0.0.3 -- 2.34.1