diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-25 00:04:31 +0100 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-25 00:04:31 +0100 |
commit | eb7bcbe84fa6f40202ab22a77318eb1034630e1e (patch) | |
tree | d4189cf6d4f694bfe782fa22e2ed3bfdd8e8f168 /module/output | |
parent | Fix bug in date-difference. (diff) | |
download | calp-eb7bcbe84fa6f40202ab22a77318eb1034630e1e.tar.gz calp-eb7bcbe84fa6f40202ab22a77318eb1034630e1e.tar.xz |
Improve *->decimal-hour procedures.
Diffstat (limited to '')
-rw-r--r-- | module/output/html.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index cf200ea3..6e64d176 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -161,8 +161,8 @@ ;; better. (define (create-top-block start-date end-date ev) - ;; NOTE be vary of api changes to date-diffenence - (define total-length (* 24 (day (date-difference (date+ end-date (date day: 1)) start-date)))) + (define total-length + (* 24 (days-in-interval start-date end-date))) (define style (format #f "top:~,3f%;height:~,3f%;left:~,3f%;width:~,3f%;" @@ -177,12 +177,13 @@ (let* ((dt (datetime date: start-date)) (diff (datetime-difference (datetime-max dt (as-datetime (attr ev 'DTSTART))) dt))) - (/ (datetime->decimal-hour diff) total-length))) + (/ (datetime->decimal-hour diff start-date) total-length))) ;; Set length of event, which makes end time ;; width (* 100 - (/ (datetime->decimal-hour (as-datetime (event-length/clamped start-date end-date ev))) + (/ (datetime->decimal-hour (as-datetime (event-length/clamped start-date end-date ev)) + start-date) total-length)))) `(a (@ (href "#" ,(UID ev)) |