From: Carsten Dominik <carsten.dominik@gmail.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] clock reports: Only include current clocking task when range includes task
Date: Mon, 17 May 2010 11:36:21 +0200 [thread overview]
Message-ID: <0B970D2C-3E2D-40B6-BCFE-4FCA5487DF0A@gmail.com> (raw)
In-Reply-To: <1274062343-8894-1-git-send-email-bernt@norang.ca>
Applied, thanks.
- Carsten
On May 17, 2010, at 4:12 AM, Bernt Hansen wrote:
> 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.
> ---
> Update patch without the debug call to the (message)
>
> This patch is available at git://git.norang.ca/org-mode.git for-
> carsten
>
> -Bernt
>
> lisp/org-clock.el | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index 504f0c9..07e2e45 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -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))
> --
> 1.7.1.86.g0e460
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
- Carsten
next prev parent reply other threads:[~2010-05-17 9:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-17 2:05 [PATCH] clock reports: Only include current clocking task when range includes task Bernt Hansen
2010-05-17 2:09 ` Bernt Hansen
2010-05-17 2:12 ` Bernt Hansen
2010-05-17 9:36 ` Carsten Dominik [this message]
2010-05-17 11:51 ` [PATCH] Fix clock report when not clocking an entry Bernt Hansen
2010-05-17 11:56 ` Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0B970D2C-3E2D-40B6-BCFE-4FCA5487DF0A@gmail.com \
--to=carsten.dominik@gmail.com \
--cc=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).