From 9e8d4c492b0178214fb1997ff46335cfd4015557 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 22 Jan 2017 12:22:14 +0100 Subject: Affichage des jours et des horaires sur la page des emplois du temps Nouveau design inspiré par https://bestmotherfucking.website/ Utilisation des templates héritées --- templates/index.html | 65 +++++++++++++++++++++++++++++++++++++----------- templates/timetable.html | 28 +++++++++------------ views.py | 9 ++++++- 3 files changed, 70 insertions(+), 32 deletions(-) diff --git a/templates/index.html b/templates/index.html index 7b43411..2305acf 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,22 +1,57 @@ -{% load dt_week %} - +{% load dt_week %} - celcatsanitizer + + {% block title %}{% endblock %}celcatsanitizer + -

celcatsanitizer

- {% for timetable in timetables %} -

{{ group.name }} – {% for week in group.weeks %}{{ week|dt_prettyprint }} {% endfor %}
{{ group.name }}

- {% endfor %} +

celcatsanitizer

{% block body %}{% for timetable in timetables %} +

{{ group.name }} – {% for week in group.weeks %}{{ week|dt_prettyprint }} {% endfor %}

{% endfor %}{% endblock %} +

+ diff --git a/templates/timetable.html b/templates/timetable.html index 23de166..f4be3a3 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -1,16 +1,12 @@ - - - - - {{ timetable.name }} – {{ group.name }} – celcatsanitizer - - -

celcatsanitizer

{{ timetable.name }} – {{ group.name }}

{{ course.name }}

- - +{% extends "index.html" %} + +{% block title %}{{ timetable.name }} – {{ group.name }} – Semaine {{ week }} – {% endblock %} + +{% block body %} +

{{ timetable.name }} – {{ group.name }} – Semaine {{ week }}

{% for day in courses %} +

{{ day.0.begin|date:"l j F o" }} – de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %}

{{ course.name }}, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}
Salle{% if course.rooms.all|length > 1 %}s{% endif %} {% for room in course.rooms.all %}{{ room }} {% endfor %}{% endif %}

{% endfor %}{% endblock %} diff --git a/views.py b/views.py index 99255c7..b971dc5 100644 --- a/views.py +++ b/views.py @@ -30,4 +30,11 @@ def timetable(request, timetable_slug, year, week, group_slug): group = get_object_or_404(Group, slug=group_slug, timetable=timetable) courses = Course.objects.get_courses_for_group(group, begin__gte=start, begin__lt=end) - return render_to_response("timetable.html", {"timetable": timetable, "group": group, "courses": courses}) + grouped_courses = [] + for i, course in enumerate(courses): + if i == 0 or courses[i - 1].begin.day != course.begin.day: + grouped_courses.append([course]) + else: + grouped_courses[-1].append(course) + + return render_to_response("timetable.html", {"timetable": timetable, "group": group, "courses": grouped_courses, "week": week}) -- cgit v1.2.1