From 779162797a298c6375d390bd27fdb11309612f01 Mon Sep 17 00:00:00 2001
From: Dorian Lesbre <dorian.lesbre@gmail.com>
Date: Mon, 22 Mar 2021 10:30:42 +0100
Subject: [PATCH] Code fixes + more admin filters
---
home/admin.py | 15 +++++++++++----
home/views.py | 8 ++++----
shared/views.py | 1 -
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/home/admin.py b/home/admin.py
index b34cf27..3a44c2d 100644
--- a/home/admin.py
+++ b/home/admin.py
@@ -13,7 +13,7 @@ admin.site.site_title = "Admin Interludes"
class InterludesActivityAdmin(ExportCsvMixin, admin.ModelAdmin):
"""option d'affichage des activités dans la vue django admin"""
list_display = ("title", "host_name", "display", "must_subscribe","on_planning")
- list_filter = ("display", "must_subscribe", "on_planning")
+ list_filter = ("display", "must_subscribe", "on_planning", "status")
ordering = ("title", "host_name",)
list_editable = ("display",)
fields = (
@@ -35,7 +35,11 @@ class InterludesActivityAdmin(ExportCsvMixin, admin.ModelAdmin):
class InterludesParticipantAdmin(ExportCsvMixin, admin.ModelAdmin):
"""option d'affichage des participant dans la vue django admin"""
list_display = ("user", "school", "is_registered")
- list_filter = ("school", "is_registered")
+ list_filter = (
+ "school", "is_registered", "sleeps",
+ "meal_friday_evening", "meal_saturday_morning", "meal_saturday_midday",
+ "meal_saturday_evening", "meal_sunday_morning", "meal_sunday_midday",
+ )
ordering = ("user",)
list_per_page = 200
@@ -43,7 +47,10 @@ class InterludesParticipantAdmin(ExportCsvMixin, admin.ModelAdmin):
class ActivityListAdmin(ExportCsvMixin, admin.ModelAdmin):
"""option d'affichage des choix d'activités dans la vue django admin"""
list_display = ("activity", "participant", "priority", "accepted")
- list_filter = ("activity", "participant__is_registered", "participant")
+ list_filter = (
+ "activity", "participant__is_registered", "activity__display",
+ "accepted", "activity__must_subscribe",
+ )
list_editable = ("accepted",)
ordering = ("activity", "priority", "participant",)
- list_per_page = 200
+ list_per_page = 400
diff --git a/home/views.py b/home/views.py
index b6191b4..4c2b86b 100644
--- a/home/views.py
+++ b/home/views.py
@@ -281,7 +281,7 @@ class ExportActivities(SuperuserRequiredMixin, CSVWriteView):
class ExportParticipants(SuperuserRequiredMixin, CSVWriteView):
filename = "participants_interludes"
headers = [
- "id", "mail", "prénom", "nom", "ENS", "Dors sur place", "Tasse",
+ "id", "mail", "prénom", "nom", "ENS", "Dors sur place", #"Tasse",
"Repas vendredi", "Repas S matin", "Repas S midi", "Repas S soir",
"Repas D matin", "Repas D soir"
]
@@ -296,7 +296,7 @@ class ExportParticipants(SuperuserRequiredMixin, CSVWriteView):
profile.user.last_name,
profile.school,
profile.sleeps,
- profile.mug,
+ # profile.mug,
profile.meal_friday_evening,
profile.meal_saturday_morning,
profile.meal_saturday_midday,
@@ -309,7 +309,7 @@ class ExportParticipants(SuperuserRequiredMixin, CSVWriteView):
class ExportActivityChoices(SuperuserRequiredMixin, CSVWriteView):
filename = "choix_activite_interludes"
model = ActivityList
- headers = ["id_participant", "nom_participant", "priorité", "nom_activité", "id_activité"]
+ headers = ["id_participant", "nom_participant", "priorité", "obtenu", "nom_activité", "id_activité"]
def get_rows(self):
activities = ActivityList.objects.all()
@@ -318,7 +318,7 @@ class ExportActivityChoices(SuperuserRequiredMixin, CSVWriteView):
if act.participant.is_registered:
rows.append([
act.participant.id, str(act.participant), act.priority,
- str(act.activity), act.activity.id
+ act.accepted, str(act.activity), act.activity.id
])
return rows
diff --git a/shared/views.py b/shared/views.py
index cae677c..5ff4d21 100644
--- a/shared/views.py
+++ b/shared/views.py
@@ -41,7 +41,6 @@ class CSVWriteView(View):
raise NotImplementedError("{}.get_rows isn't implemented".format(self.__class__.__name__))
def get(self, request, *args, **kwargs):
- print("\n\nHelloe\n\n\n")
response = HttpResponse(content_type='text/csv')
filename = self.filename
if not filename.endswith(".csv"):
--
GitLab