Skip to content
Snippets Groups Projects
Commit 0718eafb authored by Dylan Sechet's avatar Dylan Sechet
Browse files

Added school info

parent da7bb76b
No related branches found
No related tags found
10 merge requests!58Hamza,!52Hamza,!54Add field "en attentes" in participations options,!51Hamza,!48Hamza,!45Hamza,!40Solve public permission files on AWS,!36Notifications for Sec-Gen,!34Dev-> Master (ordering students by updated_date, school filter, export_csv for visits),!31Sorties
...@@ -8,6 +8,7 @@ from django.utils.safestring import mark_safe ...@@ -8,6 +8,7 @@ from django.utils.safestring import mark_safe
from django.http import HttpResponse from django.http import HttpResponse
import csv import csv
from .models import Participation, Place, Visit from .models import Participation, Place, Visit
from profiles.models import Student
# Register your models here. # Register your models here.
...@@ -114,8 +115,8 @@ reject_selected_participations.short_description = ( ...@@ -114,8 +115,8 @@ reject_selected_participations.short_description = (
class ParticipationAdmin(admin.ModelAdmin): class ParticipationAdmin(admin.ModelAdmin):
"""Admin panel for visit participations.""" """Admin panel for visit participations."""
list_display = ('submitted', 'visit', 'user_link', 'accepted', 'present') list_display = ('submitted', 'visit', 'user_link', 'school', 'accepted', 'present')
list_filter = ('submitted', 'accepted', 'present') list_filter = ('submitted', 'SchoolFilter', 'accepted', 'present')
actions = [accept_selected_participations, reject_selected_participations] actions = [accept_selected_participations, reject_selected_participations]
def user_link(self, participation: Participation): def user_link(self, participation: Participation):
...@@ -128,6 +129,14 @@ class ParticipationAdmin(admin.ModelAdmin): ...@@ -128,6 +129,14 @@ class ParticipationAdmin(admin.ModelAdmin):
actions = ["export_as_csv"] 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): def export_as_csv(self, request, queryset):
meta = self.model._meta meta = self.model._meta
field_names = [field.name for field in meta.fields] field_names = [field.name for field in meta.fields]
...@@ -144,6 +153,7 @@ class ParticipationAdmin(admin.ModelAdmin): ...@@ -144,6 +153,7 @@ class ParticipationAdmin(admin.ModelAdmin):
export_as_csv.short_description = "Exporter au format CSV" export_as_csv.short_description = "Exporter au format CSV"
@admin.register(Visit.organizers.through) @admin.register(Visit.organizers.through)
class VisitOrganizersAdmin(admin.ModelAdmin): class VisitOrganizersAdmin(admin.ModelAdmin):
"""Admin panel for visit organizers.""" """Admin panel for visit organizers."""
...@@ -177,7 +187,6 @@ class VisitAdmin(admin.ModelAdmin): ...@@ -177,7 +187,6 @@ class VisitAdmin(admin.ModelAdmin):
return obj.participants.count() return obj.participants.count()
num_participants.short_description = 'Participants' num_participants.short_description = 'Participants'
@admin.register(Place) @admin.register(Place)
class PlaceAdmin(admin.ModelAdmin): class PlaceAdmin(admin.ModelAdmin):
"""Admin panel for places.""" """Admin panel for places."""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment