Improve admin interface

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>

participation/admin.py

@@ -9,56 +9,127 @@ from .models import Note, Participation, Passage, Pool, Solution, Synthesis, Tea
 
 @admin.register(Team)
 class TeamAdmin(admin.ModelAdmin):
-    list_display = ('name', 'trigram', 'valid',)
+    list_display = ('name', 'trigram', 'tournament', 'valid', 'final',)
     search_fields = ('name', 'trigram',)
-    list_filter = ('participation__valid',)
+    list_filter = ('participation__valid', 'participation__tournament', 'participation__final',)
 
+    @admin.display(description=_("tournament"))
+    def tournament(self, record):
+        return record.participation.tournament
+
+    @admin.display(description=_("valid"), boolean=True)
     def valid(self, team):
         return team.participation.valid
 
-    valid.short_description = _('valid')
+    @admin.display(description=_("selected for final"), boolean=True)
+    def final(self, team):
+        return team.participation.final
 
 
 @admin.register(Participation)
 class ParticipationAdmin(admin.ModelAdmin):
-    list_display = ('team', 'valid',)
+    list_display = ('team', 'tournament', 'valid', 'final',)
     search_fields = ('team__name', 'team__trigram',)
     list_filter = ('valid',)
+    autocomplete_fields = ('team', 'tournament',)
 
 
 @admin.register(Pool)
 class PoolAdmin(admin.ModelAdmin):
+    list_display = ('__str__', 'tournament', 'round', 'letter', 'teams',)
+    list_filter = ('tournament', 'round', 'letter',)
     search_fields = ('participations__team__name', 'participations__team__trigram',)
+    autocomplete_fields = ('tournament', 'participations', 'juries',)
+
+    @admin.display(description=_("teams"))
+    def teams(self, record: Pool):
+        return ', '.join(p.team.trigram for p in record.participations.all())
 
 
 @admin.register(Passage)
 class PassageAdmin(admin.ModelAdmin):
+    list_display = ('__str__', 'defender_trigram', 'solution_number', 'opponent_trigram', 'reporter_trigram',
+                    'pool_abbr', 'tournament')
+    list_filter = ('pool__tournament', 'pool__round', 'pool__letter', 'solution_number',)
     search_fields = ('pool__participations__team__name', 'pool__participations__team__trigram',)
+    autocomplete_fields = ('pool', 'defender', 'opponent', 'reporter',)
+
+    @admin.display(description=_("defender"))
+    def defender_trigram(self, record: Passage):
+        return record.defender.team.trigram
+
+    @admin.display(description=_("opponent"))
+    def opponent_trigram(self, record: Passage):
+        return record.opponent.team.trigram
+
+    @admin.display(description=_("reporter"))
+    def reporter_trigram(self, record: Passage):
+        return record.reporter.team.trigram
+
+    @admin.display(description=_("pool"))
+    def pool_abbr(self, record):
+        return f"{record.pool.get_letter_display()}{record.pool.round}"
+
+    @admin.display(description=_("tournament"))
+    def tournament(self, record: Passage):
+        return record.pool.tournament
 
 
 @admin.register(Note)
 class NoteAdmin(admin.ModelAdmin):
-    search_fields = ('jury',)
+    list_display = ('passage', 'pool', 'jury', 'defender_writing', 'defender_oral',
+                    'opponent_writing', 'opponent_oral', 'reporter_writing', 'reporter_oral',)
+    list_filter = ('passage__pool__letter', 'passage__solution_number', 'jury',
+                   'defender_writing', 'defender_oral', 'opponent_writing', 'opponent_oral',
+                   'reporter_writing', 'reporter_oral')
+    search_fields = ('jury__user__last_name', 'jury__user__first_name', 'passage__defender__team__trigram',)
+    autocomplete_fields = ('jury', 'passage',)
+
+    @admin.display(description=_("pool"))
+    def pool(self, record):
+        return record.passage.pool.get_letter_display()
 
 
 @admin.register(Solution)
 class SolutionAdmin(admin.ModelAdmin):
-    list_display = ('participation',)
+    list_display = ('team', 'tournament', 'problem', 'final_solution',)
+    list_filter = ('problem', 'participation__tournament', 'final_solution',)
     search_fields = ('participation__team__name', 'participation__team__trigram',)
+    autocomplete_fields = ('participation',)
+
+    @admin.display(ordering='participation__team', description=_("team"))
+    def team(self, record):
+        return record.participation.team
+
+    @admin.display(ordering='participation__tournament__name', description=_("tournament"))
+    def tournament(self, record):
+        return Tournament.final_tournament() if record.final_solution else record.participation.tournament
 
 
 @admin.register(Synthesis)
 class SynthesisAdmin(admin.ModelAdmin):
-    list_display = ('participation',)
+    list_display = ('participation', 'type', 'defender', 'passage',)
+    list_filter = ('participation__tournament', 'type', 'passage__solution_number',)
     search_fields = ('participation__team__name', 'participation__team__trigram',)
+    autocomplete_fields = ('participation', 'passage',)
+
+    @admin.display(description=_("defender"))
+    def defender(self, record: Synthesis):
+        return record.passage.defender
+
+    @admin.display(description=_("problem"))
+    def problem(self, record: Synthesis):
+        return record.passage.solution_number
 
 
 @admin.register(Tournament)
 class TournamentAdmin(admin.ModelAdmin):
     list_display = ('name',)
     search_fields = ('name',)
+    autocomplete_fields = ('organizers',)
 
 
 @admin.register(Tweak)
 class TweakAdmin(admin.ModelAdmin):
     list_display = ('participation', 'pool', 'diff',)
+    autocomplete_fields = ('participation', 'pool',)

participation/migrations/0005_alter_team_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1.7 on 2023-04-03 17:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("participation", "0004_alter_pool_options_pool_letter"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="team",
+            options={
+                "ordering": ("trigram",),
+                "verbose_name": "team",
+                "verbose_name_plural": "teams",
+            },
+        ),
+    ]

participation/models.py

@@ -124,6 +124,7 @@ class Team(models.Model):
     class Meta:
         verbose_name = _("team")
         verbose_name_plural = _("teams")
+        ordering = ('trigram',)
         indexes = [
             Index(fields=("trigram", )),
         ]