From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Malakhovski Subject: [PATCH 3/9] org-clock: fix `org-clock-time%' Date: Tue, 3 Nov 2015 20:15:41 +0000 Message-ID: <1446581747-1960-4-git-send-email-oxij@oxij.org> References: <1446581747-1960-1-git-send-email-oxij@oxij.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zti09-0002Le-Pd for emacs-orgmode@gnu.org; Tue, 03 Nov 2015 15:16:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zti08-0004NM-NC for emacs-orgmode@gnu.org; Tue, 03 Nov 2015 15:16:17 -0500 Received: from fujibayashi-1-pt.tunnel.tserv10.par1.ipv6.he.net ([2001:470:1f12:446::2]:29106 helo=tricoro.koumakan.jp) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zti08-0004Mu-HI for emacs-orgmode@gnu.org; Tue, 03 Nov 2015 15:16:16 -0500 In-Reply-To: <1446581747-1960-1-git-send-email-oxij@oxij.org> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Jan Malakhovski * lisp/org-clock.el (org-clock-time%): Respect org-effort-durations. This also fixes a bug with time percents looking pretty much random and adding to a number that is less than 100% when a clock report has long intervals (e.g. days). --- lisp/org-clock.el | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index ad423f1..4563a8a 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2867,27 +2867,20 @@ TIME: The sum of all time spend in this tree, in minutes. This time (defun org-clock-time% (total &rest strings) "Compute a time fraction in percent. -TOTAL s a time string like 10:21 specifying the total times. +TOTAL s a total time string. STRINGS is a list of strings that should be checked for a time. -The first string that does have a time will be used. -This function is made for clock tables." - (let ((re "\\([0-9]+\\):\\([0-9]+\\)") - tot s) - (save-match-data +Strings are parsed using `org-duration-string-to-minutes`. +The first string that does have a time will be used. This +function is made for clock tables." + (save-match-data + (let (tot s cur) (catch 'exit - (if (not (string-match re total)) - (throw 'exit 0.) - (setq tot (+ (string-to-number (match-string 2 total)) - (* 60 (string-to-number (match-string 1 total))))) - (if (= tot 0.) (throw 'exit 0.))) + (setq tot (org-duration-string-to-minutes total)) + (if (= tot 0.) (throw 'exit 0.)) (while (setq s (pop strings)) - (if (string-match "\\([0-9]+\\):\\([0-9]+\\)" s) - (throw 'exit - (/ (* 100.0 (+ (string-to-number (match-string 2 s)) - (* 60 (string-to-number - (match-string 1 s))))) - tot)))) - 0)))) + (setq cur (org-clocksum-string-to-minutes s)) + (if (not (equal cur nil)) (throw 'exit (/ (* 100.0 cur) tot)))) + nil)))) ;; Saving and loading the clock -- 2.6.2