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 @@ Joueur {% for player in musikgame.musicgameresults_set.all %} -