From d1f5020faba12ec417c272979183b2e21c60c215 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 15 Jun 2014 22:37:56 -0400
Subject: [PATCH] Task

- Improved implementation of is_duemonth and is_dueweek.
---
 src/Task.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Task.cpp b/src/Task.cpp
index 596daa6f4..c0ecae93d 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -462,10 +462,9 @@ bool Task::is_dueweek () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      Date now;
       Date due (get_date ("due"));
-      if (now.year () == due.year () &&
-          now.week () == due.week ())
+      if (due >= Date ("socw") &&
+          due <= Date ("eocw"))
         return true;
     }
   }
@@ -483,10 +482,9 @@ bool Task::is_duemonth () const
     if (status != Task::completed &&
         status != Task::deleted)
     {
-      Date now;
       Date due (get_date ("due"));
-      if (now.year () == due.year () &&
-          now.month () == due.month ())
+      if (due >= Date ("socm") &&
+          due <= Date ("eocm"))
         return true;
     }
   }