diff --git a/AUTHORS b/AUTHORS index 825c87b96..bab7cef3e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,6 +7,7 @@ Contributing Authors: H. İbrahim Güngör Stefan Dorn Michael Greb + Benjamin Tegarden With thanks to: Eugene Kramer @@ -24,5 +25,4 @@ With thanks to: Russell Friesenhahn Paolo Marsi Eric Farris - Benjamin Tegarden diff --git a/ChangeLog b/ChangeLog index 1a0f7a89b..bf4907020 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,8 @@ file locking is used. + Task export feature now includes recurrence information, removes nested quotes, and limits output to pending tasks. + + Task no longer includes deleted tasks in the summary report (thanks to + Benjamin Tegarden). ------ old releases ------------------------------ diff --git a/html/task.html b/html/task.html index fa0f4ded2..ed65b903a 100644 --- a/html/task.html +++ b/html/task.html @@ -132,6 +132,8 @@ file locking is used.
diff --git a/src/report.cpp b/src/report.cpp index 5820bd7c5..606a4e3ab 100644 --- a/src/report.cpp +++ b/src/report.cpp @@ -496,13 +496,18 @@ std::string handleReportSummary (TDB& tdb, T& task, Config& conf) { T task (completed[i]); std::string project = task.getAttribute ("project"); - countCompleted[project] = countCompleted[project] + 1; - ++counter[project]; + if (task.getStatus () == T::deleted) + continue; + + ++countCompleted[project]; time_t entry = ::atoi (task.getAttribute ("entry").c_str ()); time_t end = ::atoi (task.getAttribute ("end").c_str ()); if (entry && end) + { sumEntry[project] = sumEntry[project] + (double) (end - entry); + ++counter[project]; + } } // Create a table for output.