Hacker-Software
/
minmal-file-cloud-email-pim-passmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(calendar): wiederkehrende Termine nicht per Range filtern 

Master-Event eines Serientermins liegt oft vor dem sichtbaren Bereich -
das FullCalendar-RRULE-Plugin braucht ihn trotzdem zur Expansion.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Stefan Hacker 2026-04-13 09:22:24 +02:00
parent b398d6d800
commit 10a1dec448
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/app/api/calendar.py
View File

@ -209,16 +209,25 @@ def list_events(cal_id):
end = request.args.get('end') end = request.args.get('end')
query = CalendarEvent.query.filter_by(calendar_id=cal_id) query = CalendarEvent.query.filter_by(calendar_id=cal_id)
# Wiederkehrende Termine duerfen nicht per Range gefiltert werden -
# die FullCalendar-RRULE-Plugin-Expansion im Frontend braucht den
# Master-Event auch wenn dessen dtstart vor dem sichtbaren Bereich liegt.
if start: if start:
try: try:
start_dt = datetime.fromisoformat(start) start_dt = datetime.fromisoformat(start)
query = query.filter(CalendarEvent.dtend >= start_dt) query = query.filter(db.or_(
CalendarEvent.recurrence_rule.isnot(None),
CalendarEvent.dtend >= start_dt,
))
except ValueError: except ValueError:
pass pass
if end: if end:
try: try:
end_dt = datetime.fromisoformat(end) end_dt = datetime.fromisoformat(end)
query = query.filter(CalendarEvent.dtstart <= end_dt) query = query.filter(db.or_(
CalendarEvent.recurrence_rule.isnot(None),
CalendarEvent.dtstart <= end_dt,
))
except ValueError: except ValueError:
pass pass