From mboxrd@z Thu Jan 1 00:00:00 1970 From: James TD Smith Subject: [PATCH 3/7] Show durations of clocked times in timeline Date: Fri, 25 Jul 2008 00:46:18 +0100 Message-ID: <20080724234618.23478.77283.stgit@nyarlathotep.internal.mohorovi.cc> References: <20080724234608.23478.48564.stgit@nyarlathotep.internal.mohorovi.cc> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KMAVt-0003RG-7m for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KMAVr-0003PO-OR for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:24 -0400 Received: from [199.232.76.173] (port=33527 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KMAVq-0003PD-WB for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:23 -0400 Received: from 81-86-40-42.dsl.pipex.com ([81.86.40.42]:59948 helo=yog-sothoth.mohorovi.cc) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KMAVq-0005qX-5V for emacs-orgmode@gnu.org; Thu, 24 Jul 2008 19:46:22 -0400 Received: from nyarlathotep.internal.mohorovi.cc (Debian-exim@nyarlathotep.internal.mohorovi.cc [10.0.0.5]) by yog-sothoth.mohorovi.cc (8.13.4/8.13.4) with ESMTP id m6ONlKlT002357 for ; Fri, 25 Jul 2008 00:47:20 +0100 (BST) (envelope-from ahktenzero@mohorovi.cc) Received: from [127.0.0.1] (helo=nyarlathotep.internal.mohorovi.cc ident=ahktenzero) by nyarlathotep.internal.mohorovi.cc with esmtp (Exim 4.69) (envelope-from ) id 1KMAVn-00068T-0J for emacs-orgmode@gnu.org; Fri, 25 Jul 2008 00:46:19 +0100 In-Reply-To: <20080724234608.23478.48564.stgit@nyarlathotep.internal.mohorovi.cc> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org In the timeline display in the agenda, show the length of time clocked as well as the start and end times. --- lisp/ChangeLog | 3 +++ lisp/org-agenda.el | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c81a049..e63503a 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-07-25 James TD Smith + * org-agenda.el (org-agenda-get-closed): show durations of clocked + items as well as the start and end times. + * org-compat.el (org-get-x-clipboard-compat): Add a compat function for fetching the X clipboard on XEmacs and GNU Emacs 21. diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 23cda50..2f07535 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3325,7 +3325,7 @@ the documentation of `org-diary'." (list 0 0 0 (nth 1 date) (car date) (nth 2 date)))) 1 11)))) marker hdmarker priority category tags closedp - ee txt timestr rest) + ee txt timestr rest clocked) (goto-char (point-min)) (while (re-search-forward regexp nil t) (catch :skip @@ -3341,10 +3341,11 @@ the documentation of `org-diary'." (setq rest (substring timestr (match-end 0)) timestr (substring timestr 0 (match-end 0))) (if (and (not closedp) - (string-match "\\([0-9]\\{1,2\\}:[0-9]\\{2\\}\\)\\]" rest)) - (setq timestr (concat (substring timestr 0 -1) - "-" (match-string 1 rest) "]")))) - + (string-match "\\([0-9]\\{1,2\\}:[0-9]\\{2\\}\\)\\].*\\([0-9]\\{1,2\\}:[0-9]\\{2\\}\\)" rest)) + (progn (setq timestr (concat (substring timestr 0 -1) + "-" (match-string 1 rest) "]")) + (setq clocked (match-string 2 rest))) + (setq clocked "-"))) (save-excursion (if (re-search-backward "^\\*+ " nil t) (progn @@ -3353,7 +3354,8 @@ the documentation of `org-diary'." tags (org-get-tags-at)) (looking-at "\\*+[ \t]+\\([^\r\n]+\\)") (setq txt (org-format-agenda-item - (if closedp "Closed: " "Clocked: ") + (if closedp "Closed: " + (concat "Clocked: (" clocked ")")) (match-string 1) category tags timestr))) (setq txt org-agenda-no-heading-message)) (setq priority 100000)