mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

Add running clock only to report if time scope is right

Browse Source 
Patch by Bernt Hansen:

> When org-clock-report-include-clocking-task is set we always add the
> current clocking task to the clock report.  This is incorrect if you
> are looking at an agenda clock report for a time range that does not
> include the current clocking task (e.g. yesterday or last week).
>
> Now we only include the current clocking task if the clock report
> date range includes the current clocking task start time.
This commit is contained in:
Carsten Dominik 2010-05-17 11:36:09 +02:00
parent b84aa975e0
commit 696c2bf869
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-17 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-sum): Don't include running clock if
the time block is wrong.
2010-05-16 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-clock-clock-in, org-clock-in): Added

13
lisp/org-clock.el
View File

@ -1396,12 +1396,15 @@ nil are excluded from the clock summation."
(* 60 (string-to-number (match-string 4))))))
(t ;; A headline
;; Add the currently clocking item time to the total
(when (and org-clock-report-include-clocking-task
(equal (org-clocking-buffer) (current-buffer))
(equal (marker-position org-clock-hd-marker) (point)))
(let ((org-clock-start-time-as-float (org-float-time org-clock-start-time)))
(when (and org-clock-report-include-clocking-task
(equal (org-clocking-buffer) (current-buffer))
(equal (marker-position org-clock-hd-marker) (point))
(>= org-clock-start-time-as-float tstart)
(<= org-clock-start-time-as-float tend))
(let ((time (floor (- (org-float-time)
(org-float-time org-clock-start-time)) 60)))
(setq t1 (+ t1 time))))
org-clock-start-time-as-float) 60)))
(setq t1 (+ t1 time)))))
(let* ((headline-forced
(get-text-property (point)
:org-clock-force-headline-inclusion))