Version 1.2.0

Add yearly stats page
Fixes #15
2023-11-01 20:19:16 +01:00 · 2023-11-01 20:18:39 +01:00
9 changed files with 54 additions and 220 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,18 +1,3 @@
-## 1.3.0 / 2023-11-05 15:09+01:00
-
-### New
-* Add Stats to the main navigation
-* Allow selecting year on the Stats page
-
-### Improved
-* Make some pages redirect back instead to session list
-
-### Improved
-* Make navigation more compact
-
-### Fixed
-* Correctly limit sessions to a single year for stats
-
 ## 1.2.0 / 2023-11-01 20:18+01:00

 ### New
--- a/2
+++ b/2
@ -6,7 +6,7 @@ RUN npm install && \

 FROM python:3.10.9-slim-bullseye

-ENV VERSION_NUMBER 1.3.0
+ENV VERSION_NUMBER 1.2.0
 ENV PROD 1
 ENV PYTHONUNBUFFERED=1

--- a/games/static/base.css
+++ b/games/static/base.css
@ -755,10 +755,6 @@ select {
  position: absolute;
 }

-.relative {
-  position: relative;
-}
-
 .bottom-2 {
  bottom: 0.5rem;
 }
@ -795,6 +791,11 @@ select {
  margin-bottom: 1rem;
 }

+.my-5 {
+  margin-top: 1.25rem;
+  margin-bottom: 1.25rem;
+}
+
 .my-6 {
  margin-top: 1.5rem;
  margin-bottom: 1.5rem;
@ -804,10 +805,6 @@ select {
  margin-bottom: 0.25rem;
 }

-.mb-10 {
-  margin-bottom: 2.5rem;
-}
-
 .mb-4 {
  margin-bottom: 1rem;
 }
@ -832,10 +829,6 @@ select {
  display: block;
 }

-.inline-block {
-  display: inline-block;
-}
-
 .inline {
  display: inline;
 }
@ -880,10 +873,6 @@ select {
  width: 1.75rem;
 }

-.w-auto {
-  width: auto;
-}
-
 .w-full {
  width: 100%;
 }
@ -970,11 +959,6 @@ select {
  border-color: rgb(100 116 139 / var(--tw-border-opacity));
 }

-.bg-gray-200 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(229 231 235 / var(--tw-bg-opacity));
-}
-
 .bg-green-600 {
  --tw-bg-opacity: 1;
  background-color: rgb(22 163 74 / var(--tw-bg-opacity));
@ -999,11 +983,6 @@ select {
  padding-right: 0.5rem;
 }

-.px-4 {
-  padding-left: 1rem;
-  padding-right: 1rem;
-}
-
 .py-1 {
  padding-top: 0.25rem;
  padding-bottom: 0.25rem;
@ -1022,10 +1001,6 @@ select {
  padding-right: 1rem;
 }

-.pt-1 {
-  padding-top: 0.25rem;
-}
-
 .text-center {
  text-align: center;
 }
@ -1077,11 +1052,6 @@ select {
  font-style: italic;
 }

-.text-gray-700 {
-  --tw-text-opacity: 1;
-  color: rgb(55 65 81 / var(--tw-text-opacity));
-}
-
 .text-slate-300 {
  --tw-text-opacity: 1;
  color: rgb(203 213 225 / var(--tw-text-opacity));
@ -1317,11 +1287,6 @@ th label {
  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }

-.hover\:bg-gray-400:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(156 163 175 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-green-700:hover {
  --tw-bg-opacity: 1;
  background-color: rgb(21 128 61 / var(--tw-bg-opacity));
@ -1369,10 +1334,6 @@ th label {
  --tw-ring-offset-color: #ddd6fe;
 }

-.group:hover .group-hover\:block {
-  display: block;
-}
-
 :is(.dark .dark\:bg-gray-800) {
  --tw-bg-opacity: 1;
  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
--- a/games/templates/base.html
+++ b/games/templates/base.html
@ -25,37 +25,19 @@
                    <div class="w-full md:block md:w-auto">
                        <ul
                            class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
-                            <li class="relative group">
-                                <a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New</a>
-                                <ul class="absolute hidden text-gray-700 pt-1 group-hover:block  w-auto whitespace-nowrap">
-                                    {% if purchase_available %}
-                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_device' %}">Device</a></li>
-                                    {% endif %}
-                                    <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_game' %}">Game</a></li>
-                                    {% if game_available and platform_available %}
-                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_edition' %}">Edition</a></li>
-                                    {% endif %}
-                                    <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_platform' %}">Platform</a></li>
-                                    {% if edition_available %}
-                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_purchase' %}">Purchase</a></li>
-                                    {% endif %}
-                                    {% if purchase_available %}
-                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_session' %}">Session</a></li>
-                                    {% endif %}
-                                    
-                                </ul>
-                            </li>
+                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
+                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
+                            {% if game_available and platform_available %}
+                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_edition' %}">New Edition</a></li>
+                            {% endif %}
+                            {% if edition_available %}
+                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
+                            {% endif %}
+                            {% if purchase_available %}
+                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
+                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_device' %}">New Device</a></li>
+                            {% endif %}
                            {% if session_count > 0 %}
-                                    <li class="relative group">
-                                        <a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'stats_current_year' %}">Stats</a>
-                                        <ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
-                                            {% for year in stats_dropdown_year_range %}
-                                                <li>
-                                                    <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'stats_by_year' year %}">{{ year }}</a>
-                                                </li>
-                                            {% endfor %}
-                                        </ul>
-                                    </li>
                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
                            {% endif %}
                        </ul>
--- a/games/templates/stats.html
+++ b/games/templates/stats.html
@ -6,34 +6,19 @@

 {% block content %}
    <div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
-        <div class="flex justify-center items-center">
-            <form method="get" class="text-center">
-                <label class="text-5xl text-center inline-block mb-10" for="yearSelect">Stats for:</label>
-                <select name="year" id="yearSelect" onchange="this.form.submit();" class="mx-2">
-                    {% for year_item in stats_dropdown_year_range %}
-                    <option value="{{ year_item }}" {% if year == year_item %}selected{% endif %}>{{ year_item }}</option>
-                    {% endfor %}
-                </select>
-            </form>
-        </div>
+        <h1 class="text-5xl text-center my-6">Stats for {{ year }}</h1>
        <table class="responsive-table">
            <thead>
                <tr>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Hours</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Games</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Games ({{ year }})</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Purchases</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Spendings ({{ total_spent_currency }})</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">{{ total_spent_currency }}/game</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Total hours</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Total games</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Total 2023 games</th>
                </tr>
            <tbody>
                <tr>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_hours }}</td>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_games }}</td>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_2023_games }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year.count }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_spent }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ spent_per_game }}</td>
                </tr>
            </tbody>
        </table>
@ -46,14 +31,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 class="underline decoration-slate-500 sm:decoration-2" 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>
@ -69,30 +54,11 @@
            <tbody>
                {% for item in total_playtime_per_platform %}
                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.platform_name }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.platform_name }}                    </td>
                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.formatted_playtime }}</td>
                </tr>
                {% endfor %}
            </tbody>
        </table>
-        <h1 class="text-5xl text-center my-6">Purchases</h1>
-        <table class="responsive-table">
-            <thead>
-                <tr>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Price ({{ total_spent_currency }})</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for purchase in all_purchased_this_year %}
-                <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></td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
    </div>
 {% endblock content %}
--- a/games/urls.py
+++ b/games/urls.py
@ -73,7 +73,6 @@ urlpatterns = [
        {"filter": "ownership_type"},
        name="list_sessions_by_ownership_type",
    ),
-    path("stats/", views.stats, name="stats_current_year"),
    path(
        "stats/<int:year>",
        views.stats,
--- a/games/views.py
+++ b/games/views.py
@ -1,13 +1,11 @@
-from common.time import format_duration, now as now_with_tz
 from datetime import datetime, timedelta
-from django.conf import settings
-from django.db.models import Sum, F
-from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
-from django.shortcuts import redirect, render
-from django.urls import reverse
-from typing import Callable, Any
 from zoneinfo import ZoneInfo

+from common.time import now as now_with_tz
+from common.time import format_duration
+from django.conf import settings
+from django.shortcuts import redirect, render
+
 from .forms import (
    GameForm,
    PlatformForm,
@ -29,10 +27,6 @@ def model_counts(request):
    }


-def stats_dropdown_year_range(request):
-    return {"stats_dropdown_year_range": range(2018, 2024)}
-
-
 def add_session(request):
    context = {}
    initial = {}
@ -61,25 +55,6 @@ def update_session(request, session_id=None):
    return redirect("list_sessions")


-def use_custom_redirect(
-    func: Callable[..., HttpResponse]
-) -> Callable[..., HttpResponse]:
-    """
-    Will redirect to "return_path" session variable if set.
-    """
-
-    def wrapper(request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        response = func(request, *args, **kwargs)
-        if isinstance(response, HttpResponseRedirect) and (
-            next_url := request.session.get("return_path")
-        ):
-            return HttpResponseRedirect(next_url)
-        return response
-
-    return wrapper
-
-
-@use_custom_redirect
 def edit_session(request, session_id=None):
    context = {}
    session = Session.objects.get(id=session_id)
@ -92,7 +67,6 @@ def edit_session(request, session_id=None):
    return render(request, "add_session.html", context)


-@use_custom_redirect
 def edit_purchase(request, purchase_id=None):
    context = {}
    purchase = Purchase.objects.get(id=purchase_id)
@ -105,7 +79,6 @@ def edit_purchase(request, purchase_id=None):
    return render(request, "add.html", context)


-@use_custom_redirect
 def edit_game(request, game_id=None):
    context = {}
    purchase = Game.objects.get(id=game_id)
@ -140,11 +113,9 @@ def view_game(request, game_id=None):
    context["last_session"] = context["sessions"].first()
    context["first_session"] = context["sessions"].last()
    context["sessions_with_notes"] = context["sessions"].exclude(note="")
-    request.session["return_path"] = request.path
    return render(request, "view_game.html", context)


-@use_custom_redirect
 def edit_platform(request, platform_id=None):
    context = {}
    purchase = Platform.objects.get(id=platform_id)
@ -157,7 +128,6 @@ def edit_platform(request, platform_id=None):
    return render(request, "add.html", context)


-@use_custom_redirect
 def edit_edition(request, edition_id=None):
    context = {}
    edition = Edition.objects.get(id=edition_id)
@ -170,7 +140,6 @@ def edit_edition(request, edition_id=None):
    return render(request, "add.html", context)


-@use_custom_redirect
 def start_game_session(request, game_id: int):
    last_session = (
        Session.objects.filter(purchase__edition__game_id=game_id)
@ -260,50 +229,29 @@ def list_sessions(
    return render(request, "list_sessions.html", context)


-def stats(request, year: int = 0):
-    selected_year = request.GET.get("year")
-    if selected_year:
-        return HttpResponseRedirect(reverse("stats_by_year", args=[selected_year]))
-    if year == 0:
-        year = now_with_tz().year
+def stats(request, year: int):
    first_day_of_year = datetime(year, 1, 1)
-    last_day_of_year = datetime(year + 1, 1, 1)
-    year_sessions = Session.objects.filter(timestamp_start__year=year)
-    year_played_purchases = Purchase.objects.filter(
-        session__in=year_sessions
-    ).distinct()
-
-    selected_currency = "CZK"
-    all_purchased_this_year = (
-        Purchase.objects.filter(date_purchased__year=year)
-        .filter(price_currency__exact=selected_currency)
-        .filter(date_refunded__exact=None)
-        .order_by("date_purchased")
-    )
-
-    this_year_spendings = all_purchased_this_year.aggregate(total_spent=Sum(F("price")))
-    total_spent = this_year_spendings["total_spent"]
-
-    games_with_playtime = (
-        Game.objects.filter(edition__purchase__session__in=year_sessions)
-        .annotate(
-            total_playtime=Sum(
-                F("edition__purchase__session__duration_calculated")
-                + F("edition__purchase__session__duration_manual")
-            )
+    year_sessions = Session.objects.filter(timestamp_start__gte=first_day_of_year)
+    year_purchases = Purchase.objects.filter(session__in=year_sessions).distinct()
+    year_purchases_with_playtime = year_purchases.annotate(
+        total_playtime=Sum(
+            F("session__duration_calculated") + F("session__duration_manual")
        )
-        .values("id", "name", "total_playtime")
    )
-    top_10_games_by_playtime = games_with_playtime.order_by("-total_playtime")[:10]
-    for game in top_10_games_by_playtime:
-        game["formatted_playtime"] = format_duration(game["total_playtime"], "%2.0H")
+    top_10_by_playtime = year_purchases_with_playtime.order_by("-total_playtime")[:10]
+    for purchase in top_10_by_playtime:
+        purchase.formatted_playtime = format_duration(purchase.total_playtime, "%2.0H")

    total_playtime_per_platform = (
-        year_sessions.values("purchase__platform__name")
-        .annotate(total_playtime=Sum(F("duration_calculated") + F("duration_manual")))
-        .annotate(platform_name=F("purchase__platform__name"))
-        .values("platform_name", "total_playtime")
-        .order_by("-total_playtime")
+        year_sessions.values("purchase__platform__name")  # Group by platform name
+        .annotate(
+            total_playtime=Sum(F("duration_calculated") + F("duration_manual"))
+        )  # Sum the duration_calculated for each group
+        .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")
@ -312,20 +260,14 @@ def stats(request, year: int = 0):
        "total_hours": format_duration(
            year_sessions.total_duration_unformatted(), "%2.0H"
        ),
-        "total_games": year_played_purchases.count(),
-        "total_2023_games": year_played_purchases.filter(
-            edition__year_released=year
-        ).count(),
-        "top_10_games_by_playtime": top_10_games_by_playtime,
+        "total_games": year_purchases.count(),
+        "total_2023_games": year_purchases.filter(edition__year_released=year).count(),
+        "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,
-        "total_spent": total_spent,
-        "total_spent_currency": selected_currency,
-        "all_purchased_this_year": all_purchased_this_year,
-        "spent_per_game": int(total_spent / all_purchased_this_year.count()),
    }

-    request.session["return_path"] = request.path
    return render(request, "stats.html", context)


--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,6 +1,6 @@
 [tool.poetry]
 name = "timetracker"
-version = "1.3.0"
+version = "1.2.0"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"
--- a/timetracker/settings.py
+++ b/timetracker/settings.py
@ -68,7 +68,6 @@ TEMPLATES = [
                "django.contrib.auth.context_processors.auth",
                "django.contrib.messages.context_processors.messages",
                "games.views.model_counts",
-                "games.views.stats_dropdown_year_range",
            ],
        },
    },
Author	SHA1	Message	Date
Lukáš Kucharczyk	cd6ea6e903	Version 1.2.0 All checks were successful continuous-integration/drone/push Build is passing Details	2023-11-01 20:19:16 +01:00
Lukáš Kucharczyk	22018fd2ba	Add yearly stats page Fixes #15	2023-11-01 20:18:39 +01:00