CHANGELOG.md

@@ -1,15 +1,3 @@
-## Unreleased
-
-### New
-* Add Stats to the main navigation
-* Allow selecting year on the Stats page
-
-### 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

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));

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">
+                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
-                                <a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New</a>
+                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
-                                <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>
+                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_edition' %}">New 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>
+                                <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="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_session' %}">Session</a></li>
+                                <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 %}
-                                    
-                                </ul>
-                            </li>
                             {% 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>

games/templates/stats.html

@@ -6,21 +6,13 @@
 
 {% 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">
+        <h1 class="text-5xl text-center my-6">Stats for {{ year }}</h1>
-            <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">
-                    <option value="2022" {% if year == 2022 %}selected{% endif %}>2022</option>
-                    <option value="2023" {% if year == 2023 %}selected{% endif %}>2023</option>
-                </select>
-            </form>
-        </div>
         <table class="responsive-table">
             <thead>
                 <tr>
                     <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">Released that year</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Total 2023 games</th>
                 </tr>
             <tbody>
                 <tr>

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,

games/views.py

@@ -1,13 +1,12 @@
-from common.time import format_duration
-from common.time import 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 HttpResponseRedirect
-from django.shortcuts import redirect, render
-from django.urls import reverse
 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 django.db.models import Sum, F
+
 from .forms import (
     GameForm,
     PlatformForm,
@@ -29,10 +28,6 @@ def model_counts(request):
     }
 
 
-def stats_dropdown_year_range(request):
-    return {"stats_dropdown_year_range": range(2022, 2024)}
-
-
 def add_session(request):
     context = {}
     initial = {}
@@ -235,17 +230,9 @@ def list_sessions(
     return render(request, "list_sessions.html", context)
 
 
-def stats(request, year: int = 0):
+def stats(request, year: int):
-    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
     first_day_of_year = datetime(year, 1, 1)
-    last_day_of_year = datetime(year + 1, 1, 1)
+    year_sessions = Session.objects.filter(timestamp_start__gte=first_day_of_year)
-    year_sessions = Session.objects.filter(
-        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(
         total_playtime=Sum(

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",
             ],
         },
     },