From f9814bd935f6ddb2454181bbf24ec75a487228ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 17 Aug 2020 15:52:33 +0200 Subject: Fix date output on long events. --- module/html/vcomponent.scm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'module/html/vcomponent.scm') diff --git a/module/html/vcomponent.scm b/module/html/vcomponent.scm index 9efaf77d..b4538fbd 100644 --- a/module/html/vcomponent.scm +++ b/module/html/vcomponent.scm @@ -65,18 +65,22 @@ `(span (@ (class "summary")) ,(prop ev 'SUMMARY)))) (div ,(call-with-values (lambda () (fmt-time-span ev)) - (case-lambda [(start) `(div (span (@ (class "dtstart") - (data-fmt "%L%H:%M")) - ,start))] - [(start end) `(div (span (@ (class "dtstart") - ;; TODO same format string - ;; as fmt-time-span used - (data-fmt "%L%H:%M")) - ,start) - " — " - (span (@ (class "dtend") - (data-fmt "%L%H:%M")) - ,end))])) + (case-lambda [(start) + `(div (span (@ (class "dtstart") + (data-fmt ,(string-append "~L" start))) + ,(datetime->string + (as-datetime (prop ev 'DTSTART)) + start)))] + [(start end) + `(div (span (@ (class "dtstart") + (data-fmt ,(string-append "~L" start))) + ,(datetime->string (as-datetime (prop ev 'DTSTART)) + start)) + " — " + (span (@ (class "dtend") + (data-fmt ,(string-append "~L" end))) + ,(datetime->string (as-datetime (prop ev 'DTEND)) + end)))])) ,(when (and=> (prop ev 'LOCATION) (negate string-null?)) `(div (b "Plats: ") (div (@ (class "location")) @@ -198,7 +202,9 @@ ,(tabset `(("📅" title: "Översikt" - ,(fmt-single-event ev)) + ,(begin(format (current-error-port) + "start=~a end=~a~%" (prop ev 'DTSTART) + (prop ev 'DTEND)) (fmt-single-event ev))) ("⤓" title: "Nedladdning" (div (@ (class "eventtext") (style "font-family:sans")) (h2 "Ladda ner") -- cgit v1.2.3