dbo/.emacs.d
dbo
/
.emacs.d
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow nil dates in workload report to ignore those constraints 

Emacs Lisp is fun :)
This commit is contained in:
Daniel - 2022-09-10 09:12:02 +02:00
parent 2616693233
commit 2e895a23fa
Signed by: dbo
GPG Key ID: 784AA8DF0CCDF625
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
site-lisp/db-org.el
View File

@ -9,6 +9,7 @@
;;; Code: ;;; Code:
(require 'subr-x) (require 'subr-x)
(require 'dash)
(require 'cl-lib) (require 'cl-lib)
(require 'org) (require 'org)
(require 'org-agenda) (require 'org-agenda)
@ -394,11 +395,26 @@ entries.
When ORG-QL-MATCH, an org-ql sexp, is given, filter the list of When ORG-QL-MATCH, an org-ql sexp, is given, filter the list of
tasks in range by this expression. When ORG-QL-MATCH is not tasks in range by this expression. When ORG-QL-MATCH is not
given, default to `(todo)'." given, default to `(todo)'.
(let* (;; Allow Org syntax for dates; the result should be understandable by
;; `parse-time-string' and thus `org-ql-query' should be fine with that. START-DATE and END-DATE must be strings formatted such that
(start-date (org-read-date nil nil start-date)) `org-read-date' can parse a date from them. In particular,
(end-date (org-read-date nil nil end-date)) everything understood by `parse-time-string' should be fine.
When START-DATE or END-DATE (or both) are nil, no constraints are
imposed on the respective time range."
(unless (or (null start-date)
(stringp start-date))
(user-error "START-DATE must be nil or a string, but it's %s" start-date))
(unless (or (null end-date)
(stringp end-date))
(user-error "END-DATE must be nil or a string, but it's %s" end-date))
(let* ((start-date-expr (--when-let (and start-date (org-read-date nil nil start-date))
(list :from it)))
(end-date-expr (--when-let (and end-date (org-read-date nil nil end-date))
(list :to it)))
(tasks (org-ql-query (tasks (org-ql-query
:from (org-agenda-files) :from (org-agenda-files)
:select '(cons :select '(cons
@ -406,9 +422,9 @@ given, default to `(todo)'."
(org-entry-get (point) "Effort")) (org-entry-get (point) "Effort"))
:where `(and ,(or org-ql-match '(todo)) :where `(and ,(or org-ql-match '(todo))
;; Is this redundant? Could we just stick with `ts-active'? ;; Is this redundant? Could we just stick with `ts-active'?
(or (scheduled :from ,start-date :to ,end-date) (or (scheduled ,@start-date-expr ,@end-date-expr)
(deadline :from ,start-date :to ,end-date) (deadline ,@start-date-expr ,@end-date-expr)
(ts-active :from ,start-date :to ,end-date))))) (ts-active ,@start-date-expr ,@end-date-expr)))))
(total-time (->> tasks (total-time (->> tasks
(-map #'(lambda (task) (-map #'(lambda (task)
(let ((effort (cdr task))) (let ((effort (cdr task)))