summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/views.py37
-rw-r--r--templates/program/today_schedule.html48
2 files changed, 17 insertions, 68 deletions
diff --git a/program/views.py b/program/views.py
index 1fa84af..10d193b 100644
--- a/program/views.py
+++ b/program/views.py
@@ -50,42 +50,39 @@ class RecommendationsView(ListView):
return Note.objects.filter(status=1, timeslot__start__range=(now, in_one_week))[:10]
-class TodayScheduleView(TodayArchiveView):
- model = TimeSlot
- allow_future = True
- date_field = 'start'
- context_object_name = 'timeslots'
- template_name = 'program/today_schedule.html'
+class TodayScheduleView(TemplateView):
+ template_name = 'program/day_schedule.html'
def get_context_data(self, **kwargs):
context = super(TodayScheduleView, self).get_context_data(**kwargs)
now = datetime.now()
- midnight = datetime.combine(date.today(), time(23, 59))
+ today = datetime.combine(date.today(), time(6, 0))
+ tomorrow = datetime.combine(date.today()+timedelta(days=1), time(6, 0))
context['broadcastformats'] = BroadcastFormat.objects.all()
- context['recommendations'] = Note.objects.filter(status=1, timeslot__start__range=(now, midnight))
+ context['recommendations'] = Note.objects.filter(status=1, timeslot__start__range=(now, tomorrow))
+ context['timeslots'] = TimeSlot.objects.filter(start__range=(today, tomorrow))
return context
-class DayScheduleView(DayArchiveView):
- model = TimeSlot
- allow_future = True
- date_field = 'start'
- month_format = '%m'
- context_object_name = 'timeslots'
+class DayScheduleView(TemplateView):
template_name = 'program/day_schedule.html'
def get_context_data(self, **kwargs):
context = super(DayScheduleView, self).get_context_data(**kwargs)
- year, month, day = map(int, [self.get_year(), self.get_month(), self.get_day()])
- this_day = datetime(year, month, day, 0, 0)
- midnight = datetime(year, month, day, 23, 59)
-
- context['broadcastformats'] = BroadcastFormat.objects.all()
- context['recommendations'] = Note.objects.filter(status=1, timeslot__start__range=(this_day, midnight))
+ year = context['params']['year']
+ month = context['params']['month']
+ day = context['params']['day']
+ # start the day at 6
+ this_day = datetime.strptime('%s__%s__%s__06__00' % (year, month, day), '%Y__%m__%d__%H__%M')
+ that_day = this_day+timedelta(days=1)
+
+ context['broadcastformats'] = BroadcastFormat.objects.all()
+ context['recommendations'] = Note.objects.filter(status=1, timeslot__start__range=(this_day, that_day))
+ context['timeslots'] = TimeSlot.objects.filter(start__range=(this_day, that_day))
return context
class CurrentShowView(TemplateView):
diff --git a/templates/program/today_schedule.html b/templates/program/today_schedule.html
deleted file mode 100644
index cb32ae8..0000000
--- a/templates/program/today_schedule.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-<div id="calendar">
-</div>
-
-<div id="recommendations">
- {% for recommendation in recommendations %}
- <div>{{ recommendation.timeslot.start|date:"H:i" }}</div>
- <div>{{ recommendation.timeslot.programslot.show.name }}</div>
- <div><a href="{% url timeslot-detail recommendation.timeslot.id %}">{{ recommendation.title }}</a></div>
- {% endfor %}
-</div>
-
-<div>
- {% for timeslot in timeslots %}
- <div>
- <span class="time">{{ timeslot.start|date:"H:i" }}</span>
- <span class="abbrev">
- {% for showinformation in timeslot.programslot.show.showinformation.all %}
- {{ showinformation.abbrev }}
- {% endfor %}
- </span>
- <span class="abbrev">
- {% for showtopic in timeslot.programslot.show.showtopic.all %}
- {{ showtopic.abbrev }}
- {% endfor %}
- </span>
- <span class="abbrev">
- {% for musicfocus in timeslot.programslot.show.musicfocus.all %}
- {{ musicfocus.abbrev }}
- {% endfor %}
- </span>
- <span class="timeslot">
- <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show }}</a>
- {% if timeslot.note %}
- <span>Heute: {{ timeslot.note.title }}</span>
- {% endif %}
- </span>
- {% endfor %}
-</div>
-
-<div>
- {% for broadcastformat in broadcastformats %}
- <div>
- {{ broadcastformat }}
- </div>
- {% endfor %}
-</div> \ No newline at end of file