From: Ihor Radchenko <yantar92@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: Bug: Total shown clocked time of inlinetask includes the clocking of the parent task [9.3.7 (release_9.3.7-783-gd307b6 @ /home/yantar92/.emacs.d/straight/build/org/)]
Date: Sat, 22 Aug 2020 16:43:42 +0800 [thread overview]
Message-ID: <87a6yn2hq9.fsf@localhost> (raw)
In-Reply-To: <87a6ynwb6r.fsf@kyleam.com>
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
> Thank you. Please send the patch with a commit message, as described at
> <https://orgmode.org/worg/org-contribute.html>.
See the attached. Let me know if anything is missing.
Best,
Ihor
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-clock.el-Fix-calculated-clocking-sum-in-inlineta.patch --]
[-- Type: text/x-diff, Size: 1381 bytes --]
From 3f7b54f0100013c9a37be10256538f76abdd7112 Mon Sep 17 00:00:00 2001
From: Ihor Radchenko <yantar92@gmail.com>
Date: Sat, 15 Aug 2020 16:31:48 +0800
Subject: [PATCH] org-clock.el: Fix calculated clocking sum in inlinetasks
* lisp/org-clock.el (org-clock-sum-current-item): Do not include
clocked time from the parent when inside inlinetask.
Calling `org-narrow-to-subtree' from inside inlinetask would narrow to
the parent's subtree (correct behaviour). However, it is not what we
want when calculating the clocking sum. Inlinetask case should be
treated specially.
---
lisp/org-clock.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 0dd495493..6a25f1e18 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1956,7 +1956,12 @@ PROPNAME lets you set a custom text property instead of :org-clock-minutes."
"Return time, clocked on current item in total."
(save-excursion
(save-restriction
- (org-narrow-to-subtree)
+ (if (and (featurep 'org-inlinetask)
+ (or (org-inlinetask-at-task-p)
+ (org-inlinetask-in-task-p)))
+ (narrow-to-region (save-excursion (org-inlinetask-goto-beginning) (point))
+ (save-excursion (org-inlinetask-goto-end) (point)))
+ (org-narrow-to-subtree))
(org-clock-sum tstart)
org-clock-file-total-minutes)))
--
2.26.2
[-- Attachment #3: Type: text/plain, Size: 555 bytes --]
Kyle Meyer <kyle@kyleam.com> writes:
> Ihor Radchenko writes:
>
>> I have noticed that total clocked time shown while clocked-in into
>> inlinetask includes the clocked time of its parent task.
>>
>> Expected behaviour: only the clocking time for the inline task itself
>> should be shown.
>>
>> This can be fixed if org-clock-sum-current-item consider the case when
>> point is at inlinetask. The proposed fix is attached.
>
> Thank you. Please send the patch with a commit message, as described at
> <https://orgmode.org/worg/org-contribute.html>.
next prev parent reply other threads:[~2020-08-22 8:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-15 4:18 Bug: Total shown clocked time of inlinetask includes the clocking of the parent task [9.3.7 (release_9.3.7-783-gd307b6 @ /home/yantar92/.emacs.d/straight/build/org/)] Ihor Radchenko
2020-08-22 4:34 ` Kyle Meyer
2020-08-22 8:43 ` Ihor Radchenko [this message]
2020-08-24 2:44 ` Kyle Meyer
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a6yn2hq9.fsf@localhost \
--to=yantar92@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=kyle@kyleam.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.