init.el

@@ -977,15 +977,7 @@
                     ;; Caching is not possible, check it directly.
                     (org-entry-get pom property 'inherit)
                   ;; This is different in the original implementation
-                  (org-entry-get pom property))))
+                  (org-entry-get pom property))))))
-
-            ;; Fix (Org 9.5.5): the variable `org-time-was-given' dynamically
-            ;; bound to signify when `org-read-date-analyze' has found a hh:mm
-            ;; part; it's only considered, however, when it has previously been
-            ;; bound, resulting in some prior calls of `org-read-date' to ignore
-            ;; the hh:mm part.  So let's bind this variable now to make things
-            ;; work.
-            (setq org-time-was-given nil)))
 
 ;; Drag-and-Drop images into org-mode buffer
 (use-package org-download

site-lisp/db-org.el

@@ -575,20 +575,29 @@ PARAMS is a property list of the following parameters:
 
   `org-ql' expression (in sexp syntax) to filter the list of
   tasks to consider.  Defaults to (todo)."
-  (let* ((start-date (org-read-date t t
+  (let* ((start-date (or (--if-let (plist-get params :start-date)
-                                    (or (plist-get params :start-date)
+                             (org-read-date nil nil it))
-                                        "00:00")))
+                         (org-read-date t nil ". 00:00")))
          (end-date (or (--if-let (plist-get params :end-date)
-                           (org-read-date t t it))
+                           (org-read-date nil nil it))
                        (user-error "No valid end-date provided")))
          (increment (or (plist-get params :increment)
                         "+1d"))
          (org-ql-match (or (plist-get params :org-ql-match)
                            '(todo)))
-         (timestamp-format "%Y-%m-%d %a %H:%M")
+         (current start-date)
-         date-range)
+         (date-range nil))
 
     ;; Check input
+    (unless (or (null start-date)
+                (string-match-p (org-re-timestamp 'inactive)
+                                (format "[%s]" start-date)))
+      (user-error "Invalid start date given: %s" start-date))
+
+    (unless (string-match-p (org-re-timestamp 'inactive)
+                            (format "[%s]" end-date))
+      (user-error "Invalid end date given: %s" end-date))
+
     (unless (string-match-p (rx bos "+" (+ digit) (in "dwmy") eos)
                             increment)
       (user-error "Increment must be of the form +1d, +2m, +3y, …, but it's %s" increment))
@@ -596,32 +605,37 @@ PARAMS is a property list of the following parameters:
     ;; Compute range of dates to check; simple but potentially costly approach
     ;; taken from https://sachachua.com/blog/2015/08/org-mode-date-arithmetic/;
     ;; maybe consider `org-read-date-get-relative' as well?
-    (let ((current start-date))
+    (while (or (string< current end-date)
-      (while (or (time-less-p current end-date)
+               (string= current end-date))
-                 (time-equal-p current end-date))
+      (setq current (org-read-date nil
-        (setq current (org-read-date t t
+                                   nil
-                                     ;; Add an extra + to ensure we increase the
+                                   ;; Add an extra + to ensure we increase the
-                                     ;; amount of time relative to the given
+                                   ;; amount of time relative to the given
-                                     ;; default time string.
+                                   ;; default time string.
-                                     (format "+%s" increment)
+                                   (format "+%s" increment)
-                                     nil current))
+                                   nil
-        (push current date-range)))
+                                   (org-time-string-to-time current)))
+      (push current date-range))
     (setq date-range (nreverse date-range))
 
     (insert (format "#+CAPTION: Workload Overview Report at %s with start date [%s]\n"
-                    (format-time-string timestamp-format (current-time))
+                    (with-temp-buffer
-                    (format-time-string timestamp-format start-date)))
+                      ;; Is there an easier way to get the current time as an
+                      ;; inactive timestamp?
+                      (org-insert-time-stamp (current-time) t t)
+                      (buffer-string))
+                    start-date))
     (insert "| End Time | Planned Total |\n| <r> | <r> |\n|---|\n")
-    ;; Compute workload report for each date and record the total time;
+    ;; Compute workload report for each date and record the total time; XXX:
-    ;; XXX: this might be slow, try to reduce the calls to
+    ;; this might be slow, try to reduce the calls to
     ;; `db/org-planned-tasks-in-range'.
     (dolist (interval-end-date date-range)
-      (let ((total-time (car (db/org-planned-tasks-in-range (format-time-string timestamp-format start-date)
+      (let ((total-time (car (db/org-planned-tasks-in-range start-date
-                                                            (format-time-string timestamp-format interval-end-date)
+                                                            interval-end-date
                                                             org-ql-match))))
-        (insert (format "| [%s] | %s |\n"
+        (insert "| ")
-                        (format-time-string timestamp-format interval-end-date)
+        (org-insert-time-stamp (org-time-string-to-time interval-end-date) t 'inactive)
-                        total-time))))
+        (insert (format " | %s |\n" total-time))))
     (insert "|--|")
     (org-table-align)))