From 45ea4c8007e2103eb50910b725761998a446c3f5 Mon Sep 17 00:00:00 2001 From: Dorian Lesbre <dorian.lesbre@gmail.com> Date: Tue, 9 Mar 2021 17:02:09 +0100 Subject: [PATCH] Better activity editing --- home/admin.py | 5 +++-- home/models.py | 2 +- site_settings/models.py | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/home/admin.py b/home/admin.py index 9deaaa2..5dabe71 100644 --- a/home/admin.py +++ b/home/admin.py @@ -29,7 +29,8 @@ class InterludesParticipantAdmin(ExportCsvMixin, admin.ModelAdmin): @admin.register(ActivityList) class ActivityListAdmin(ExportCsvMixin, admin.ModelAdmin): """option d'affichage des choix d'activités dans la vue django admin""" - list_display = ("participant", "priority", "activity",) + list_display = ("activity", "participant", "priority", "accepted") list_filter = ("activity", "participant",) - ordering = ("participant", "priority",) + list_editable = ("accepted",) + ordering = ("activity", "priority", "participant",) list_per_page = 200 diff --git a/home/models.py b/home/models.py index 7cf4865..54f0593 100644 --- a/home/models.py +++ b/home/models.py @@ -81,7 +81,7 @@ class ActivityList(models.Model): activity = models.ForeignKey( InterludesActivity, on_delete=models.CASCADE, db_column="activité" ) - accepted = models.BooleanField(default=False) + accepted = models.BooleanField("Obtenue", default=False) class Meta: # couples uniques diff --git a/site_settings/models.py b/site_settings/models.py index e0a9087..399e08e 100644 --- a/site_settings/models.py +++ b/site_settings/models.py @@ -41,6 +41,8 @@ class SiteSettings(SingletonModel): display_planning = models.BooleanField("Afficher le planning", default=False) + activities_allocated = models.BooleanField("Afficher les activités obtenues", default=False) + @property def contact_email_reversed(self): return self.contact_email[::-1] -- GitLab