diff options
| -rw-r--r-- | module/calp/html/view/calendar.scm | 6 | ||||
| -rw-r--r-- | module/calp/html/view/calendar/month.scm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm index d08210bc..129f51a9 100644 --- a/module/calp/html/view/calendar.scm +++ b/module/calp/html/view/calendar.scm @@ -376,11 +376,11 @@ window.default_calendar='~a';" (stream-filter (lambda (ev) ((@ (vcomponent datetime) event-overlaps?) - ev start-date - (date+ end-date (date day: 1)))) + ev pre-start + (date+ post-end (date day: 1)))) (stream-take-while (lambda (ev) (date< (as-date (prop ev 'DTSTART)) - (date+ end-date (date day: 1)))) + (date+ post-end (date day: 1)))) events)))) (repeating% regular (partition repeating? flat-events)) (repeating diff --git a/module/calp/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm index 0e29f5b2..e058a2ec 100644 --- a/module/calp/html/view/calendar/month.scm +++ b/module/calp/html/view/calendar/month.scm @@ -80,7 +80,7 @@ ;; These popups are relative the document root. ;; Can thus be placed anywhere in the DOM. ,@(for event in (stream->list - (events-between start-date end-date events)) + (events-between pre-start post-end events)) `(popup-element (@ (class "vevent") (data-uid ,(output-uid event))))) |