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 @@
{% trans "Schedule" %}
{% for schedule in page.program.schedule_set.all %}
- -
- {% 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 %}
+
-
+ {% endwith %}
+ {% endwith %}
+
+ {% with start=schedule.time|date:"H:i" duration=schedule.duration|time:"H\"i" %}
{% blocktrans trimmed %}
- {{ day }} at {{ start }} until {{ end }}, {{ frequency }}
+ {{ day }} at {{ start }} ({{ duration }}), {{ frequency }}
{% endblocktrans %}
- {% endwith %}
- {% endwith %}
{% if schedule.initial %}
{% trans "Rerun" %}
{% endif %}
+ {% endwith %}
+
+ {% endwith %}
{% endfor %}
{% else %}