From ce945c7428ad2d7ea852762ef9192bef1130885f Mon Sep 17 00:00:00 2001
From: Joshua Carp <jm.carp@gmail.com>
Date: Sat, 26 Sep 2015 20:16:03 -0400
Subject: [PATCH] Update built-in date filters.

[Resolves #725]
---
 openfecwebapp/utils.py             | 15 ++++++++++++++-
 templates/macros/filters/date.html | 16 ++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/openfecwebapp/utils.py b/openfecwebapp/utils.py
index 50e5cec25..1003e0d09 100644
--- a/openfecwebapp/utils.py
+++ b/openfecwebapp/utils.py
@@ -73,6 +73,7 @@ def date_ranges():
     """
     today = datetime.date.today()
     quarter = math.floor((today.month - 1) / 3)
+    cycle = current_cycle()
     return {
         'month': (
             today.replace(day=1),
@@ -91,5 +92,17 @@ def date_ranges():
                 day=calendar.monthrange(today.year, 12)[1],
                 month=12,
             ),
-        )
+        ),
+        'cycle': (
+            datetime.date(
+                year=cycle - 1,
+                month=1,
+                day=1,
+            ),
+            datetime.date(
+                year=cycle,
+                month=12,
+                day=calendar.monthrange(cycle, 12)[1],
+            ),
+        ),
     }
diff --git a/templates/macros/filters/date.html b/templates/macros/filters/date.html
index ac9151136..b10ee5233 100644
--- a/templates/macros/filters/date.html
+++ b/templates/macros/filters/date.html
@@ -5,20 +5,16 @@
     <legend for="{{ name }}" class="label">{{ label }}</legend>
     <ul>
       <li>
-        <input id="radio-2" name="{{ name }}" type="radio" data-min-date={{ dates['month'][0] | date(fmt='%m-%d-%Y') }} data-max-date={{ dates['month'][1] | date(fmt='%m-%d-%Y') }}>
-        <label for="radio-2">This month</label>
+        <input id="radio-1" name="{{ name }}" type="radio" data-min-date={{ dates['year'][0] | date(fmt='%m-%d-%Y') }} data-max-date={{ dates['year'][1] | date(fmt='%m-%d-%Y') }}>
+        <label for="radio-1">This year</label>
       </li>
       <li>
-        <input id="radio-3" name="{{ name }}" type="radio" data-min-date={{ dates['quarter'][0] | date(fmt='%m-%d-%Y') }} data-max-date={{ dates['quarter'][1] | date(fmt='%m-%d-%Y') }}>
-        <label for="radio-3">This quarter</label>
+        <input id="radio-2" name="{{ name }}" type="radio" data-min-date={{ dates['cycle'][0] | date(fmt='%m-%d-%Y') }} data-max-date={{ dates['cycle'][1] | date(fmt='%m-%d-%Y') }}>
+        <label for="radio-2">This cycle</label>
       </li>
       <li>
-        <input id="radio-4" name="{{ name }}" type="radio" data-min-date={{ dates['year'][0] | date(fmt='%m-%d-%Y') }} data-max-date={{ dates['year'][1] | date(fmt='%m-%d-%Y') }}>
-        <label for="radio-4">This year</label>
-      </li>
-      <li>
-        <input id="radio-5" name="{{ name }}" type="radio">
-        <label for="radio-5">Custom</label>
+        <input id="radio-3" name="{{ name }}" type="radio">
+        <label for="radio-3">Custom</label>
       </li>
     </ul>
     <div class="date-range-input">