Skip to content
Snippets Groups Projects
Commit d4dd17cc authored by Alban Gruin's avatar Alban Gruin
Browse files

Merge branch 'stable/0.10.z' into prod/pa1ch/0.10.z

parents 604fab9f 5939a5dc
Branches
Tags v0.10.5-pa1ch
No related merge requests found
......@@ -15,7 +15,7 @@ <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
{% if is_old_timetable %}
<b><a href="{% url "timetable" group.timetable.year.slug group.timetable.slug group.slug %}">Accéder à l’emploi du temps de cette semaine.</b></a><br />
{% endif %}
Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}
{% if last_update %}Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}{% endif %}
</p>
{% include "timetable_common.html" %}
<p class="subscribe"><a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> &ndash; <a href="{% url "rss" group.timetable.year.slug group.timetable.slug group.slug %}">RSS</a> &ndash; <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a></p>{% endblock %}
......@@ -9,4 +9,5 @@ <h3>{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} &ndash; de
<small>Remarques : {{ course.notes }}</small>{% endif %}
</li>{% endfor %}
</ul>
</section>{% endfor %}
</section>{% empty %}
<p>Aucun cours cette semaine.</p>{% endfor %}
......@@ -65,10 +65,11 @@ def group_list(request, year_slug, timetable_slug):
def timetable(request, year_slug, timetable_slug, group_slug, year=None, week=None):
current_year, current_week = get_current_or_next_week()
is_old_timetable = False
is_old_timetable, provided_week = False, True
if year is None or week is None:
year, week = current_year, current_week
provided_week = False
elif (int(year), int(week)) < (current_year, current_week):
is_old_timetable = True
......@@ -80,15 +81,15 @@ def timetable(request, year_slug, timetable_slug, group_slug, year=None, week=No
if group.children.count():
return group_list_common(request, timetable, Group.objects.get_relevant_children(group))
courses = Course.objects.get_courses_for_group(group, begin__gte=start, begin__lt=end) \
.annotate(Max("last_update"))
if courses.count() == 0:
courses = Course.objects.get_courses_for_group(group, begin__gte=start, begin__lt=end)
if courses.count() == 0 and provided_week:
raise Http404
last_update = courses.aggregate(Max("last_update"))["last_update__max"]
grouped_courses = group_courses(courses)
return render(request, "timetable.html", {"group": group, "courses": grouped_courses,
"last_update": courses.first().last_update__max,
"last_update": last_update,
"year": year, "week": int(week),
"is_old_timetable": is_old_timetable})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment