From b219f1248fa84eb2b015a5a04f80905dad8904ae Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 17 Nov 2017 16:11:55 +0100 Subject: Page principale de l’emploi du temps des salles --- urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 487994e..4de8103 100644 --- a/urls.py +++ b/urls.py @@ -19,6 +19,7 @@ from . import feeds, views urlpatterns = [ url(r"^$", views.index, name="index"), url(r"^pages/", include("django.contrib.flatpages.urls")), + url(r"^salles/", views.rooms, name="rooms"), url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), -- cgit v1.2.1 From 959afb011f5e98e56f88a455228eab32579c9433 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 18 Nov 2017 13:35:37 +0100 Subject: Contenu de la page des emplois du temps --- urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 4de8103..b0ca9f4 100644 --- a/urls.py +++ b/urls.py @@ -19,7 +19,8 @@ from . import feeds, views urlpatterns = [ url(r"^$", views.index, name="index"), url(r"^pages/", include("django.contrib.flatpages.urls")), - url(r"^salles/", views.rooms, name="rooms"), + url(r"^salles/$", views.rooms, name="rooms"), + url(r"^salles/(?P[-\w]+)$", views.room_timetable), url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), -- cgit v1.2.1 From 599ca85167ad7d53f6434b105cb74c761d994ecf Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 18 Nov 2017 16:04:18 +0100 Subject: Liens et URLs pour les emplois du temps des salles --- urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index b0ca9f4..4c4abe3 100644 --- a/urls.py +++ b/urls.py @@ -20,7 +20,8 @@ urlpatterns = [ url(r"^$", views.index, name="index"), url(r"^pages/", include("django.contrib.flatpages.urls")), url(r"^salles/$", views.rooms, name="rooms"), - url(r"^salles/(?P[-\w]+)$", views.room_timetable), + url(r"^salles/(?P[-\w]+)$", views.room_timetable, name="room-timetable"), + url(r"^salles/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])/$", views.room_timetable, name="room-timetable"), url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), -- cgit v1.2.1 From b55297c4d0de64501a6baf3b1f255210de492e97 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Wed, 17 Jan 2018 12:16:09 +0100 Subject: Correction d’URLs --- urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 4c4abe3..22011c4 100644 --- a/urls.py +++ b/urls.py @@ -20,8 +20,8 @@ urlpatterns = [ url(r"^$", views.index, name="index"), url(r"^pages/", include("django.contrib.flatpages.urls")), url(r"^salles/$", views.rooms, name="rooms"), - url(r"^salles/(?P[-\w]+)$", views.room_timetable, name="room-timetable"), - url(r"^salles/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])/$", views.room_timetable, name="room-timetable"), + url(r"^salles/(?P[-\w]+)/$", views.room_timetable, name="room-timetable"), + url(r"^salles/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])$", views.room_timetable, name="room-timetable"), url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), -- cgit v1.2.1 From a2fcd4c7c42b6c02ff8ff7dac4aa23b3d17407de Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Wed, 17 Jan 2018 12:34:11 +0100 Subject: Base du formulaire de QSJPS --- urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 22011c4..f24bbba 100644 --- a/urls.py +++ b/urls.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Alban Gruin +# Copyright (C) 2017-2018 Alban Gruin # # celcatsanitizer is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published @@ -20,6 +20,7 @@ urlpatterns = [ url(r"^$", views.index, name="index"), url(r"^pages/", include("django.contrib.flatpages.urls")), url(r"^salles/$", views.rooms, name="rooms"), + url(r"^salles/qsjps$", views.qsjps, name="qsjps"), url(r"^salles/(?P[-\w]+)/$", views.room_timetable, name="room-timetable"), url(r"^salles/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])$", views.room_timetable, name="room-timetable"), url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), -- cgit v1.2.1 From ed1abe16a35d5ea5cea1106f97c6dc08bfd5265c Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 15 Apr 2018 19:30:52 +0200 Subject: urls: utilisation de la nouvelle syntaxe path de Django Mise à jour de la doc, nouvelles protections dans timetable_common() --- urls.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index f24bbba..b61bbbe 100644 --- a/urls.py +++ b/urls.py @@ -13,23 +13,23 @@ # You should have received a copy of the GNU Affero General Public License # along with celcatsanitizer. If not, see . -from django.conf.urls import include, url +from django.urls import include, path from . import feeds, views urlpatterns = [ - url(r"^$", views.index, name="index"), - url(r"^pages/", include("django.contrib.flatpages.urls")), - url(r"^salles/$", views.rooms, name="rooms"), - url(r"^salles/qsjps$", views.qsjps, name="qsjps"), - url(r"^salles/(?P[-\w]+)/$", views.room_timetable, name="room-timetable"), - url(r"^salles/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])$", views.room_timetable, name="room-timetable"), - url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendars", views.calendars, name="calendars"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar.ics$", feeds.IcalFeed(), name="ics"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar-group.ics$", feeds.IcalOnlyOneFeed(), name="ics-group"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.atom$", feeds.AtomFeed(), name="atom"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.rss$", feeds.RSSFeed(), name="rss"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])/$", views.timetable, name="timetable"), + path("", views.index, name="index"), + path("pages/", include("django.contrib.flatpages.urls")), + path("salles/", views.rooms, name="rooms"), + path("salles/qsjps", views.qsjps, name="qsjps"), + path("salles//", views.room_timetable, name="room-timetable"), + path("salles///", views.room_timetable, name="room-timetable"), + path("/", views.mention_list, name="mentions"), + path("//", views.group_list, name="groups"), + path("///", views.timetable, name="timetable"), + path("///calendars", views.calendars, name="calendars"), + path("///calendar.ics", feeds.IcalFeed(), name="ics"), + path("///calendar-group.ics", feeds.IcalOnlyOneFeed(), name="ics-group"), + path("///feed.atom", feeds.AtomFeed(), name="atom"), + path("///feed.rss", feeds.RSSFeed(), name="rss"), + path("/////", views.timetable, name="timetable"), ] -- cgit v1.2.1 From a6d14aa482e322fcd1946ea2541272477b4f8c6b Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 21 Apr 2018 15:20:01 +0200 Subject: Ajout d’une liste complète des groupes et d’une liste des semaines --- urls.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index b61bbbe..977ac8d 100644 --- a/urls.py +++ b/urls.py @@ -22,14 +22,17 @@ urlpatterns = [ path("salles/", views.rooms, name="rooms"), path("salles/qsjps", views.qsjps, name="qsjps"), path("salles//", views.room_timetable, name="room-timetable"), + path("salles//semaines", views.room_weeks, name="room-weeks"), path("salles///", views.room_timetable, name="room-timetable"), path("/", views.mention_list, name="mentions"), path("//", views.group_list, name="groups"), + path("//tous", views.groups_all, name="groups-all"), path("///", views.timetable, name="timetable"), path("///calendars", views.calendars, name="calendars"), path("///calendar.ics", feeds.IcalFeed(), name="ics"), path("///calendar-group.ics", feeds.IcalOnlyOneFeed(), name="ics-group"), path("///feed.atom", feeds.AtomFeed(), name="atom"), path("///feed.rss", feeds.RSSFeed(), name="rss"), + path("///semaines", views.group_weeks, name="group-weeks"), path("/////", views.timetable, name="timetable"), ] -- cgit v1.2.1