diff options
| author | Hugo Hörnquist <hugo@hornquist.se> | 2020-02-18 01:17:44 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@hornquist.se> | 2020-02-18 01:17:44 +0100 |
| commit | 341b244ff62fcd1aabddb807dcbc97da726158e6 (patch) | |
| tree | 74df319885520566aed38da1e7a202d1685311d9 /module | |
| parent | Once again replace get-time. (diff) | |
| download | calp-341b244ff62fcd1aabddb807dcbc97da726158e6.tar.gz calp-341b244ff62fcd1aabddb807dcbc97da726158e6.tar.xz | |
Change long-event detection to use dates.
Diffstat (limited to 'module')
| -rw-r--r-- | module/output/html.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index fe877ca0..4f12dab2 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -114,33 +114,33 @@ ;; Lay out complete day (graphical) ;; (date . (events)) -> sxml (define (lay-out-day day) - (let* (((date . events) day) - (time-obj (datetime date: date)) + (let* (((day-date . events) day) + (time-obj (datetime date: day-date)) (long-events short-events (partition (lambda (ev) (or (date? (attr ev 'DTSTART)) - (datetime<=? (datetime time: (time hour: 24)) + (datetime<=? (datetime date: (date day: 1)) (datetime-difference (attr ev 'DTEND) (attr ev 'DTSTART))))) (stream->list events)))) - (fix-event-widths! date short-events) - (fix-event-widths! date long-events) + (fix-event-widths! day-date short-events) + (fix-event-widths! day-date long-events) `(div (@ (class "day")) (div (@ (class "meta")) - ,(let ((str (date-link date))) + ,(let ((str (date-link day-date))) `(span (@ (id ,str) (class "daydate")) ,str)) - (span (@ (class "dayname")) ,(date->string date "~a"))) + (span (@ (class "dayname")) ,(date->string day-date "~a"))) (div (@ (class "wholeday")) "" ; To prevent self closing div tag - ,@(map (lambda (e) (create-top-block date e)) + ,@(map (lambda (e) (create-top-block day-date e)) long-events)) (div (@ (class "events")) "" ; To prevent self closing div tag ,@(map (lambda (time) `(div (@ (class "clock clock-" ,time)) "")) (iota 12 0 2)) - ,@(map (lambda (e) (create-block date e)) short-events))))) + ,@(map (lambda (e) (create-block day-date e)) short-events))))) (define (time-marker-div) `(div (@ (class "sideclock")) |