Format times nicely

Author: encukou

naucse/templates.py

@@ -170,6 +170,13 @@ def __str__(self):
     }
 
 
+@template_filter()
+def format_time(time):
+    if time.second:
+        return '{d.hour}:{d.minute:02}:{d.second:02}'.format(d=time)
+    return '{d.hour}:{d.minute:02}'.format(d=time)
+
+
 @template_filter()
 def format_date(date, relative_to=None):
     return '{d.day}. {d.month}. {d.year}'.format(d=date)

naucse/templates/course.html

@@ -59,9 +59,9 @@ <h4>
                             </div>
                             {% if course.default_start_time %}
                                 <div class="default-times">
-                                    {{ course.default_start_time }}
+                                    {{ course.default_start_time | format_time }}
                                     –
-                                    {{ course.default_end_time }}
+                                    {{ course.default_end_time | format_time }}
                                 </div>
                             {% endif %}
                         </div>

test_naucse/test_filters.py

@@ -1,4 +1,4 @@
-from datetime import date
+from datetime import date, time, datetime
 
 import pytest
 
@@ -13,8 +13,24 @@
         (date(2017, 8, 1), date(2017, 9, 25), '1. 8. – 25. 9. 2017'),
         (date(2017, 8, 25), date(2017, 9, 25), '25. 8. – 25. 9. 2017'),
         (date(2016, 9, 25), date(2017, 9, 25), '25. 9. 2016 – 25. 9. 2017'),
+        (datetime(2016, 9, 25, 8, 30), datetime(2017, 9, 25, 18, 0),
+         '25. 9. 2016 – 25. 9. 2017'),
     )
 )
 def test_format_date_range(start, end, result):
     assert naucse.templates.format_date_range((start, end)) == result
 
+@pytest.mark.parametrize(
+    ('time', 'result'),
+    (
+        (time(8, 0, 0), '8:00'),
+        (time(18, 0, 0), '18:00'),
+        (time(8, 3, 0), '8:03'),
+        (time(8, 3, 5), '8:03:05'),
+        (time(18, 4, 5), '18:04:05'),
+        (datetime(2018, 1, 14, 18, 4, 5), '18:04:05'),
+    )
+)
+def test_format_time(time, result):
+    assert naucse.templates.format_time(time) == result
+