From fd72079c5163f9881872d70b64aafde03b8b2385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Wed, 12 Aug 2020 15:57:55 +0200
Subject: Add option for default calendar.

---
 module/html/view/calendar.scm | 20 ++++++++++++++------
 module/vcomponent.scm         |  4 ++++
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'module')

diff --git a/module/html/view/calendar.scm b/module/html/view/calendar.scm
index ed6ea066..76d1e79f 100644
--- a/module/html/view/calendar.scm
+++ b/module/html/view/calendar.scm
@@ -16,10 +16,14 @@
                                           ))
   :use-module (html config)
   :use-module (html util)
+
+  :use-module (util config)
+
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-26)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
+
   :use-module ((vcomponent group)
                :select (group-stream get-groups-between))
   :use-module ((git)
@@ -288,13 +292,17 @@
                                            ,(html-attr (prop calendar 'NAME))))
                                       ,(prop calendar 'NAME)))
                                calendars))
-                        (div (@ (id "calendar-dropdown-template") (class "template"))
-                             (select
+                      (div (@ (id "calendar-dropdown-template") (class "template"))
+                           (select
                                (option "- Choose a Calendar -")
-                               ,@(map (lambda (calendar)
-                                        `(option (@ (value ,(html-attr (prop calendar 'NAME))))
-                                                 ,(prop calendar 'NAME)))
-                                      calendars))
+                               ,@(let ((dflt (get-config 'default-calendar)))
+                                   (map (lambda (calendar)
+                                          (define name (prop calendar 'NAME))
+                                          `(option (@ (value ,(html-attr name))
+                                                      ,@(when (string=? name dflt)
+                                                          '((selected))))
+                                                   ,name))
+                                        calendars)))
                              )))
 
           ;; List of events
diff --git a/module/vcomponent.scm b/module/vcomponent.scm
index 66b72162..b4a30c83 100644
--- a/module/vcomponent.scm
+++ b/module/vcomponent.scm
@@ -17,3 +17,7 @@
                [(string? v) ((@ (glob) glob) v)]
                [else #f])))
 
+(define-config default-calendar ""
+  description: "Default calendar to use for operations. Set to empty string to unset"
+  pre: (ensure string?))
+
-- 
cgit v1.2.3