From 9b284c34b36a6ecef2d23c62d0a801277cb02e0c Mon Sep 17 00:00:00 2001
From: bkfox <thomas bkfox net>
Date: Mon, 12 Feb 2018 00:34:08 +0100
Subject: [PATCH] remove Schedule.end property + fix templates + add
 accessibility info

---
 aircox/models.py                              |  4 ----
 .../templates/aircox_cms/program_page.html    | 19 +++++++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/aircox/models.py b/aircox/models.py
index 7e1ed70..31c49b4 100755
--- a/aircox/models.py
+++ b/aircox/models.py
@@ -578,10 +578,6 @@ class Schedule(models.Model):
         }
         return before == now
 
-    @property
-    def end(self):
-        return self.time + utils.to_timedelta(self.duration)
-
     def match(self, date = None, check_time = True):
         """
         Return True if the given datetime matches the schedule
diff --git a/aircox_cms/templates/aircox_cms/program_page.html b/aircox_cms/templates/aircox_cms/program_page.html
index bfa7d46..cba6c46 100755
--- a/aircox_cms/templates/aircox_cms/program_page.html
+++ b/aircox_cms/templates/aircox_cms/program_page.html
@@ -12,18 +12,25 @@
     <h2>{% trans "Schedule" %}</h2>
     <ul>
         {% for schedule in page.program.schedule_set.all %}
-        <li>
-            {% with frequency=schedule.get_frequency_display day=schedule.date|date:'l' %}
-            {% with start=schedule.date|date:"H:i" end=schedule.end|date:"H:i" %}
+        {% with frequency=schedule.get_frequency_display day=schedule.date|date:'l' %}
+
+        {% with start_hour=schedule.time.hour start_minute=schedule.time.minute %}
+        {% with duration_hour=schedule.duration.hour duration_minute=schedule.duration.minute %}
+        <li aria-label="{% blocktrans trimmed %}Diffusion on {{ day }} at {{ start_hour }} hours {{ start_minute }}, on the {{ frequency }}, and last for {{ duration_hour }} hours and {{ duration_minute }} minutes {% endblocktrans %}">
+        {% endwith %}
+        {% endwith %}
+
+        {% with start=schedule.time|date:"H:i" duration=schedule.duration|time:"H\"i" %}
             {% blocktrans trimmed %}
-            {{ day }} at {{ start }} until {{ end }}, <span class="info">{{ frequency }}</span>
+            {{ day }} at {{ start }} ({{ duration }}),  <span class="info">{{ frequency }}</span>
             {% endblocktrans %}
-            {% endwith %}
-            {% endwith %}
             {% if schedule.initial %}
             <span class="info">{% trans "Rerun" %}</span>
             {% endif %}
+        {% endwith %}
+
         </li>
+        {% endwith %}
         {% endfor %}
     </ul>
 {% else %}