From 89d3b4e805c9bc28bbfa8771f9ea819cbd5a0b8f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Tue, 23 Aug 2011 21:36:09 -0400
Subject: [PATCH] Bug #737

- Fixed bug #737, which allows wait dates after due dates, but provides a
  warning (thanks to Arkady Grudzinsky).
---
 AUTHORS      | 1 +
 ChangeLog    | 2 ++
 src/Task.cpp | 9 +++------
 src/en-US.h  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bd0c526ac..39801e197 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -107,4 +107,5 @@ suggestions:
   Miguel de Val Borro
   Yann Davin
   John Hammond
+  Arkady Grudzinsky
 
diff --git a/ChangeLog b/ChangeLog
index d48ee57f5..d70e965f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -126,6 +126,8 @@
    truncated to a page.
  + Fixed bug #732, which fixes misleading messages and documentation for
    merge/push/pull URIs (thanks to Tomas Cech).
+ + Fixed bug #737, which allows wait dates after due dates, but provides a
+   warning (thanks to Arkady Grudzinsky).
  + Fixed bug #741, which miscounted columns widths when a table header used
    unicode characters (thanks to Tomas Cech).
  + Fixed bug #744, which omitted new ID feedback for all but the first
diff --git a/src/Task.cpp b/src/Task.cpp
index ada62cfb5..64f16aa4e 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -1091,30 +1091,27 @@ void Task::validate () const
     Date due (get_date ("due"));
 
     // Verify wait < due
-    // TODO Downgrade to warning.
     if (has ("wait"))
     {
       Date wait (get_date ("wait"));
       if (wait > due)
-        throw std::string (STRING_TASK_VALID_WAIT);
+        context.footnote (STRING_TASK_VALID_WAIT);
     }
 
     Date entry (get_date ("entry"));
 
-    // TODO Downgrade to warning.
     if (has ("start"))
     {
       Date start (get_date ("start"));
       if (entry > start)
-        throw std::string (STRING_TASK_VALID_START);
+        context.footnote (STRING_TASK_VALID_START);
     }
 
-    // TODO Downgrade to warning.
     if (has ("end"))
     {
       Date end (get_date ("end"));
       if (entry > end)
-        throw std::string (STRING_TASK_VALID_END);
+        context.footnote (STRING_TASK_VALID_END);
     }
   }
   else
diff --git a/src/en-US.h b/src/en-US.h
index 4748743cf..80e84863c 100644
--- a/src/en-US.h
+++ b/src/en-US.h
@@ -419,9 +419,9 @@
 #define STRING_TASK_VALID_ENTRY      "A task must have an entry timestamp."
 #define STRING_TASK_VALID_DESC       "A task must have a description."
 #define STRING_TASK_VALID_BLANK      "Cannot add a task that is blank."
-#define STRING_TASK_VALID_WAIT       "A 'wait' date must be before a 'due' date."
-#define STRING_TASK_VALID_START      "A 'start' date must be after an 'entry' date."
-#define STRING_TASK_VALID_END        "An 'end' date must be after an 'entry' date."
+#define STRING_TASK_VALID_WAIT       "Warning: You have specified a 'wait' date that is after the 'due' date."
+#define STRING_TASK_VALID_START      "Warning: You have specified a 'start' date that is before the 'entry' date."
+#define STRING_TASK_VALID_END        "Warning: You have specified an 'end' date that is before the 'entry' date."
 #define STRING_TASK_VALID_REC_DUE    "A recurring task must also have a 'due' date."
 #define STRING_TASK_VALID_UNTIL      "Only recurring tasks may have an 'until' date."
 #define STRING_TASK_VALID_RECUR      "The recurrence value '{1}' is not valid."