ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'clock-check-faces'

This commit is contained in:
Carsten Dominik 2011-04-27 13:50:23 +02:00
parent 1a68794fdc ad4970a32e
commit b00948328d
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lisp/org-agenda.el
View File

@ -1098,9 +1098,11 @@ the agenda to display all available LOG items temporarily."
(defcustom org-agenda-clock-consistency-checks (defcustom org-agenda-clock-consistency-checks
'(:max-duration "10:00" :min-duration 0 :max-gap "0:05" '(:max-duration "10:00" :min-duration 0 :max-gap "0:05"
:gap-ok-around ("4:00")) :gap-ok-around ("4:00")
"How to check clock times for consistency. :default-face ((:background "DarkRed") (:foreground "white"))
This is a property list, with the following keys: :overlap-face nil :gap-face nil :no-end-time-face nil
:long-face nil :short-face nil)
"This is a property list, with the following keys:
:max-duration Mark clocking chunks that are longer than this time. :max-duration Mark clocking chunks that are longer than this time.
This is a time string like \"HH:MM\", or the number This is a time string like \"HH:MM\", or the number
@ -1122,7 +1124,17 @@ This is a property list, with the following keys:
(i.e. a typical lunch time) do not cause a warning. (i.e. a typical lunch time) do not cause a warning.
You should have at least one time during the night in this You should have at least one time during the night in this
list, or otherwise the first task each morning will trigger list, or otherwise the first task each morning will trigger
a warning because it follows a long gap." a warning because it follows a long gap.
Furthermore, the following properties can be used to define faces for
issue display.
:default-face the default face, if the specific face is undefined
:overlap-face face for overlapping clocks
:gap-face face for gaps between clocks
:no-end-time-face face for incomplete clocks
:long-face face for clock intervals that are too long
:short-face face for clock intervals that are too short"
:group 'org-agenda-daily/weekly :group 'org-agenda-daily/weekly
:group 'org-clock :group 'org-clock
:type 'plist) :type 'plist)
@ -4946,10 +4958,12 @@ See also the user option `org-agenda-clock-consistency-checks'."
(or (plist-get pl :max-gap) "30:00"))) (or (plist-get pl :max-gap) "30:00")))
(gapok (mapcar 'org-hh:mm-string-to-minutes (gapok (mapcar 'org-hh:mm-string-to-minutes
(plist-get pl :gap-ok-around))) (plist-get pl :gap-ok-around)))
(def-face (or (plist-get pl :default-face)
'((:background "DarkRed") (:foreground "white"))))
issue) issue)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward " Clocked: +(-\\|\\([0-9]+:[0-9]+\\))" nil t) (while (re-search-forward " Clocked: +(-\\|\\([0-9]+:[0-9]+\\))" nil t)
(setq issue nil) (setq issue nil face def-face)
(catch 'next (catch 'next
(setq m (org-get-at-bol 'org-marker) (setq m (org-get-at-bol 'org-marker)
te nil ts nil) te nil ts nil)
@ -4962,7 +4976,8 @@ See also the user option `org-agenda-clock-consistency-checks'."
(error "No valid Clock line") (error "No valid Clock line")
(throw 'next t)) (throw 'next t))
(unless (match-end 3) (unless (match-end 3)
(setq issue "No end time") (setq issue "No end time"
face (or (plist-get pl :no-end-time-face) face))
(throw 'next t)) (throw 'next t))
(setq ts (match-string 1) (setq ts (match-string 1)
te (match-string 3) te (match-string 3)
@ -4976,20 +4991,25 @@ See also the user option `org-agenda-clock-consistency-checks'."
;; a very long clocking chunk ;; a very long clocking chunk
(setq issue (format "Clocking interval is very long: %s" (setq issue (format "Clocking interval is very long: %s"
(org-minutes-to-hh:mm-string (org-minutes-to-hh:mm-string
(floor (/ (float dt) 60.)))))) (floor (/ (float dt) 60.))))
face (or (plist-get pl :long-face) face)))
((< dt (* 60 mintime)) ((< dt (* 60 mintime))
;; a very short clocking chunk ;; a very short clocking chunk
(setq issue (format "Clocking interval is very short: %s" (setq issue (format "Clocking interval is very short: %s"
(org-minutes-to-hh:mm-string (org-minutes-to-hh:mm-string
(floor (/ (float dt) 60.)))))) (floor (/ (float dt) 60.))))
face (or (plist-get pl :short-face) face)))
((and (> tlend 0) (< ts tlend)) ((and (> tlend 0) (< ts tlend))
;; Two clock entries are overlapping ;; Two clock entries are overlapping
(setq issue (format "Clocking overlap: %d minutes" (/ (- tlend ts) 60)))) (setq issue (format "Clocking overlap: %d minutes"
(/ (- tlend ts) 60))
face (or (plist-get pl :overlap-face) face)))
((and (> tlend 0) (> ts (+ tlend (* 60 maxgap)))) ((and (> tlend 0) (> ts (+ tlend (* 60 maxgap))))
;; There is a gap, lets see if we need to report it ;; There is a gap, lets see if we need to report it
(unless (org-agenda-check-clock-gap tlend ts gapok) (unless (org-agenda-check-clock-gap tlend ts gapok)
(setq issue (format "Clocking gap: %d minutes" (setq issue (format "Clocking gap: %d minutes"
(/ (- ts tlend) 60))))) (/ (- ts tlend) 60))
face (or (plist-get pl :gap-face) face))))
(t nil))) (t nil)))
(setq tlend (or te tlend) tlstart (or ts tlstart)) (setq tlend (or te tlend) tlstart (or ts tlstart))
(when issue (when issue
@ -5000,7 +5020,7 @@ See also the user option `org-agenda-clock-consistency-checks'."
(org-add-props (org-add-props
(format "%-43s" (concat " " issue)) (format "%-43s" (concat " " issue))
nil nil
'face '((:background "DarkRed") (:foreground "white"))) 'face face)
"\n")) "\n"))
(overlay-put ov 'evaporate t))))) (overlay-put ov 'evaporate t)))))