emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Alan D. Salewski" <salewski@att.net>
To: emacs-orgmode@gnu.org
Cc: "Alan D. Salewski" <ads@salewski.email>
Subject: [PATCH] org-clock.el: clocktable ':formula %' now includes per-file time pct
Date: Sun, 31 Jan 2021 15:26:17 -0500	[thread overview]
Message-ID: <YBcSaba2GZ5ZLK25@localhost> (raw)
In-Reply-To: YBcSaba2GZ5ZLK25.ref@localhost

* lisp/org-clock.el (org-clocktable-write-default): When ':formula %'
   is in-effect, show the per-file time percentage in the '%' column.

This change only has an effect when multiple files are contributing
to a given clocktable (such as when ':scope agenda' has been
specified).  The existing behavior is that such tables have an extra
'File' column, and each individual file that contributes has its own
summary line with the headline value '*File time*'.  Those summary
rows also produce a rollup time value for the file in the 'Time'

Prior to this change, the built-in '%' formula does not produce a
calculation for those per-file times in the '%' column (the relevant
cells in the '%' column were blank).  With this change, the
percentage contribution of each individual file time to the total
time is shown.

The more agenda files you have, the more useful this behavior


Signed-off-by: Alan D. Salewski <ads@salewski.email>
  lisp/org-clock.el | 20 ++++++++++++++++++--
  1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index cfd112ec3..8e91609c2 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2697,7 +2697,18 @@ from the dynamic block definition."
  	     (format (concat "| %s %s | %s%s%s"
  			     (format org-clock-file-time-cell-format
  				     (org-clock--translate "File time" lang))
-			     " | *%s*|\n")
+			     ;; The file-time rollup value goes in the first time
+			     ;; column (of which there is always at least one)...
+			     " | *%s*|"
+			     ;; ...and the remaining file time cols (if any) are blank.
+			     (make-string (max 0 (1- time-columns)) ?|)
+			     ;; Optionally show the percentage contribution of "this"
+			     ;; file time to the total time.
+			     (if (eq formula '%) " %s |" "")
+			     "\n")
  		     (file-name-nondirectory file-name)
  		     (if level?    "| " "") ;level column, maybe
  		     (if timestamp "| " "") ;timestamp column, maybe
@@ -2705,7 +2716,12 @@ from the dynamic block definition."
  		     (if properties	    ;properties columns, maybe
  			 (make-string (length properties) ?|)
-		     (org-duration-from-minutes file-time)))) ;time
+		     (org-duration-from-minutes file-time) ;time
+		     (cond ((not (eq formula '%)) "")	   ;time percentage, maybe
+			   ((or (not total-time) (= total-time 0)) "0.0")
+			   (t
+			    (format "%.1f" (* 100 (/ file-time (float total-time)))))))))
  	  ;; Get the list of node entries and iterate over it
  	  (when (> maxlevel 0)
a l a n   d.   s a l e w s k i

       reply	other threads:[~2021-02-06 17:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <YBcSaba2GZ5ZLK25.ref@localhost>
2021-01-31 20:26 ` Alan D. Salewski [this message]
2021-01-31 21:49 [PATCH] org-clock.el: clocktable ':formula %' now includes per-file time pct Alan D. Salewski
2021-05-01  9:52 ` Bastien

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:

  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=YBcSaba2GZ5ZLK25@localhost \
    --to=salewski@att.net \
    --cc=ads@salewski.email \
    --cc=emacs-orgmode@gnu.org \


* 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


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).