From 325c80b7e4bee054f8aa39c214e2dfffa9eb41fc Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Oct 2013 16:25:00 -0400
Subject: [PATCH] Reports

- New 'long' report.
---
 src/Config.cpp   | 10 +++++-----
 test/roundtrip.t |  4 ++--
 test/uuid.t      |  9 ++++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index 9dfb3a032..c6e89487c 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -311,11 +311,11 @@ std::string Config::_defaults =
   "\n"
   "# Reports\n"
   "\n"
-  "report.long.description=Lists all pending tasks\n"
-  "report.long.columns=id,project,priority,entry,start,due,recur,due.countdown,entry.age,depends,tags,description\n"
-  "report.long.labels=ID,Proj,Pri,Added,Started,Due,Recur,Countdown,Age,Deps,Tags,Description\n"
-  "report.long.sort=due+,priority-,project+\n"
-  "report.long.filter=status:pending\n"
+  "report.long.description=All details of pending tasks by creation date\n"
+  "report.long.labels=ID,A,Created,Mod,Deps,P,Project,Tags,Recur,Wait,Sched,Due,Until,Description\n"
+  "report.long.columns=id,start.active,entry,modified.age,depends,priority,project,tags,recur,wait.age,scheduled,due,until,description\n"
+  "report.long.filter= ( status:pending or status:waiting )\n"
+  "report.long.sort=modified-\n"
   "\n"
   "report.list.description=Lists all pending tasks\n"
   "report.list.columns=id,project,priority,due,start.active,entry.age,description\n"
diff --git a/test/roundtrip.t b/test/roundtrip.t
index 0153d56dd..c22f57330 100755
--- a/test/roundtrip.t
+++ b/test/roundtrip.t
@@ -56,14 +56,14 @@ qx{../src/task rc:roundtrip.rc export > ./roundtrip.txt 2>&1};
 unlink 'pending.data', 'completed.data', 'undo.data';
 qx{../src/task rc:roundtrip.rc import ./roundtrip.txt 2>&1};
 
-# Exammine.
+# Examine.
 
 # ID Project Pri Added    Started Due Recur Countdown Age Deps Tags      Description
 # -- ------- --- -------- ------- --- ----- --------- --- ---- --------- ---------
 #  1 A       H   8/7/2010                               -                one
 #  2             8/7/2010                               -      tag1 tag2 two
 my $output = qx{../src/task rc:roundtrip.rc long 2>&1};
-like ($output, qr/1.+A.+H.+\d+\/\d+\/\d+.+(?:-|\d+).+one/,       '2 round trips task 1 identical');
+like ($output, qr/1.+\d+\/\d+\/\d+.+H.+A.+one/,                  '2 round trips task 1 identical');
 like ($output, qr/2.+\d+\/\d+\/\d+.+(?:-|\d+).+tag1\stag2\stwo/, '2 round trips task 2 identical');
 
 # Cleanup.
diff --git a/test/uuid.t b/test/uuid.t
index 7b0162436..50e3bf5d3 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -35,7 +35,10 @@ if (open my $fh, '>', 'uuid.rc')
 {
   print $fh "data.location=.\n",
             "dateformat=m/d/Y\n",
-            "confirmation=off\n";
+            "confirmation=off\n",
+            "report.unittest.columns=id,entry,start,description\n",
+            "report.unittest.filter=status:pending\n",
+            "report.unittest.sort=id\n";
   close $fh;
   ok (-r 'uuid.rc', 'Created uuid.rc');
 }
@@ -94,7 +97,7 @@ $output = qx{../src/task rc:uuid.rc completed 2>&1};
 unlike ($output, qr/UUNNDDOO/, 'task does not list UUNNDDOO after modification');
 
 qx{../src/task rc:uuid.rc d71d3566-7a6b-4c32-8f0b-6de75bb9397b modify start:1293796800 2>&1};
-$output = qx{../src/task rc:uuid.rc long 2>&1};
+$output = qx{../src/task rc:uuid.rc unittest 2>&1};
 like ($output, qr/12\/31\/2010/, 'modified start date of task ssttaarrtt');
 
 qx{../src/task rc:uuid.rc 727baa6c-65b8-485e-a810-e133e3cd83dc modify end:1293796800 2>&1};
@@ -103,7 +106,7 @@ like ($output, qr/12\/31\/2010/, 'modified end date of task eenndd');
 
 qx{../src/task rc:uuid.rc aa4abef1-1dc5-4a43-b6a0-7872df3094bb modify entry:1293710400 2>&1};
 qx{../src/task rc:uuid.rc aa4abef1-1dc5-4a43-b6a0-7872df3094bb modify start:1293883200 2>&1};
-$output = qx{../src/task rc:uuid.rc long 2>&1};
+$output = qx{../src/task rc:uuid.rc unittest 2>&1};
 like ($output, qr/12\/30\/2010/, 'modified entry date of task three');
 like ($output, qr/1\/1\/2011/, 'added start date of task three with modify');