diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-10 21:08:08 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-10 21:08:08 +0200 |
| commit | f6e157c45f7914188ed2deeb33581f2546be79ec (patch) | |
| tree | 2e247f8d9972def68358bf43ea377ff9d245e19c | |
| parent | Actually delete old html-search. (diff) | |
| download | calp-f6e157c45f7914188ed2deeb33581f2546be79ec.tar.gz calp-f6e157c45f7914188ed2deeb33581f2546be79ec.tar.xz | |
Remove dependency from view/calendar -> datetime.
| -rw-r--r-- | module/datetime.scm | 4 | ||||
| -rw-r--r-- | module/html/view/calendar.scm | 6 | ||||
| -rw-r--r-- | module/html/view/calendar/month.scm | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/module/datetime.scm b/module/datetime.scm index 1141aa64..a0b1e533 100644 --- a/module/datetime.scm +++ b/module/datetime.scm @@ -462,8 +462,8 @@ ;; @example ;; (weekday-list sun) ;; => (0 1 2 3 4 5 6) -;; @end example -(define-public (weekday-list week-start) +;; @end exampl +(define*-public (weekday-list optional: (week-start (week-start))) (take (drop (apply circular-list (iota 7)) week-start) 7)) diff --git a/module/html/view/calendar.scm b/module/html/view/calendar.scm index da1d6c9b..819441e6 100644 --- a/module/html/view/calendar.scm +++ b/module/html/view/calendar.scm @@ -5,7 +5,6 @@ :select (events-between)) :use-module ((vcomponent build) :select (vcalendar vevent)) - :use-module (util config) :use-module (datetime) :use-module (html components) :use-module ((html vcomponent) @@ -38,8 +37,7 @@ ;; @end example ;; date - a date in the month to display ;; week-start - which day the week begins on, see (datetime util) -(define* (cal-table key: start-date end-date next-start prev-start - (week-start (get-config 'week-start))) +(define* (cal-table key: start-date end-date next-start prev-start) (define (td date) `(a (@ ,@(cond @@ -203,7 +201,7 @@ (div (@ (class "change-view")) ,(btn href: (date->string (if (= 1 (day start-date)) - (start-of-week start-date (get-config 'week-start)) + (start-of-week start-date) start-date) "/week/~1.html") "veckovy") diff --git a/module/html/view/calendar/month.scm b/module/html/view/calendar/month.scm index f02a10d6..9288fd1a 100644 --- a/module/html/view/calendar/month.scm +++ b/module/html/view/calendar/month.scm @@ -6,7 +6,6 @@ :use-module (datetime) :use-module (html view calendar shared) :use-module (html config) - :use-module (util config) :use-module (vcomponent) :use-module ((vcomponent datetime) :select (really-long-event? @@ -46,7 +45,7 @@ (min 10 (* 4 (length (cddr long-group)))))) long-event-groups)))) ,@(map (lambda (d) `(div (@ (class "thead")) ,(string-titlecase (week-day-name d)))) - (weekday-list (get-config 'week-start))) + (weekday-list)) ,@(map (lambda (group i) (let* (((s e . events) group)) `(div (@ (class "cal-cell longevents event-container") |