Show end time as 24:00 in more places

OneGov · Apr 28, 2016 · 0234693 · 0234693
1 parent e890965
commit 0234693
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/onegov/town/layout.py b/onegov/town/layout.py
@@ -272,6 +272,9 @@ def move_person_url_template(self):
     def get_user_color(self, username):
         return utils.get_user_color(username)
 
+    def format_time_range(self, start, end):
+        return utils.format_time_range(start, end)
+
 
 class DefaultMailLayout(Layout):
     """ A special layout for creating HTML E-Mails. """

diff --git a/onegov/town/models/ticket.py b/onegov/town/models/ticket.py
@@ -9,6 +9,7 @@
 from onegov.town import _
 from onegov.town.elements import DeleteLink, Link
 from onegov.town.layout import DefaultLayout, EventLayout
+from onegov.town.utils import correct_time_range
 from purl import URL
 
 
@@ -145,10 +146,12 @@ def title(self):
 
         for ix, reservation in enumerate(self.reservations):
             parts.append(
-                template.format(
-                    start=reservation.display_start(),
-                    end=reservation.display_end(),
-                    quota=reservation.quota
+                correct_time_range(
+                    template.format(
+                        start=reservation.display_start(),
+                        end=reservation.display_end(),
+                        quota=reservation.quota
+                    )
                 )
             )
 

diff --git a/onegov/town/templates/macros.pt b/onegov/town/templates/macros.pt
@@ -429,12 +429,12 @@
                 <strong>
                     ${layout.format_date(start, 'weekday_long')},
                     ${layout.format_date(start, 'date_long')}
-                    <!--! simple whole day check: -->
-                    <tal:block condition="start.time() != end.time()">
-                        ${layout.format_date(start, 'time')} -
-                        ${layout.format_date(end, 'time')}
-                    </tal:block>
                 </strong>
+                <!--! simple whole day check: -->
+                <span tal:condition="start.time() != end.time()">
+                    <br>
+                    ${layout.format_time_range(start, end)}
+                </span>
                 <br><span i18n:translate>Quota</span>
                 <span>
                     ${reservation.quota}

diff --git a/onegov/town/templates/mail_macros.pt b/onegov/town/templates/mail_macros.pt
@@ -16,8 +16,8 @@
                         ${layout.format_date(start, 'date_long')}
                         <!-- simple whole day check: -->
                         <tal:block condition="start.time() != end.time()">
-                            ${layout.format_date(start, 'time')} -
-                            ${layout.format_date(end, 'time')}
+                        <br>
+                            ${layout.format_time_range(start, end)}
                         </tal:block>
                     </span>
                     <br>

diff --git a/onegov/town/utils.py b/onegov/town/utils.py
@@ -443,3 +443,13 @@ def get_libres_session_id(request):
         request.browser_session.libres_session_id = uuid4()
 
     return request.browser_session.libres_session_id
+
+
+def format_time_range(start, end):
+    return correct_time_range('{:%H:%M} - {:%H:%M}'.format(start, end))
+
+
+def correct_time_range(string):
+    if string.endswith('00:00'):
+        return string[:-5] + '24:00'
+    return string