Browse Source

Fix a problem with summaries in the agenda column view.

If there was a title set for a column, org-agenda-colview-summarize would look
for the title instead of the property, resulting in empty summaries. This is now
fixed.
James TD Smith 15 years ago
parent
commit
b0eaeaa0bd
2 changed files with 13 additions and 5 deletions
  1. 6 0
      lisp/ChangeLog
  2. 7 5
      lisp/org-colview.el

+ 6 - 0
lisp/ChangeLog

@@ -1,3 +1,9 @@
+2009-11-25  James TD Smith  <ahktenzero@mohorovi.cc>
+
+	* org-colview.el (org-agenda-colview-summarize): Sort out some
+	confusion between properties and titles, which resulted in
+	agenda summaries not working if a title was set for a column.
+
 2009-11-24  Carsten Dominik  <carsten.dominik@gmail.com>
 2009-11-24  Carsten Dominik  <carsten.dominik@gmail.com>
 
 
 	* org-mobile.el (org-mobile-agendas): New option.
 	* org-mobile.el (org-mobile-agendas): New option.

+ 7 - 5
lisp/org-colview.el

@@ -1377,8 +1377,9 @@ and tailing newline characters."
 This will add overlays to the date lines, to show the summary for each day."
 This will add overlays to the date lines, to show the summary for each day."
   (let* ((fmt (mapcar (lambda (x)
   (let* ((fmt (mapcar (lambda (x)
 			(if (equal (car x) "CLOCKSUM")
 			(if (equal (car x) "CLOCKSUM")
-			    (list "CLOCKSUM" (nth 2 x) nil 'add_times nil '+ 'identity)
-			  (cdr x)))
+			    (list "CLOCKSUM" (nth 1 x) (nth 2 x) ":" 'add_times
+				  nil '+ nil)
+			  x))
 		      org-columns-current-fmt-compiled))
 		      org-columns-current-fmt-compiled))
 	 line c c1 stype calc sumfunc props lsum entries prop v)
 	 line c c1 stype calc sumfunc props lsum entries prop v)
     (catch 'exit
     (catch 'exit
@@ -1404,9 +1405,10 @@ This will add overlays to the date lines, to show the summary for each day."
 		    (mapcar
 		    (mapcar
 		     (lambda (f)
 		     (lambda (f)
 		       (setq prop (car f)
 		       (setq prop (car f)
-			     stype (nth 3 f)
-			     sumfunc (nth 5 f)
-			     calc (or (nth 6 f) 'identity))
+			     title (nth 1 f)
+			     stype (nth 4 f)
+			     sumfunc (nth 6 f)
+			     calc (or (nth 7 f) 'identity))
 		       (cond
 		       (cond
 			((equal prop "ITEM")
 			((equal prop "ITEM")
 			 (cons prop (buffer-substring (point-at-bol)
 			 (cons prop (buffer-substring (point-at-bol)