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

REF rename agenda flets so they actually make sense

This commit is contained in:
Nathan Dwarshuis 2022-04-24 10:58:05 -04:00
parent 0cf7f2388a
commit 2bc636fb72
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2840,43 +2840,38 @@ FUTURE-LIMIT in a list."
(let ((todayp (org-x-dag-date= (org-x-dag-current-date) sel-date))) (let ((todayp (org-x-dag-date= (org-x-dag-current-date) sel-date)))
(cl-flet* (cl-flet*
((get-datetimes ((get-datetimes
(donep get-fun pts) (donep dt-fun pts)
(if donep (if donep
(-let (((&plist :datetime) pts)) (-let (((&plist :datetime) pts))
(when (org-x-dag-date= datetime sel-date) (when (org-x-dag-date= datetime sel-date)
`(,datetime))) `(,datetime)))
(-when-let (datetimes (funcall get-fun sel-date pts)) (-when-let (datetimes (funcall dt-fun sel-date pts))
(if todayp datetimes (if todayp datetimes
(--drop-while (org-x-dag-date< it sel-date) datetimes))))) (--drop-while (org-x-dag-date< it sel-date) datetimes)))))
(format-timestamps (expand-datetimes
(donep id which get-fun format-fun) (id donep which dt-fun)
(-when-let (pts (-some->> (org-x-dag-id->planning-timestamp which id) (-when-let (pts (-some->> (org-x-dag-id->planning-timestamp which id)
(org-x-dag-partition-timestamp))) (org-x-dag-partition-timestamp)))
(-when-let (ds (get-datetimes donep get-fun pts)) (-when-let (ds (get-datetimes donep dt-fun pts))
(-let ((tags (org-x-dag-id->tags id)) (-let ((tags (org-x-dag-id->tags id))
((&plist :pos) pts)) ((&plist :pos) pts))
(--map (list :pos pos :datetime it :tags tags :id id) ds))))) (--map (list :pos pos :datetime it :tags tags :id id) ds)))))
;; (--map (funcall format-fun sel-date pos it tags id) ds))))) (scheduled-datetimes
(format-scheduleds (id donep)
(donep id) (expand-datetimes id donep :scheduled #'org-x-dag-get-scheduled-at))
(format-timestamps donep id :scheduled (deadlined-datetimes
#'org-x-dag-get-scheduled-at (id donep)
#'org-x-dag-format-scheduled-node)) (expand-datetimes id donep :deadline #'org-x-dag-get-deadlines-at))
(format-deadlines
(donep id)
(format-timestamps donep id :deadline
#'org-x-dag-get-deadlines-at
#'org-x-dag-format-deadline-node))
(add-sched (add-sched
(acc id donep) (acc id donep)
(-let (((acc-d acc-s) acc) (-let (((acc-d acc-s) acc)
(ss (format-scheduleds donep id))) (ss (scheduled-datetimes id donep)))
`(,acc-d (,@ss ,@acc-s)))) `(,acc-d (,@ss ,@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 (format-deadlines donep id)) (ds (deadlined-datetimes id donep))
(ss (format-scheduleds donep id))) (ss (scheduled-datetimes id donep)))
`((,@ds ,@acc-d) (,@ss ,@acc-s)))) `((,@ds ,@acc-d) (,@ss ,@acc-s))))
(format-id (format-id
(acc id) (acc id)