From e48fac299412ab4e3ff5e59439c4262473f040f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 8 Nov 2021 18:07:49 +0100 Subject: Fix flat event slice for calendars. As noted in the fidd, our simple filter-sorted-stream on event-overlaps? missbehaves in some edge cases. The new system "should" work *fingers crossed*. --- module/calp/html/view/calendar.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'module') diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm index 727fd8ba..82cccdf3 100644 --- a/module/calp/html/view/calendar.scm +++ b/module/calp/html/view/calendar.scm @@ -355,12 +355,16 @@ (id "xcal-data")) ,((@ (vcomponent xcal output) ns-wrap) (map (@ (vcomponent xcal output) vcomponent->sxcal) + ;; A simple filter-sorted-stream on event-overlaps? here fails. See tests/annoying-events.scm (stream->list - (filter-sorted-stream + (stream-filter (lambda (ev) ((@ (vcomponent datetime) event-overlaps?) ev start-date (date+ end-date (date day: 1)))) - events)))))) + (stream-take-while (lambda (ev) (date< + (as-date (prop ev 'DTSTART)) + (date+ end-date (date day: 1)))) + events))))))) )) -- cgit v1.2.3