From c0f19d41c8dfb6d499defcfc63c273bbc8918584 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 9 Sep 2017 19:37:12 +0200 Subject: Génération automatique d’un slug pour les modèles Year et Timetable --- admin.py | 1 + 1 file changed, 1 insertion(+) (limited to 'admin.py') diff --git a/admin.py b/admin.py index 2fc0e78..48930e0 100644 --- a/admin.py +++ b/admin.py @@ -21,6 +21,7 @@ from .models import Timetable, LastUpdate, Group, Room, Course, Year class YearAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ("name",)} list_display = ("name",) + ordering = ("name",) @admin.register(Timetable) -- cgit v1.2.1 From 445bfdcde5309645ac4d6f5c1d565530e6dbfeed Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 9 Sep 2017 21:07:09 +0200 Subject: Tri du modèle Timetable --- admin.py | 1 + 1 file changed, 1 insertion(+) (limited to 'admin.py') diff --git a/admin.py b/admin.py index 48930e0..fff2c19 100644 --- a/admin.py +++ b/admin.py @@ -29,6 +29,7 @@ class TimetableAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ("name",)} list_display = ("name", "year", "url",) list_filter = ("year__name",) + ordering = ("year", "name",) @admin.register(LastUpdate) -- cgit v1.2.1 From 5a391f46fafee98b653f9c64219ad17844f7e340 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 10 Sep 2017 11:59:32 +0200 Subject: Filtrage des cours et des groupes par l’emploi du temps et non par son nom --- admin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'admin.py') diff --git a/admin.py b/admin.py index fff2c19..16e34f3 100644 --- a/admin.py +++ b/admin.py @@ -44,7 +44,8 @@ class GroupAdmin(admin.ModelAdmin): (None, {"fields": ("name", "celcat_name", "timetable",)}), ("Groupes", {"fields": ("mention", "subgroup", "td", "tp", "parent",)}),) list_display = ("name", "timetable",) - list_filter = ("timetable__name",) + list_filter = ("timetable",) + ordering = ("timetable",) readonly_fields = ("celcat_name", "mention", "subgroup", "td", "tp",) @@ -60,5 +61,5 @@ class CourseAdmin(admin.ModelAdmin): ("Horaires", {"fields": ("begin", "end",)}), ("Remarques", {"fields": ("notes",)}),) list_display = ("name", "type", "timetable", "begin", "end",) - list_filter = ("type", "timetable__name", "groups",) + list_filter = ("type", "timetable", "groups",) ordering = ("begin",) -- cgit v1.2.1 From 77748ec01d1ef59d8436597a9b52675b309e1c4d Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 24 Sep 2017 15:50:58 +0200 Subject: Ajout du champ last_update dans le modèle des cours --- admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'admin.py') diff --git a/admin.py b/admin.py index 16e34f3..4a238be 100644 --- a/admin.py +++ b/admin.py @@ -57,7 +57,7 @@ class RoomAdmin(admin.ModelAdmin): @admin.register(Course) class CourseAdmin(admin.ModelAdmin): fieldsets = ( - (None, {"fields": ("name", "type", "timetable", "groups", "rooms",)}), + (None, {"fields": ("name", "type", "timetable", "groups", "rooms", "last_update",)}), ("Horaires", {"fields": ("begin", "end",)}), ("Remarques", {"fields": ("notes",)}),) list_display = ("name", "type", "timetable", "begin", "end",) -- cgit v1.2.1 From e30b0c673cae607175c5bae6df6e87d8b100bdf3 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 24 Sep 2017 17:16:10 +0200 Subject: Suppression du modèle LastUpdate, utilisation du champ last_update à la place. --- admin.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'admin.py') diff --git a/admin.py b/admin.py index 4a238be..8a409e3 100644 --- a/admin.py +++ b/admin.py @@ -14,7 +14,7 @@ # along with celcatsanitizer. If not, see . from django.contrib import admin -from .models import Timetable, LastUpdate, Group, Room, Course, Year +from .models import Timetable, Group, Room, Course, Year @admin.register(Year) @@ -32,12 +32,6 @@ class TimetableAdmin(admin.ModelAdmin): ordering = ("year", "name",) -@admin.register(LastUpdate) -class LastUpdateAdmin(admin.ModelAdmin): - list_display = ("timetable", "week", "year", "date", "updated_at",) - list_filter = ("timetable__name",) - - @admin.register(Group) class GroupAdmin(admin.ModelAdmin): fieldsets = ( -- cgit v1.2.1 From 5d59112a9c7badc2cc0a48d1a8e33d48e1e6e719 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 1 Oct 2017 16:54:42 +0200 Subject: Ajout d’une colonne pour cacher un groupe dans la liste des groupes. Ajout d’actions personnalisées dans l’interface d’administration pour cacher et afficher plusieurs groupes à la fois. Filtrage des groupes cachés dans get_relevant_children() et get_relevant_groups(). --- admin.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'admin.py') diff --git a/admin.py b/admin.py index 8a409e3..e17948a 100644 --- a/admin.py +++ b/admin.py @@ -16,6 +16,14 @@ from django.contrib import admin from .models import Timetable, Group, Room, Course, Year +def make_hidden(modeladmin, request, queryset): + queryset.update(hidden=True) +make_hidden.short_description = "Cacher les groupes sélectionnés" + +def make_visible(modeladmin, request, queryset): + queryset.update(hidden=False) +make_visible.short_description = "Afficher les groupes sélectionnés" + @admin.register(Year) class YearAdmin(admin.ModelAdmin): @@ -35,12 +43,14 @@ class TimetableAdmin(admin.ModelAdmin): @admin.register(Group) class GroupAdmin(admin.ModelAdmin): fieldsets = ( - (None, {"fields": ("name", "celcat_name", "timetable",)}), + (None, {"fields": ("name", "celcat_name", "timetable", "hidden",)}), ("Groupes", {"fields": ("mention", "subgroup", "td", "tp", "parent",)}),) - list_display = ("name", "timetable",) + list_display = ("name", "timetable", "hidden",) + list_editable = ("hidden",) list_filter = ("timetable",) ordering = ("timetable",) readonly_fields = ("celcat_name", "mention", "subgroup", "td", "tp",) + actions = (make_hidden, make_visible,) @admin.register(Room) -- cgit v1.2.1