[bug 975537] Do not display both start and end dates if they match.

mozilla · Mar 12, 2014 · f754cb9 · f754cb9
1 parent 987c0b0
commit f754cb9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/remo/base/templates/dashboard_reps.html b/remo/base/templates/dashboard_reps.html
@@ -46,7 +46,7 @@ <h2>Reports</h2>
                   <span class="date-range">
                     {{ date_to_weeks(user.userprofile.current_streak_start,
                                       today.date()) }} weeks<br>
-                    {% if user.userprofile.current_streak_start|is_date_today %}
+                    {% if is_same_day(user.userprofile.current_streak_start) %}
                         Today
                     {% else %}
                         {{ user.userprofile.current_streak_start|strftime('%d %b %Y')}}
@@ -64,8 +64,11 @@ <h2>Reports</h2>
                   <span class="date-range">
                     {{ date_to_weeks(user.userprofile.longest_streak_start,
                                       user.userprofile.longest_streak_end) }} weeks<br>
-                    {% if user.userprofile.longest_streak_start|is_date_today %}
+                    {% if is_same_day(user.userprofile.longest_streak_start) %}
                         Today
+                    {% elif is_same_day(user.userprofile.longest_streak_start,
+                                        user.userprofile.longest_streak_end) %}
+                        {{ user.userprofile.longest_streak_start|strftime('%d %b %Y')}}
                     {% else %}
                         {{ user.userprofile.longest_streak_start|strftime('%d %b %Y')}}
                         &nbsp;-&nbsp;

diff --git a/remo/reports/helpers.py b/remo/reports/helpers.py
@@ -13,9 +13,9 @@ def count_ng_reports(obj, current_streak=False, longest_streak=False,
                                        longest_streak, period)
 
 
-@register.filter
-def is_date_today(date):
-    if date == utc_now().date():
+@register.function
+def is_same_day(first_date, second_date=None):
+    if first_date == (second_date or utc_now().date()):
         return True
     return False