ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 8 Pull Requests Activity

work on schedule; section.as_view()

Browse Source
This commit is contained in:
bkfox
2016-06-07 01:57:06 +02:00
parent 2365cc8b8e
commit b99dec05e3
8 changed files with 184 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/models.py
View File

@ -50,3 +50,10 @@ class Diffusion (RelatedPost):
if not self.tags and self.pk:
self.tags = self.thread.tags
@property
def info(self):
if not self.related or not self.related.initial:
return
return _('rerun of %(day)s') % {
'day': self.related.initial.start.strftime('%A %d/%m')
}

77
website/sections.py
View File

@ -14,8 +14,6 @@ class Diffusions(sections.List):
Section that print diffusions. When rendering, if there is no post yet
associated, use the programs' article.
"""
next_count = 5
prev_count = 5
order_by = '-start'
show_schedule = False
@ -32,16 +30,16 @@ class Diffusions(sections.List):
if filter_args:
qs = qs.filter(**filter_args).order_by('start')
r = []
if not self.next_count and not self.prev_count:
return qs
if self.next_count:
r += list(programs.Diffusion.get(next=True, queryset = qs)
.order_by('-start')[:self.next_count])
if self.prev_count:
r += list(programs.Diffusion.get(prev=True, queryset = qs)
.order_by('-start')[:self.prev_count])
return r
return qs
#r = []
#if self.next_count:
# r += list(programs.Diffusion.get(next=True, queryset = qs)
# .order_by('-start')[:self.next_count])
#if self.prev_count:
# r += list(programs.Diffusion.get(prev=True, queryset = qs)
# .order_by('-start')[:self.prev_count])
#return r
def get_object_list(self):
diffs = self.get_diffs()
@ -59,7 +57,7 @@ class Diffusions(sections.List):
if diff.initial:
post.info = _('rerun of %(day)s') % {
'day': diff.initial.date.strftime('%A %d/%m')
'day': diff.initial.start.strftime('%A %d/%m')
}
if self.object:
@ -121,10 +119,7 @@ class Schedule(Diffusions):
Render a list of diffusions in the form of a schedule
"""
template_name = 'aircox/website/schedule.html'
next_count = None
prev_count = None
date = None
days = 7
nav_date_format = '%a. %d'
fields = [ 'time', 'image', 'title']
@ -134,13 +129,16 @@ class Schedule(Diffusions):
@staticmethod
def get_week_dates(date):
"""
Return a list of dates of the week of the given date.
"""
first = date - tz.timedelta(days=date.weekday())
return [ first + tz.timedelta(days=i) for i in range(0, 7) ]
def date_or_default(self):
if self.date:
return self.date
elif 'year' in self.kwargs:
elif self.kwargs and 'year' in self.kwargs:
return tz.datetime(year = int(self.kwargs['year']),
month = int(self.kwargs['month']),
day = int(self.kwargs['day']),
@ -148,18 +146,21 @@ class Schedule(Diffusions):
microsecond = 0)
return tz.datetime.now()
def get_diffs(self):
def get_object_list(self):
date = self.date_or_default()
diffs = super().get_diffs(
start__year = date.year,
start__month = date.month,
start__day = date.day,
)
return diffs
qs = routes.DateRoute.get_queryset(
models.Diffusion, self.request,
year = date.year,
month = date.month,
day = date.day
).order_by('date')
return qs
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
def get_context_data(self, **kwargs):
date = self.date_or_default()
dates_url = [
dates = [
(date, models.Diffusion.route_url(
routes.DateRoute,
year = date.year, month = date.month, day = date.day
@ -167,13 +168,33 @@ class Schedule(Diffusions):
for date in self.get_week_dates(date)
]
context = super().get_context_data(**kwargs)
next_week = dates[-1][0] + tz.timedelta(days=1)
next_week = models.Diffusion.route_url(
routes.DateRoute,
year = next_week.year, month = next_week.month,
day = next_week.day
)
prev_week = dates[0][0] - tz.timedelta(days=1)
prev_week = models.Diffusion.route_url(
routes.DateRoute,
year = prev_week.year, month = prev_week.month,
day = prev_week.day
)
context.update({
'date': date,
'dates_url': dates_url,
'dates': dates,
'next_week': next_week,
'prev_week': prev_week,
})
return context
@property
def url(self):
return None
#class DatesOfDiffusion(sections.List):
# title = _('Dates of diffusion')

55
website/templates/aircox/website/schedule.html
View File

@ -6,42 +6,53 @@
function update_schedule(event) {
var target = event.currentTarget;
var url = target.getAttribute('href');
var schedule = target;
while(schedule && schedule.className.indexOf('schedule'))
schedule = schedule.parentNode;
if(!schedule)
return false;
// prevent event
event.preventDefault();
// get schedule
while(schedule) {
if (schedule.className &&
schedule.className.indexOf('section_schedule') != -1)
break;
schedule = schedule.parentNode;
}
if(!schedule)
return;
console.log(schedule.className)
// xhr
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if(xhr.readyState != 4 || xhr.status != 200 && xhr.status)
return;
var obj = document.createElement('div');
obj.innerHTML = xhr.responseText;
target.replaceChild(
obj.querySelector('.content'),
schedule.querySelector('.schedule .content')
)
target.replaceChild(
obj.querySelector('.schedule header'),
schedule.querySelector('.schedule header')
)
// target.querySelector('nav a').href = url
}
var obj = document.implementation.createHTMLDocument('result');
obj.documentElement.innerHTML = xhr.responseText;
obj = obj.documentElement;
xhr.open('GET', url + '?embed=1', true);
schedule.querySelector('header').innerHTML =
obj.querySelector('header').innerHTML;
schedule.querySelector('.content').innerHTML =
obj.querySelector('.content').innerHTML;
}
fields = [ {% for field in list.fields %}"fields={{ field }}",{% endfor %} ];
fields = fields.join('&');
xhr.open('GET', url + '?embed=1&' + fields, true);
xhr.send();
return false;
}
</script>
{% for curr, url in dates_url %}
<a href="{{ url }}" onclick="return update_schedule(event);" {% if curr == date %}
class="selected"{% endif %}>
<a href="{{ prev_week }}" onclick="update_schedule(event); return true;">&lt;</a>
{% for curr, url in dates %}
<a href="{{ url }}" {% if curr == date %}class="selected" {% endif %}
onclick="update_schedule(event); return true;">
{{ curr|date:'D. d' }}
</a>
{% endfor %}
<a href="{{ next_week }}" onclick="update_schedule(event); return true;">&gt;</a>
</header>
{% endblock %}