From 4710dbe7ceadf251bc654902e40a71d29db56bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Mogu=C3=A9rou?= <valentin@mp2i-vms.fr>
Date: Fri, 3 May 2024 16:55:52 +0200
Subject: [PATCH] admin fix

---
 colloscope/admin.py  | 18 +++++++++++++++---
 colloscope/models.py |  6 ++++--
 templates/base.html  |  4 ++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/colloscope/admin.py b/colloscope/admin.py
index 4be14bd..3ccaace 100644
--- a/colloscope/admin.py
+++ b/colloscope/admin.py
@@ -12,24 +12,36 @@ admin.site.register(Term)
 admin.site.register(Subject)
 admin.site.register(GroupType)
 admin.site.register(Group)
-admin.site.register(Student)
+
+
+@admin.register(Student)
+class StudentAdmin(admin.ModelAdmin):
+    list_display = ("cls", "first_name", "last_name")
+    list_filter = ("cls",)
+
+
 admin.site.register(Member)
 admin.site.register(Colleur)
 
 
+class ColleInline(admin.StackedInline):
+    model = Colle
+    raw_id_fields = ("slot",)
+
+
 @admin.register(Slot)
 class SlotAdmin(admin.ModelAdmin):
     list_display = ('subject', 'colleur', "term", 'view_day', "time", "duration")
     list_filter = ("subject", "colleur", "term")
+    inlines = [ColleInline]
 
     def view_day(self, obj):
         jours = ["dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi"]
-        return jours[obj.jour]
+        return jours[obj.day]
 
     view_day.short_description = 'Day'
 
 
-admin.site.register(Colle)
 admin.site.register(Swap)
 admin.site.register(Profile)
 admin.site.register(CalendarLink)
diff --git a/colloscope/models.py b/colloscope/models.py
index 00d9f31..fb93ddc 100644
--- a/colloscope/models.py
+++ b/colloscope/models.py
@@ -1,6 +1,5 @@
 from datetime import date, datetime, timedelta
 
-from asgiref.sync import async_to_sync
 from pytz import timezone
 
 import aiohttp
@@ -118,7 +117,7 @@ class Class(models.Model):
                 .first())
 
     def __str__(self):
-        return f"{self.description} ({self.lycee.description})"
+        return f"{self.description} ({self.school.description})"
 
 
 class Term(models.Model):
@@ -244,6 +243,9 @@ class Student(models.Model):
         """
         return self.group_of_type(term, "colle")
 
+    def swap_score(self, term):
+        colles = term.query_colles_of_student(self)
+
     def __str__(self):
         return f"{self.first_name} {self.last_name}"
 
diff --git a/templates/base.html b/templates/base.html
index 09e80fa..cb737e2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -13,9 +13,9 @@
             {% if request.user.is_authenticated %}
             <div class="bandeau">
                 Vous êtes connecté avec le compte <b>{{ user.username }}</b>.
-                {% if request.session.profil == "student" %}
+                {% if request.session.profile == "student" %}
                     Profil actuel : étudiant.
-                {% elif request.session.profil == "colleur" %}
+                {% elif request.session.profile == "colleur" %}
                     Profil actuel : colleur.
                 {% else %}
                     Pas de profil.