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

ADD deadlined projects to agenda view

This commit is contained in:
Nathan Dwarshuis 2022-05-03 19:17:42 -04:00
parent 6aa65e4adf
commit 5ce792fc42
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2951,6 +2951,11 @@ FUTURE-LIMIT in a list."
(-let (((acc-d acc-s) acc) (-let (((acc-d acc-s) acc)
(ss (scheduled-datetimes id donep))) (ss (scheduled-datetimes id donep)))
`(,acc-d (,@ss ,@acc-s)))) `(,acc-d (,@ss ,@acc-s))))
(add-dead
(acc id donep)
(-let (((acc-d acc-s) acc)
(ds (deadlined-datetimes id donep)))
`((,@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)
@ -2974,6 +2979,11 @@ 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
:proj-wait
:proj-held
:proj-stuck))
(add-dead acc id nil))
(`(:sp-task :task-active ,_) (`(:sp-task :task-active ,_)
(add-dead-sched acc id nil)) (add-dead-sched acc id nil))
(`(:sp-task :task-complete ,_) (`(:sp-task :task-complete ,_)
@ -4423,14 +4433,16 @@ In the order of display
(lambda (a) (lambda (a)
(let* ((id (get-text-property 1 'x-id a)) (let* ((id (get-text-property 1 'x-id a))
(ts-type (get-text-property 1 'type a)) (ts-type (get-text-property 1 'type a))
(ns (-some-> (org-x-dag-id->ns id) (is-proj (org-x-dag-id->buffer-children id))
(is-planned (-some-> (org-x-dag-id->ns id)
(either-from-right nil) (either-from-right nil)
(plist-get :planned)))) (plist-get :planned))))
(cond (->> (cond
((member ts-type '("past-scheduled" "scheduled")) ((member ts-type '("past-scheduled" "scheduled"))
(if ns "Scheduled (Planned)" "Scheduled")) "Scheduled")
((member ts-type '("upcoming-deadline" "deadline")) ((member ts-type '("upcoming-deadline" "deadline"))
(if ns "Deadlined (Planned)" "Deadlined"))))))) (if is-proj "Deadlined Projects" "Deadlined Tasks")))
(format (if is-planned "%s (Planned)" "%s")))))))
(org-x-dag-agenda-call-inner "Timeblock" 'agenda "" files (org-x-dag-agenda-call-inner "Timeblock" 'agenda "" files
`((org-agenda-sorting-strategy '(time-up category-keep)) `((org-agenda-sorting-strategy '(time-up category-keep))
(org-super-agenda-groups (org-super-agenda-groups