From 0718eafb2b5239ffd1087092288387ee69b59a5f Mon Sep 17 00:00:00 2001
From: Dylan Sechet <dylan.sechet82@gmail.com>
Date: Mon, 7 Dec 2020 13:32:33 +0100
Subject: [PATCH] Added school info
---
visits/admin.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/visits/admin.py b/visits/admin.py
index 0f1462e..81dc40f 100644
--- a/visits/admin.py
+++ b/visits/admin.py
@@ -8,6 +8,7 @@ from django.utils.safestring import mark_safe
from django.http import HttpResponse
import csv
from .models import Participation, Place, Visit
+from profiles.models import Student
# Register your models here.
@@ -114,8 +115,8 @@ reject_selected_participations.short_description = (
class ParticipationAdmin(admin.ModelAdmin):
"""Admin panel for visit participations."""
- list_display = ('submitted', 'visit', 'user_link', 'accepted', 'present')
- list_filter = ('submitted', 'accepted', 'present')
+ list_display = ('submitted', 'visit', 'user_link', 'school', 'accepted', 'present')
+ list_filter = ('submitted', 'SchoolFilter', 'accepted', 'present')
actions = [accept_selected_participations, reject_selected_participations]
def user_link(self, participation: Participation):
@@ -128,6 +129,14 @@ class ParticipationAdmin(admin.ModelAdmin):
actions = ["export_as_csv"]
+
+ def school(self, participation: Participation):
+ """Return a link to the participation's user's school."""
+ school = Student.objects.get(user = participation.user).school
+ return school
+ school.short_description = "Établissement"
+
+
def export_as_csv(self, request, queryset):
meta = self.model._meta
field_names = [field.name for field in meta.fields]
@@ -144,6 +153,7 @@ class ParticipationAdmin(admin.ModelAdmin):
export_as_csv.short_description = "Exporter au format CSV"
+
@admin.register(Visit.organizers.through)
class VisitOrganizersAdmin(admin.ModelAdmin):
"""Admin panel for visit organizers."""
@@ -177,7 +187,6 @@ class VisitAdmin(admin.ModelAdmin):
return obj.participants.count()
num_participants.short_description = 'Participants'
-
@admin.register(Place)
class PlaceAdmin(admin.ModelAdmin):
"""Admin panel for places."""
--
GitLab