From 0e34f1a4ac6b86b949a53d21b2d9357f280e857f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sun, 3 May 2020 16:27:31 +0200 Subject: Fix HTML week number rendering around v. 1. --- module/output/html.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/module/output/html.scm b/module/output/html.scm index cbbc2498..d2762f46 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -558,11 +558,13 @@ ,@(map (lambda (d) `(div (@ (class "column-head")) ,(string-titlecase (week-day-name d 2)))) (weekday-list week-start)) - ,@(let ((first (week-number (car events) week-start)) - (last (week-number (last events) week-start))) + ,@(let ((first (start-of-week (car events) week-start)) + (last (start-of-week (last events) week-start))) (map (lambda (v) `(div (@ (class "row-head")) ,v)) - ;; TODO this fails around new-year - (iota (1+ (- last first)) first))) + (map (lambda (d) (week-number d week-start)) + (stream->list + (stream-take-while (lambda (s) (date<= s last)) + (week-stream first)))))) ,@(map td events )))) -- cgit v1.2.3