From d78139a5b3fb6b2a2d535371166e18bd633cdd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Mon, 20 Nov 2023 21:56:16 +0100
Subject: [PATCH] Display finished DLCs in stats better

---
 games/templates/stats.html     | 8 +++++++-
 games/templates/view_game.html | 1 -
 games/views.py                 | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/games/templates/stats.html b/games/templates/stats.html
index d2dd1c4..3faf56c 100644
--- a/games/templates/stats.html
+++ b/games/templates/stats.html
@@ -136,7 +136,13 @@
                     <tr>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
                             <a class="underline decoration-slate-500 sm:decoration-2"
-                               href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a>
+                               href="{% url 'edit_purchase' purchase.id %}">
+                                {% if purchase.type == 'dlc' %}
+                                    {{ purchase.name }} ({{ purchase.edition.name }} DLC)
+                                {% else %}
+                                    {{ purchase.edition.name }}
+                                {% endif %}
+                            </a>
                         </td>
                         <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
                     </tr>
diff --git a/games/templates/view_game.html b/games/templates/view_game.html
index b28cba5..c8fb77a 100644
--- a/games/templates/view_game.html
+++ b/games/templates/view_game.html
@@ -61,7 +61,6 @@
             {% url 'start_game_session' game.id as add_session_link %}
             {% include 'components/button.html' with title="Start new session" text="New" link=add_session_link %}
             and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
-            
         </h1>
         <ul>
             {% for session in sessions %}
diff --git a/games/views.py b/games/views.py
index 6593173..9f92d9b 100644
--- a/games/views.py
+++ b/games/views.py
@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
 from typing import Any, Callable
 
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Count, F, Prefetch, Sum
+from django.db.models import Count, F, Prefetch, Q, Sum
 from django.db.models.functions import TruncDate
 from django.http import (
     HttpRequest,
@@ -344,8 +344,8 @@ def stats(request, year: int = 0):
     this_year_purchases_unfinished = this_year_purchases_without_refunded.filter(
         date_finished__isnull=True
     ).filter(
-        type=Purchase.GAME
-    )  # do not count DLC etc.
+        Q(type=Purchase.GAME) | Q(type=Purchase.DLC)
+    )  # do not count battle passes etc.
 
     this_year_purchases_unfinished_percent = int(
         safe_division(