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

implemented skip functions on project and task level

This commit is contained in:
petrucci4prez 2018-04-01 18:45:26 -04:00
parent 834e1270ca
commit a14650fc16
2 changed files with 174 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
conf.el
View File

@ -350,42 +350,48 @@
(tags "REFILE" (tags "REFILE"
((org-agenda-overriding-header "Tasks to Refile") ((org-agenda-overriding-header "Tasks to Refile")
(org-tags-match-list-sublevels nil))) (org-tags-match-list-sublevels nil)))
;; (tags-todo "-NA-CANCELLED/!NEXT" (tags-todo "-NA-REFILE/!"
;; ((org-agenda-overriding-header (concat "Project Next Tasks" ((org-agenda-overriding-header (concat "Project Next Tasks"))
;; (if nd/hide-scheduled-and-waiting-next-tasks (org-agenda-skip-function 'nd/skip-non-next-project-tasks)
;; "" (org-agenda-todo-ignore-with-date 'all)
;; " (including WAITING and SCHEDULED tasks)"))) (org-agenda-sorting-strategy
;; (org-agenda-skip-function 'nd/skip-projects-and-habits-and-single-tasks) '(category-keep))))
;; (org-tags-match-list-sublevels t) (tags-todo "-NA-REFILE/!"
;; (org-agenda-todo-ignore-with-date 'all) ((org-agenda-overriding-header (concat "Project Waiting Tasks"))
;; (org-agenda-sorting-strategy (org-agenda-skip-function 'nd/skip-non-waiting-project-tasks)
;; '(todo-state-down effort-up category-keep)))) (org-agenda-todo-ignore-with-date 'all)
;; (tags-todo "-NA-REFILE/!" (org-agenda-sorting-strategy
;; ((org-agenda-overriding-header (concat "Atomic Tasks")) '(category-keep))))
;; (org-agenda-skip-function 'nd/skip-non-atomic-tasks) (tags-todo "-NA-REFILE/!"
;; ;;(org-agenda-todo-ignore-with-date 'all) ((org-agenda-overriding-header (concat "Project Held Tasks"))
;; (org-agenda-sorting-strategy (org-agenda-skip-function 'nd/skip-non-held-project-tasks)
;; '(category-keep)))) (org-agenda-todo-ignore-with-date 'all)
;; (tags-todo "-NA-REFILE-CANCELLED-WAITING-HOLD/!" (org-agenda-sorting-strategy
;; ((org-agenda-overriding-header (concat "Project Subtasks" '(category-keep))))
;; (if nd/hide-scheduled-and-waiting-next-tasks (tags-todo "-NA-REFILE/!"
;; "" ((org-agenda-overriding-header (concat "Atomic Tasks"))
;; " (including WAITING and SCHEDULED tasks)"))) (org-agenda-skip-function 'nd/skip-non-atomic-tasks)
;; (org-agenda-skip-function 'nd/skip-non-project-tasks) (org-agenda-todo-ignore-with-date 'all)
;; (org-agenda-todo-ignore-with-date 'all) (org-agenda-sorting-strategy
;; (org-agenda-sorting-strategy '(category-keep))))
;; '(category-keep))))
;; (tags-todo "-NA-CANCELLED+WAITING|HOLD/!"
;; ((org-agenda-overriding-header (concat "Waiting and Postponed Tasks"
;; (if nd/hide-scheduled-and-waiting-next-tasks
;; ""
;; " (including WAITING and SCHEDULED tasks)")))
;; (org-agenda-skip-function 'nd/skip-non-tasks)
;; (org-tags-match-list-sublevels nil)
;; (org-agenda-todo-ignore-with-date 'all)))
(tags-todo "-NA-REFILE/!" (tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Stuck Projects") ((org-agenda-overriding-header "Stuck Projects")
(org-agenda-skip-function 'nd/skip-non-stuck-projects) (org-agenda-skip-function 'nd/skip-non-stuck-projects)
(org-agenda-sorting-strategy
'(category-keep))))
(tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Held Projects")
(org-agenda-skip-function 'nd/skip-non-held-projects)
(org-agenda-sorting-strategy
'(category-keep))))
(tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Waiting Projects")
(org-agenda-skip-function 'nd/skip-non-waiting-projects)
(org-agenda-sorting-strategy
'(category-keep))))
(tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Active Projects")
(org-agenda-skip-function 'nd/skip-non-active-projects)
(org-agenda-sorting-strategy (org-agenda-sorting-strategy
'(category-keep))))) '(category-keep)))))
;; (tags-todo "-NA-REFILE/!" ;; (tags-todo "-NA-REFILE/!"
@ -420,6 +426,8 @@ and retrieve the keyword"
(defun nd/heading-has-children () (defun nd/heading-has-children ()
"returns t if heading has todoitems in its immediate subtree" "returns t if heading has todoitems in its immediate subtree"
;; TODO make this more efficient (and accurate) by only testing
;; the level immediately below (if it exists)
(let ((has-children) (let ((has-children)
(subtree-end (save-excursion (org-end-of-subtree t)))) (subtree-end (save-excursion (org-end-of-subtree t))))
(save-excursion (save-excursion
@ -448,6 +456,10 @@ and retrieve the keyword"
"return todo keyword if heading is task with no parents" "return todo keyword if heading is task with no parents"
(and (not (nd/heading-has-parent)) (nd/is-task-p))) (and (not (nd/heading-has-parent)) (nd/is-task-p)))
(defun nd/is-project-task-p ()
"return todo keyword if heading is task with no parents"
(and (nd/heading-has-parent) (nd/is-task-p)))
(defun nd/is-scheduled-heading-p () (defun nd/is-scheduled-heading-p ()
"return timestamp if headline is scheduled" "return timestamp if headline is scheduled"
(org-entry-get nil "SCHEDULED")) (org-entry-get nil "SCHEDULED"))
@ -484,8 +496,9 @@ function is not meant to be called independently."
(org-forward-heading-same-level 1 t))) (org-forward-heading-same-level 1 t)))
found-active)) found-active))
;; projects that have these keywords are not considered in determining status (defconst nd/project-invalid-todostates
(defvar nd/project-skip-keywords '("HOLD" "DONE" "CANCELLED")) '("WAITING" "NEXT")
"projects cannot have these todostates")
;; project level testing ;; project level testing
(defun nd/descend-into-project () (defun nd/descend-into-project ()
@ -504,16 +517,19 @@ keyword will override any other WAITING or HELD task present"
(outline-next-heading) (outline-next-heading)
(while (and (< project-state 3) (while (and (< project-state 3)
(> (point) previous-point)) (> (point) previous-point))
(let ((keyword (nd/is-todoitem-p))) (let ((keyword (nd/is-todoitem-p))
(has-children (nd/heading-has-children)))
(if keyword (if keyword
(let ((cur-state (cond ((and (not (member keyword nd/project-skip-keywords)) (let ((cur-state
(nd/heading-has-children)) (if has-children
(nd/descend-into-project)) (cond ((equal keyword "HOLD") 1)
((equal keyword "HOLD") 1) ((equal keyword "TODO") (nd/descend-into-project))
(t 0))
(cond ((equal keyword "HOLD") 1)
((equal keyword "WAITING") 2) ((equal keyword "WAITING") 2)
((equal keyword "NEXT") 3) ((equal keyword "NEXT") 3)
((nd/is-scheduled-heading-p) 3) ((nd/is-scheduled-heading-p) 3)
(t 0)))) (t 0)))))
(if (> cur-state project-state) (if (> cur-state project-state)
(setq project-state cur-state))))) (setq project-state cur-state)))))
(setq previous-point (point)) (setq previous-point (point))
@ -521,11 +537,12 @@ keyword will override any other WAITING or HELD task present"
project-state)) project-state))
(defun nd/is-project-status-p (statuscode) (defun nd/is-project-status-p (statuscode)
;;TODO maybe return keyword here to consistant?
(let ((keyword (nd/is-project-p))) (let ((keyword (nd/is-project-p)))
(and keyword (if keyword
(not (member keyword nd/project-skip-keywords)) (cond ((member keyword nd/project-invalid-todostates) nil)
(equal statuscode (nd/descend-into-project))))) ((and (equal keyword "HOLD") (= statuscode 1)) keyword)
((and (equal keyword "HOLD") (/= statuscode 1)) nil)
((= statuscode (nd/descend-into-project)) keyword)))))
;; task skip functions ;; task skip functions
;; NOTE: use save-restriction and widen if we ever actually use narrowing ;; NOTE: use save-restriction and widen if we ever actually use narrowing
@ -533,14 +550,34 @@ keyword will override any other WAITING or HELD task present"
(if (not (nd/is-atomic-task-p)) (if (not (nd/is-atomic-task-p))
(save-excursion (or (outline-next-heading) (point-max))))) (save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-projects () (defun nd/skip-non-next-project-tasks ()
(if (not (nd/is-project-p)) (if (not (equal (nd/is-project-task-p) "NEXT"))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-waiting-project-tasks ()
(if (not (equal (nd/is-project-task-p) "WAITING"))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-held-project-tasks ()
(if (not (equal (nd/is-project-task-p) "HOLD"))
(save-excursion (or (outline-next-heading) (point-max))))) (save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-stuck-projects () (defun nd/skip-non-stuck-projects ()
(if (not (nd/is-project-status-p 0)) (if (not (nd/is-project-status-p 0))
(save-excursion (or (outline-next-heading) (point-max))))) (save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-held-projects ()
(if (not (nd/is-project-status-p 1))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-waiting-projects ()
(if (not (nd/is-project-status-p 2))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-active-projects ()
(if (not (nd/is-project-status-p 3))
(save-excursion (or (outline-next-heading) (point-max)))))
;; (defvar nd/hide-scheduled-and-waiting-next-tasks t) ;; (defvar nd/hide-scheduled-and-waiting-next-tasks t)
;; (defun nd/toggle-next-task-display () ;; (defun nd/toggle-next-task-display ()

131
conf.org
View File

@ -527,42 +527,48 @@ TODO: add meeting template as scheduled+action item thing
(tags "REFILE" (tags "REFILE"
((org-agenda-overriding-header "Tasks to Refile") ((org-agenda-overriding-header "Tasks to Refile")
(org-tags-match-list-sublevels nil))) (org-tags-match-list-sublevels nil)))
;; (tags-todo "-NA-CANCELLED/!NEXT" (tags-todo "-NA-REFILE/!"
;; ((org-agenda-overriding-header (concat "Project Next Tasks" ((org-agenda-overriding-header (concat "Project Next Tasks"))
;; (if nd/hide-scheduled-and-waiting-next-tasks (org-agenda-skip-function 'nd/skip-non-next-project-tasks)
;; "" (org-agenda-todo-ignore-with-date 'all)
;; " (including WAITING and SCHEDULED tasks)"))) (org-agenda-sorting-strategy
;; (org-agenda-skip-function 'nd/skip-projects-and-habits-and-single-tasks) '(category-keep))))
;; (org-tags-match-list-sublevels t) (tags-todo "-NA-REFILE/!"
;; (org-agenda-todo-ignore-with-date 'all) ((org-agenda-overriding-header (concat "Project Waiting Tasks"))
;; (org-agenda-sorting-strategy (org-agenda-skip-function 'nd/skip-non-waiting-project-tasks)
;; '(todo-state-down effort-up category-keep)))) (org-agenda-todo-ignore-with-date 'all)
;; (tags-todo "-NA-REFILE/!" (org-agenda-sorting-strategy
;; ((org-agenda-overriding-header (concat "Atomic Tasks")) '(category-keep))))
;; (org-agenda-skip-function 'nd/skip-non-atomic-tasks) (tags-todo "-NA-REFILE/!"
;; ;;(org-agenda-todo-ignore-with-date 'all) ((org-agenda-overriding-header (concat "Project Held Tasks"))
;; (org-agenda-sorting-strategy (org-agenda-skip-function 'nd/skip-non-held-project-tasks)
;; '(category-keep)))) (org-agenda-todo-ignore-with-date 'all)
;; (tags-todo "-NA-REFILE-CANCELLED-WAITING-HOLD/!" (org-agenda-sorting-strategy
;; ((org-agenda-overriding-header (concat "Project Subtasks" '(category-keep))))
;; (if nd/hide-scheduled-and-waiting-next-tasks (tags-todo "-NA-REFILE/!"
;; "" ((org-agenda-overriding-header (concat "Atomic Tasks"))
;; " (including WAITING and SCHEDULED tasks)"))) (org-agenda-skip-function 'nd/skip-non-atomic-tasks)
;; (org-agenda-skip-function 'nd/skip-non-project-tasks) (org-agenda-todo-ignore-with-date 'all)
;; (org-agenda-todo-ignore-with-date 'all) (org-agenda-sorting-strategy
;; (org-agenda-sorting-strategy '(category-keep))))
;; '(category-keep))))
;; (tags-todo "-NA-CANCELLED+WAITING|HOLD/!"
;; ((org-agenda-overriding-header (concat "Waiting and Postponed Tasks"
;; (if nd/hide-scheduled-and-waiting-next-tasks
;; ""
;; " (including WAITING and SCHEDULED tasks)")))
;; (org-agenda-skip-function 'nd/skip-non-tasks)
;; (org-tags-match-list-sublevels nil)
;; (org-agenda-todo-ignore-with-date 'all)))
(tags-todo "-NA-REFILE/!" (tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Stuck Projects") ((org-agenda-overriding-header "Stuck Projects")
(org-agenda-skip-function 'nd/skip-non-stuck-projects) (org-agenda-skip-function 'nd/skip-non-stuck-projects)
(org-agenda-sorting-strategy
'(category-keep))))
(tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Held Projects")
(org-agenda-skip-function 'nd/skip-non-held-projects)
(org-agenda-sorting-strategy
'(category-keep))))
(tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Waiting Projects")
(org-agenda-skip-function 'nd/skip-non-waiting-projects)
(org-agenda-sorting-strategy
'(category-keep))))
(tags-todo "-NA-REFILE/!"
((org-agenda-overriding-header "Active Projects")
(org-agenda-skip-function 'nd/skip-non-active-projects)
(org-agenda-sorting-strategy (org-agenda-sorting-strategy
'(category-keep))))) '(category-keep)))))
;; (tags-todo "-NA-REFILE/!" ;; (tags-todo "-NA-REFILE/!"
@ -613,6 +619,8 @@ some definitions:
(defun nd/heading-has-children () (defun nd/heading-has-children ()
"returns t if heading has todoitems in its immediate subtree" "returns t if heading has todoitems in its immediate subtree"
;; TODO make this more efficient (and accurate) by only testing
;; the level immediately below (if it exists)
(let ((has-children) (let ((has-children)
(subtree-end (save-excursion (org-end-of-subtree t)))) (subtree-end (save-excursion (org-end-of-subtree t))))
(save-excursion (save-excursion
@ -641,6 +649,10 @@ some definitions:
"return todo keyword if heading is task with no parents" "return todo keyword if heading is task with no parents"
(and (not (nd/heading-has-parent)) (nd/is-task-p))) (and (not (nd/heading-has-parent)) (nd/is-task-p)))
(defun nd/is-project-task-p ()
"return todo keyword if heading is task with no parents"
(and (nd/heading-has-parent) (nd/is-task-p)))
(defun nd/is-scheduled-heading-p () (defun nd/is-scheduled-heading-p ()
"return timestamp if headline is scheduled" "return timestamp if headline is scheduled"
(org-entry-get nil "SCHEDULED")) (org-entry-get nil "SCHEDULED"))
@ -677,8 +689,9 @@ some definitions:
(org-forward-heading-same-level 1 t))) (org-forward-heading-same-level 1 t)))
found-active)) found-active))
;; projects that have these keywords are not considered in determining status (defconst nd/project-invalid-todostates
(defvar nd/project-skip-keywords '("HOLD" "DONE" "CANCELLED")) '("WAITING" "NEXT")
"projects cannot have these todostates")
;; project level testing ;; project level testing
(defun nd/descend-into-project () (defun nd/descend-into-project ()
@ -697,16 +710,19 @@ some definitions:
(outline-next-heading) (outline-next-heading)
(while (and (< project-state 3) (while (and (< project-state 3)
(> (point) previous-point)) (> (point) previous-point))
(let ((keyword (nd/is-todoitem-p))) (let ((keyword (nd/is-todoitem-p))
(has-children (nd/heading-has-children)))
(if keyword (if keyword
(let ((cur-state (cond ((and (not (member keyword nd/project-skip-keywords)) (let ((cur-state
(nd/heading-has-children)) (if has-children
(nd/descend-into-project)) (cond ((equal keyword "HOLD") 1)
((equal keyword "HOLD") 1) ((equal keyword "TODO") (nd/descend-into-project))
(t 0))
(cond ((equal keyword "HOLD") 1)
((equal keyword "WAITING") 2) ((equal keyword "WAITING") 2)
((equal keyword "NEXT") 3) ((equal keyword "NEXT") 3)
((nd/is-scheduled-heading-p) 3) ((nd/is-scheduled-heading-p) 3)
(t 0)))) (t 0)))))
(if (> cur-state project-state) (if (> cur-state project-state)
(setq project-state cur-state))))) (setq project-state cur-state)))))
(setq previous-point (point)) (setq previous-point (point))
@ -714,11 +730,12 @@ some definitions:
project-state)) project-state))
(defun nd/is-project-status-p (statuscode) (defun nd/is-project-status-p (statuscode)
;;TODO maybe return keyword here to consistant?
(let ((keyword (nd/is-project-p))) (let ((keyword (nd/is-project-p)))
(and keyword (if keyword
(not (member keyword nd/project-skip-keywords)) (cond ((member keyword nd/project-invalid-todostates) nil)
(equal statuscode (nd/descend-into-project))))) ((and (equal keyword "HOLD") (= statuscode 1)) keyword)
((and (equal keyword "HOLD") (/= statuscode 1)) nil)
((= statuscode (nd/descend-into-project)) keyword)))))
;; task skip functions ;; task skip functions
;; NOTE: use save-restriction and widen if we ever actually use narrowing ;; NOTE: use save-restriction and widen if we ever actually use narrowing
@ -726,14 +743,34 @@ some definitions:
(if (not (nd/is-atomic-task-p)) (if (not (nd/is-atomic-task-p))
(save-excursion (or (outline-next-heading) (point-max))))) (save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-projects () (defun nd/skip-non-next-project-tasks ()
(if (not (nd/is-project-p)) (if (not (equal (nd/is-project-task-p) "NEXT"))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-waiting-project-tasks ()
(if (not (equal (nd/is-project-task-p) "WAITING"))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-held-project-tasks ()
(if (not (equal (nd/is-project-task-p) "HOLD"))
(save-excursion (or (outline-next-heading) (point-max))))) (save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-stuck-projects () (defun nd/skip-non-stuck-projects ()
(if (not (nd/is-project-status-p 0)) (if (not (nd/is-project-status-p 0))
(save-excursion (or (outline-next-heading) (point-max))))) (save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-held-projects ()
(if (not (nd/is-project-status-p 1))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-waiting-projects ()
(if (not (nd/is-project-status-p 2))
(save-excursion (or (outline-next-heading) (point-max)))))
(defun nd/skip-non-active-projects ()
(if (not (nd/is-project-status-p 3))
(save-excursion (or (outline-next-heading) (point-max)))))
;; (defvar nd/hide-scheduled-and-waiting-next-tasks t) ;; (defvar nd/hide-scheduled-and-waiting-next-tasks t)
;; (defun nd/toggle-next-task-display () ;; (defun nd/toggle-next-task-display ()