mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-29 07:58:21 +00:00
Code

Several improvements and fixes to org-habit.el

Browse Source
This commit is contained in:
John Wiegley 2009-10-23 16:49:12 -04:00
parent 14ac7bef8b
commit 41e7ee3173
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/ChangeLog
View File

@ -1,3 +1,17 @@
2009-10-23 John Wiegley <jwiegley@gmail.com>
* org-habit.el (org-habit-warning-face)
(org-habit-warning-future-face): Removed because these are no
longer used.
(org-habit-deadline, org-habit-deadline-repeat): Now always
returns a date; computed if there was a scheduled repeater but no
deadline repeater.
(org-habit-get-priority): Further improvements to the priority
algorithm. In particular, items past due should always appear
before items due or not yet due.
(org-habit-get-faces): Greatly simplified the logic, now that
`org-habit-deadline' always returns a valid time.
2009-10-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-ascii.el (org-export-ascii-table-keep-all-vertical-lines):

55
lisp/org-habit.el
View File

@ -93,19 +93,6 @@ relative to the current effective time."
:group 'org-habit
:group 'org-faces)
(defface org-habit-warning-face
'((((background light)) (:background "yellow"))
(((background dark)) (:background "gold")))
"Face for days on which a task ought to be done."
:group 'org-habit
:group 'org-faces)
(defface org-habit-warning-future-face
'((((background light)) (:background "palegoldenrod"))
(((background dark)) (:background "darkgoldenrod")))
"Face for days on which a task ought be done."
:group 'org-habit
:group 'org-faces)
(defface org-habit-alert-face
'((((background light)) (:background "yellow"))
(((background dark)) (:background "gold")))
@ -187,9 +174,13 @@ This list represents a \"habit\" for the rest of this module."
(defsubst org-habit-scheduled-repeat (habit)
(nth 1 habit))
(defsubst org-habit-deadline (habit)
(nth 2 habit))
(let ((deadline (nth 2 habit)))
(or deadline
(time-add (org-habit-scheduled habit)
(days-to-time (1- (org-habit-scheduled-repeat habit)))))))
(defsubst org-habit-deadline-repeat (habit)
(nth 3 habit))
(or (nth 3 habit)
(org-habit-scheduled-repeat habit)))
(defsubst org-habit-done-dates (habit)
(nth 4 habit))
@ -204,20 +195,17 @@ This must take into account not just urgency, but consistency as well."
(d-days (time-to-days (org-habit-deadline habit))))
;; add 10 for every day past the scheduled date, and subtract for every
;; day before it
(let ((slip (- days s-days)))
(setq pri (+ pri (* (- days s-days) 10)))
;; add 50 if the deadline is today
(if (and (/= s-days d-days)
(= days d-days))
(setq pri (+ pri 50)))
;; add 100 for every day beyond the deadline date, and subtract 10 for
;; every day before it
(let ((slip (- days (1- d-days))))
(if (> slip 0)
(setq pri (+ pri (* slip 10)))
(setq pri (+ pri (* slip 100)))
(setq pri (+ pri (* slip 10)))))
;; add 20 for every day beyond the deadline date, and subtract 5 for every
;; day before it
(if (/= s-days d-days)
;; add 100 if the deadline is today
(if (= days d-days)
(setq pri (+ pri 100))))
(let ((slip (- days d-days)))
(if (> slip 0)
(setq pri (+ pri (* slip 20)))
(setq pri (+ pri (* slip 5)))))
pri))
(defun org-habit-get-faces (habit &optional moment scheduled-time donep)
@ -247,20 +235,13 @@ Habits are assigned colors on the following basis:
(m-days (time-to-days moment))
(s-days (time-to-days scheduled))
(s-end-days (time-to-days scheduled-end))
(d-days (and deadline (time-to-days deadline))))
(d-days (time-to-days deadline)))
(cond
((< m-days s-days)
'(org-habit-clear-face . org-habit-clear-future-face))
((or (< m-days s-end-days)
(and deadline (< m-days d-days)))
((< m-days d-days)
'(org-habit-ready-face . org-habit-ready-future-face))
((and deadline (< m-days d-days))
(if donep
'(org-habit-ready-face . org-habit-ready-future-face)
'(org-habit-warning-face . org-habit-warning-future-face)))
((= m-days (if deadline
d-days
s-end-days))
((= m-days d-days)
(if donep
'(org-habit-ready-face . org-habit-ready-future-face)
'(org-habit-alert-face . org-habit-alert-future-face)))