ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH update agenda itemizer

This commit is contained in:
Nathan Dwarshuis 2022-06-05 13:26:33 -04:00
parent d1ffcee540
commit 0b2b8d7c5a
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
local/lib/org-x/org-x-dag.el
View File

@ -3431,8 +3431,8 @@ FUTURE-LIMIT in a list."
#'org-x-dag-get-scheduled-at #'org-x-dag-get-scheduled-at
#'identity)) #'identity))
(deadlined-datetimes (deadlined-datetimes
(id donep) (id)
(expand-datetimes id donep t :deadline (expand-datetimes id nil t :deadline
#'org-x-dag-get-deadlines-at #'org-x-dag-get-deadlines-at
(lambda (datetime) (lambda (datetime)
(if (org-x-dag-date= datetime sel-date) datetime (if (org-x-dag-date= datetime sel-date) datetime
@ -3443,14 +3443,14 @@ FUTURE-LIMIT in a list."
(ss (scheduled-datetimes id donep))) (ss (scheduled-datetimes id donep)))
`(,acc-d (,@ss ,@acc-s)))) `(,acc-d (,@ss ,@acc-s))))
(add-dead (add-dead
(acc id donep) (acc id)
(-let (((acc-d acc-s) acc) (-let (((acc-d acc-s) acc)
(ds (deadlined-datetimes id donep))) (ds (deadlined-datetimes id)))
`((,@ds ,@acc-d) ,acc-s))) `((,@ds ,@acc-d) ,acc-s)))
(add-dead-sched (add-dead-sched
(acc id donep) (acc id donep)
(-let (((acc-d acc-s) acc) (-let (((acc-d acc-s) acc)
(ds (deadlined-datetimes id donep)) (ds (deadlined-datetimes id))
(ss (scheduled-datetimes id donep))) (ss (scheduled-datetimes id donep)))
`((,@ds ,@acc-d) (,@ss ,@acc-s)))) `((,@ds ,@acc-d) (,@ss ,@acc-s))))
(format-id (format-id
@ -3470,18 +3470,17 @@ FUTURE-LIMIT in a list."
(plist-get a :held-parent-p)) (plist-get a :held-parent-p))
acc acc
(pcase l (pcase l
(`(:sp-proj ,(or :proj-active ((or `(:sp-proj :proj-active ,_)
:proj-wait `(:sp-subiter :si-proj :proj-active ,_)
:proj-held `(:sp-proj ,(or :proj-wait
:proj-stuck)) :proj-held
(add-dead acc id nil)) :proj-stuck)))
(`(:sp-task :task-active ,_) (add-dead acc id))
((or `(:sp-task :task-active ,_)
`(:sp-subiter :si-task :task-active ,_))
(add-dead-sched acc id nil)) (add-dead-sched acc id nil))
(`(:sp-task :task-complete ,_) ((or `(:sp-task :task-complete ,_)
(add-dead-sched acc id t)) `(:sp-subiter :si-task :task-complete ,_))
(`(:sp-subiter :si-active ,_)
(add-dead-sched acc id nil))
(`(:sp-subiter :si-complete ,_)
(add-dead-sched acc id t)) (add-dead-sched acc id t))
(_ acc))))) (_ acc)))))
(_ acc))) (_ acc)))