From 993ed8963c703da2760d5f3b75cb6222dbd21248 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Sun, 15 Jun 2025 15:56:30 +0200
Subject: [PATCH] Highlight current user in game results and score display

---
 base/static/css/main.css                      | 2 +-
 game/models.py                                | 8 +++++---
 game/templates/game/include/game_results.html | 2 +-
 game/templates/game/musikgame_detail.html     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/base/static/css/main.css b/base/static/css/main.css
index 3f13bbc..d81f86f 100644
--- a/base/static/css/main.css
+++ b/base/static/css/main.css
@@ -117,7 +117,7 @@ h6,
 i.i {
     margin-right: .5em;
 }
-i.hl {
+i.hl, .me {
     color: var(--pico-primary);
 }
 
diff --git a/game/models.py b/game/models.py
index fa84cbd..0affa8c 100644
--- a/game/models.py
+++ b/game/models.py
@@ -131,12 +131,14 @@ class MusicGameOrder(models.Model):
 
 class AnswerManager(models.Manager):
     def score(self, game, player):
-        qs = self.filter(game__game=game, game__player=player)
+        qs = self.filter(game__game=game, player=player)
         return (
-            qs.filter(answer=F("game__player"))
+            qs.exclude(game__player=player)
+            .filter(game__player=F("answer"))
             .aggregate(score=models.Sum("game__value", default=0))
             .get("score")
-            - 500 * qs.exclude(game__player=F("answer")).count()
+            - 500
+            * qs.filter(game__player=player).exclude(game__player=F("answer")).count()
         )
 
 
diff --git a/game/templates/game/include/game_results.html b/game/templates/game/include/game_results.html
index 0f03b99..ca2821c 100644
--- a/game/templates/game/include/game_results.html
+++ b/game/templates/game/include/game_results.html
@@ -21,7 +21,7 @@
                             <i class="ri-user-line"></i> Joueur
                         </th>
                         {% for player in musikgame.musicgameresults_set.all %}
-                            <th>{{ player.player.username }}</th>
+                            <th {% if user == player.player %}class="me"{% endif %}>{{ player.player.username }}</th>
                             <th class="sc">
                                 {% if forloop.first %}<i class="ri-medal-fill gold"></i>{% endif %}
                                 <span class="score">{{ player.score }}</span>
diff --git a/game/templates/game/musikgame_detail.html b/game/templates/game/musikgame_detail.html
index 0df1510..67b9921 100644
--- a/game/templates/game/musikgame_detail.html
+++ b/game/templates/game/musikgame_detail.html
@@ -40,7 +40,7 @@
     {% if musikgame.over %}
         <ol class="podium">
             {% for player in musikgame.musicgameresults_set.all %}
-                <li>
+                <li {% if user == player.player %}class="me"{% endif %}>
                     {{ player.player.username }} <span class="score">{{ player.score }}</span>
                 </li>
             {% endfor %}