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

ADD goal groups for projects

This commit is contained in:
Nathan Dwarshuis 2021-12-28 17:04:04 -05:00
parent 0e61accb0a
commit be99260615
1 changed files with 82 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
etc/conf.org
View File

@ -2950,26 +2950,25 @@ original function being advised and ARGS are the arguments."
(advice-add #'org-agenda-run-series :around #'org-x-agenda-run-series-advice) (advice-add #'org-agenda-run-series :around #'org-x-agenda-run-series-advice)
(defun nd/org-agenda-call (name type match files settings) (defun nd/org-agenda-run-series (name files cmds)
(declare (indent 4)) (declare (indent 2))
(-let* (((bname hname) (pcase name
(`(,b ,h) (list b h))
((and s (pred stringp)) (list s s))
(e (error "Invalid agenda name spec: %s" e))))
(s `((org-agenda-overriding-header ,hname)
,@settings)))
(catch 'exit (catch 'exit
(let ((org-agenda-buffer-name (format "*Agenda: %s*" bname))) (let ((org-agenda-buffer-name (format "*Agenda: %s*" name)))
(org-agenda-run-series name `(((,type ,match ,s)) (org-agenda-run-series name `((,@cmds) ((org-agenda-files ',files)))))))
((org-agenda-files ',files))))))))
(defun nd/org-agenda-call-agenda (name files settings) (defun nd/org-agenda-call (buffer-name header-name type match files settings)
(declare (indent 2)) (declare (indent 5))
(nd/org-agenda-call name 'agenda "" files settings)) (let* ((n (or header-name buffer-name))
(s `((org-agenda-overriding-header ,n) ,@settings)))
(nd/org-agenda-run-series buffer-name files `((,type ,match ,s)))))
(defun nd/org-agenda-call-headlines (name files settings) (defun nd/org-agenda-call-agenda (buffer-name header-name files settings)
(declare (indent 2)) (declare (indent 3))
(nd/org-agenda-call name 'search "*" files settings)) (nd/org-agenda-call buffer-name header-name 'agenda "" files settings))
(defun nd/org-agenda-call-headlines (buffer-name header-name files settings)
(declare (indent 3))
(nd/org-agenda-call buffer-name header-name 'search "*" files settings))
(defun nd/org-agenda-timeblock () (defun nd/org-agenda-timeblock ()
"Show the timeblock agenda view. "Show the timeblock agenda view.
@ -2981,7 +2980,7 @@ In the order of display
4. habits" 4. habits"
(interactive) (interactive)
(let ((files (cons (org-x-get-daily-plan-file) (org-x-get-action-files)))) (let ((files (cons (org-x-get-daily-plan-file) (org-x-get-action-files))))
(nd/org-agenda-call-agenda "Timeblock" files (nd/org-agenda-call-agenda "Timeblock" nil files
`((org-agenda-skip-function #'org-x-calendar-skip-function) `((org-agenda-skip-function #'org-x-calendar-skip-function)
(org-agenda-sorting-strategy '(time-up deadline-up scheduled-up category-keep)) (org-agenda-sorting-strategy '(time-up deadline-up scheduled-up category-keep))
(org-agenda-include-diary t) (org-agenda-include-diary t)
@ -3046,22 +3045,28 @@ In the order of display
(files (list (org-x-get-endpoint-goal-file) (files (list (org-x-get-endpoint-goal-file)
(org-x-get-lifetime-goal-file)))) (org-x-get-lifetime-goal-file))))
(org-x-update-goal-link-ids) (org-x-update-goal-link-ids)
(nd/org-agenda-call "Goals" 'todo org-x-kw-todo files (nd/org-agenda-call "Goals" nil 'todo org-x-kw-todo files
`((org-agenda-sorting-strategy '(time-up scheduled-down)) `((org-agenda-sorting-strategy '(time-up scheduled-down))
(org-super-agenda-groups ',gs)))))) (org-super-agenda-groups ',gs))))))
;; TODO this is slow and the code isn't pretty to look at, perhaps break into
;; several agenda views, or at least refactor the common bits
(defun nd/org-agenda-goal-groups () (defun nd/org-agenda-goal-groups ()
(interactive) (interactive)
(let ((match (nd/org-mk-match-string (let ((task-match (nd/org-mk-match-string
- org-x-tag-incubated - org-x-tag-incubated
/ org-x-kw-todo / org-x-kw-todo
| org-x-kw-next | org-x-kw-next
| org-x-kw-wait | org-x-kw-wait
| org-x-kw-hold | org-x-kw-hold
| org-x-kw-canc)) | org-x-kw-canc))
(proj-match (nd/org-mk-match-string - org-x-tag-incubated))
(files (org-x-get-action-and-incubator-files))) (files (org-x-get-action-and-incubator-files)))
(nd/org-agenda-call "Goal Groups" 'tags-todo match (org-x-get-action-files) (nd/org-agenda-run-series "Goal Groups" (org-x-get-action-files)
`((org-agenda-sorting-strategy '(time-up scheduled-down)) `((tags-todo
,task-match
((org-agenda-overriding-header "Tasks")
(org-agenda-sorting-strategy '(time-up scheduled-down))
(org-agenda-skip-function #'org-x-task-skip-function) (org-agenda-skip-function #'org-x-task-skip-function)
(org-super-agenda-groups (org-super-agenda-groups
',(nd/org-def-super-agenda-automap ',(nd/org-def-super-agenda-automap
@ -3071,12 +3076,29 @@ In the order of display
(s-capitalize (f-base f)) (s-capitalize (f-base f))
(org-ml-get-property :raw-value h)) (org-ml-get-property :raw-value h))
"No Goal"))) "No Goal")))
(format "%s | %s" (if is-ind "Indep." "Project") goal-status)))))))) (format "%s | %s" (if is-ind "Indep." "Project") goal-status))))))
(tags-todo
,proj-match
((org-agenda-overriding-header "Projects")
(org-agenda-skip-function #'org-x-project-skip-function)
(org-agenda-sorting-strategy '(category-keep))
(org-super-agenda-groups
',(nd/org-def-super-agenda-automap
(let* ((status (org-x-headline-get-project-status))
(priority (alist-get status nd/org-x-project-status-priorities)))
(unless (< priority 0)
(let ((is-sub (org-x-headline-has-task-parent))
(goal-status (-if-let ((f . h) (org-x-resolve-goal-id))
(format "%s | %s"
(s-capitalize (f-base f))
(org-ml-get-property :raw-value h))
"No Goal")))
(format "%s | %s" (if is-sub "Subproject" "Project") goal-status))))))))))))
(defun nd/org-agenda-daily () (defun nd/org-agenda-daily ()
"Show the daily agenda view." "Show the daily agenda view."
(interactive) (interactive)
(nd/org-agenda-call-agenda "Daily" (org-x-get-action-and-incubator-files) (nd/org-agenda-call-agenda "Daily" nil (org-x-get-action-and-incubator-files)
`((org-agenda-skip-function #'org-x-calendar-skip-function) `((org-agenda-skip-function #'org-x-calendar-skip-function)
(org-agenda-sorting-strategy '(time-up deadline-up scheduled-up category-keep)) (org-agenda-sorting-strategy '(time-up deadline-up scheduled-up category-keep))
(org-agenda-include-diary t) (org-agenda-include-diary t)
@ -3116,7 +3138,7 @@ review phase)"
| org-x-kw-hold | org-x-kw-hold
| org-x-kw-canc)) | org-x-kw-canc))
(files (org-x-get-action-and-incubator-files))) (files (org-x-get-action-and-incubator-files)))
(nd/org-agenda-call "Tasks" 'tags-todo match files (nd/org-agenda-call "Tasks" nil 'tags-todo match files
`((org-agenda-skip-function #'org-x-task-skip-function) `((org-agenda-skip-function #'org-x-task-skip-function)
(org-agenda-todo-ignore-with-date t) (org-agenda-todo-ignore-with-date t)
(org-agenda-sorting-strategy '(user-defined-up category-keep)) (org-agenda-sorting-strategy '(user-defined-up category-keep))
@ -3137,7 +3159,7 @@ review phase)"
(interactive) (interactive)
(let ((match (nd/org-mk-match-string - org-x-tag-incubated)) (let ((match (nd/org-mk-match-string - org-x-tag-incubated))
(files (org-x-get-action-and-incubator-files))) (files (org-x-get-action-and-incubator-files)))
(nd/org-agenda-call "Projects" 'tags-todo match files (nd/org-agenda-call "Projects" nil 'tags-todo match files
`((org-agenda-skip-function #'org-x-project-skip-function) `((org-agenda-skip-function #'org-x-project-skip-function)
(org-agenda-sorting-strategy '(category-keep)) (org-agenda-sorting-strategy '(category-keep))
(org-super-agenda-groups (org-super-agenda-groups
@ -3154,7 +3176,7 @@ review phase)"
(interactive) (interactive)
(let ((match (nd/org-mk-match-string + org-x-tag-incubated)) (let ((match (nd/org-mk-match-string + org-x-tag-incubated))
(files (org-x-get-action-and-incubator-files))) (files (org-x-get-action-and-incubator-files)))
(nd/org-agenda-call "Incubator" 'tags-todo match (nd/org-agenda-call "Incubator" nil 'tags-todo match
`((org-agenda-skip-function #'org-x-incubator-skip-function) `((org-agenda-skip-function #'org-x-incubator-skip-function)
(org-agenda-sorting-strategy '(category-keep)) (org-agenda-sorting-strategy '(category-keep))
(org-super-agenda-groups (org-super-agenda-groups
@ -3176,7 +3198,7 @@ review phase)"
"Show the periodical agenda view." "Show the periodical agenda view."
(interactive) (interactive)
(let ((files (org-x-get-action-files))) (let ((files (org-x-get-action-files)))
(nd/org-agenda-call-headlines '("Periodicals" "Periodical Status") files (nd/org-agenda-call-headlines "Periodicals" "Periodical Status" files
`((org-agenda-skip-function #'org-x-periodical-skip-function) `((org-agenda-skip-function #'org-x-periodical-skip-function)
(org-agenda-sorting-strategy '(category-keep)) (org-agenda-sorting-strategy '(category-keep))
(org-super-agenda-groups (org-super-agenda-groups
@ -3191,9 +3213,9 @@ review phase)"
(defun nd/org-agenda-iterators () (defun nd/org-agenda-iterators ()
"Show the iterator agenda view." "Show the iterator agenda view."
(interactive) (interactive)
(nd/org-agenda-call-headlines "Iterators" (org-x-get-action-files) (let ((files (org-x-get-action-files)))
`((org-agenda-overriding-header "Iterator Status") (nd/org-agenda-call-headlines "Iterators" "Iterator Status" files
(org-agenda-skip-function #'org-x-iterator-skip-function) `((org-agenda-skip-function #'org-x-iterator-skip-function)
(org-agenda-sorting-strategy '(category-keep)) (org-agenda-sorting-strategy '(category-keep))
(org-super-agenda-groups (org-super-agenda-groups
',(nd/org-def-super-agenda-automap ',(nd/org-def-super-agenda-automap
@ -3203,12 +3225,12 @@ review phase)"
(:unscheduled "0. Unscheduled") (:unscheduled "0. Unscheduled")
(:empt "1. Empty") (:empt "1. Empty")
(:actv "2. Active") (:actv "2. Active")
(t "3. Other"))))))) (t "3. Other"))))))))
(defun nd/org-agenda-refile () (defun nd/org-agenda-refile ()
"Show the refile agenda view." "Show the refile agenda view."
(interactive) (interactive)
(nd/org-agenda-call-headlines '("Refile" "Tasks to Refile") (nd/org-agenda-call-headlines "Refile" "Tasks to Refile"
`(,(org-x-get-capture-file)) `(,(org-x-get-capture-file))
nil)) nil))
@ -3216,7 +3238,7 @@ review phase)"
"Show the critical errors agenda view." "Show the critical errors agenda view."
(interactive) (interactive)
(let ((match (nd/org-mk-match-string - org-x-tag-incubated))) (let ((match (nd/org-mk-match-string - org-x-tag-incubated)))
(nd/org-agenda-call "Errors" 'tags match (org-x-get-action-files) (nd/org-agenda-call "Errors" nil 'tags match (org-x-get-action-files)
`((org-agenda-skip-function #'org-x-error-skip-function) `((org-agenda-skip-function #'org-x-error-skip-function)
(org-super-agenda-groups (org-super-agenda-groups
`(,(nd/org-def-super-agenda-pred "Discontinuous Projects" `(,(nd/org-def-super-agenda-pred "Discontinuous Projects"
@ -3273,7 +3295,7 @@ review phase)"
(defun nd/org-agenda-archive () (defun nd/org-agenda-archive ()
"Show the archive agenda view." "Show the archive agenda view."
(interactive) (interactive)
(nd/org-agenda-call-headlines "Archive" (org-x-get-action-files) (nd/org-agenda-call-headlines "Archive" nil (org-x-get-action-files)
`((org-agenda-skip-function #'org-x-archive-skip-function) `((org-agenda-skip-function #'org-x-archive-skip-function)
(org-agenda-sorting-strategy '(category-keep)) (org-agenda-sorting-strategy '(category-keep))
(org-super-agenda-groups (org-super-agenda-groups