From ed2890927d79792e9222f61c19969352b614da8f Mon Sep 17 00:00:00 2001
From: Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>
Date: Sat, 18 Jun 2011 20:43:30 +0200
Subject: fixed week view.
diff --git a/program/templatetags/timeslots.py b/program/templatetags/timeslots.py
new file mode 100644
index 0000000..9b83a80
--- /dev/null
+++ b/program/templatetags/timeslots.py
@@ -0,0 +1,22 @@
+from django import template
+
+register = template.Library()
+
+from datetime import datetime, time, timedelta
+
+@register.simple_tag
+def duration(start, end):
+ return 'style="height: %dpx"' % ((end-start).seconds/60)
+
+@register.simple_tag
+def duration_until(end):
+ start = datetime.combine(end.date(), time(6,0))
+ return 'style="height: %dpx"' % ((end-start).seconds/60)
+
+@register.simple_tag
+def duration_since(start):
+ if start.time()<time(0,0):
+ end = datetime.combine(start.date()+timedelta(days=1), time(6,0))
+ else:
+ end = datetime.combine(start.date(), time(6,0))
+ return 'style="height: %dpx"' % ((end-start).seconds/60)
\ No newline at end of file
diff --git a/templates/program/week_schedule.html b/templates/program/week_schedule.html
index 4ee2d3f..238b191 100644
--- a/templates/program/week_schedule.html
+++ b/templates/program/week_schedule.html
@@ -6,138 +6,79 @@
<body>
<div id="content-main" class="week-schedule">
-
- <div id="weekday-starts"> </div>
+ <div id="weekday-starts">
+ <div style="height: 47px;"> </div>
+ <div style="height: 61px;">06:00</div>
+ <div style="height: 61px;">07:00</div>
+ <div style="height: 61px;">08:00</div>
+ <div style="height: 61px;">09:00</div>
+ <div style="height: 61px;">10:00</div>
+ <div style="height: 61px;">11:00</div>
+ <div style="height: 61px;">12:00</div>
+ <div style="height: 61px;">13:00</div>
+ <div style="height: 61px;">14:00</div>
+ <div style="height: 61px;">15:00</div>
+ <div style="height: 61px;">16:00</div>
+ <div style="height: 61px;">17:00</div>
+ <div style="height: 61px;">18:00</div>
+ <div style="height: 61px;">19:00</div>
+ <div style="height: 61px;">20:00</div>
+ <div style="height: 61px;">21:00</div>
+ <div style="height: 61px;">22:00</div>
+ <div style="height: 61px;">23:00</div>
+ <div style="height: 61px;">00:00</div>
+ <div style="height: 61px;">01:00</div>
+ <div style="height: 61px;">02:00</div>
+ <div style="height: 61px;">03:00</div>
+ <div style="height: 61px;">04:00</div>
+ <div style="height: 61px;">05:00</div>
+ </div>
<div id="monday" class="weekday">
<h2>{{ monday|date:"l d.m.Y" }}</h2>
{% for timeslot in monday_timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
+ {% include "program/week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="tuesday" class="weekday">
<h2>{{ tuesday|date:"l d.m.Y" }}</h2>
{% for timeslot in tuesday_timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
+ {% include "program/week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="wednesday" class="weekday">
<h2>{{ wednesday|date:"l d.m.Y" }}</h2>
{% for timeslot in wednesday_timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
+ {% include "program/week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="thursday" class="weekday">
<h2>{{ thursday|date:"l d.m.Y" }}</h2>
{% for timeslot in thursday_timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
+ {% include "program/week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="friday" class="weekday">
<h2>{{ friday|date:"l d.m.Y" }}</h2>
{% for timeslot in friday_timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
+ {% include "program/week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="saturday" class="weekday">
<h2>{{ saturday|date:"l d.m.Y" }}</h2>
{% for timeslot in saturday_timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
+ {% include "program/week_schedule_timeslot.html" %}
{% endfor %}
</div>
<div id="sunday" class="weekday">
<h2>{{ sunday|date:"l d.m.Y" }}</h2>
{% for timeslot in sunday_timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- {{ default_show.name }}
- </div>
- {% endif %}
+ {% include "program/week_schedule_timeslot.html" %}
{% endfor %}
</div>
</div>
diff --git a/templates/program/week_schedule_timeslot.html b/templates/program/week_schedule_timeslot.html
new file mode 100644
index 0000000..7b0f800
--- /dev/null
+++ b/templates/program/week_schedule_timeslot.html
@@ -0,0 +1,21 @@
+{% load timeslots %}
+
+{% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
+<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_until timeslot.start %}>
+{{ default_show.name }}
+</div>
+{% endif %}
+<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+ <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
+</div>
+{% if timeslot.end != timeslot.get_next_by_start.start %}
+ {% if not forloop.last %}
+<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration timeslot.end timeslot.get_next_by_start.start %}>
+{{ default_show.name }}
+</div>
+ {% else %}
+<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_since timeslot.end %}>
+{{ default_show.name }}
+</div>
+ {% endif %}
+{% endif %}
--
cgit v0.10.2