Organize better

This reverts commit 6ac4209492.

.github/workflows/build-docker.yml

@@ -17,7 +17,7 @@ jobs:
           poetry install
           poetry env info
           poetry run python manage.py migrate
-          PROD=1 poetry run pytest
+          poetry run pytest
   build-and-push:
     needs: test
     runs-on: ubuntu-latest

.gitignore

@@ -1,10 +1,9 @@
 __pycache__
 .mypy_cache
 .pytest_cache
-.venv/
+.venv
 node_modules
 package-lock.json
 db.sqlite3
 /static/
-dist/
+dist/
-.DS_Store

.pre-commit-config.yaml

@@ -8,8 +8,3 @@ repos:
   hooks:
     - id: isort
       name: isort (python)
-- repo: https://github.com/Riverside-Healthcare/djLint
-  rev: v1.34.0
-  hooks:
-    - id: djlint-reformat-django
-    - id: djlint-django

CHANGELOG.md

@@ -1,22 +1,8 @@
 ## Unreleased
 
 ## Improved
-* mark refunded purchases red on game overview
+* game overview: improve how editions and purchases are displayed
-* increase session count on game overview when starting a new session
-
-## Fixed
-* Fix title not being displayed on the Recent sessions page
-
-## 1.5.2 / 2024-01-14 21:27+01:00
-
-## Improved
-* game overview:
-  * improve how editions and purchases are displayed
-  * make it possible to end session from overview
 * add purchase: only allow choosing purchases of selected edition
-* session list:
-  * starting and ending sessions is much faster/doest not reload the page
-  * listing sessions is much faster
 
 ## 1.5.1 / 2023-11-14 21:10+01:00
 

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.12.0-slim-bullseye
 
-ENV VERSION_NUMBER=1.5.2 \
+ENV VERSION_NUMBER=1.5.1 \
     PROD=1 \
     PYTHONUNBUFFERED=1 \
     PYTHONFAULTHANDLER=1 \

common/input.css

@@ -23,12 +23,6 @@
   font-style: normal;
 }
 
-a:hover {
-  text-decoration-color: #ff4400;
-  color: rgb(254, 185, 160);
-  transition: all 0.2s ease-out;
-}
-
 form label {
   @apply dark:text-slate-400;
 }

games/forms.py

@@ -83,7 +83,6 @@ class PurchaseForm(forms.ModelForm):
             "date_purchased": custom_date_widget,
             "date_refunded": custom_date_widget,
             "date_finished": custom_date_widget,
-            "date_dropped": custom_date_widget,
         }
         model = Purchase
         fields = [
@@ -92,8 +91,6 @@ class PurchaseForm(forms.ModelForm):
             "date_purchased",
             "date_refunded",
             "date_finished",
-            "date_dropped",
-            "infinite",
             "price",
             "price_currency",
             "ownership_type",

games/migrations/0033_alter_edition_unique_together.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.2.7 on 2023-11-28 13:43
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0032_alter_session_options_session_modified_at_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name="edition",
-            unique_together={("name", "platform", "year_released")},
-        ),
-    ]

games/migrations/0034_purchase_date_dropped_purchase_infinite.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.7 on 2024-01-03 21:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0033_alter_edition_unique_together"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="purchase",
-            name="date_dropped",
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="purchase",
-            name="infinite",
-            field=models.BooleanField(default=False),
-        ),
-    ]

games/models.py

@@ -34,7 +34,7 @@ class Game(models.Model):
 
 class Edition(models.Model):
     class Meta:
-        unique_together = [["name", "platform", "year_released"]]
+        unique_together = [["name", "platform"]]
 
     game = models.ForeignKey("Game", on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
@@ -116,8 +116,6 @@ class Purchase(models.Model):
     date_purchased = models.DateField()
     date_refunded = models.DateField(blank=True, null=True)
     date_finished = models.DateField(blank=True, null=True)
-    date_dropped = models.DateField(blank=True, null=True)
-    infinite = models.BooleanField(default=False)
     price = models.IntegerField(default=0)
     price_currency = models.CharField(max_length=3, default="USD")
     ownership_type = models.CharField(

games/static/base.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -32,11 +32,9 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
-7. Disable tap highlights on iOS
 */
 
-html,
+html {
-:host {
   line-height: 1.5;
   /* 1 */
   -webkit-text-size-adjust: 100%;
@@ -46,14 +44,12 @@ html,
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: IBM Plex Sans, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: IBM Plex Sans, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
   font-variation-settings: normal;
   /* 6 */
-  -webkit-tap-highlight-color: transparent;
-  /* 7 */
 }
 
 /*
@@ -125,10 +121,8 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font-family by default.
+1. Use the user's configured `mono` font family by default.
-2. Use the user's configured `mono` font-feature-settings by default.
+2. Correct the odd `em` font sizing in all browsers.
-3. Use the user's configured `mono` font-variation-settings by default.
-4. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -137,12 +131,8 @@ samp,
 pre {
   font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-feature-settings: normal;
-  /* 2 */
-  font-variation-settings: normal;
-  /* 3 */
   font-size: 1em;
-  /* 4 */
+  /* 2 */
 }
 
 /*
@@ -577,26 +567,10 @@ select {
   background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
 }
 
-@media (forced-colors: active)  {
-  [type='checkbox']:checked {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='radio']:checked {
   background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e");
 }
 
-@media (forced-colors: active)  {
-  [type='radio']:checked {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='checkbox']:checked:hover,[type='checkbox']:checked:focus,[type='radio']:checked:hover,[type='radio']:checked:focus {
   border-color: transparent;
   background-color: currentColor;
@@ -611,14 +585,6 @@ select {
   background-repeat: no-repeat;
 }
 
-@media (forced-colors: active)  {
-  [type='checkbox']:indeterminate {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='checkbox']:indeterminate:hover,[type='checkbox']:indeterminate:focus {
   border-color: transparent;
   background-color: currentColor;
@@ -890,10 +856,6 @@ select {
   display: none;
 }
 
-.h-3 {
-  height: 0.75rem;
-}
-
 .h-4 {
   height: 1rem;
 }
@@ -976,12 +938,6 @@ select {
   gap: 0.5rem;
 }
 
-.space-x-1 > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(0.25rem * var(--tw-space-x-reverse));
-  margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse)));
-}
-
 .self-center {
   align-self: center;
 }
@@ -1000,10 +956,6 @@ select {
   border-radius: 0.25rem;
 }
 
-.rounded-full {
-  border-radius: 9999px;
-}
-
 .rounded-lg {
   border-radius: 0.5rem;
 }
@@ -1134,11 +1086,6 @@ select {
   color: rgb(55 65 81 / var(--tw-text-opacity));
 }
 
-.text-red-600 {
-  --tw-text-opacity: 1;
-  color: rgb(220 38 38 / var(--tw-text-opacity));
-}
-
 .text-slate-300 {
   --tw-text-opacity: 1;
   color: rgb(203 213 225 / var(--tw-text-opacity));
@@ -1226,12 +1173,6 @@ select {
   font-style: normal;
 }
 
-a:hover {
-  text-decoration-color: #ff4400;
-  color: rgb(254, 185, 160);
-  transition: all 0.2s ease-out;
-}
-
 :is(.dark form label) {
   --tw-text-opacity: 1;
   color: rgb(148 163 184 / var(--tw-text-opacity));
@@ -1536,6 +1477,10 @@ th label {
     display: block;
   }
 
+  .md\:w-1\/2 {
+    width: 50%;
+  }
+
   .md\:w-auto {
     width: auto;
   }

games/static/js/utils.js

@@ -75,6 +75,10 @@ function syncSelectInputUntilChanged(syncData, parentSelector = document) {
  * @param {string} property - The property to retrieve the value from.
  */
 function getValueFromProperty(sourceElement, property) {
+  let source =
+    sourceElement instanceof HTMLSelectElement
+      ? sourceElement.selectedOptions[0]
+      : sourceElement;
   let source =
     sourceElement instanceof HTMLSelectElement
       ? sourceElement.selectedOptions[0]
@@ -201,7 +205,7 @@ export {
   syncSelectInputUntilChanged,
   getEl,
   conditionalElementHandler,
-  disableElementsWhenValueNotEqual,
+  disableElementsWhenFalse,
   disableElementsWhenTrue,
   getValueFromProperty,
 };

games/templates/add_session.html

@@ -16,7 +16,7 @@
                     {% endif %}
                     {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
                         <td>
-                            <div class="basic-button-container" hx-boost="false">
+                            <div class="basic-button-container">
                                 <button class="basic-button" data-target="{{ field.name }}" data-type="now">Set to now</button>
                                 <button class="basic-button"
                                         data-target="{{ field.name }}"

games/templates/base.html

@@ -1,4 +1,3 @@
-{% load django_htmx %}
 <!DOCTYPE html>
 <html lang="en">
     {% load static %}
@@ -13,26 +12,18 @@
             {% endblock title %}
         </title>
         <script src="{% static 'js/htmx.min.js' %}"></script>
-        {% django_htmx_script %}
         <link rel="stylesheet" href="{% static 'base.css' %}" />
     </head>
-    <body class="dark" hx-indicator="#indicator">
+    <body class="dark" hx-indicator="#indicator" hx-boost="true">
         <img id="indicator"
              src="{% static 'icons/loading.png' %}"
-             class="absolute right-3 top-3 animate-spin htmx-indicator"
+             class="absolute right-3 top-3 animate-spin htmx-indicator" />
-             height="24"
-             width="24"
-             alt="loading indicator" />
         <div class="dark:bg-gray-800 min-h-screen">
             <nav class="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
                 <div class="container flex flex-wrap items-center justify-between mx-auto">
                     <a href="{% url 'list_sessions_recent' %}" class="flex items-center">
                         <span class="text-4xl">
-                            <img src="{% static 'icons/schedule.png' %}"
+                            <img src="{% static 'icons/schedule.png' %}" width="48" class="mr-4" />
-                                 height="48"
-                                 width="48"
-                                 alt="Timetracker Logo"
-                                 class="mr-4" />
                         </span>
                         <span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
                     </a>

games/templates/list_sessions.html

@@ -4,21 +4,21 @@
     {{ title }}
 {% endblock title %}
 {% block content %}
-    {% if dataset_count >= 1 %}
+    {% if dataset.count >= 1 %}
-        {% url 'list_sessions_start_session_from_session' last.id as start_session_url %}
         <div class="mx-auto text-center my-4">
             <a id="last-session-start"
-                href="{{ start_session_url }}"
+               href="{% url 'start_session_same_as_last' last.id %}"
-                hx-get="{{ start_session_url }}"
+               hx-get="{% url 'start_session_same_as_last' last.id %}"
-                hx-swap="afterbegin"
+               hx-swap="afterbegin"
-                hx-target=".responsive-table tbody"
+               hx-target=".responsive-table tbody"
-                onClick="document.querySelector('#last-session-start').classList.add('invisible')"
+               hx-select=".responsive-table tbody tr:first-child"
-                class="{% if last.timestamp_end == null %}invisible{% endif %}">
+               onClick="document.querySelector('#last-session-start').classList.add('invisible')"
+               class="{% if last.timestamp_end == null %}invisible{% endif %}">
                 {% include 'components/button_start.html' with text=last.purchase title="Start session of last played game" only %}
             </a>
         </div>
     {% endif %}
-    {% if dataset_count != 0 %}
+    {% if dataset.count != 0 %}
         <table class="responsive-table">
             <thead>
                 <tr>
@@ -29,38 +29,36 @@
                 </tr>
             </thead>
             <tbody>
-                {% for session in dataset %}
+                {% for data in dataset %}
-                        {% partialdef session-row inline=True %}
+                    <tr>
-                            <tr>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char md:max-w-40char">
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char md:max-w-40char">
+                            <a class="underline decoration-slate-500 sm:decoration-2"
-                                    <a class="underline decoration-slate-500 sm:decoration-2"
+                               href="{% url 'view_game' data.purchase.edition.game.id %}">
-                                        href="{% url 'view_game' session.purchase.edition.game.id %}">
+                                {{ data.purchase.edition }}
-                                        {{ session.purchase.edition }}
+                            </a>
-                                    </a>
+                        </td>
-                                </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden sm:table-cell">
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden sm:table-cell">
+                            {{ data.timestamp_start | date:"d/m/Y H:i" }}
-                                    {{ session.timestamp_start | date:"d/m/Y H:i" }}
+                        </td>
-                                </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
+                            {% if data.unfinished %}
-                                    {% if not session.timestamp_end %}
+                                <a href="{% url 'update_session' data.id %}"
-                                    {% url 'list_sessions_end_session' session.id as end_session_url %}
+                                   hx-get="{% url 'update_session' data.id %}"
-                                        <a  href="{{ end_session_url }}"
+                                   hx-swap="outerHTML"
-                                            hx-get="{{ end_session_url }}"
+                                   hx-target=".responsive-table tbody tr:first-child"
-                                            hx-target="closest tr"
+                                   hx-select=".responsive-table tbody tr:first-child"
-                                            hx-swap="outerHTML"
+                                   hx-indicator="#indicator"
-                                            hx-indicator="#indicator"
+                                   onClick="document.querySelector('#last-session-start').classList.remove('invisible')">
-                                            onClick="document.querySelector('#last-session-start').classList.remove('invisible')">
+                                    <span class="text-yellow-300">Finish now?</span>
-                                            <span class="text-yellow-300">Finish now?</span>
+                                </a>
-                                        </a>
+                            {% elif data.duration_manual %}
-                                    {% elif session.duration_manual %}
+                                --
-                                        --
+                            {% else %}
-                                    {% else %}
+                                {{ data.timestamp_end | date:"d/m/Y H:i" }}
-                                        {{ session.timestamp_end | date:"d/m/Y H:i" }}
+                            {% endif %}
-                                    {% endif %}
+                        </td>
-                                </td>
+                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ data.duration_formatted }}</td>
-                                <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ session.duration_formatted }}</td>
+                    </tr>
-                            </tr>
-                        {% endpartialdef %}
                 {% endfor %}
             </tbody>
         </table>

games/templates/manage.html

@@ -1,36 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-<table class="table table-sm table-zebra">
-    <thead>
-        <tr class="text-left">
-            <th></th>
-            <th>Name</th>
-            <th>Year</th>
-            <th>Wikidata ID</th>
-            <th>Created At</th>
-            <th>Manage</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for game in games %}
-        <tr>
-            <th>{{ game.pk }}</th>
-            <td>{{ game.name }}</td>
-            <td>{{ game.year_released }}</td>
-            <td>{{ game.wikidata }}</td>
-            <td>{{ game.created_at }}</td>
-            <td>
-                <div class="join">
-                    <button class="btn btn-primary btn-sm join-item">
-                        Edit
-                    </button>
-                    <button class="btn btn-warning btn-sm join-item">
-                        Delete
-                    </button>
-                </div>
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
-{% endblock content %}

games/templates/stats.html

@@ -18,90 +18,74 @@
                 </select>
             </form>
         </div>
-        <h1 class="text-5xl text-center my-6">Playtime</h1>
+        <div class="flex flex-column flex-wrap justify-center">
-        <table class="responsive-table">
+            <div class="md:w-1/2">
-            <tbody>
+                <h1 class="text-5xl text-center my-6">Playtime</h1>
-                <tr>
+                <table class="responsive-table">
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Hours</td>
+                    <tbody>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_hours }}</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Hours</td>
-                <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">Sessions</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_sessions }}</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Sessions</td>
-                <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_sessions }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Days</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ unique_days }} ({{ unique_days_percent }}%)</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Days</td>
-                <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ unique_days }} ({{ unique_days_percent }}%)</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Games</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_games }}</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Games</td>
-                <tr>
+                            <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">Games ({{ year }})</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_2023_games }}</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Games ({{ year }})</td>
-                <tr>
+                            <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">Finished</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year_count }}</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished</td>
-                <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year.count }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished ({{ year }})</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year_count }}</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished ({{ year }})</td>
-                <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year.count }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Longest session</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ longest_session_time }} ({{ longest_session_game }})</td>
+                    </tbody>
-                </tr>
+                </table>
-                <tr>
+            </div>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Most sessions</td>
+            <div class="md:w-1/2">
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ highest_session_count }} ({{ highest_session_count_game }})</td>
+                <h1 class="text-5xl text-center my-6">Purchases</h1>
-                </tr>
+                <table class="responsive-table">
-                <tr>
+                    <tbody>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Highest session average</td>
+                        <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Total</td>
-                        {{ highest_session_average }} ({{ highest_session_average_game }})
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year.count }}</td>
-                    </td>
+                        </tr>
-                </tr>
+                        <tr>
-                <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Refunded</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">First play</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ first_play_name }} ({{ first_play_date }})</td>
+                                {{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)
-                </tr>
+                            </td>
-                <tr>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Last play</td>
+                        <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ last_play_name }} ({{ last_play_date }})</td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Unfinished</td>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-            </tbody>
+                                {{ purchased_unfinished.count }} ({{ unfinished_purchases_percent }}%)
-        </table>
+                            </td>
-        <h1 class="text-5xl text-center my-6">Purchases</h1>
+                        </tr>
-        <table class="responsive-table">
+                        <tr>
-            <tbody>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Backlog Decrease</td>
-                <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ backlog_decrease_count }}</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Total</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year_count }}</td>
+                        <tr>
-                </tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2">Spendings ({{ total_spent_currency }})</td>
-                <tr>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_spent }} ({{ spent_per_game }}/game)</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Refunded</td>
+                        </tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
+                    </tbody>
-                        {{ all_purchased_refunded_this_year_count }} ({{ refunded_percent }}%)
+                </table>
-                    </td>
+            </div>
-                </tr>
+        </div>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Unfinished</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ purchased_unfinished_count }} ({{ unfinished_purchases_percent }}%)
-                    </td>
-                </tr>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Backlog Decrease</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ backlog_decrease_count }}</td>
-                </tr>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Spendings ({{ total_spent_currency }})</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_spent }} ({{ spent_per_game }}/game)</td>
-                </tr>
-            </tbody>
-        </table>
         <h1 class="text-5xl text-center my-6">Top games by playtime</h1>
         <table class="responsive-table">
             <thead>
@@ -152,13 +136,7 @@
                     <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 %}">
+                               href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a>
-                                {% 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>
@@ -205,33 +183,6 @@
                 {% endfor %}
             </tbody>
         </table>
-
-        <h1 class="text-5xl text-center my-6">Unfinished 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 purchased_unfinished %}
-                    <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 }}
-                                {% if purchase.type == "dlc" %}({{ purchase.name }}, {{ purchase.get_type_display }}){% endif %}
-                            </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>
-
         <h1 class="text-5xl text-center my-6">All Purchases</h1>
         <table class="responsive-table">
             <thead>

games/templates/view_game.html

@@ -36,7 +36,7 @@
                 </li>
                 <ul>
                     {% for purchase in edition.game_purchases %}
-                        <li class="sm:pl-6 flex items-center {% if purchase.date_refunded %}text-red-600{% endif %}">
+                        <li class="sm:pl-6 flex items-center">
                             {{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}
                             {% if purchase.price != 0 %}({{ purchase.price }} {{ purchase.price_currency }}){% endif %}
                             {% url 'edit_purchase' purchase.id as edit_url %}
@@ -57,56 +57,22 @@
         </ul>
         <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center">
             Sessions
-            <span class="dark:text-slate-500" id="session-count">({{ session_count }})</span>
+            <span class="dark:text-slate-500">({{ sessions.count }})</span>
-            {% url 'view_game_start_session_from_session' latest_session_id as add_session_link %}
+            {% url 'start_game_session' game.id as add_session_link %}
-            <a
+            {% include 'components/button.html' with title="Start new session" text="New" link=add_session_link %}
-                class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm"
-                title="Start new session"
-                href="{{ add_session_link }}"
-                hx-get="{{ add_session_link }}"
-                hx-vals="js:{session_count:getSessionCount()}"
-                hx-target="#session-list"
-                hx-swap="afterbegin"
-            >New</a>
             and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
+            
         </h1>
-        <ul id="session-list">
+        <ul>
             {% for session in sessions %}
-                {% partialdef session-info inline=True %}
+                <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center">
-                    <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center space-x-1">
+                    {{ session.timestamp_start | date:"d/m/Y H:m" }}
-                        {{ session.timestamp_start | date:"d/m/Y H:m" }}
+                    ({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
-                        ({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
+                    {% url 'edit_session' session.id as edit_url %}
-                        {% url 'edit_session' session.id as edit_url %}
+                    {% include 'components/edit_button.html' with edit_url=edit_url %}
-                        {% include 'components/edit_button.html' with edit_url=edit_url %}
+                </li>
-                        {% if not session.timestamp_end %}
+                <li class="sm:pl-4 italic">{{ session.note|linebreaks }}</li>
-                        {% url 'view_game_end_session' session.id as end_session_url %}
-                        <a
-                            class="flex bg-green-600 rounded-full px-2 w-7 h-4 text-white justify-center items-center"
-                            href="{{ end_session_url }}"
-                            hx-get="{{ end_session_url }}"
-                            hx-target="closest li"
-                            hx-swap="outerHTML"
-                            hx-vals="js:{session_count:getSessionCount()}"
-                            hx-indicator="#indicator"
-                        >
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="#ffffff" class="h-3" x="0px" y="0px" viewBox="0 0 24 24">
-                            <path d="M 12 2 C 6.486 2 2 6.486 2 12 C 2 17.514 6.486 22 12 22 C 17.514 22 22 17.514 22 12 C 22 10.874 21.803984 9.7942031 21.458984 8.7832031 L 19.839844 10.402344 C 19.944844 10.918344 20 11.453 20 12 C 20 16.411 16.411 20 12 20 C 7.589 20 4 16.411 4 12 C 4 7.589 7.589 4 12 4 C 13.633 4 15.151922 4.4938906 16.419922 5.3378906 L 17.851562 3.90625 C 16.203562 2.71225 14.185 2 12 2 z M 21.292969 3.2929688 L 11 13.585938 L 7.7070312 10.292969 L 6.2929688 11.707031 L 11 16.414062 L 22.707031 4.7070312 L 21.292969 3.2929688 z"></path>
-                        </svg>
-                        </a>
-
-                        {% endif %}
-                    </li>
-                    <li class="sm:pl-4 italic">{{ session.note|linebreaks }}</li>
-                    <div class="hidden" hx-swap-oob="innerHTML:#session-count">
-                        ({{ session_count }})
-                    </div>
-                {% endpartialdef %}
             {% endfor %}
         </ul>
     </div>
-    <script>
-        function getSessionCount() {
-            return document.getElementById('session-count').textContent.match("[0-9]+");
-        }
-    </script>
 {% endblock content %}

games/urls.py

@@ -19,28 +19,19 @@ urlpatterns = [
         name="add_session_for_purchase",
     ),
     path(
-        "session/clone/from-game/<int:session_id>",
+        "update-session/by-session/<int:session_id>",
-        views.new_session_from_existing_session,
+        views.update_session,
-        {"template": "view_game.html#session-info"},
+        name="update_session",
-        name="view_game_start_session_from_session",
     ),
     path(
-        "session/clone/from-list/<int:session_id>",
+        "start-session-same-as-last/<int:last_session_id>",
-        views.new_session_from_existing_session,
+        views.start_session_same_as_last,
-        {"template": "list_sessions.html#session-row"},
+        name="start_session_same_as_last",
-        name="list_sessions_start_session_from_session",
     ),
     path(
-        "session/end/from-game/<int:session_id>",
+        "start-session/<int:game_id>",
-        views.end_session,
+        views.start_game_session,
-        {"template": "view_game.html#session-info"},
+        name="start_game_session",
-        name="view_game_end_session",
-    ),
-    path(
-        "session/end/from-list/<int:session_id>",
-        views.end_session,
-        {"template": "list_sessions.html#session-row"},
-        name="list_sessions_end_session",
     ),
     # path(
     #     "delete_session/by-id/<int:session_id>",

games/views.py

@@ -1,17 +1,8 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Any, Callable
-import re
 
-from django.db.models import (
+from django.core.exceptions import ObjectDoesNotExist
-    Avg,
+from django.db.models import Count, F, Prefetch, Sum
-    Count,
-    ExpressionWrapper,
-    F,
-    Prefetch,
-    Q,
-    Sum,
-    fields,
-)
 from django.db.models.functions import TruncDate
 from django.http import (
     HttpRequest,
@@ -22,7 +13,6 @@ from django.http import (
 from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.shortcuts import get_object_or_404
 
 from common.time import format_duration
 from common.utils import safe_division
@@ -40,11 +30,11 @@ from .models import Edition, Game, Platform, Purchase, Session
 
 def model_counts(request):
     return {
-        "game_available": Game.objects.exists(),
+        "game_available": Game.objects.count() != 0,
-        "edition_available": Edition.objects.exists(),
+        "edition_available": Edition.objects.count() != 0,
-        "platform_available": Platform.objects.exists(),
+        "platform_available": Platform.objects.count() != 0,
-        "purchase_available": Purchase.objects.exists(),
+        "purchase_available": Purchase.objects.count() != 0,
-        "session_count": Session.objects.exists(),
+        "session_count": Session.objects.count(),
     }
 
 
@@ -83,6 +73,13 @@ def add_session(request, purchase_id=None):
     return render(request, "add_session.html", context)
 
 
+def update_session(request, session_id=None):
+    session = Session.objects.get(id=session_id)
+    session.finish_now()
+    session.save()
+    return redirect("list_sessions")
+
+
 def use_custom_redirect(
     func: Callable[..., HttpResponse]
 ) -> Callable[..., HttpResponse]:
@@ -161,14 +158,11 @@ def view_game(request, game_id=None):
         .order_by("year_released")
     )
 
-    sessions = Session.objects.prefetch_related("device").filter(
+    sessions = Session.objects.filter(purchase__edition__game=game)
-        purchase__edition__game=game
-    )
     session_count = sessions.count()
 
     playrange_start = sessions.earliest().timestamp_start.strftime("%b %Y")
-    latest_session = sessions.latest()
+    playrange_end = sessions.latest().timestamp_start.strftime("%b %Y")
-    playrange_end = latest_session.timestamp_start.strftime("%b %Y")
 
     playrange = (
         playrange_start
@@ -189,7 +183,6 @@ def view_game(request, game_id=None):
         "sessions": sessions.order_by("-timestamp_start"),
         "title": f"Game Overview - {game.name}",
         "hours_sum": total_hours,
-        "latest_session_id": latest_session.pk,
     }
 
     request.session["return_path"] = request.path
@@ -233,40 +226,30 @@ def related_purchase_by_edition(request):
     return render(request, "partials/related_purchase_field.html", {"form": form})
 
 
-def clone_session_by_id(session_id: int) -> Session:
-    session = get_object_or_404(Session, id=session_id)
-    clone = session
-    clone.pk = None
-    clone.timestamp_start = timezone.now()
-    clone.timestamp_end = None
-    clone.note = ""
-    clone.save()
-    return clone
-
-
 @use_custom_redirect
-def new_session_from_existing_session(request, session_id: int, template: str = ""):
+def start_game_session(request, game_id: int):
-    session = clone_session_by_id(session_id)
+    last_session = Session.objects.filter(purchase__edition__game_id=game_id).latest()
-    if request.htmx:
+    session = SessionForm(
-        context = {
+        {
-            "session": session,
+            "purchase": last_session.purchase.id,
-            "session_count": int(request.GET.get("session_count", 0)) + 1,
+            "timestamp_start": timezone.now(),
+            "device": last_session.device,
         }
-        return render(request, template, context)
+    )
+    session.save()
     return redirect("list_sessions")
 
 
-@use_custom_redirect
+def start_session_same_as_last(request, last_session_id: int):
-def end_session(request, session_id: int, template: str = ""):
+    last_session = Session.objects.get(id=last_session_id)
-    session = get_object_or_404(Session, id=session_id)
+    session = SessionForm(
-    session.timestamp_end = timezone.now()
+        {
-    session.save()
+            "purchase": last_session.purchase.id,
-    if request.htmx:
+            "timestamp_start": timezone.now(),
-        context = {
+            "device": last_session.device,
-            "session": session,
-            "session_count": request.GET.get("session_count", 0),
         }
-        return render(request, template, context)
+    )
+    session.save()
     return redirect("list_sessions")
 
 
@@ -288,41 +271,45 @@ def list_sessions(
     context = {}
     context["title"] = "Sessions"
 
-    all_sessions = Session.objects.prefetch_related(
-        "purchase", "purchase__edition", "purchase__edition__game"
-    ).order_by("-timestamp_start")
-
     if filter == "purchase":
-        dataset = all_sessions.filter(purchase=purchase_id)
+        dataset = Session.objects.filter(purchase=purchase_id)
         context["purchase"] = Purchase.objects.get(id=purchase_id)
     elif filter == "platform":
-        dataset = all_sessions.filter(purchase__platform=platform_id)
+        dataset = Session.objects.filter(purchase__platform=platform_id)
         context["platform"] = Platform.objects.get(id=platform_id)
     elif filter == "edition":
-        dataset = all_sessions.filter(purchase__edition=edition_id)
+        dataset = Session.objects.filter(purchase__edition=edition_id)
         context["edition"] = Edition.objects.get(id=edition_id)
     elif filter == "game":
-        dataset = all_sessions.filter(purchase__edition__game=game_id)
+        dataset = Session.objects.filter(purchase__edition__game=game_id)
         context["game"] = Game.objects.get(id=game_id)
     elif filter == "ownership_type":
-        dataset = all_sessions.filter(purchase__ownership_type=ownership_type)
+        dataset = Session.objects.filter(purchase__ownership_type=ownership_type)
         context["ownership_type"] = dict(Purchase.OWNERSHIP_TYPES)[ownership_type]
     elif filter == "recent":
         current_year = timezone.now().year
         first_day_of_year = timezone.make_aware(datetime(current_year, 1, 1))
-        dataset = all_sessions.filter(timestamp_start__gte=first_day_of_year).order_by(
+        dataset = Session.objects.filter(
-            "-timestamp_start"
+            timestamp_start__gte=first_day_of_year
-        )
+        ).order_by("-timestamp_start")
         context["title"] = "This year"
     else:
-        dataset = all_sessions
+        # by default, sort from newest to oldest
+        dataset = Session.objects.order_by("-timestamp_start")
 
-    context = {
+    for session in dataset:
-        **context,
+        if session.timestamp_end == None and session.duration_manual == timedelta(
-        "dataset": dataset,
+            seconds=0
-        "dataset_count": dataset.count(),
+        ):
-        "last": Session.objects.prefetch_related("purchase__platform").latest(),
+            session.timestamp_end = timezone.now()
-    }
+            session.unfinished = True
+
+    context["total_duration"] = dataset.total_duration_formatted()
+    context["dataset"] = dataset
+    try:
+        context["last"] = Session.objects.latest()
+    except ObjectDoesNotExist:
+        context["last"] = None
 
     return render(request, "list_sessions.html", context)
 
@@ -333,28 +320,7 @@ def stats(request, year: int = 0):
         return HttpResponseRedirect(reverse("stats_by_year", args=[selected_year]))
     if year == 0:
         year = timezone.now().year
-    this_year_sessions = Session.objects.filter(
+    this_year_sessions = Session.objects.filter(timestamp_start__year=year)
-        timestamp_start__year=year
-    ).select_related("purchase__edition")
-    this_year_sessions_with_durations = this_year_sessions.annotate(
-        duration=ExpressionWrapper(
-            F("timestamp_end") - F("timestamp_start"),
-            output_field=fields.DurationField(),
-        )
-    )
-    longest_session = this_year_sessions_with_durations.order_by("-duration").first()
-    this_year_games = Game.objects.filter(
-        edition__purchase__session__in=this_year_sessions
-    ).distinct()
-    this_year_games_with_session_counts = this_year_games.annotate(
-        session_count=Count(
-            "edition__purchase__session",
-            filter=Q(edition__purchase__session__timestamp_start__year=year),
-        )
-    )
-    game_highest_session_count = this_year_games_with_session_counts.order_by(
-        "-session_count"
-    ).first()
     selected_currency = "CZK"
     unique_days = (
         this_year_sessions.annotate(date=TruncDate("timestamp_start"))
@@ -367,29 +333,23 @@ def stats(request, year: int = 0):
     ).distinct()
 
     this_year_purchases = Purchase.objects.filter(date_purchased__year=year)
-    this_year_purchases_with_currency = this_year_purchases.select_related(
+    this_year_purchases_with_currency = this_year_purchases.filter(
-        "edition"
+        price_currency__exact=selected_currency
-    ).filter(price_currency__exact=selected_currency)
+    )
     this_year_purchases_without_refunded = this_year_purchases_with_currency.filter(
         date_refunded=None
     )
     this_year_purchases_refunded = this_year_purchases_with_currency.refunded()
 
-    this_year_purchases_unfinished = (
+    this_year_purchases_unfinished = this_year_purchases_without_refunded.filter(
-        this_year_purchases_without_refunded.filter(date_finished__isnull=True)
+        date_finished__isnull=True
-        .filter(date_dropped__isnull=True)
+    ).filter(
-        .filter(infinite=False)
+        type=Purchase.GAME
-        .filter(Q(type=Purchase.GAME) | Q(type=Purchase.DLC))
+    )  # do not count DLC etc.
-    )  # do not count battle passes etc.
 
-    this_year_purchases_without_refunded_count = (
-        this_year_purchases_without_refunded.count()
-    )
-    this_year_purchases_unfinished_count = this_year_purchases_unfinished.count()
     this_year_purchases_unfinished_percent = int(
         safe_division(
-            this_year_purchases_unfinished_count,
+            this_year_purchases_unfinished.count(), this_year_purchases_refunded.count()
-            this_year_purchases_without_refunded_count,
         )
         * 100
     )
@@ -401,8 +361,10 @@ def stats(request, year: int = 0):
         )
     )
     purchased_this_year_finished_this_year = (
-        this_year_purchases_without_refunded.filter(date_finished__year=year)
+        this_year_purchases_without_refunded.intersection(
-    ).order_by("date_finished")
+            purchases_finished_this_year
+        ).order_by("date_finished")
+    )
 
     this_year_spendings = this_year_purchases_without_refunded.aggregate(
         total_spent=Sum(F("price"))
@@ -419,14 +381,6 @@ def stats(request, year: int = 0):
         )
         .values("id", "name", "total_playtime")
     )
-    highest_session_average_game = (
-        Game.objects.filter(edition__purchase__session__in=this_year_sessions)
-        .annotate(
-            session_average=Avg("edition__purchase__session__duration_calculated")
-        )
-        .order_by("-session_average")
-        .first()
-    )
     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")
@@ -447,20 +401,6 @@ def stats(request, year: int = 0):
         .count()
     )
 
-    first_play_name = "N/A"
-    first_play_date = "N/A"
-    last_play_name = "N/A"
-    last_play_date = "N/A"
-    if this_year_sessions:
-        first_session = this_year_sessions.earliest()
-        first_play_name = first_session.purchase.edition.name
-        first_play_date = first_session.timestamp_start.strftime("%x")
-        last_session = this_year_sessions.latest()
-        last_play_name = last_session.purchase.edition.name
-        last_play_date = last_session.timestamp_start.strftime("%x")
-
-    all_purchased_this_year_count = this_year_purchases_with_currency.count()
-    all_purchased_refunded_this_year_count = this_year_purchases_refunded.count()
     context = {
         "total_hours": format_duration(
             this_year_sessions.total_duration_unformatted(), "%2.0H"
@@ -476,68 +416,34 @@ def stats(request, year: int = 0):
         "total_spent_currency": selected_currency,
         "all_purchased_this_year": this_year_purchases_without_refunded,
         "spent_per_game": int(
-            safe_division(total_spent, this_year_purchases_without_refunded_count)
+            safe_division(total_spent, this_year_purchases_without_refunded.count())
         ),
-        "all_finished_this_year": purchases_finished_this_year.select_related(
+        "all_finished_this_year": purchases_finished_this_year.order_by(
-            "edition"
-        ).order_by("date_finished"),
-        "all_finished_this_year_count": purchases_finished_this_year.count(),
-        "this_year_finished_this_year": purchases_finished_this_year_released_this_year.select_related(
-            "edition"
-        ).order_by(
             "date_finished"
         ),
-        "this_year_finished_this_year_count": purchases_finished_this_year_released_this_year.count(),
+        "this_year_finished_this_year": purchases_finished_this_year_released_this_year.order_by(
-        "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year.select_related(
+            "date_finished"
-            "edition"
+        ),
-        ).order_by(
+        "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year.order_by(
             "date_finished"
         ),
         "total_sessions": this_year_sessions.count(),
         "unique_days": unique_days["dates"],
         "unique_days_percent": int(unique_days["dates"] / 365 * 100),
         "purchased_unfinished": this_year_purchases_unfinished,
-        "purchased_unfinished_count": this_year_purchases_unfinished_count,
         "unfinished_purchases_percent": this_year_purchases_unfinished_percent,
         "refunded_percent": int(
             safe_division(
-                all_purchased_refunded_this_year_count,
+                this_year_purchases_refunded.count(),
-                all_purchased_this_year_count,
+                this_year_purchases_with_currency.count(),
             )
             * 100
         ),
         "all_purchased_refunded_this_year": this_year_purchases_refunded,
-        "all_purchased_refunded_this_year_count": all_purchased_refunded_this_year_count,
         "all_purchased_this_year": this_year_purchases_with_currency.order_by(
             "date_purchased"
         ),
-        "all_purchased_this_year_count": all_purchased_this_year_count,
         "backlog_decrease_count": backlog_decrease_count,
-        "longest_session_time": format_duration(
-            longest_session.duration, "%2.0Hh %2.0mm"
-        )
-        if longest_session
-        else 0,
-        "longest_session_game": longest_session.purchase.edition.name
-        if longest_session
-        else "N/A",
-        "highest_session_count": game_highest_session_count.session_count
-        if game_highest_session_count
-        else 0,
-        "highest_session_count_game": game_highest_session_count.name
-        if game_highest_session_count
-        else "N/A",
-        "highest_session_average": format_duration(
-            highest_session_average_game.session_average, "%2.0Hh %2.0mm"
-        )
-        if highest_session_average_game
-        else 0,
-        "highest_session_average_game": highest_session_average_game,
-        "first_play_name": first_play_name,
-        "first_play_date": first_play_date,
-        "last_play_name": last_play_name,
-        "last_play_date": last_play_date,
-        "title": f"{year} Stats",
     }
 
     request.session["return_path"] = request.path

poetry.lock

@@ -143,21 +143,6 @@ tzdata = {version = "*", markers = "sys_platform == \"win32\""}
 argon2 = ["argon2-cffi (>=19.1.0)"]
 bcrypt = ["bcrypt"]
 
-[[package]]
-name = "django-debug-toolbar"
-version = "4.2.0"
-description = "A configurable set of panels that display various debug information about the current request/response."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "django_debug_toolbar-4.2.0-py3-none-any.whl", hash = "sha256:af99128c06e8e794479e65ab62cc6c7d1e74e1c19beb44dcbf9bad7a9c017327"},
-    {file = "django_debug_toolbar-4.2.0.tar.gz", hash = "sha256:bc7fdaafafcdedefcc67a4a5ad9dac96efd6e41db15bc74d402a54a2ba4854dc"},
-]
-
-[package.dependencies]
-django = ">=3.2.4"
-sqlparse = ">=0.2"
-
 [[package]]
 name = "django-extensions"
 version = "3.2.3"
@@ -172,39 +157,6 @@ files = [
 [package.dependencies]
 Django = ">=3.2"
 
-[[package]]
-name = "django-htmx"
-version = "1.17.2"
-description = "Extensions for using Django with htmx."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "django-htmx-1.17.2.tar.gz", hash = "sha256:4089f2ed38727e9846c2f4cd1daddf6b010c7be8d834cfbcffc8c5ecf445c04e"},
-    {file = "django_htmx-1.17.2-py3-none-any.whl", hash = "sha256:f4971432d2ca45dbb31d9b58add1c50ae54354afe4bf59cafd591b1711b502c0"},
-]
-
-[package.dependencies]
-asgiref = ">=3.6"
-Django = ">=3.2"
-
-[[package]]
-name = "django-template-partials"
-version = "23.4"
-description = "django-template-partials"
-optional = false
-python-versions = "*"
-files = [
-    {file = "django-template-partials-23.4.tar.gz", hash = "sha256:f762b0b7b2222462df0845f0556792640b769eb832eae218a0e7dadd4e5606cc"},
-    {file = "django_template_partials-23.4-py2.py3-none-any.whl", hash = "sha256:d83d9c2d2836be769919e9aaf394d5feb1ac86e1187083030398308070122fca"},
-]
-
-[package.dependencies]
-Django = "*"
-
-[package.extras]
-docs = ["Sphinx"]
-tests = ["coverage", "django_coverage_plugin"]
-
 [[package]]
 name = "djhtml"
 version = "1.5.2"
@@ -628,13 +580,13 @@ files = [
 
 [[package]]
 name = "platformdirs"
-version = "4.0.0"
+version = "3.11.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"},
+    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
-    {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"},
+    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
 ]
 
 [package.extras]
@@ -868,17 +820,17 @@ files = [
 
 [[package]]
 name = "setuptools"
-version = "69.0.2"
+version = "68.2.2"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-69.0.2-py3-none-any.whl", hash = "sha256:1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2"},
+    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
-    {file = "setuptools-69.0.2.tar.gz", hash = "sha256:735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6"},
+    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -982,19 +934,19 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)",
 
 [[package]]
 name = "virtualenv"
-version = "20.24.7"
+version = "20.24.6"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.24.7-py3-none-any.whl", hash = "sha256:a18b3fd0314ca59a2e9f4b556819ed07183b3e9a3702ecfe213f593d44f7b3fd"},
+    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
-    {file = "virtualenv-20.24.7.tar.gz", hash = "sha256:69050ffb42419c91f6c1284a7b24e0475d793447e35929b488bf6a0aade39353"},
+    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
 ]
 
 [package.dependencies]
 distlib = ">=0.3.7,<1"
 filelock = ">=3.12.2,<4"
-platformdirs = ">=3.9.1,<5"
+platformdirs = ">=3.9.1,<4"
 
 [package.extras]
 docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
@@ -1019,5 +971,5 @@ watchdog = ["watchdog (>=2.3)"]
 
 [metadata]
 lock-version = "2.0"
-python-versions = "^3.11"
+python-versions = "^3.12"
-content-hash = "4662e73ad621b11cbe5b517ca08aae4cbeb350bfcc855a6c067861942e232d2a"
+content-hash = "49b33333953d875c6c2a26ffd1a1a2d21f75e06fe59e6619ba2900e39d2cf1bf"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "timetracker"
-version = "1.5.2"
+version = "1.5.1"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"
@@ -8,13 +8,11 @@ readme = "README.md"
 packages = [{include = "timetracker"}]
 
 [tool.poetry.group.main.dependencies]
-python = "^3.11"
+python = "^3.12"
 django = "^4.2.0"
 gunicorn = "^20.1.0"
 uvicorn = "^0.20.0"
 graphene-django = "^3.1.5"
-django-htmx = "^1.17.2"
-django-template-partials = "^23.4"
 
 [tool.poetry.group.dev.dependencies]
 black = "^22.12.0"
@@ -27,8 +25,6 @@ djhtml = "^1.5.2"
 djlint = "^1.19.11"
 isort = "^5.11.4"
 pre-commit = "^3.5.0"
-django-debug-toolbar = "^4.2.0"
-
 
 [tool.isort]
 profile = "black"

timetracker/settings.py

@@ -38,9 +38,7 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "template_partials",
     "graphene_django",
-    "django_htmx",
 ]
 
 GRAPHENE = {"SCHEMA": "games.schema.schema"}
@@ -48,7 +46,6 @@ GRAPHENE = {"SCHEMA": "games.schema.schema"}
 if DEBUG:
     INSTALLED_APPS.append("django_extensions")
     INSTALLED_APPS.append("django.contrib.admin")
-    INSTALLED_APPS.append("debug_toolbar")
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
@@ -58,14 +55,8 @@ MIDDLEWARE = [
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django_htmx.middleware.HtmxMiddleware",
 ]
 
-if DEBUG:
-    MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware")
-    INTERNAL_IPS = ["127.0.0.1"]
-    DEBUG_TOOLBAR_CONFIG = {"ROOT_TAG_EXTRA_ATTRS": "hx-preserve"}
-
 ROOT_URLCONF = "timetracker.urls"
 
 TEMPLATES = [
@@ -82,7 +73,6 @@ TEMPLATES = [
                 "games.views.model_counts",
                 "games.views.stats_dropdown_year_range",
             ],
-            "builtins": ["template_partials.templatetags.partials"],
         },
     },
 ]

timetracker/urls.py

@@ -28,4 +28,3 @@ urlpatterns = [
 
 if settings.DEBUG:
     urlpatterns.append(path("admin/", admin.site.urls))
-    urlpatterns.append(path("__debug__/", include("debug_toolbar.urls")))