From e2f3ddadef63c1bda330797740836e00c10fe448 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 11 Feb 2017 11:28:36 +0100 Subject: Nettoyage des imports --- views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'views.py') diff --git a/views.py b/views.py index 273720a..08a450f 100644 --- a/views.py +++ b/views.py @@ -22,9 +22,9 @@ from django.core.mail import send_mail from django.conf import settings from django.template import Context, loader -from edt.forms import SubscribeForm -from edt.models import Timetable, LastUpdate, Group, Subscription, Course -from edt.utils import get_current_week, get_week, group_courses +from .forms import SubscribeForm +from .models import Timetable, LastUpdate, Group, Subscription, Course +from .utils import get_current_week, get_week, group_courses import datetime -- cgit v1.2.1 From 9be6d21a548a1a041fdf52791fde96cc49092682 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 12 Feb 2017 13:25:51 +0100 Subject: Affichage d'un message si il n'y a pas de cours enregitré pour un groupe Tri des emplois du temps par nom --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views.py') diff --git a/views.py b/views.py index 08a450f..c573589 100644 --- a/views.py +++ b/views.py @@ -29,7 +29,7 @@ from .utils import get_current_week, get_week, group_courses import datetime def index(request): - timetables = Timetable.objects.all() + timetables = Timetable.objects.all().order_by("name") groups = Group.objects.filter(tp__isnull=False).order_by("name") year, week = get_current_week() -- cgit v1.2.1 From 8d382e5fa2107398d8793483674d50d768cd3029 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 12 Feb 2017 13:30:55 +0100 Subject: Erreur 404 au lieu de 500 si une semaine n'est pas trouvée --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views.py') diff --git a/views.py b/views.py index c573589..651533a 100644 --- a/views.py +++ b/views.py @@ -59,8 +59,8 @@ def timetable(request, timetable_slug, group_slug, year=None, week=None): timetable = get_object_or_404(Timetable, slug=timetable_slug) group = get_object_or_404(Group, slug=group_slug, timetable=timetable) + last_update = get_object_or_404(LastUpdate, timetable=timetable, week=week, year=year) courses = Course.objects.get_courses_for_group(group, begin__gte=start, begin__lt=end) - last_update = LastUpdate.objects.get(timetable=timetable, week=week, year=year) grouped_courses = group_courses(courses) -- cgit v1.2.1