games/templates/stats.html

@@ -39,14 +39,14 @@
                 </tr>
             </thead>
             <tbody>
-                {% for game in top_10_games_by_playtime %}
+                {% for purchase in top_10_by_playtime %}
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        <a href="{% url 'view_game' game.id  %}">{{ game.name }}
+                        <a href="{% url 'view_game' purchase.edition.game.id  %}">{{ purchase.edition.name }}
 
                         </a>
                     </td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.formatted_playtime }}</td>
                 </tr>
                 {% endfor %}
             </tbody>

games/views.py

@@ -247,27 +247,25 @@ def stats(request, year: int = 0):
         timestamp_start__gte=first_day_of_year
     ).filter(timestamp_start__lt=last_day_of_year)
     year_purchases = Purchase.objects.filter(session__in=year_sessions).distinct()
-
+    year_purchases_with_playtime = year_purchases.annotate(
-    games_with_playtime = (
-        Game.objects.filter(edition__purchase__session__in=year_sessions)
-        .annotate(
         total_playtime=Sum(
-                F("edition__purchase__session__duration_calculated")
+            F("session__duration_calculated") + F("session__duration_manual")
-                + F("edition__purchase__session__duration_manual")
         )
     )
-        .values("id", "name", "total_playtime")
+    top_10_by_playtime = year_purchases_with_playtime.order_by("-total_playtime")[:10]
-    )
+    for purchase in top_10_by_playtime:
-    top_10_games_by_playtime = games_with_playtime.order_by("-total_playtime")[:10]
+        purchase.formatted_playtime = format_duration(purchase.total_playtime, "%2.0H")
-    for game in top_10_games_by_playtime:
-        game["formatted_playtime"] = format_duration(game["total_playtime"], "%2.0H")
 
     total_playtime_per_platform = (
-        year_sessions.values("purchase__platform__name")
+        year_sessions.values("purchase__platform__name")  # Group by platform name
-        .annotate(total_playtime=Sum(F("duration_calculated") + F("duration_manual")))
+        .annotate(
-        .annotate(platform_name=F("purchase__platform__name"))
+            total_playtime=Sum(F("duration_calculated") + F("duration_manual"))
-        .values("platform_name", "total_playtime")
+        )  # Sum the duration_calculated for each group
-        .order_by("-total_playtime")
+        .annotate(platform_name=F("purchase__platform__name"))  # Rename the field
+        .values(
+            "platform_name", "total_playtime"
+        )  # Select the renamed field and total_playtime
+        .order_by("-total_playtime")  # Optional: Order by the renamed platform name
     )
     for item in total_playtime_per_platform:
         item["formatted_playtime"] = format_duration(item["total_playtime"], "%2.0H")
@@ -278,7 +276,8 @@ def stats(request, year: int = 0):
         ),
         "total_games": year_purchases.count(),
         "total_2023_games": year_purchases.filter(edition__year_released=year).count(),
-        "top_10_games_by_playtime": top_10_games_by_playtime,
+        "top_10_by_playtime_formatted": top_10_by_playtime,
+        "top_10_by_playtime": top_10_by_playtime,
         "year": year,
         "total_playtime_per_platform": total_playtime_per_platform,
     }