jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deadline/scheduled warning days, and improve relative date formatting

Browse source
This commit is contained in:
Adam Porter 2018-05-10 14:30:29 -05:00
parent 96fb97d4bd
commit 7a1e22da50
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
org-agenda-ng.el
View file

@ -104,6 +104,16 @@ NONE-PREDS."
collect (org-element-headline-parser (line-end-position)) collect (org-element-headline-parser (line-end-position))
while (outline-next-heading))))) while (outline-next-heading)))))
(defun org-agenda-ng--format-relative-date (difference)
"Return relative date string for DIFFERENCE.
DIFFERENCE should be an integer number of days, positive for
dates in the past, and negative for dates in the future."
(cond ((> difference 0)
(format "%sd ago" difference))
((< difference 0)
(format "in %sd" (* -1 difference)))
(t "today")))
;;;; Faces/properties ;;;; Faces/properties
(defun org-agenda-ng--add-markers (element) (defun org-agenda-ng--add-markers (element)
@ -209,6 +219,11 @@ Its property list should be the second item in the list, as returned by `org-ele
today-day-number) today-day-number)
(scheduled-day-number (org-time-string-to-absolute (scheduled-day-number (org-time-string-to-absolute
(org-element-timestamp-interpreter scheduled-date 'ignore))) (org-element-timestamp-interpreter scheduled-date 'ignore)))
(difference-days (- today-day-number scheduled-day-number))
(relative-due-date (pcase difference-days
(0 "today")
(_ (org-add-props (org-agenda-ng--format-relative-date difference-days) nil
'help-echo (org-element-property :raw-value scheduled-date)))))
(repeat-day-number (cond (sexp-p (org-time-string-to-absolute scheduled-date)) (repeat-day-number (cond (sexp-p (org-time-string-to-absolute scheduled-date))
((< today-day-number scheduled-day-number) scheduled-day-number) ((< today-day-number scheduled-day-number) scheduled-day-number)
(t (org-time-string-to-absolute (t (org-time-string-to-absolute
@ -233,7 +248,8 @@ Its property list should be the second item in the list, as returned by `org-ele
(org-add-props it nil (org-add-props it nil
'face face))) 'face face)))
(properties (--> (second element) (properties (--> (second element)
(plist-put it :title title))) (plist-put it :title title)
(plist-put it :relative-due-date relative-due-date)))
(prefix (cl-destructuring-bind (first next) org-agenda-scheduled-leaders (prefix (cl-destructuring-bind (first next) org-agenda-scheduled-leaders
(cond ((> scheduled-day-number today-day-number) (cond ((> scheduled-day-number today-day-number)
;; Future ;; Future
@ -262,7 +278,7 @@ property."
(difference-days (- today-day-number deadline-day-number)) (difference-days (- today-day-number deadline-day-number))
(relative-due-date (pcase difference-days (relative-due-date (pcase difference-days
(0 "today") (0 "today")
(_ (org-add-props (format "%sd ago" difference-days) nil (_ (org-add-props (org-agenda-ng--format-relative-date difference-days) nil
'help-echo (org-element-property :raw-value deadline-date))))) 'help-echo (org-element-property :raw-value deadline-date)))))
(todo-keyword (org-element-property :todo-keyword element)) (todo-keyword (org-element-property :todo-keyword element))
(done-p (member todo-keyword org-done-keywords)) (done-p (member todo-keyword org-done-keywords))
@ -348,10 +364,11 @@ like one returned by `date-to-day'."
;; Not comparing, just checking if it has one ;; Not comparing, just checking if it has one
('nil t) ('nil t)
;; Compare dates ;; Compare dates
((and (pred functionp) (guard target-date)) ((pred functionp)
(let ((target-day-number (cl-typecase target-date (let ((target-day-number (cl-typecase target-date
;; Append time to target-date ;; Append time to target-date
;; because `date-to-day' requires it ;; because `date-to-day' requires it
(null (+ (org-get-wdays timestamp) (org-today)))
(string (date-to-day (concat target-date " 00:00"))) (string (date-to-day (concat target-date " 00:00")))
(integer target-date)))) (integer target-date))))
(pcase (org-element-property :type date-element) (pcase (org-element-property :type date-element)