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

ENH check for repeated deadlines within actions

This commit is contained in:
Nathan Dwarshuis 2022-05-09 22:24:08 -04:00
parent 8bcefb4718
commit 46ad19d39f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -741,12 +741,17 @@ used for optimization."
,open-form*))))) ,open-form*)))))
(defun org-x-dag-action-dead-after-parent-p (ancestry deadline) (defun org-x-dag-action-dead-after-parent-p (ancestry deadline)
"Return t if DEADLINE is after the deadline in ANCESTRY.
This can happen if DEADLINE is literally after the ancestral
deadline (eg via epoch time) or if it has a repeater."
(if (org-ml-timestamp-get-repeater deadline) t
(let ((this (-some->> deadline (let ((this (-some->> deadline
(org-ml-timestamp-get-start-time) (org-ml-timestamp-get-start-time)
(org-ml-time-to-unixtime))) (org-ml-time-to-unixtime)))
(parent (plist-get ancestry :parent-deadline))) (parent (plist-get ancestry :parent-deadline)))
(when (and this parent) (when (and this parent)
(< parent this)))) (< parent this)))))
(defun org-x-dag-bs-action-project-inner (node-data ancestry child-bss) (defun org-x-dag-bs-action-project-inner (node-data ancestry child-bss)
(cl-flet (cl-flet
@ -1509,6 +1514,7 @@ used for optimization."
((week-start week-end) weekly-span) ((week-start week-end) weekly-span)
(put-scheduled-action-maybe (put-scheduled-action-maybe
(lambda (id committed-ids) (lambda (id committed-ids)
;; TODO what about repeaters?
(-when-let (sched (org-x-dag-adjlist-id-planning-datetime (-when-let (sched (org-x-dag-adjlist-id-planning-datetime
adjlist :scheduled id)) adjlist :scheduled id))
(when (and (not (or (org-x-dag-date< sched week-start) (when (and (not (or (org-x-dag-date< sched week-start)
@ -1535,8 +1541,6 @@ used for optimization."
(t (t
(either :right `(:committed (,@e ,@l) :survivalp nil)))) (either :right `(:committed (,@e ,@l) :survivalp nil))))
(ht-set this-h id)) (ht-set this-h id))
;; TODO add additional restriction that these must be scheduled
;; within the current week
(funcall put-scheduled-action-maybe id (-union e l)) (funcall put-scheduled-action-maybe id (-union e l))
(org-x-dag-ht-add-links id ht-l :fulfilled l) (org-x-dag-ht-add-links id ht-l :fulfilled l)
(org-x-dag-ht-add-links id ht-s :fulfilled s) (org-x-dag-ht-add-links id ht-s :fulfilled s)