diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-04-26 17:25:02 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-04-26 17:25:02 +0200 |
| commit | 02cb5364bb441dc8265c32ad4042559e4f3be118 (patch) | |
| tree | d9df481fc01c60dcb024b9911289ce08a290eb88 | |
| parent | Styled weekly,monthly button better. (diff) | |
| download | calp-02cb5364bb441dc8265c32ad4042559e4f3be118.tar.gz calp-02cb5364bb441dc8265c32ad4042559e4f3be118.tar.xz | |
Move events-between.
| -rw-r--r-- | module/output/html.scm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index 4d8ebc05..c5915723 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -113,6 +113,17 @@ (tablify rest width proc: proc))))) +;; date, date, [sorted-stream events] → [list events] +(define (events-between start-date end-date events) + (define (overlaps e) + (timespan-overlaps? start-date (date+ end-date (date day: 1)) + (attr e 'DTSTART) (attr e 'DTEND))) + + (stream-filter overlaps + (get-stream-interval + overlaps + (lambda (e) (not (date< end-date (as-date (attr e 'DTSTART))))) + events))) @@ -307,17 +318,6 @@ ,time ":00"))) (iota 12 0 2))))) -;; date, date, [sorted-stream events] → [list events] -(define (events-between start-date end-date events) - (define (overlaps e) - (timespan-overlaps? start-date (date+ end-date (date day: 1)) - (attr e 'DTSTART) (attr e 'DTEND))) - - (stream-filter overlaps - (get-stream-interval - overlaps - (lambda (e) (not (date< end-date (as-date (attr e 'DTSTART))))) - events))) (define*-public (render-calendar key: events start-date end-date #:allow-other-keys) |