diff --git a/home/admin.py b/home/admin.py index 9deaaa28256758c6fe9b8372f5246eb2c034dc18..5dabe710a1f7c51f0129095c33f090fe852f1cc1 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 7cf4865c16ec56ebf1a507bed3f6901187df2f27..54f0593bef47bee1c5f42ef86fb15f476cc54928 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 e0a90876ad3f3ed5f4bfaa532d919fa75632c28a..399e08eead58158fabcc8c9451cafab99a0ded45 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]