From 702f6a9e6ef16638660905c71380e615f90d8e0e Mon Sep 17 00:00:00 2001 From: Christian Cunningham Date: Fri, 14 Jun 2024 15:51:34 -0700 Subject: New Todo and Sorting --- elchemy-dashboard.el | 4 ++-- elchemy-functions.el | 2 +- elchemy-user.el | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elchemy-dashboard.el b/elchemy-dashboard.el index 32efb92..0768483 100644 --- a/elchemy-dashboard.el +++ b/elchemy-dashboard.el @@ -153,14 +153,14 @@ (add-text-properties start (point) '(face (:height 1.5)))) (insert "\n") - (insert (elchemy/format-processed-agenda (mapcar 'elchemy/process-agenda-heading (org-ql-select (org-agenda-files) `(and (todo "STRT" "WAIT" "TODO") (ts :from ,(- elchemy/schedule-lookahead) :to today)))))) + (insert (elchemy/format-processed-agenda (mapcar 'elchemy/process-agenda-heading (org-ql-select (org-agenda-files) `(and (todo "STRT" "WAIT" "TODO" "CYCL") (ts :from ,(- elchemy/schedule-lookahead) :to today)) :sort '(todo priority date))))) (insert "\n") (let ((start (point))) (insert "Upcoming") (add-text-properties start (point) '(face (:height 1.5)))) (insert "\n") - (insert (elchemy/format-processed-agenda (mapcar 'elchemy/process-agenda-heading (org-ql-select (org-agenda-files) `(and (todo "STRT" "WAIT" "TODO") (ts :from today :to ,elchemy/schedule-lookahead)))))) + (insert (elchemy/format-processed-agenda (mapcar 'elchemy/process-agenda-heading (org-ql-select (org-agenda-files) `(and (todo "STRT" "WAIT" "TODO" "CYCL") (ts :from today :to ,elchemy/schedule-lookahead)) :sort '(todo priority date))))) (insert "\n") (let ((start (point))) (insert "Command Reference") diff --git a/elchemy-functions.el b/elchemy-functions.el index 0c36ad8..0c53bc5 100644 --- a/elchemy-functions.el +++ b/elchemy-functions.el @@ -69,7 +69,7 @@ (let* ((agenda-items-raw (org-ql-select (org-agenda-files) `(todo ,TODO) - :sort '(date todo priority))) + :sort '(priority todo date))) (agenda-items-plist (mapcar #'(lambda (x) (cl--plist-to-alist (car (cdr x)))) agenda-items-raw)) (agenda-items-filtered (seq-filter (lambda (x) (eq (cdr (assoc :level x)) LEVEL)) agenda-items-plist))) (mapcar #'(lambda (x) (cdr (assoc :raw-value x))) agenda-items-filtered))) diff --git a/elchemy-user.el b/elchemy-user.el index 8f42974..0051d12 100644 --- a/elchemy-user.el +++ b/elchemy-user.el @@ -80,6 +80,7 @@ '((sequence "TODO(t)" "STRT(s)" "WAIT(w)" + "CYCL(c)" "|" "DONE(d)" "KILL(k)") @@ -106,8 +107,7 @@ ("STRT" . +org-todo-active) ("[?]" . +org-todo-onhold) ("WAIT" . +org-todo-onhold) - ("HOLD" . +org-todo-onhold) - ("PROJ" . +org-todo-project) + ("CYCL" . "Blue") ("NO" . +org-todo-cancel) ("KILL" . +org-todo-cancel))) -- cgit v1.2.1