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

Progress

Browse source
This commit is contained in:
Adam Porter 2017-08-05 02:39:24 -05:00
parent fdb80d05c0
commit 6d18c1bee5
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
org-agenda-ng.el
View file

@ -56,30 +56,34 @@ date compares with TARGET-DATE according to COMPARATOR."
(defun org-agenda-ng--add-scheduled-faces (entry) (defun org-agenda-ng--add-scheduled-faces (entry)
"Add faces to ENTRY for its scheduled status." "Add faces to ENTRY for its scheduled status."
(if-let ((today-day-number (org-today)) (if-let ((scheduled-date (org-find-text-property-in-string 'scheduled entry)))
(scheduled-date (org-element-property :scheduled entry)) (let* ((today-day-number (org-today))
(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)))
(todo-keyword (org-element-property :todo-keyword)) (todo-keyword (org-find-text-property-in-string 'todo-keyword entry))
(done-p (member todo-keyword org-done-keywords)) (done-p (member todo-keyword org-done-keywords))
(today-p (= today-day-number scheduled-day-number)) (today-p (= today-day-number scheduled-day-number))
(face (cond (face (cond
(donep 'org-agenda-done) (done-p 'org-agenda-done)
(today-p 'org-scheduled-today) (today-p 'org-scheduled-today)
(t 'org-scheduled)))) (t 'org-scheduled))))
(org-add-props entry nil (org-add-props entry nil
'face face) 'face face))
;; Not scheduled
entry)) entry))
(defun org-agenda-ng--add-text-properties (element) (defun org-agenda-ng--add-text-properties (element)
"Return ELEMENT as a string with its text-properties set according to its property list. "Return ELEMENT as a string with its text-properties set according to its property list.
Its property list should be the second item in the list, as returned by `org-element-parse-buffer'." Its property list should be the second item in the list, as returned by `org-element-parse-buffer'."
(let* ((string (org-element-property :title element)) (let* ((string (org-element-property :title element))
(properties (second element)) (properties (second element))
(properties (seq-subseq properties 0 24)) ;; FIXME ;(properties (seq-subseq properties 0 (1- (length properties)))) ;; FIXME
; (properties (cl-subseq properties (- (length properties) 2)))
(properties (cl-loop for (key val) on properties by #'cddr (properties (cl-loop for (key val) on properties by #'cddr
for key = (intern (cl-subseq (symbol-name key) 1)) for key = (intern (cl-subseq (symbol-name key) 1))
unless (equal key 'raw-value) unless (member key '(raw-value parent)) ; FIXME: Is this the right way to do this, or really necessary?
append (list key val)))) append (list key val))))
(setq string (org-add-props string properties)) (setq string (org-add-props string properties))