Version 1.4.0

.dockerignore

@@ -5,13 +5,4 @@
 .venv
 .vscode
 node_modules
-static
-.drone.yml
-.editorconfig
-.gitignore
-Caddyfile
-CHANGELOG.md
-db.sqlite3
-docker-compose*
-Dockerfile
-Makefile
+src/timetracker/static/*

.drone.yml

@@ -5,12 +5,11 @@ name: default
 
 steps:
 - name: test
-  image: python:3.12
+  image: python:3.10
   commands:
     - python -m pip install poetry
     - poetry install
     - poetry env info
-    - poetry run python manage.py migrate
     - poetry run pytest
 
 - name: build-prod

.github/workflows/build-docker.yml

@@ -1,36 +0,0 @@
-name: Django CI/CD
-
-on:
-  push:
-    paths-ignore: [ 'README.md' ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.12
-      - run: |
-          python -m pip install poetry
-          poetry install
-          poetry env info
-          poetry run python manage.py migrate
-          poetry run pytest
-  build-and-push:
-    needs: test
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - uses: actions/checkout@v4
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: |
-            registry.kucharczyk.xyz/timetracker:latest
-            registry.kucharczyk.xyz/timetracker:${{ env.VERSION_NUMBER }}          
-    env:
-      VERSION_NUMBER: 1.5.1

.pre-commit-config.yaml

@@ -1,10 +0,0 @@
-repos:
--   repo: https://github.com/psf/black
-    rev: 22.12.0
-    hooks:
-    -   id: black
-- repo: https://github.com/pycqa/isort
-  rev: 5.12.0
-  hooks:
-    - id: isort
-      name: isort (python)

CHANGELOG.md

@@ -1,28 +1,3 @@
-## Unreleased
-
-## Improved
-* game overview: improve how editions and purchases are displayed
-* add purchase: only allow choosing purchases of selected edition
-
-## 1.5.1 / 2023-11-14 21:10+01:00
-
-## Improved
-* Disallow choosing non-game purchase as related purchase
-* Improve display of purchases
-
-## 1.5.0 / 2023-11-14 19:27+01:00
-
-## New
-* Add stat for finished this year's games
-* Add purchase types:
-  * Game (previously all of them were this type)
-  * DLC
-  * Season Pass
-  * Battle Pass
-
-## Fixed
-* Order purchases by date on game view
-
 ## 1.4.0 / 2023-11-09 21:01+01:00
 
 ### New

Dockerfile

@@ -1,45 +1,27 @@
-FROM python:3.12.0-slim-bullseye
+FROM node as css
+WORKDIR /app
+COPY . /app
+RUN npm install && \
+    npx tailwindcss -i ./common/input.css -o ./static/base.css --minify
 
-ENV VERSION_NUMBER=1.5.1 \
-    PROD=1 \
-    PYTHONUNBUFFERED=1 \
-    PYTHONFAULTHANDLER=1 \
-    PYTHONHASHSEED=random \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PIP_NO_CACHE_DIR=1 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    PIP_DEFAULT_TIMEOUT=100 \
-    PIP_ROOT_USER_ACTION=ignore \
-    POETRY_NO_INTERACTION=1 \
-    POETRY_VIRTUALENVS_CREATE=false \
-    POETRY_CACHE_DIR='/var/cache/pypoetry' \
-    POETRY_HOME='/usr/local'
+FROM python:3.10.9-slim-bullseye
 
-RUN apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-    bash \
-    curl \
-  && curl -sSL 'https://install.python-poetry.org' | python - \
-  && poetry --version \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && apt-get clean -y && rm -rf /var/lib/apt/lists/*
+ENV VERSION_NUMBER 1.4.0
+ENV PROD 1
+ENV PYTHONUNBUFFERED=1
 
-RUN useradd -m --uid 1000 timetracker \
-    && mkdir -p '/var/www/django/static' \
-    && chown timetracker:timetracker '/var/www/django/static'
+RUN useradd -m --uid 1000 timetracker
 WORKDIR /home/timetracker/app
 COPY . /home/timetracker/app/
 RUN chown -R timetracker:timetracker /home/timetracker/app
+COPY --from=css ./app/static/base.css /home/timetracker/app/static/base.css
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
-RUN --mount=type=cache,target="$POETRY_CACHE_DIR" \
-    echo "$PROD" \
-    && poetry version \
-    && poetry run pip install -U pip \
-    && poetry install --only main --no-interaction --no-ansi --sync
-
 USER timetracker
+ENV PATH="$PATH:/home/timetracker/.local/bin"
+RUN pip install --no-cache-dir poetry
+RUN poetry install
 
 EXPOSE 8000
 CMD [ "/entrypoint.sh" ]

common/input.css

@@ -66,16 +66,6 @@ textarea {
   @apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
 }
 
-form input:disabled,
-select:disabled,
-textarea:disabled {
-  @apply dark:bg-slate-700 dark:text-slate-400;
-}
-
-.errorlist {
-  @apply mt-4 mb-1 pl-3 py-2 bg-red-600 text-slate-200 w-[300px];
-}
-
 @media screen and (min-width: 768px) {
   form input,
   select,

common/time.py

@@ -1,5 +1,12 @@
 import re
-from datetime import timedelta
+from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
+
+from django.conf import settings
+
+
+def now() -> datetime:
+    return datetime.now(ZoneInfo(settings.TIME_ZONE))
 
 
 def _safe_timedelta(duration: timedelta | int | None):
@@ -37,7 +44,7 @@ def format_duration(
     # timestamps where end is before start
     if seconds_total < 0:
         seconds_total = 0
-    days = hours = hours_float = minutes = seconds = 0
+    days = hours = minutes = seconds = 0
     remainder = seconds = seconds_total
     if "%d" in format_string:
         days, remainder = divmod(seconds_total, day_seconds)
@@ -48,7 +55,7 @@ def format_duration(
         minutes, seconds = divmod(remainder, minute_seconds)
     literals = {
         "d": str(days),
-        "H": str(hours) if "m" not in format_string else str(hours_float),
+        "H": str(hours),
         "m": str(minutes),
         "s": str(seconds),
         "r": str(seconds_total),

docker-compose.yml

@@ -10,14 +10,13 @@ services:
       - CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
     user: "1000"
     volumes:
-      - "static-files:/var/www/django/static"
-      - "$PWD/db.sqlite3:/home/timetracker/app/db.sqlite3"
+      - "static-files:/home/timetracker/app/static"
     restart: unless-stopped
 
   frontend:
     image: caddy
     volumes:
-      - "static-files:/usr/share/caddy:ro"
+      - "static-files:/usr/share/caddy"
       - "$PWD/Caddyfile:/etc/caddy/Caddyfile"
     ports:
       - "8000:8000"
@@ -27,4 +26,3 @@ services:
 volumes:
   static-files:
     
-    

games/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from games.models import Device, Edition, Game, Platform, Purchase, Session
+from games.models import Game, Platform, Purchase, Session, Edition, Device
 
 # Register your models here.
 admin.site.register(Game)

games/forms.py

@@ -1,7 +1,6 @@
 from django import forms
-from django.urls import reverse
 
-from games.models import Device, Edition, Game, Platform, Purchase, Session
+from games.models import Game, Platform, Purchase, Session, Edition, Device
 
 custom_date_widget = forms.DateInput(attrs={"type": "date"})
 custom_datetime_widget = forms.DateTimeInput(
@@ -51,32 +50,11 @@ class IncludePlatformSelect(forms.Select):
 
 
 class PurchaseForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Automatically update related_purchase <select/>
-        # to only include purchases of the selected edition.
-        related_purchase_by_edition_url = reverse("related_purchase_by_edition")
-        self.fields["edition"].widget.attrs.update(
-            {
-                "hx-trigger": "load, click",
-                "hx-get": related_purchase_by_edition_url,
-                "hx-target": "#id_related_purchase",
-                "hx-swap": "outerHTML",
-            }
-        )
-
     edition = EditionChoiceField(
         queryset=Edition.objects.order_by("sort_name"),
         widget=IncludePlatformSelect(attrs={"autoselect": "autoselect"}),
     )
     platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
-    related_purchase = forms.ModelChoiceField(
-        queryset=Purchase.objects.filter(type=Purchase.GAME).order_by(
-            "edition__sort_name"
-        ),
-        required=False,
-    )
 
     class Meta:
         widgets = {
@@ -94,32 +72,8 @@ class PurchaseForm(forms.ModelForm):
             "price",
             "price_currency",
             "ownership_type",
-            "type",
-            "related_purchase",
-            "name",
         ]
 
-    def clean(self):
-        cleaned_data = super().clean()
-        purchase_type = cleaned_data.get("type")
-        related_purchase = cleaned_data.get("related_purchase")
-        name = cleaned_data.get("name")
-
-        # Set the type on the instance to use get_type_display()
-        # This is safe because we're not saving the instance.
-        self.instance.type = purchase_type
-
-        if purchase_type != Purchase.GAME:
-            type_display = self.instance.get_type_display()
-            if not related_purchase:
-                self.add_error(
-                    "related_purchase",
-                    f"{type_display} must have a related purchase.",
-                )
-            if not name:
-                self.add_error("name", f"{type_display} must have a name.")
-        return cleaned_data
-
 
 class IncludeNameSelect(forms.Select):
     def create_option(self, name, value, *args, **kwargs):

games/migrations/0007_alter_purchase_game_alter_purchase_platform_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-01-19 18:30
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

games/migrations/0008_edition.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-02-18 16:29
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

games/migrations/0010_alter_purchase_game.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-02-18 19:06
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

games/migrations/0014_device_session_device.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-02-18 19:59
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

games/migrations/0016_alter_edition_platform_alter_edition_year_released_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-06 11:10
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

games/migrations/0016_alter_edition_platform_alter_edition_year_released_and_more_squashed_0022_rename_year_game_year_released.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-06 18:14
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 def rename_duplicates(apps, schema_editor):

games/migrations/0017_alter_device_type_alter_purchase_platform.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.5 on 2023-11-06 16:53
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

games/migrations/0026_purchase_type.py

@@ -1,27 +0,0 @@
-# Generated by Django 4.1.5 on 2023-11-14 08:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0025_game_sort_name"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="purchase",
-            name="type",
-            field=models.CharField(
-                choices=[
-                    ("game", "Game"),
-                    ("dlc", "DLC"),
-                    ("season_pass", "Season Pass"),
-                    ("battle_pass", "Battle Pass"),
-                ],
-                default="game",
-                max_length=255,
-            ),
-        ),
-    ]

games/migrations/0027_purchase_related_purchase.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.1.5 on 2023-11-14 08:41
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0026_purchase_type"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="purchase",
-            name="related_purchase",
-            field=models.ForeignKey(
-                blank=True,
-                default=None,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                to="games.purchase",
-            ),
-        ),
-    ]

games/migrations/0028_purchase_name.py

@@ -1,26 +0,0 @@
-# Generated by Django 4.1.5 on 2023-11-14 11:05
-
-from django.db import migrations, models
-
-from games.models import Purchase
-
-
-def null_game_name(apps, schema_editor):
-    Purchase.objects.filter(type=Purchase.GAME).update(name=None)
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("games", "0027_purchase_related_purchase"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="purchase",
-            name="name",
-            field=models.CharField(
-                blank=True, default="Unknown Name", max_length=255, null=True
-            ),
-        ),
-        migrations.RunPython(null_game_name),
-    ]

games/migrations/0029_alter_purchase_related_purchase.py

@@ -1,26 +0,0 @@
-# Generated by Django 4.1.5 on 2023-11-14 21:19
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0028_purchase_name"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="purchase",
-            name="related_purchase",
-            field=models.ForeignKey(
-                blank=True,
-                default=None,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="related_purchases",
-                to="games.purchase",
-            ),
-        ),
-    ]

games/migrations/0030_alter_purchase_name.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-11-15 12:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0029_alter_purchase_related_purchase"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="purchase",
-            name="name",
-            field=models.CharField(blank=True, default="", max_length=255, null=True),
-        ),
-    ]

games/migrations/0031_device_created_at_edition_created_at_game_created_at_and_more.py

@@ -1,44 +0,0 @@
-# Generated by Django 4.1.5 on 2023-11-15 13:51
-
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0030_alter_purchase_name"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="device",
-            name="created_at",
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name="edition",
-            name="created_at",
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name="game",
-            name="created_at",
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name="platform",
-            name="created_at",
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name="purchase",
-            name="created_at",
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-        migrations.AddField(
-            model_name="session",
-            name="created_at",
-            field=models.DateTimeField(default=django.utils.timezone.now),
-        ),
-    ]

games/migrations/0032_alter_session_options_session_modified_at_and_more.py

@@ -1,52 +0,0 @@
-# Generated by Django 4.1.5 on 2023-11-15 18:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("games", "0031_device_created_at_edition_created_at_game_created_at_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="session",
-            options={"get_latest_by": "timestamp_start"},
-        ),
-        migrations.AddField(
-            model_name="session",
-            name="modified_at",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AlterField(
-            model_name="device",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-        migrations.AlterField(
-            model_name="edition",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-        migrations.AlterField(
-            model_name="game",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-        migrations.AlterField(
-            model_name="platform",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-        migrations.AlterField(
-            model_name="purchase",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-        migrations.AlterField(
-            model_name="session",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-    ]

games/models.py

@@ -1,11 +1,11 @@
-from datetime import timedelta
-
-from django.core.exceptions import ValidationError
-from django.db import models
-from django.db.models import F, Manager, Sum
-from django.utils import timezone
+from datetime import datetime, timedelta
+from typing import Any
+from zoneinfo import ZoneInfo
 
 from common.time import format_duration
+from django.conf import settings
+from django.db import models
+from django.db.models import F, Manager, Sum
 
 
 class Game(models.Model):
@@ -13,7 +13,6 @@ class Game(models.Model):
     sort_name = models.CharField(max_length=255, null=True, blank=True, default=None)
     year_released = models.IntegerField(null=True, blank=True, default=None)
     wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.name
@@ -44,7 +43,6 @@ class Edition(models.Model):
     )
     year_released = models.IntegerField(null=True, blank=True, default=None)
     wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.sort_name
@@ -73,9 +71,6 @@ class PurchaseQueryset(models.QuerySet):
     def finished(self):
         return self.filter(date_finished__isnull=False)
 
-    def games_only(self):
-        return self.filter(type=Purchase.GAME)
-
 
 class Purchase(models.Model):
     PHYSICAL = "ph"
@@ -96,16 +91,6 @@ class Purchase(models.Model):
         (DEMO, "Demo"),
         (PIRATED, "Pirated"),
     ]
-    GAME = "game"
-    DLC = "dlc"
-    SEASONPASS = "season_pass"
-    BATTLEPASS = "battle_pass"
-    TYPES = [
-        (GAME, "Game"),
-        (DLC, "DLC"),
-        (SEASONPASS, "Season Pass"),
-        (BATTLEPASS, "Battle Pass"),
-    ]
 
     objects = PurchaseQueryset().as_manager()
 
@@ -121,46 +106,17 @@ class Purchase(models.Model):
     ownership_type = models.CharField(
         max_length=2, choices=OWNERSHIP_TYPES, default=DIGITAL
     )
-    type = models.CharField(max_length=255, choices=TYPES, default=GAME)
-    name = models.CharField(max_length=255, default="", null=True, blank=True)
-    related_purchase = models.ForeignKey(
-        "Purchase",
-        on_delete=models.SET_NULL,
-        default=None,
-        null=True,
-        blank=True,
-        related_name="related_purchases",
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
-        additional_info = [
-            self.get_type_display() if self.type != Purchase.GAME else "",
-            f"{self.edition.platform} version on {self.platform}"
-            if self.platform != self.edition.platform
-            else self.platform,
-            self.edition.year_released,
-            self.get_ownership_type_display(),
-        ]
-        return f"{self.edition} ({', '.join(filter(None, map(str, additional_info)))})"
-
-    def is_game(self):
-        return self.type == self.GAME
-
-    def save(self, *args, **kwargs):
-        if self.type == Purchase.GAME:
-            self.name = ""
-        elif self.type != Purchase.GAME and not self.related_purchase:
-            raise ValidationError(
-                f"{self.get_type_display()} must have a related purchase."
-            )
-        super().save(*args, **kwargs)
+        platform_info = self.platform
+        if self.platform != self.edition.platform:
+            platform_info = f"{self.edition.platform} version on {self.platform}"
+        return f"{self.edition} ({platform_info}, {self.edition.year_released}, {self.get_ownership_type_display()})"
 
 
 class Platform(models.Model):
     name = models.CharField(max_length=255)
     group = models.CharField(max_length=255, null=True, blank=True, default=None)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.name
@@ -178,9 +134,6 @@ class SessionQuerySet(models.QuerySet):
 
 
 class Session(models.Model):
-    class Meta:
-        get_latest_by = "timestamp_start"
-
     purchase = models.ForeignKey("Purchase", on_delete=models.CASCADE)
     timestamp_start = models.DateTimeField()
     timestamp_end = models.DateTimeField(blank=True, null=True)
@@ -194,25 +147,23 @@ class Session(models.Model):
         default=None,
     )
     note = models.TextField(blank=True, null=True)
-    created_at = models.DateTimeField(auto_now_add=True)
-    modified_at = models.DateTimeField(auto_now=True)
 
     objects = SessionQuerySet.as_manager()
 
     def __str__(self):
-        mark = ", manual" if self.is_manual() else ""
+        mark = ", manual" if self.duration_manual != None else ""
         return f"{str(self.purchase)} {str(self.timestamp_start.date())} ({self.duration_formatted()}{mark})"
 
     def finish_now(self):
-        self.timestamp_end = timezone.now()
+        self.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
 
     def start_now():
-        self.timestamp_start = timezone.now()
+        self.timestamp_start = datetime.now(ZoneInfo(settings.TIME_ZONE))
 
     def duration_seconds(self) -> timedelta:
         manual = timedelta(0)
         calculated = timedelta(0)
-        if self.is_manual():
+        if not self.duration_manual in (None, 0, timedelta(0)):
             manual = self.duration_manual
         if self.timestamp_end != None and self.timestamp_start != None:
             calculated = self.timestamp_end - self.timestamp_start
@@ -222,9 +173,6 @@ class Session(models.Model):
         result = format_duration(self.duration_seconds(), "%02.0H:%02.0m")
         return result
 
-    def is_manual(self) -> bool:
-        return not self.duration_manual == timedelta(0)
-
     @property
     def duration_sum(self) -> str:
         return Session.objects.all().total_duration_formatted()
@@ -260,7 +208,6 @@ class Device(models.Model):
     ]
     name = models.CharField(max_length=255)
     type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=UNKNOWN)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return f"{self.name} ({self.get_type_display()})"

games/static/base.css

@@ -808,10 +808,6 @@ select {
   margin-bottom: 2.5rem;
 }
 
-.mb-2 {
-  margin-bottom: 0.5rem;
-}
-
 .mb-4 {
   margin-bottom: 1rem;
 }
@@ -1226,28 +1222,6 @@ textarea) {
   color: rgb(241 245 249 / var(--tw-text-opacity));
 }
 
-:is(.dark form input:disabled),:is(.dark 
-select:disabled),:is(.dark 
-textarea:disabled) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(51 65 85 / var(--tw-bg-opacity));
-  --tw-text-opacity: 1;
-  color: rgb(148 163 184 / var(--tw-text-opacity));
-}
-
-.errorlist {
-  margin-top: 1rem;
-  margin-bottom: 0.25rem;
-  width: 300px;
-  --tw-bg-opacity: 1;
-  background-color: rgb(220 38 38 / var(--tw-bg-opacity));
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  padding-left: 0.75rem;
-  --tw-text-opacity: 1;
-  color: rgb(226 232 240 / var(--tw-text-opacity));
-}
-
 @media screen and (min-width: 768px) {
   form input,
   select,
@@ -1409,11 +1383,6 @@ th label {
   background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 }
 
-:is(.dark .dark\:text-slate-400) {
-  --tw-text-opacity: 1;
-  color: rgb(148 163 184 / var(--tw-text-opacity));
-}
-
 :is(.dark .dark\:text-slate-500) {
   --tw-text-opacity: 1;
   color: rgb(100 116 139 / var(--tw-text-opacity));
@@ -1451,10 +1420,6 @@ th label {
     padding-right: 1rem;
   }
 
-  .sm\:pl-12 {
-    padding-left: 3rem;
-  }
-
   .sm\:pl-2 {
     padding-left: 0.5rem;
   }
@@ -1463,10 +1428,6 @@ th label {
     padding-left: 1rem;
   }
 
-  .sm\:pl-6 {
-    padding-left: 1.5rem;
-  }
-
   .sm\:decoration-2 {
     text-decoration-thickness: 2px;
   }

games/static/js/add_edition.js

@@ -1,24 +1,24 @@
-import { syncSelectInputUntilChanged } from "./utils.js";
+import { syncSelectInputUntilChanged } from './utils.js';
 
 let syncData = [
   {
-    source: "#id_game",
-    source_value: "dataset.name",
-    target: "#id_name",
-    target_value: "value",
+    "source": "#id_game",
+    "source_value": "dataset.name",
+    "target": "#id_name",
+    "target_value": "value"
   },
   {
-    source: "#id_game",
-    source_value: "textContent",
-    target: "#id_sort_name",
-    target_value: "value",
+    "source": "#id_game",
+    "source_value": "textContent",
+    "target": "#id_sort_name",
+    "target_value": "value"
   },
   {
-    source: "#id_game",
-    source_value: "dataset.year",
-    target: "#id_year_released",
-    target_value: "value",
+    "source": "#id_game",
+    "source_value": "dataset.year",
+    "target": "#id_year_released",
+    "target_value": "value"
   },  
-];
+]
 
 syncSelectInputUntilChanged(syncData, "form");

games/static/js/add_game.js

@@ -1,12 +1,12 @@
-import { syncSelectInputUntilChanged } from "./utils.js";
+import { syncSelectInputUntilChanged } from './utils.js'
 
 let syncData = [
   {
-    source: "#id_name",
-    source_value: "value",
-    target: "#id_sort_name",
-    target_value: "value",
-  },
-];
+    "source": "#id_name",
+    "source_value": "value",
+    "target": "#id_sort_name",
+    "target_value": "value"
+  }
+]
 
-syncSelectInputUntilChanged(syncData, "form");
+syncSelectInputUntilChanged(syncData, "form")

games/static/js/add_purchase.js

@@ -1,47 +1,12 @@
-import {
-  syncSelectInputUntilChanged,
-  getEl,
-  disableElementsWhenTrue,
-  disableElementsWhenValueNotEqual,
-} from "./utils.js";
+import { syncSelectInputUntilChanged } from './utils.js'
 
 let syncData = [
   {
-    source: "#id_edition",
-    source_value: "dataset.platform",
-    target: "#id_platform",
-    target_value: "value",
-  },
-];
-
-syncSelectInputUntilChanged(syncData, "form");
-
-function setupElementHandlers() {
-  disableElementsWhenTrue("#id_type", "game", [
-    "#id_name",
-    "#id_related_purchase",
-  ]);
-  disableElementsWhenValueNotEqual(
-    "#id_type",
-    ["game", "dlc"],
-    ["#id_date_finished"]
-  );
+    "source": "#id_edition",
+    "source_value": "dataset.platform",
+    "target": "#id_platform",
+    "target_value": "value"
   }
+]
 
-document.addEventListener("DOMContentLoaded", setupElementHandlers);
-document.addEventListener("htmx:afterSwap", setupElementHandlers);
-getEl("#id_type").onchange = () => {
-  setupElementHandlers();
-};
-
-document.body.addEventListener("htmx:beforeRequest", function (event) {
-  // Assuming 'Purchase1' is the element that triggers the HTMX request
-  if (event.target.id === "id_edition") {
-    var idEditionValue = document.getElementById("id_edition").value;
-
-    // Condition to check - replace this with your actual logic
-    if (idEditionValue != "") {
-      event.preventDefault(); // This cancels the HTMX request
-    }
-  }
-});
+syncSelectInputUntilChanged(syncData, "form")

games/static/js/add_session.js

@@ -7,14 +7,10 @@ for (let button of document.querySelectorAll("[data-target]")) {
   button.addEventListener("click", (event) => {
     event.preventDefault();
     if (type == "now") {
-      targetElement.value = toISOUTCString(new Date());
+      targetElement.value = toISOUTCString(new Date);
     } else if (type == "copy") {
-      const oppositeName =
-        targetElement.name == "timestamp_start"
-          ? "timestamp_end"
-          : "timestamp_start";
-      document.querySelector(`[name='${oppositeName}']`).value =
-        targetElement.value;
+      const oppositeName = targetElement.name == "timestamp_start" ? "timestamp_end" : "timestamp_start";
+      document.querySelector(`[name='${oppositeName}']`).value = targetElement.value;
     } else if (type == "toggle") {
       if (targetElement.type == "datetime-local") targetElement.type = "text";
       else targetElement.type = "datetime-local";

games/static/js/utils.js

@@ -75,10 +75,7 @@ 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] : sourceElement
   if (property.startsWith("dataset.")) {
     let datasetKey = property.slice(8); // Remove 'dataset.' part
     return source.dataset[datasetKey];
@@ -90,118 +87,4 @@ function getValueFromProperty(sourceElement, property) {
   }
 }
 
-/**
- * @description Returns a single element by name.
- * @param {string} selector The selector to look for.
- */
-function getEl(selector) {
-  if (selector.startsWith("#")) {
-    return document.getElementById(selector.slice(1));
-  } else if (selector.startsWith(".")) {
-    return document.getElementsByClassName(selector);
-  } else {
-    return document.getElementsByTagName(selector);
-  }
-}
-
-/**
- * @description Applies different behaviors to elements based on multiple conditional configurations.
- * Each configuration is an array containing a condition function, an array of target element selectors,
- * and two callback functions for handling matched and unmatched conditions.
- * @param {...Array} configs Each configuration is an array of the form:
- *   - 0: {function(): boolean} condition - Function that returns true or false based on a condition.
- *   - 1: {string[]} targetElements - Array of CSS selectors for target elements.
- *   - 2: {function(HTMLElement): void} callbackfn1 - Function to execute when condition is true.
- *   - 3: {function(HTMLElement): void} callbackfn2 - Function to execute when condition is false.
- */
-function conditionalElementHandler(...configs) {
-  configs.forEach(([condition, targetElements, callbackfn1, callbackfn2]) => {
-    if (condition()) {
-      targetElements.forEach((elementName) => {
-        let el = getEl(elementName);
-        if (el === null) {
-          console.error(`Element ${elementName} doesn't exist.`);
-        } else {
-          callbackfn1(el);
-        }
-      });
-    } else {
-      targetElements.forEach((elementName) => {
-        let el = getEl(elementName);
-        if (el === null) {
-          console.error(`Element ${elementName} doesn't exist.`);
-        } else {
-          callbackfn2(el);
-        }
-      });
-    }
-  });
-}
-
-function disableElementsWhenValueNotEqual(
-  targetSelect,
-  targetValue,
-  elementList
-) {
-  return conditionalElementHandler([
-    () => {
-      let target = getEl(targetSelect);
-      console.debug(
-        `${disableElementsWhenTrue.name}: triggered on ${target.id}`
-      );
-      console.debug(`
-      ${disableElementsWhenTrue.name}: matching against value(s): ${targetValue}`);
-      if (targetValue instanceof Array) {
-        if (targetValue.every((value) => target.value != value)) {
-          console.debug(
-            `${disableElementsWhenTrue.name}: none of the values is equal to ${target.value}, returning true.`
-          );
-          return true;
-        }
-      } else {
-        console.debug(
-          `${disableElementsWhenTrue.name}: none of the values is equal to ${target.value}, returning true.`
-        );
-        return target.value != targetValue;
-      }
-    },
-    elementList,
-    (el) => {
-      console.debug(
-        `${disableElementsWhenTrue.name}: evaluated true, disabling ${el.id}.`
-      );
-      el.disabled = "disabled";
-    },
-    (el) => {
-      console.debug(
-        `${disableElementsWhenTrue.name}: evaluated false, NOT disabling ${el.id}.`
-      );
-      el.disabled = "";
-    },
-  ]);
-}
-
-function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
-  return conditionalElementHandler([
-    () => {
-      return getEl(targetSelect).value == targetValue;
-    },
-    elementList,
-    (el) => {
-      el.disabled = "disabled";
-    },
-    (el) => {
-      el.disabled = "";
-    },
-  ]);
-}
-
-export {
-  toISOUTCString,
-  syncSelectInputUntilChanged,
-  getEl,
-  conditionalElementHandler,
-  disableElementsWhenFalse,
-  disableElementsWhenTrue,
-  getValueFromProperty,
-};
+export { toISOUTCString, syncSelectInputUntilChanged };

games/templates/add.html

@@ -1,24 +1,25 @@
 {% extends "base.html" %}
 {% load static %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
         {% csrf_token %}
+
         {{ form.as_table }}
         <tr>
             <td></td>
-                <td>
-                    <input type="submit" value="Submit" />
-                </td>
+            <td><input type="submit" value="Submit"/></td>
         </tr>
         </table>
     </form>
 {% endblock content %}
+
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
+        

games/templates/add_edition.html

@@ -1,32 +1,29 @@
 {% extends "base.html" %}
 {% load static %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
         {% csrf_token %}
+
         {{ form.as_table }}
         <tr>
             <td></td>
-                <td>
-                    <input type="submit" name="submit" value="Submit" />
-                </td>
+            <td><input type="submit" name="submit" value="Submit"/></td>
         </tr>
         <tr>
             <td></td>
-                <td>
-                    <input type="submit"
-                           name="submit_and_redirect"
-                           value="Submit & Create Purchase" />
-                </td>
+            <td><input type="submit" name="submit_and_redirect" value="Submit & Create Purchase"/></td>
         </tr>
         </table>
     </form>
 {% endblock content %}
+
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
+        

games/templates/add_game.html

@@ -1,32 +1,29 @@
 {% extends "base.html" %}
 {% load static %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
         {% csrf_token %}
+
         {{ form.as_table }}
         <tr>
             <td></td>
-                <td>
-                    <input type="submit" name="submit" value="Submit" />
-                </td>
+            <td><input type="submit" name="submit" value="Submit"/></td>
         </tr>
         <tr>
             <td></td>
-                <td>
-                    <input type="submit"
-                           name="submit_and_redirect"
-                           value="Submit & Create Edition" />
-                </td>
+            <td><input type="submit" name="submit_and_redirect" value="Submit & Create Edition"/></td>
         </tr>
         </table>
     </form>
 {% endblock content %}
+
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
+        

games/templates/add_purchase.html

@@ -1,32 +1,29 @@
 {% extends "base.html" %}
 {% load static %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
         {% csrf_token %}
+
         {{ form.as_table }}
         <tr>
             <td></td>
-                <td>
-                    <input type="submit" name="submit" value="Submit" />
-                </td>
+            <td><input type="submit" name="submit" value="Submit"/></td>
         </tr>
         <tr>
             <td></td>
-                <td>
-                    <input type="submit"
-                           name="submit_and_redirect"
-                           value="Submit & Create Session" />
-                </td>
+            <td><input type="submit" name="submit_and_redirect" value="Submit & Create Session"/></td>
         </tr>
         </table>
     </form>
 {% endblock content %}
+
 {% block scripts %}
     {% if script_name %}
         <script type="module" src="{% static 'js/'|add:script_name %}"></script>
     {% endif %}
 {% endblock scripts %}
+        

games/templates/add_session.html

@@ -1,11 +1,12 @@
 {% extends "base.html" %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
     <form method="post" enctype="multipart/form-data">
         <table class="mx-auto">
         {% csrf_token %}
+
         {% for field in form %}
         <tr>
             <th>{{ field.label_tag }}</th>
@@ -18,9 +19,7 @@
             <td>
                 <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 }}"
-                                        data-type="toggle">Toggle text</button>
+                    <button class="basic-button" data-target="{{field.name}}" data-type="toggle">Toggle text</button>
                     <button class="basic-button" data-target="{{field.name}}" data-type="copy">Copy</button>
                 </div>
             </td>
@@ -29,9 +28,7 @@
         {% endfor %}
         <tr>
             <td></td>
-                <td>
-                    <input type="submit" value="Submit" />
-                </td>
+            <td><input type="submit" value="Submit"/></td>
         </tr>
         </table>
     </form>

games/templates/base.html

@@ -1,101 +1,72 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
+
     {% load static %}
+
     <head>
         <meta charset="utf-8"/>
         <meta name="description" content="Self-hosted time-tracker."/>
         <meta name="keywords" content="time, tracking, video games, self-hosted"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
-        <title>Timetracker -
-            {% block title %}
-                Untitled
-            {% endblock title %}
-        </title>
+        <title>Timetracker - {% block title %}Untitled{% endblock title %}</title>
         <script src="{% static 'js/htmx.min.js' %}"></script>
         <link rel="stylesheet" href="{% static 'base.css' %}" />
     </head>
-    <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" />
+    
+    <body class="dark">
+        <img id="indicator" src="{% static 'icons/loading.png' %}" class="absolute right-3 top-3 animate-spin htmx-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' %}" width="48" class="mr-4" />
-                        </span>
+                        <span class="text-4xl"><img src="{% static 'icons/schedule.png' %}" width="48" class="mr-4" /></span>
                         <span class="self-center text-xl font-semibold whitespace-nowrap text-white">Timetracker</span>
                     </a>
                     <div class="w-full md:block md:w-auto">
-                        <ul class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
+                        <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>
+                                <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>
+                                        <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>
+                                    <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="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>
+                                    <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="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>
+                                        <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>
                             {% 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>
+                                        <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>
+                                                    <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>
+                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
                             {% endif %}
                         </ul>
                     </div>
                 </div>
             </nav>
-            {% block content %}
-                No content here.
-            {% endblock content %}
+            {% block content %}No content here.{% endblock content %}
         </div>
         {% load version %}
         <span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span>
-        {% block scripts %}
-        {% endblock scripts %}
+    {% block scripts %}{% endblock scripts %}
     </body>
+
 </html>

games/templates/components/button.html

@@ -2,11 +2,24 @@
 title
 text
 {% endcomment %}
-<a href="{{ link }}"
+<a
+  href="{{ link }}"
   title="{{ title }}"
-   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">
-    {% comment %} <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="self-center w-6 h-6 inline">
-    <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" /> 
+  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"
+>
+  {% comment %} <svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    class="self-center w-6 h-6 inline"
+  >
+    <path
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
+      /> 
     </svg>
     {% endcomment %}
   {{ text }}

games/templates/components/button_start.html

@@ -2,17 +2,25 @@
 title
 text
 {% endcomment %}
-<button type="button"
+<button
+  type="button"
   title="{{ title }}"
   autofocus
-        class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 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 text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg">
-    <svg xmlns="http://www.w3.org/2000/svg"
+  class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 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 text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg"
+>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
     fill="none"
     viewBox="0 0 24 24"
     stroke-width="1.5"
     stroke="currentColor"
-         class="self-center w-6 h-6 inline">
-        <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
+    class="self-center w-6 h-6 inline"
+  >
+    <path
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
+    />
   </svg>
   {{ text }}
 </button>

games/templates/components/edit_button.html

@@ -1,13 +1,21 @@
 <a href="{{ edit_url }}">
-    <button type="button"
+  <button
+    type="button"
     title="Edit"
-            class="ml-1 py-1 px-2 flex justify-center items-center bg-violet-600 hover:bg-violet-700 focus:ring-violet-500 focus:ring-offset-violet-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg">
-        <svg xmlns="http://www.w3.org/2000/svg"
+    class="ml-1 py-1 px-2 flex justify-center items-center bg-violet-600 hover:bg-violet-700 focus:ring-violet-500 focus:ring-offset-violet-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 w-7 h-4 rounded-lg"
+  >
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 20 20"
       fill="currentColor"
-             class="w-5 h-5">
-            <path d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z" />
-            <path d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z" />
+      class="w-5 h-5"
+    >
+      <path
+        d="M5.433 13.917l1.262-3.155A4 4 0 017.58 9.42l6.92-6.918a2.121 2.121 0 013 3l-6.92 6.918c-.383.383-.84.685-1.343.886l-3.154 1.262a.5.5 0 01-.65-.65z"
+      />
+      <path
+        d="M3.5 5.75c0-.69.56-1.25 1.25-1.25H10A.75.75 0 0010 3H4.75A2.75 2.75 0 002 5.75v9.5A2.75 2.75 0 004.75 18h9.5A2.75 2.75 0 0017 15.25V10a.75.75 0 00-1.5 0v5.25c0 .69-.56 1.25-1.25 1.25h-9.5c-.69 0-1.25-.56-1.25-1.25v-9.5z"
+      />
     </svg>
   </button>
 </a>

games/templates/index.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
     <div class="text-slate-300 mx-auto max-w-screen-lg text-center">
         {% if session_count > 0 %}

games/templates/list_sessions.html

@@ -1,24 +1,29 @@
 {% extends 'base.html' %}
+
 {% load static %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% block content %}
+
 {% if dataset.count >= 1 %}
 <div class="mx-auto text-center my-4">
-            <a id="last-session-start"
+  <a
+    id="last-session-start"
     href="{% url 'start_session_same_as_last' last.id %}"
     hx-get="{% url 'start_session_same_as_last' last.id %}"
+    hx-indicator="#indicator"
     hx-swap="afterbegin"
     hx-target=".responsive-table tbody"
     hx-select=".responsive-table tbody tr:first-child"
     onClick="document.querySelector('#last-session-start').classList.add('invisible')"
-               class="{% if last.timestamp_end == null %}invisible{% endif %}">
+    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 %}
+
 <table class="responsive-table">
   <thead>
     <tr>
@@ -31,8 +36,11 @@
   <tbody>
     {% for data in dataset %}
     <tr>
-                        <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"
+      <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"
           href="{% url 'view_game' data.purchase.edition.game.id %}">
             {{ data.purchase.edition }}
         </a>
@@ -42,13 +50,15 @@
       </td>
       <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono hidden lg:table-cell">
         {% if data.unfinished %}
-                                <a href="{% url 'update_session' data.id %}"
+        <a
+          href="{% url 'update_session' data.id %}"
           hx-get="{% url 'update_session' data.id %}"
           hx-swap="outerHTML"
           hx-target=".responsive-table tbody tr:first-child"
           hx-select=".responsive-table tbody tr:first-child"
           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>
         </a>
         {% elif data.duration_manual %}
@@ -57,12 +67,11 @@
             {{ data.timestamp_end | date:"d/m/Y H:i" }}
         {% endif %}
       </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">
+        {{ data.duration_formatted }}
+      </td>
     </tr>
     {% endfor %}
   </tbody>
 </table>
-    {% else %}
-        <div class="mx-auto text-center text-slate-300 text-xl">No sessions found.</div>
-    {% endif %}
 {% endblock content %}

games/templates/partials/related_purchase_field.html

@@ -1 +0,0 @@
-{{ form.related_purchase }}

games/templates/stats.html

@@ -1,17 +1,15 @@
 {% extends "base.html" %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% load static %}
+
 {% 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">
+                <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 %}
@@ -47,10 +45,6 @@
                             <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished</td>
                             <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 ({{ year }})</td>
-                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year.count }}</td>
-                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -64,15 +58,11 @@
                         </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 font-mono">
-                                {{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)
-                            </td>
+                            <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)</td>
                         </tr>
                         <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>
+                            <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>
@@ -98,8 +88,9 @@
                 {% for game in top_10_games_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>
+                        <a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'view_game' game.id  %}">{{ game.name }}
+
+                        </a>
                     </td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
                 </tr>
@@ -134,10 +125,7 @@
             <tbody>
                 {% for purchase in all_finished_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"><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.date_finished | date:"d/m/Y" }}</td>
                 </tr>
                 {% endfor %}
@@ -154,10 +142,7 @@
             <tbody>
                 {% for purchase in this_year_finished_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"><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.date_finished | date:"d/m/Y" }}</td>
                 </tr>
                 {% endfor %}
@@ -174,10 +159,7 @@
             <tbody>
                 {% for purchase in purchased_this_year_finished_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"><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.date_finished | date:"d/m/Y" }}</td>
                 </tr>
                 {% endfor %}
@@ -195,13 +177,7 @@
             <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 }}
-                                {% if purchase.type != "game" %}({{ purchase.name }}, {{ purchase.get_type_display }}){% endif %}
-                            </a>
-                        </td>
+                    <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>

games/templates/view_game.html

@@ -1,8 +1,9 @@
 {% extends "base.html" %}
-{% block title %}
-    {{ title }}
-{% endblock title %}
+
+{% block title %}{{ title }}{% endblock title %}
+
 {% load static %}
+
 {% block content %}
     <div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
         <h1 class="text-4xl flex items-center">
@@ -12,14 +13,11 @@
             {% include 'components/edit_button.html' with edit_url=edit_url %}
         </h1>
         <h2 class="text-lg my-2 ml-2">
-            {{ hours_sum }} <span class="dark:text-slate-500">total</span>
+            {{ total_hours }} <span class="dark:text-slate-500">total</span>
             {{ session_average }} <span class="dark:text-slate-500">avg</span> 
-            ({{ playrange }})
-        </h2>
+            ({{ playrange }}) </h2>
         <hr class="border-slate-500">
-        <h1 class="text-3xl mt-4 mb-1">
-            Editions <span class="dark:text-slate-500">({{ edition_count }})</span> and Purchases <span class="dark:text-slate-500">({{ purchase_count }})</span>
-        </h1>
+        <h1 class="text-3xl mt-4 mb-1">Editions <span class="dark:text-slate-500">({{ editions.count }})</span></h1>
         <ul>
             {% for edition in editions %}
             <li class="sm:pl-2 flex items-center">
@@ -34,45 +32,56 @@
                 {% url 'edit_edition' edition.id as edit_url %}
                 {% include 'components/edit_button.html' with edit_url=edit_url %}
             </li>
+            {% endfor %}
+        </ul>
+        <h1 class="text-3xl mt-4 mb-1">Purchases <span class="dark:text-slate-500">({{ purchases.count }})</span></h1>
         <ul>
-                    {% for purchase in edition.game_purchases %}
-                        <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 %}
+            {% for purchase in purchases %}
+            <li class="sm:pl-2 flex items-center">
+                {{ purchase.platform }}
+                ({{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}, {{ purchase.price }} {{ purchase.price_currency}})
                 {% url 'edit_purchase' purchase.id as edit_url %}
                 {% include 'components/edit_button.html' with edit_url=edit_url %}
             </li>
-                        <ul>
-                            {% for related_purchase in purchase.nongame_related_purchases %}
-                                <li class="sm:pl-12 flex items-center">
-                                    {{ related_purchase.name }} ({{ related_purchase.get_type_display }}, {{ purchase.platform }}, {{ related_purchase.date_purchased | date:"Y" }}, {{ related_purchase.price }} {{ related_purchase.price_currency }})
-                                    {% url 'edit_purchase' related_purchase.id as edit_url %}
-                                    {% include 'components/edit_button.html' with edit_url=edit_url %}
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    {% endfor %}
-                </ul>
             {% endfor %}
         </ul>
         <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center">
             Sessions
-            <span class="dark:text-slate-500">({{ sessions.count }})</span>
+            <span class="dark:text-slate-500">
+                ({{ sessions.count }})
+            </span>
             {% url 'start_game_session' game.id as add_session_link %}
             {% include 'components/button.html' with title="Start new session" text="New" link=add_session_link %}
-            and Notes <span class="dark:text-slate-500">({{ sessions_with_notes_count }})</span>
-            
         </h1>
         <ul>
             {% for session in sessions %}
-                <li class="sm:pl-2 mt-4 mb-2 dark:text-slate-400 flex items-center">
-                    {{ session.timestamp_start | date:"d/m/Y H:m" }}
+            <li class="sm:pl-2 flex items-center">
+                {{ session.timestamp_start | date:"d/m/Y" }}
                 ({{ session.device.get_type_display | default:"Unknown" }}, {{ session.duration_formatted }})
                 {% url 'edit_session' session.id as edit_url %}
                 {% include 'components/edit_button.html' with edit_url=edit_url %}
             </li>
-                <li class="sm:pl-4 italic">{{ session.note|linebreaks }}</li>
             {% endfor %}
         </ul>
+        <h1 class="text-3xl mt-4 mb-1">Notes <span class="dark:text-slate-500">({{ sessions_with_notes.count }})</span></h1>
+        <ul>
+            {% for session in sessions_with_notes %}
+            <li class="sm:pl-2">
+                <ul>
+                    <li class="block dark:text-slate-500">
+                        <span class="flex items-center">
+                            {{ session.timestamp_start | date:"d/m/Y H:m" }}
+                            {% url 'edit_session' session.id as edit_session_url %}
+                            {% include 'components/edit_button.html' with edit_url=edit_session_url %}
+                        </span>
+                    </li>
+                    <li class="sm:pl-4 italic">
+                        {{ session.note|linebreaks }}
+                    </li>
+                </ul>
+            </li>
+            {% endfor %}
+        </ul>
+        
     </div>
 {% endblock content %}

games/urls.py

@@ -11,6 +11,7 @@ urlpatterns = [
         name="list_sessions_recent",
     ),
     path("add-game/", views.add_game, name="add_game"),
+    path("add-game-unified/", views.add_game_unified, name="add_game_unified"),
     path("add-platform/", views.add_platform, name="add_platform"),
     path("add-session/", views.add_session, name="add_session"),
     path(
@@ -44,11 +45,6 @@ urlpatterns = [
         views.add_purchase,
         name="add_purchase_for_edition",
     ),
-    path(
-        "related-purchase-by-edition",
-        views.related_purchase_by_edition,
-        name="related_purchase_by_edition",
-    ),
     path("add-edition/", views.add_edition, name="add_edition"),
     path(
         "add-edition-for-game/<int:game_id>",

games/views.py

@@ -1,31 +1,24 @@
+from common.time import format_duration, now as now_with_tz
+from common.utils import safe_division
 from datetime import datetime, timedelta
-from typing import Any, Callable
-
-from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Count, F, Prefetch, Sum
+from django.conf import settings
+from django.db.models import Sum, F, Count
 from django.db.models.functions import TruncDate
-from django.http import (
-    HttpRequest,
-    HttpResponse,
-    HttpResponseBadRequest,
-    HttpResponseRedirect,
-)
+from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect, render
 from django.urls import reverse
-from django.utils import timezone
-
-from common.time import format_duration
-from common.utils import safe_division
+from typing import Callable, Any
+from zoneinfo import ZoneInfo
 
 from .forms import (
-    DeviceForm,
-    EditionForm,
     GameForm,
     PlatformForm,
     PurchaseForm,
     SessionForm,
+    EditionForm,
+    DeviceForm,
 )
-from .models import Edition, Game, Platform, Purchase, Session
+from .models import Game, Platform, Purchase, Session, Edition
 
 
 def model_counts(request):
@@ -39,15 +32,14 @@ def model_counts(request):
 
 
 def stats_dropdown_year_range(request):
-    result = {"stats_dropdown_year_range": range(timezone.now().year, 1999, -1)}
-    return result
+    return {"stats_dropdown_year_range": range(2018, 2024)}
 
 
 def add_session(request, purchase_id=None):
     context = {}
-    initial = {"timestamp_start": timezone.now()}
+    initial = {"timestamp_start": now_with_tz()}
 
-    last = Session.objects.last()
+    last = Session.objects.all().last()
     if last != None:
         initial["purchase"] = last.purchase
 
@@ -121,8 +113,7 @@ def edit_purchase(request, purchase_id=None):
         return redirect("list_sessions")
     context["title"] = "Edit Purchase"
     context["form"] = form
-    context["script_name"] = "add_purchase.js"
-    return render(request, "add_purchase.html", context)
+    return render(request, "add.html", context)
 
 
 @use_custom_redirect
@@ -139,52 +130,34 @@ def edit_game(request, game_id=None):
 
 
 def view_game(request, game_id=None):
+    context = {}
     game = Game.objects.get(id=game_id)
-    nongame_related_purchases_prefetch = Prefetch(
-        "related_purchases",
-        queryset=Purchase.objects.exclude(type=Purchase.GAME),
-        to_attr="nongame_related_purchases",
+    context["title"] = "View Game"
+    context["game"] = game
+    context["editions"] = Edition.objects.filter(game_id=game_id)
+    context["purchases"] = Purchase.objects.filter(edition__game_id=game_id)
+    context["sessions"] = Session.objects.filter(
+        purchase__edition__game_id=game_id
+    ).order_by("-timestamp_start")
+    context["total_hours"] = float(
+        format_duration(context["sessions"].total_duration_unformatted(), "%2.1H")
     )
-    game_purchases_prefetch = Prefetch(
-        "purchase_set",
-        queryset=Purchase.objects.filter(type=Purchase.GAME).prefetch_related(
-            nongame_related_purchases_prefetch
-        ),
-        to_attr="game_purchases",
-    )
-    editions = (
-        Edition.objects.filter(game=game)
-        .prefetch_related(game_purchases_prefetch)
-        .order_by("year_released")
+    context["session_average"] = round(
+        (context["total_hours"]) / int(context["sessions"].count()), 1
     )
+    # here first and last is flipped
+    # because sessions are ordered from newest to oldest
+    # so the most recent are on top
+    playrange_start = context["sessions"].last().timestamp_start.strftime("%b %Y")
+    playrange_end = context["sessions"].first().timestamp_start.strftime("%b %Y")
 
-    sessions = Session.objects.filter(purchase__edition__game=game)
-    session_count = sessions.count()
-
-    playrange_start = sessions.earliest().timestamp_start.strftime("%b %Y")
-    playrange_end = sessions.latest().timestamp_start.strftime("%b %Y")
-
-    playrange = (
+    context["playrange"] = (
         playrange_start
         if playrange_start == playrange_end
         else f"{playrange_start} — {playrange_end}"
     )
-    total_hours = float(format_duration(sessions.total_duration_unformatted(), "%2.1H"))
-
-    context = {
-        "edition_count": editions.count(),
-        "editions": editions,
-        "game": game,
-        "playrange": playrange,
-        "purchase_count": Purchase.objects.filter(edition__game=game).count(),
-        "session_average": round(total_hours / int(session_count), 1),
-        "session_count": session_count,
-        "sessions_with_notes_count": sessions.exclude(note="").count(),
-        "sessions": sessions.order_by("-timestamp_start"),
-        "title": f"Game Overview - {game.name}",
-        "hours_sum": total_hours,
-    }
 
+    context["sessions_with_notes"] = context["sessions"].exclude(note="")
     request.session["return_path"] = request.path
     return render(request, "view_game.html", context)
 
@@ -215,24 +188,17 @@ def edit_edition(request, edition_id=None):
     return render(request, "add.html", context)
 
 
-def related_purchase_by_edition(request):
-    edition_id = request.GET.get("edition")
-    if not edition_id:
-        return HttpResponseBadRequest("Invalid edition_id")
-    form = PurchaseForm()
-    form.fields["related_purchase"].queryset = Purchase.objects.filter(
-        edition_id=edition_id, type=Purchase.GAME
-    ).order_by("edition__sort_name")
-    return render(request, "partials/related_purchase_field.html", {"form": form})
-
-
 @use_custom_redirect
 def start_game_session(request, game_id: int):
-    last_session = Session.objects.filter(purchase__edition__game_id=game_id).latest()
+    last_session = (
+        Session.objects.filter(purchase__edition__game_id=game_id)
+        .order_by("-timestamp_start")
+        .first()
+    )
     session = SessionForm(
         {
             "purchase": last_session.purchase.id,
-            "timestamp_start": timezone.now(),
+            "timestamp_start": now_with_tz(),
             "device": last_session.device,
         }
     )
@@ -245,7 +211,7 @@ def start_session_same_as_last(request, last_session_id: int):
     session = SessionForm(
         {
             "purchase": last_session.purchase.id,
-            "timestamp_start": timezone.now(),
+            "timestamp_start": now_with_tz(),
             "device": last_session.device,
         }
     )
@@ -287,29 +253,27 @@ def list_sessions(
         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))
+        current_year = datetime.now().year
+        first_day_of_year = datetime(current_year, 1, 1)
         dataset = Session.objects.filter(
             timestamp_start__gte=first_day_of_year
         ).order_by("-timestamp_start")
         context["title"] = "This year"
     else:
         # by default, sort from newest to oldest
-        dataset = Session.objects.order_by("-timestamp_start")
+        dataset = Session.objects.all().order_by("-timestamp_start")
 
     for session in dataset:
         if session.timestamp_end == None and session.duration_manual == timedelta(
             seconds=0
         ):
-            session.timestamp_end = timezone.now()
+            session.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
             session.unfinished = True
 
     context["total_duration"] = dataset.total_duration_formatted()
     context["dataset"] = dataset
-    try:
-        context["last"] = Session.objects.latest()
-    except ObjectDoesNotExist:
-        context["last"] = None
+    # cannot use dataset[0] here because that might be only partial QuerySet
+    context["last"] = Session.objects.all().order_by("timestamp_start").last()
 
     return render(request, "list_sessions.html", context)
 
@@ -319,7 +283,7 @@ def stats(request, year: int = 0):
     if selected_year:
         return HttpResponseRedirect(reverse("stats_by_year", args=[selected_year]))
     if year == 0:
-        year = timezone.now().year
+        year = now_with_tz().year
     this_year_sessions = Session.objects.filter(timestamp_start__year=year)
     selected_currency = "CZK"
     unique_days = (
@@ -343,9 +307,7 @@ def stats(request, year: int = 0):
 
     this_year_purchases_unfinished = this_year_purchases_without_refunded.filter(
         date_finished__isnull=True
-    ).filter(
-        type=Purchase.GAME
-    )  # do not count DLC etc.
+    )
 
     this_year_purchases_unfinished_percent = int(
         safe_division(
@@ -369,7 +331,7 @@ def stats(request, year: int = 0):
     this_year_spendings = this_year_purchases_without_refunded.aggregate(
         total_spent=Sum(F("price"))
     )
-    total_spent = this_year_spendings["total_spent"] or 0
+    total_spent = this_year_spendings["total_spent"]
 
     games_with_playtime = (
         Game.objects.filter(edition__purchase__session__in=this_year_sessions)
@@ -418,15 +380,9 @@ def stats(request, year: int = 0):
         "spent_per_game": int(
             safe_division(total_spent, this_year_purchases_without_refunded.count())
         ),
-        "all_finished_this_year": purchases_finished_this_year.order_by(
-            "date_finished"
-        ),
-        "this_year_finished_this_year": purchases_finished_this_year_released_this_year.order_by(
-            "date_finished"
-        ),
-        "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year.order_by(
-            "date_finished"
-        ),
+        "all_finished_this_year": purchases_finished_this_year,
+        "this_year_finished_this_year": purchases_finished_this_year_released_this_year,
+        "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year,
         "total_sessions": this_year_sessions.count(),
         "unique_days": unique_days["dates"],
         "unique_days_percent": int(unique_days["dates"] / 365 * 100),
@@ -452,7 +408,7 @@ def stats(request, year: int = 0):
 
 def add_purchase(request, edition_id=None):
     context = {}
-    initial = {"date_purchased": timezone.now()}
+    initial = {"date_purchased": now_with_tz()}
 
     if request.method == "POST":
         form = PurchaseForm(request.POST or None, initial=initial)
@@ -521,12 +477,7 @@ def add_edition(request, game_id=None):
         if game_id:
             game = Game.objects.get(id=game_id)
             form = EditionForm(
-                initial={
-                    "game": game,
-                    "name": game.name,
-                    "sort_name": game.sort_name,
-                    "year_released": game.year_released,
-                }
+                initial={"game": game, "name": game.name, "sort_name": game.sort_name}
             )
         else:
             form = EditionForm()

pyproject.toml

@@ -1,15 +1,15 @@
 [tool.poetry]
 name = "timetracker"
-version = "1.5.1"
+version = "1.4.0"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"
 readme = "README.md"
 packages = [{include = "timetracker"}]
 
-[tool.poetry.group.main.dependencies]
-python = "^3.12"
-django = "^4.2.0"
+[tool.poetry.dependencies]
+python = "^3.10"
+django = "^4.1.4"
 gunicorn = "^20.1.0"
 uvicorn = "^0.20.0"
 
@@ -23,10 +23,6 @@ werkzeug = "^2.2.2"
 djhtml = "^1.5.2"
 djlint = "^1.19.11"
 isort = "^5.11.4"
-pre-commit = "^3.5.0"
-
-[tool.isort]
-profile = "black"
 
 [build-system]
 requires = ["poetry-core"]

tests/test_paths_return_200.py

@@ -1,90 +0,0 @@
-import os
-from datetime import datetime
-from zoneinfo import ZoneInfo
-
-import django
-from django.test import TestCase
-from django.urls import reverse
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
-django.setup()
-from django.conf import settings
-
-from games.models import Edition, Game, Platform, Purchase, Session
-
-ZONEINFO = ZoneInfo(settings.TIME_ZONE)
-
-
-class PathWorksTest(TestCase):
-    def setUp(self) -> None:
-        pl = Platform(name="Test Platform")
-        pl.save()
-        g = Game(name="The Test Game")
-        g.save()
-        e = Edition(game=g, name="The Test Game Edition", platform=pl)
-        e.save()
-        p = Purchase(
-            edition=e,
-            platform=pl,
-            date_purchased=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO),
-        )
-        p.save()
-        s = Session(
-            purchase=p,
-            timestamp_start=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO),
-            timestamp_end=datetime(2022, 9, 26, 17, 38, tzinfo=ZONEINFO),
-        )
-        s.save()
-        self.testSession = s
-        return super().setUp()
-
-    def test_add_device_returns_200(self):
-        url = reverse("add_device")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_add_platform_returns_200(self):
-        url = reverse("add_platform")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_add_game_returns_200(self):
-        url = reverse("add_game")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_add_edition_returns_200(self):
-        url = reverse("add_edition")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_add_purchase_returns_200(self):
-        url = reverse("add_purchase")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_add_session_returns_200(self):
-        url = reverse("add_session")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_edit_session_returns_200(self):
-        id = self.testSession.id
-        url = reverse("edit_session", args=[id])
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_view_game_returns_200(self):
-        url = reverse("view_game", args=[1])
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_edit_game_returns_200(self):
-        url = reverse("edit_game", args=[1])
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_list_sessions_returns_200(self):
-        url = reverse("list_sessions")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)

tests/test_session_formatting.py

@@ -1,40 +0,0 @@
-import os
-from datetime import datetime
-from zoneinfo import ZoneInfo
-
-import django
-from django.db import models
-from django.test import TestCase
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
-django.setup()
-from django.conf import settings
-
-from games.models import Edition, Game, Purchase, Session
-
-ZONEINFO = ZoneInfo(settings.TIME_ZONE)
-
-
-class FormatDurationTest(TestCase):
-    def setUp(self) -> None:
-        return super().setUp()
-
-    def test_duration_format(self):
-        g = Game(name="The Test Game")
-        g.save()
-        e = Edition(game=g, name="The Test Game Edition")
-        e.save()
-        p = Purchase(
-            edition=e, date_purchased=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO)
-        )
-        p.save()
-        s = Session(
-            purchase=p,
-            timestamp_start=datetime(2022, 9, 26, 14, 58, tzinfo=ZONEINFO),
-            timestamp_end=datetime(2022, 9, 26, 17, 38, tzinfo=ZONEINFO),
-        )
-        s.save()
-        self.assertEqual(
-            s.duration_formatted(),
-            "02:40",
-        )

tests/test_time.py

@@ -83,16 +83,6 @@ class FormatDurationTest(unittest.TestCase):
         result = format_duration(delta, "%r seconds")
         self.assertEqual(result, "0 seconds")
 
-    def test_specific(self):
-        delta = timedelta(hours=2, minutes=40)
-        result = format_duration(delta, "%H:%m")
-        self.assertEqual(result, "2:40")
-
-    def test_specific_precise_if_unncessary(self):
-        delta = timedelta(hours=2, minutes=40)
-        result = format_duration(delta, "%02.0H:%02.0m")
-        self.assertEqual(result, "02:40")
-
     def test_all_at_once(self):
         delta = timedelta(days=50, hours=10, minutes=34, seconds=24)
         result = format_duration(

timetracker/settings.py

@@ -40,7 +40,7 @@ INSTALLED_APPS = [
     "django.contrib.staticfiles",
 ]
 
-if DEBUG:
+# if DEBUG:
 INSTALLED_APPS.append("django_extensions")
 INSTALLED_APPS.append("django.contrib.admin")
 
@@ -123,7 +123,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/4.1/howto/static-files/
 
 STATIC_URL = "static/"
-STATIC_ROOT = BASE_DIR / "static" if DEBUG else "/var/www/django/static"
+STATIC_ROOT = BASE_DIR / "static"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
@@ -150,3 +150,5 @@ if _csrf_trusted_origins:
     CSRF_TRUSTED_ORIGINS = _csrf_trusted_origins.split(",")
 else:
     CSRF_TRUSTED_ORIGINS = []
+
+USE_L10N = False

timetracker/urls.py

@@ -23,5 +23,6 @@ urlpatterns = [
     path("tracker/", include("games.urls")),
 ]
 
-if settings.DEBUG:
+# if settings.DEBUG:
+#     urlpatterns.append(path("admin/", admin.site.urls))
 urlpatterns.append(path("admin/", admin.site.urls))