Version 1.3.0

Fixes #15

.dockerignore

@@ -1 +1,8 @@
-src/web/static/*
+.git
+.githooks
+.mypy_cache
+.pytest_cache
+.venv
+.vscode
+node_modules
+src/timetracker/static/*

.drone.yml

@@ -11,15 +11,45 @@ steps:
     - poetry install
     - poetry env info
     - poetry run pytest
-- name: build container
+
+- name: build-prod
   image: plugins/docker
   settings:
     repo: registry.kucharczyk.xyz/timetracker
     tags:
       - latest
+      - 1.1.0
+  depends_on:
+    - "test"
+  when:
+    branch:
+      - main
+
+- name: build-non-prod
+  image: plugins/docker
+  settings:
+    repo: registry.kucharczyk.xyz/timetracker
+    tags:
+      - ${DRONE_COMMIT_REF}
+      - ${DRONE_COMMIT_BRANCH}
+  when:
+    branch:
+      exclude:
+        - main
+  depends_on:
+    - "test"
+
+- name: redeploy on portainer
+  image: plugins/webhook
+  settings:
+    urls:
+      from_secret: PORTAINER_TIMETRACKER_WEBHOOK_URL
+  depends_on:
+    - "build-prod"
+    
+    
+    
 trigger:
   event:
   - push
   - cron
-  exclude:
-    - pull_request

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,py}]
+charset = utf-8
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+[**/*.js]
+indent_style = space
+indent_size = 2

.gitignore

@@ -5,4 +5,5 @@ __pycache__
 node_modules
 package-lock.json
 db.sqlite3
-src/web/static
+/static/
+dist/

.vscode/settings.json

@@ -4,5 +4,8 @@
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "python.analysis.typeCheckingMode": "basic"
-}
+    "python.analysis.typeCheckingMode": "basic",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    },
+}

CHANGELOG.md

@@ -1,3 +1,137 @@
+## 1.3.0 / 2023-11-05 15:09+01:00
+
+### New
+* Add Stats to the main navigation
+* Allow selecting year on the Stats page
+
+### Improved
+* Make some pages redirect back instead to session list
+
+### Improved
+* Make navigation more compact
+
+### Fixed
+* Correctly limit sessions to a single year for stats
+
+## 1.2.0 / 2023-11-01 20:18+01:00
+
+### New
+* Add yearly stats page (https://git.kucharczyk.xyz/lukas/timetracker/issues/15)
+
+### Enhancements
+* Add a button to start session from game overview
+
+## 1.1.2 / 2023-10-13 16:30+02:00
+
+### Enhancements
+* Durations are formatted in a consisent manner across all pages
+
+### Fixes
+* Game Overview: display duration when >1 hour instead of displaying 0
+
+## 1.1.1 / 2023-10-09 20:52+02:00
+
+### New
+* Add notes section to game overview
+
+### Enhancements
+* Make it possible to add any data on the game overview page
+
+## 1.1.0 / 2023-10-09 00:01+02:00
+
+### New
+* Add game overview page (https://git.kucharczyk.xyz/lukas/timetracker/issues/8)
+* Add helper buttons next to datime fields
+* Add copy button on Add session page to copy times between fields
+* Change fonts to IBM Plex
+
+### Enhancements
+* Improve form appearance
+* Focus important fields on forms
+* Use the same form when editing a session as when adding a session
+* Change recent session view to current year instead of last 30 days
+* Add a hacky way not to reload a page when starting or ending a session (https://git.kucharczyk.xyz/lukas/timetracker/issues/52)
+* Improve session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/53)
+
+### Fixes
+
+* Fix session being wrongly considered in progress if it had a certain amount of manual hours (https://git.kucharczyk.xyz/lukas/timetracker/issues/58)
+* Fix bug when filtering only manual sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/51)
+
+
+## 1.0.3 / 2023-02-20 17:16+01:00
+
+* Add wikidata ID and year for editions
+* Add icons for game, edition, purchase filters
+* Allow filtering by game, edition, purchase from the session list
+* Allow editing filtered entities from session list
+
+## 1.0.2 / 2023-02-18 21:48+01:00
+
+* Add support for device info (https://git.kucharczyk.xyz/lukas/timetracker/issues/49)
+* Add support for purchase ownership information (https://git.kucharczyk.xyz/lukas/timetracker/issues/48)
+* Add support for purchase prices
+* Add support for game editions (https://git.kucharczyk.xyz/lukas/timetracker/issues/28)
+
+## 1.0.1 / 2023-01-30 22:17+01:00
+
+* Make it possible to edit sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/46)
+* Show markers on smaller graphs to make it clearer which dates the session belong to
+* Show only last 30 days on the homepage (https://git.kucharczyk.xyz/lukas/timetracker/issues/47)
+
+## 1.0.0 / 2023-01-20 19:54+01:00
+
+* Breaking
+  * Due to major re-arranging and re-naming of the folder structure, tables also had to be renamed.
+* Fixed
+  * Sort form fields alphabetically (https://git.kucharczyk.xyz/lukas/timetracker/issues/39, https://git.kucharczyk.xyz/lukas/timetracker/issues/40)
+  * Start session button starts different game than it says (#44)
+
+## 0.2.5 / 2023-01-18 17:01+01:00
+
+* New
+  * When adding session, pre-select game with the last session
+* Fixed
+  * Start session now button would take up 100% width, leading to accidental clicks (https://git.kucharczyk.xyz/lukas/timetracker/issues/37)
+* Removed
+  * Session model property `last` is already implemented by Django method `last()`, thus it was removed (https://git.kucharczyk.xyz/lukas/timetracker/issues/38)
+
+## 0.2.4 / 2023-01-16 19:39+01:00
+
+* Fixed
+  * When filtering by game, the "Filtering by (...)" text would erroneously list an unrelated platform
+  * Playtime graph would display timeline backwards
+  * Playtime graph with many dates would overlap (https://git.kucharczyk.xyz/lukas/timetracker/issues/34)
+  * Manually added times (= without end timestamp) would make graphs look ugly and noisy (https://git.kucharczyk.xyz/lukas/timetracker/issues/35)
+
+## 0.2.3 / 2023-01-15 23:13+01:00
+
+* Allow filtering by platform and game on session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/32)
+* Order session by newest as preparation for https://git.kucharczyk.xyz/lukas/timetracker/issues/33
+
+## 0.2.2 / 2023-01-15 17:59+01:00
+
+* Display playtime graph on session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/29)
+* Fix error when showing session list with no sessions (https://git.kucharczyk.xyz/lukas/timetracker/issues/31)
+
+## 0.2.1 / 2023-01-13 16:53+01:00
+
+* List number of sessions when filtering on session list
+* Start sessions of last purchase from list (https://git.kucharczyk.xyz/lukas/timetracker/issues/19)
+
+## 0.2.0 / 2023-01-09 22:42+01:00
+
+* Show playtime total on session list (https://git.kucharczyk.xyz/lukas/timetracker/issues/6)
+* Make formatting durations more robust, change default duration display to "X hours" (https://git.kucharczyk.xyz/lukas/timetracker/issues/26)
+
+## 0.1.4 / 2023-01-08 15:45+01:00
+
+* Fix collectstaticfiles causing error when restarting container (https://git.kucharczyk.xyz/lukas/timetracker/issues/23)
+
+## 0.1.3 / 2023-01-08 15:23+01:00
+
+* Fix CSRF error (https://git.kucharczyk.xyz/lukas/timetracker/pulls/22)
+
 ## 0.1.2 / 2023-01-07 22:05+01:00
 
 * Switch to Uvicorn/Gunicorn + Caddy (https://git.kucharczyk.xyz/lukas/timetracker/pulls/4)
@@ -23,4 +157,4 @@
 * Make it possible to add a new platform
 * Save calculated duration to database if both timestamps are set
 * Improve session listing
-* Set version in the footer to fixed, fix main container height
+* Set version in the footer to fixed, fix main container height

Caddyfile

@@ -5,10 +5,10 @@
 
 :8000 {
     handle_path /static/* {
-        root * src/web/static/
+        root * /usr/share/caddy
         file_server
     }
     handle {
-        reverse_proxy :8001
+        reverse_proxy backend:8001
     }
 }

Dockerfile

@@ -2,30 +2,26 @@ FROM node as css
 WORKDIR /app
 COPY . /app
 RUN npm install && \
-    npx tailwindcss -i ./src/input.css -o ./src/web/tracker/static/base.css --minify
+    npx tailwindcss -i ./common/input.css -o ./static/base.css --minify
 
-FROM python:3.10.9-alpine
+FROM python:3.10.9-slim-bullseye
 
-ENV VERSION_NUMBER 0.1.2
+ENV VERSION_NUMBER 1.3.0
 ENV PROD 1
+ENV PYTHONUNBUFFERED=1
 
-RUN apk add \
-    bash \
-    vim \
-    curl \
-    caddy
-RUN adduser -D -u 1000 timetracker
+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/src/web/tracker/static/base.css /home/timetracker/app/src/web/tracker/static/base.css
+COPY --from=css ./app/static/base.css /home/timetracker/app/static/base.css
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
 USER timetracker
 ENV PATH="$PATH:/home/timetracker/.local/bin"
 RUN pip install --no-cache-dir poetry
-RUN poetry install --without dev
+RUN poetry install
 
 EXPOSE 8000
-ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "/entrypoint.sh" ]

Makefile

@@ -2,49 +2,52 @@ all: css migrate
 
 initialize: npm css migrate sethookdir loadplatforms
 
-HTMLFILES := $(shell find src/web/tracker/templates -type f)
+HTMLFILES := $(shell find games/templates -type f)
 
 npm:
 	npm install
 
-css: src/input.css
-	npx tailwindcss -i ./src/input.css -o  ./src/web/tracker/static/base.css
+css: common/input.css
+	npx tailwindcss -i ./common/input.css -o  ./games/static/base.css
 
 css-dev: css
-	npx tailwindcss -i ./src/input.css -o  ./src/web/tracker/static/base.css --watch
+	npx tailwindcss -i ./common/input.css -o  ./games/static/base.css --watch
 
 makemigrations:
-	poetry run python src/web/manage.py makemigrations
+	poetry run python manage.py makemigrations
 
 migrate: makemigrations
-	poetry run python src/web/manage.py migrate
+	poetry run python manage.py migrate
 
-dev: migrate sethookdir
-	poetry run python src/web/manage.py runserver_plus
+dev: migrate
+	poetry run python manage.py runserver
 
 caddy:
 	caddy run --watch
 
-dev-prod: migrate collectstatic sethookdir
-	cd src/web/; PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker
+dev-prod: migrate collectstatic
+	PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker
 
-dumptracker:
-	poetry run python src/web/manage.py dumpdata --format yaml tracker --output tracker_fixture.yaml
+dumpgames:
+	poetry run python manage.py dumpdata --format yaml games --output tracker_fixture.yaml
 
 loadplatforms:
-	poetry run python src/web/manage.py loaddata platforms.yaml
+	poetry run python manage.py loaddata platforms.yaml
+
+loadall:
+	poetry run python manage.py loaddata data.yaml
 
 loadsample:
-	poetry run python src/web/manage.py loaddata sample.yaml
+	poetry run python manage.py loaddata sample.yaml
 
 createsuperuser:
-	poetry run python src/web/manage.py createsuperuser
+	poetry run python manage.py createsuperuser
 
 shell:
-	poetry run python src/web/manage.py shell
+	poetry run python manage.py shell
 
 collectstatic:
-	poetry run python src/web/manage.py collectstatic
+	poetry run python manage.py collectstatic --clear --no-input
 
 poetry.lock: pyproject.toml
 	poetry install
@@ -52,13 +55,10 @@ poetry.lock: pyproject.toml
 test: poetry.lock
 	poetry run pytest
 
-sethookdir:
-	git config core.hooksPath .githooks
-
 date:
-	python3 -c 'import datetime; from zoneinfo import ZoneInfo; print(datetime.datetime.isoformat(datetime.datetime.now(ZoneInfo("Europe/Prague")), timespec="minutes", sep=" "))'
+	poetry run python -c 'import datetime; from zoneinfo import ZoneInfo; print(datetime.datetime.isoformat(datetime.datetime.now(ZoneInfo("Europe/Prague")), timespec="minutes", sep=" "))'
 
 cleanstatic:
-	rm -r src/web/static/*
+	rm -r static/*
 
 clean: cleanstatic

common/import_data.py

@@ -0,0 +1,30 @@
+import csv
+from typing import TypeAlias
+
+from games.models import Game
+
+DataList: TypeAlias = list[dict[str, str]] | None
+
+
+def read_csv(filename: str) -> DataList:
+    with open(filename, "r") as csvfile:
+        writer = csv.DictReader(csvfile)
+        return writer
+
+
+def import_data(data: DataList):
+    matching_names = {}
+    for line in data:
+        name = line["name"]
+        if name not in matching_names:
+            # try exact match first
+            try:
+                game_id = Game.objects.get(name__iexact=name)
+            except:
+                pass
+            matching_names[name] = game_id
+    print(f"Exact matched {len(matching_names)} games.")
+
+
+def import_from_file(filename: str):
+    import_data(read_csv(filename))

common/input.css

@@ -0,0 +1,103 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@font-face {
+  font-family: "IBM Plex Mono";
+  src: url("fonts/IBMPlexMono-regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "IBM Plex Sans";
+  src: url("fonts/IBMPlexSans-Regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "IBM Plex Serif";
+  src: url("fonts/IBMPlexSerif-Regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
+form label {
+  @apply dark:text-slate-400;
+}
+
+.responsive-table {
+  @apply dark:text-white mx-auto;
+}
+
+.responsive-table tr:nth-child(even) {
+  @apply bg-slate-800
+}
+
+.responsive-table tbody tr:nth-child(odd) {
+  @apply bg-slate-900
+}
+
+.responsive-table thead th {
+  @apply text-left border-b-2 border-b-slate-500 text-xl;
+}
+
+.responsive-table thead th:not(:first-child),
+.responsive-table td:not(:first-child) {
+  @apply border-l border-l-slate-500;
+}
+
+@layer utilities {
+  .max-w-20char {
+    max-width: 20ch;
+  }
+  .max-w-35char {
+    max-width: 40ch;
+  }
+  .max-w-40char {
+    max-width: 40ch;
+  }
+}
+
+form input,
+select,
+textarea {
+  @apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
+}
+
+@media screen and (min-width: 768px) {
+  form input,
+  select,
+  textarea {
+    width: 300px;
+  }
+}
+
+@media screen and (max-width: 768px) {
+  form input,
+  select,
+  textarea {
+    width: 150px;
+  }
+}
+
+#button-container button {
+  @apply mx-1;
+}
+
+th {
+  @apply text-right;
+}
+
+th label {
+  @apply mr-4;
+}
+
+.basic-button-container {
+  @apply flex space-x-2 justify-center;
+}
+
+.basic-button {
+  @apply inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight uppercase rounded shadow-md hover:bg-blue-700 hover:shadow-lg focus:bg-blue-700 focus:shadow-lg focus:outline-none focus:ring-0 active:bg-blue-800 active:shadow-lg transition duration-150 ease-in-out;
+}

common/time.py

@@ -0,0 +1,79 @@
+import re
+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):
+    if duration == None:
+        return timedelta(0)
+    elif isinstance(duration, int):
+        return timedelta(seconds=duration)
+    elif isinstance(duration, timedelta):
+        return duration
+
+
+def format_duration(
+    duration: timedelta | int | None, format_string: str = "%H hours"
+) -> str:
+    """
+    Format timedelta into the specified format_string.
+    Valid format variables:
+    - %H hours
+    - %m minutes
+    - %s seconds
+    - %r total seconds
+    Values don't change into higher units if those units are missing
+    from the formatting string. For example:
+    - 61 seconds as "%s" = 61 seconds
+    - 61 seconds as "%m %s" = 1 minutes 1 seconds"
+    Format specifiers can include width and precision options:
+    - %5.2H: hours formatted with width 5 and 2 decimal places (padded with zeros)
+    """
+    minute_seconds = 60
+    hour_seconds = 60 * minute_seconds
+    day_seconds = 24 * hour_seconds
+    safe_duration = _safe_timedelta(duration)
+    # we don't need float
+    seconds_total = int(safe_duration.total_seconds())
+    # timestamps where end is before start
+    if seconds_total < 0:
+        seconds_total = 0
+    days = hours = minutes = seconds = 0
+    remainder = seconds = seconds_total
+    if "%d" in format_string:
+        days, remainder = divmod(seconds_total, day_seconds)
+    if re.search(r"%\d*\.?\d*H", format_string):
+        hours_float, remainder = divmod(remainder, hour_seconds)
+        hours = float(hours_float) + remainder / hour_seconds
+    if re.search(r"%\d*\.?\d*m", format_string):
+        minutes, seconds = divmod(remainder, minute_seconds)
+    literals = {
+        "d": str(days),
+        "H": str(hours),
+        "m": str(minutes),
+        "s": str(seconds),
+        "r": str(seconds_total),
+    }
+    formatted_string = format_string
+    for pattern, replacement in literals.items():
+        # Match format specifiers with optional width and precision
+        match = re.search(rf"%(\d*\.?\d*){pattern}", formatted_string)
+        if match:
+            format_spec = match.group(1)
+            if "." in format_spec:
+                # Format the number as float if precision is specified
+                replacement = f"{float(replacement):{format_spec}f}"
+            else:
+                # Format the number as integer if no precision is specified
+                replacement = f"{int(float(replacement)):>{format_spec}}"
+            # Replace the format specifier with the formatted number
+            formatted_string = re.sub(
+                rf"%\d*\.?\d*{pattern}", replacement, formatted_string
+            )
+    return formatted_string

docker-compose.no-caddy.yml

@@ -0,0 +1,17 @@
+---
+services:
+  timetracker:
+    image: registry.kucharczyk.xyz/timetracker
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: timetracker
+    environment:
+      - TZ=Europe/Prague
+      - CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
+    user: "1000"
+    # volumes:
+    #   - "db:/home/timetracker/app/src/timetracker/db.sqlite3"
+    ports:
+      - "8000:8000"
+    restart: unless-stopped

docker-compose.yml

@@ -1,17 +1,28 @@
 ---
 services:
-  timetracker:
+  backend:
     image: registry.kucharczyk.xyz/timetracker
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: timetracker
     environment:
       - TZ=Europe/Prague
       - CSRF_TRUSTED_ORIGINS="https://tracker.kucharczyk.xyz"
     user: "1000"
-    # volumes:
-    #   - "db:/home/timetracker/app/src/web/db.sqlite3"
+    volumes:
+      - "static-files:/home/timetracker/app/static"
+    restart: unless-stopped
+
+  frontend:
+    image: caddy
+    volumes:
+      - "static-files:/usr/share/caddy"
+      - "$PWD/Caddyfile:/etc/caddy/Caddyfile"
     ports:
       - "8000:8000"
-    restart: unless-stopped
+    depends_on:
+      - backend
+
+volumes:
+  static-files:
+    

entrypoint.sh

@@ -2,12 +2,18 @@
 # Apply database migrations
 set -euo pipefail
 echo "Apply database migrations"
-poetry run python src/web/manage.py migrate
+poetry run python manage.py migrate
 
 echo "Collect static files"
-poetry run python src/web/manage.py collectstatic
+poetry run python manage.py collectstatic --clear --no-input
 
-echo "Starting server"
-caddy start
-cd src/web || exit
-poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker
+_term() {
+  echo "Caught SIGTERM signal!"
+  kill -SIGTERM "$gunicorn_pid"
+}
+trap _term SIGTERM
+
+echo "Starting app"
+poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker --access-logfile - --error-logfile - & gunicorn_pid=$!
+
+wait "$gunicorn_pid"

games/admin.py

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

games/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class TrackerConfig(AppConfig):
+class GamesConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "tracker"
+    name = "games"

games/fixtures/platforms.yaml

@@ -1,28 +1,28 @@
-- model: tracker.Platform
+- model: games.Platform
   fields:
     name: Steam
     group: PC
-- model: tracker.Platform
+- model: games.Platform
   fields:
     name: Xbox Gamepass
     group: PC
-- model: tracker.Platform
+- model: games.Platform
   fields:
     name: Epic Games Store
     group: PC
-- model: tracker.Platform
+- model: games.Platform
   fields:
     name: Playstation 5
     group: Playstation
-- model: tracker.Platform
+- model: games.Platform
   fields:
     name: Playstation 4
     group: Playstation
-- model: tracker.Platform
+- model: games.Platform
   fields:
     name: Nintendo Switch
     group: Nintendo
-- model: tracker.Platform
+- model: games.Platform
   fields:
     name: Nintendo 3DS
     group: Nintendo

games/fixtures/ps-tracker.csv

@@ -0,0 +1,225 @@
+name,platform,start,end
+Nioh 2,PS5,2022-12-17 19:34,2022-12-17 22:53
+Nioh 2,PS5,2022-12-15 02:25,2022-12-15 03:57
+Nioh 2,PS5,2022-12-13 02:41,2022-12-13 04:34
+Nioh 2,PS5,2022-12-11 21:01,2022-12-11 23:21
+VALKYRIE ELYSIUM,PS5,2022-12-11 06:07,2022-12-11 06:20
+Metal: Hellsinger,PS5,2022-12-11 05:50,2022-12-11 06:07
+Nioh 2,PS5,2022-12-11 04:31,2022-12-11 05:50
+Nioh 2,PS5,2022-12-11 04:11,2022-12-11 04:26
+Forspoken,PS5,2022-12-10 22:29,2022-12-10 23:10
+Nioh 2,PS5,2022-12-10 19:44,2022-12-10 22:29
+Nioh 2,PS5,2022-12-09 02:14,2022-12-09 04:16
+Nioh 2,PS5,2022-12-08 01:03,2022-12-08 01:57
+Nioh 2,PS5,2022-12-07 00:43,2022-12-07 04:16
+Nioh 2,PS5,2022-12-04 20:48,2022-12-04 23:31
+Nioh 2,PS5,2022-12-04 04:26,2022-12-04 07:01
+Nioh 2,PS5,2022-12-04 04:20,2022-12-04 04:22
+Nioh 2,PS5,2022-11-26 19:18,2022-11-26 21:28
+Nioh 2,PS5,2022-11-26 19:16,2022-11-26 19:18
+Nioh 2,PS5,2022-11-26 02:46,2022-11-26 03:56
+Nioh 2,PS5,2022-11-26 02:01,2022-11-26 02:43
+God of War Ragnarök,PS5,2022-11-24 23:03,2022-11-25 01:32
+God of War Ragnarök,PS5,2022-11-23 00:41,2022-11-23 07:52
+God of War Ragnarök,PS5,2022-11-21 22:52,2022-11-22 04:51
+God of War Ragnarök,PS5,2022-11-21 02:11,2022-11-21 05:13
+God of War Ragnarök,PS5,2022-11-20 21:34,2022-11-20 22:50
+God of War Ragnarök,PS5,2022-11-20 03:46,2022-11-20 05:52
+God of War Ragnarök,PS5,2022-11-19 14:30,2022-11-19 16:14
+God of War Ragnarök,PS5,2022-11-18 23:15,2022-11-19 04:16
+God of War Ragnarök,PS5,2022-11-18 19:58,2022-11-18 20:40
+God of War Ragnarök,PS5,2022-11-18 03:50,2022-11-18 06:25
+God of War Ragnarök,PS5,2022-11-17 19:36,2022-11-18 00:26
+God of War Ragnarök,PS5,2022-11-17 13:16,2022-11-17 16:13
+God of War Ragnarök,PS5,2022-11-16 21:45,2022-11-16 22:38
+God of War Ragnarök,PS5,2022-11-16 00:14,2022-11-16 04:28
+God of War Ragnarök,PS5,2022-11-15 01:33,2022-11-15 05:06
+God of War Ragnarök,PS5,2022-11-14 00:37,2022-11-14 04:43
+God of War Ragnarök,PS5,2022-11-12 23:32,2022-11-13 03:45
+God of War Ragnarök,PS5,2022-11-12 03:17,2022-11-12 05:00
+Grand Theft Auto V (PlayStation®5),PS5,2022-10-03 02:01,2022-10-03 02:23
+Grand Theft Auto V (PlayStation®5),PS5,2022-10-02 13:59,2022-10-02 15:54
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-30 22:40,2022-10-01 02:50
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-27 22:38,2022-09-28 00:16
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-27 19:27,2022-09-27 21:09
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-26 20:58,2022-09-26 23:38
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 23:56,2022-09-26 02:36
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 14:57,2022-09-25 16:38
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 02:04,2022-09-25 02:12
+Grand Theft Auto V (PlayStation®5),PS5,2022-09-23 20:33,2022-09-23 23:38
+Wo Long: Fallen Dynasty,PS5,2022-09-18 15:26,2022-09-18 16:58
+Grand Theft Auto V (PlayStation®5),PS5,2022-08-31 00:42,2022-08-31 01:15
+Grand Theft Auto V (PlayStation®5),PS5,2022-08-18 13:43,2022-08-18 15:12
+Grand Theft Auto V (PlayStation®5),PS5,2022-08-18 00:42,2022-08-18 01:58
+Tony Hawk's™ Pro Skater™ 1 + 2,PS5,2022-08-18 00:40,2022-08-18 00:42
+Tony Hawk's™ Pro Skater™ 1 + 2,PS5,2022-08-14 15:46,2022-08-14 16:10
+FINAL FANTASY VII,PS5,2022-07-26 18:56,2022-07-26 20:22
+FINAL FANTASY VII REMAKE,PS5,2022-07-26 17:39,2022-07-26 18:53
+FINAL FANTASY VII REMAKE,PS5,2022-07-25 22:12,2022-07-26 04:37
+FINAL FANTASY VII REMAKE,PS5,2022-07-24 00:09,2022-07-24 05:33
+FINAL FANTASY VII REMAKE,PS5,2022-07-23 23:34,2022-07-23 23:48
+FINAL FANTASY VII REMAKE,PS5,2022-07-23 18:05,2022-07-23 19:44
+FINAL FANTASY VII REMAKE,PS5,2022-07-22 17:07,2022-07-23 01:48
+FINAL FANTASY VII REMAKE,PS5,2022-07-22 15:26,2022-07-22 15:59
+FINAL FANTASY VII REMAKE,PS5,2022-07-21 21:27,2022-07-21 22:43
+FINAL FANTASY VII REMAKE,PS5,2022-07-21 20:48,2022-07-21 20:58
+FINAL FANTASY VII REMAKE,PS5,2022-07-21 18:35,2022-07-21 18:36
+Stray,PS5,2022-07-21 01:24,2022-07-21 02:34
+Stray,PS5,2022-07-19 23:49,2022-07-20 03:24
+Atelier Ayesha ~The Alchemist of Dusk~,PS3,2022-07-04 03:26,2022-07-04 03:34
+Red Dead Redemption,PS3,2022-07-04 02:36,2022-07-04 03:14
+Ghost of Tsushima,PS5,2022-07-04 01:38,2022-07-04 02:34
+Dark Cloud™,PS4,2022-07-01 23:48,2022-07-02 00:04
+Atelier Ayesha ~The Alchemist of Dusk~,PS3,2022-07-01 23:20,2022-07-01 23:46
+Resident Evil Director’s Cut,PS5,2022-07-01 23:14,2022-07-01 23:20
+ELEX II,PS5,2022-07-01 22:48,2022-07-01 23:13
+OlliOlli World,PS5,2022-07-01 21:30,2022-07-01 22:30
+Deep Rock Galactic,PS5,2022-06-16 05:30,2022-06-16 06:14
+Curse of the Dead Gods,PS5,2022-06-16 05:00,2022-06-16 05:22
+Persona 5: Dancing in Starlight,PS5,2022-04-29 20:14,2022-04-29 20:15
+Persona 5: Dancing in Starlight,PS5,2022-04-29 00:18,2022-04-29 00:44
+Dying Light 2,PS5,2022-04-14 01:26,2022-04-14 01:27
+Grand Theft Auto V (PlayStation®5),PS5,2022-03-24 16:26,2022-03-24 16:27
+Grand Theft Auto V (PlayStation®5),PS5,2022-03-21 15:52,2022-03-21 15:59
+Horizon Forbidden West,PS5,2022-02-23 19:37,2022-02-24 00:24
+Horizon Forbidden West,PS5,2022-02-23 13:57,2022-02-23 17:44
+Horizon Forbidden West,PS5,2022-02-22 18:05,2022-02-23 05:26
+Horizon Forbidden West,PS5,2022-02-22 15:39,2022-02-22 17:02
+Horizon Forbidden West,PS5,2022-02-22 00:05,2022-02-22 04:08
+Horizon Forbidden West,PS5,2022-02-20 15:39,2022-02-20 23:08
+Horizon Forbidden West,PS5,2022-02-20 14:54,2022-02-20 15:09
+Horizon Forbidden West,PS5,2022-02-19 23:37,2022-02-20 04:45
+Horizon Forbidden West,PS5,2022-02-18 23:15,2022-02-19 03:27
+Assassin's Creed® Origins,PS5,2022-02-18 21:49,2022-02-18 23:15
+Assassin's Creed® Origins,PS5,2022-01-17 02:38,2022-01-17 02:50
+Deep Rock Galactic,PS5,2022-01-17 00:57,2022-01-17 02:35
+HITMAN 3,PS5,2021-11-17 00:35,2021-11-17 01:17
+HITMAN 3,PS5,2021-11-08 01:59,2021-11-08 06:17
+HITMAN 3,PS5,2021-11-07 03:10,2021-11-07 05:23
+HITMAN 3,PS5,2021-11-06 04:23,2021-11-06 08:49
+HITMAN 3,PS5,2021-11-06 02:17,2021-11-06 03:31
+HITMAN 3,PS5,2021-11-05 21:33,2021-11-05 23:24
+HITMAN 3,PS5,2021-11-05 03:09,2021-11-05 03:34
+HITMAN 3,PS5,2021-11-05 00:47,2021-11-05 02:26
+HITMAN 3,PS5,2021-11-04 20:27,2021-11-04 23:32
+HITMAN 3,PS5,2021-11-04 01:34,2021-11-04 05:33
+RESIDENT EVIL 3,PS5,2021-11-03 23:14,2021-11-03 23:56
+RESIDENT EVIL 3,PS5,2021-11-02 23:56,2021-11-03 05:10
+RESIDENT EVIL 3,PS5,2021-11-02 21:22,2021-11-02 23:23
+RESIDENT EVIL 3,PS5,2021-11-02 05:36,2021-11-02 06:56
+HITMAN 3,PS5,2021-11-02 03:00,2021-11-02 05:36
+HITMAN 3,PS5,2021-11-02 01:19,2021-11-02 01:25
+HITMAN™ 2,PS5,2021-11-02 01:09,2021-11-02 01:19
+HITMAN 3,PS5,2021-11-01 23:45,2021-11-02 01:09
+RESIDENT EVIL 3,PS5,2021-11-01 19:32,2021-11-01 19:47
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-17 01:06,2021-10-17 03:27
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-16 20:58,2021-10-16 22:00
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-05 02:30,2021-10-05 03:27
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-03 23:12,2021-10-04 01:21
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-03 03:02,2021-10-03 04:42
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-02 20:12,2021-10-02 21:10
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-02 01:40,2021-10-02 03:36
+Marvel's Spider-Man: Miles Morales,PS5,2021-10-01 04:34,2021-10-01 05:30
+DEATHLOOP,PS5,2021-10-01 01:12,2021-10-01 04:27
+DEATHLOOP,PS5,2021-09-30 03:04,2021-09-30 06:30
+DEATHLOOP,PS5,2021-09-29 00:28,2021-09-29 05:08
+Persona 5 Royal,PS5,2021-09-28 00:36,2021-09-28 03:08
+Persona 5 Royal,PS5,2021-09-27 02:16,2021-09-27 05:56
+Persona 5 Royal,PS5,2021-09-26 14:54,2021-09-26 16:32
+Persona 5 Royal,PS5,2021-09-25 18:43,2021-09-25 23:26
+Persona 5 Royal,PS5,2021-09-24 21:41,2021-09-25 03:40
+Persona 5 Royal,PS5,2021-09-23 00:18,2021-09-23 06:26
+Persona 5 Royal,PS5,2021-09-21 20:27,2021-09-22 05:43
+Persona 5 Royal,PS5,2021-09-21 01:07,2021-09-21 06:06
+Borderlands: The Handsome Collection,PS5,2021-09-20 23:59,2021-09-21 01:07
+Persona 5 Royal,PS5,2021-09-20 23:53,2021-09-20 23:59
+DEATHLOOP,PS5,2021-09-20 02:03,2021-09-20 06:29
+DEATHLOOP,PS5,2021-09-19 19:49,2021-09-20 01:16
+Borderlands: The Handsome Collection,PS5,2021-09-19 00:51,2021-09-19 03:41
+Borderlands: The Handsome Collection,PS5,2021-09-17 23:45,2021-09-18 01:48
+Borderlands: The Handsome Collection,PS5,2021-09-17 23:40,2021-09-17 23:41
+DEATHLOOP,PS5,2021-09-17 16:48,2021-09-17 18:56
+DEATHLOOP,PS5,2021-09-17 03:02,2021-09-17 04:39
+DEATHLOOP,PS5,2021-09-17 00:03,2021-09-17 02:53
+DEATHLOOP,PS5,2021-09-16 18:39,2021-09-16 21:12
+Persona 5 Royal,PS5,2021-09-16 18:29,2021-09-16 18:30
+Persona 5 Royal,PS5,2021-09-16 02:26,2021-09-16 06:13
+Persona 5 Royal,PS5,2021-09-16 02:20,2021-09-16 02:21
+Persona 5 Royal,PS5,2021-09-15 01:48,2021-09-15 06:07
+Persona 5 Royal,PS5,2021-09-14 22:21,2021-09-15 01:22
+Persona 5 Royal,PS5,2021-09-14 02:01,2021-09-14 05:48
+Persona 5 Royal,PS5,2021-09-14 00:24,2021-09-14 01:46
+Persona 5 Royal,PS5,2021-08-12 05:04,2021-08-12 07:05
+Persona 5 Royal,PS5,2021-08-11 05:02,2021-08-11 06:48
+Persona 5 Royal,PS5,2021-08-09 00:37,2021-08-09 06:15
+Persona 5 Royal,PS5,2021-08-08 00:31,2021-08-08 08:01
+Persona 5 Royal,PS5,2021-08-07 19:51,2021-08-07 22:50
+Persona 5 Royal,PS5,2021-08-06 23:51,2021-08-07 01:35
+Persona 5 Royal,PS5,2021-08-06 19:26,2021-08-06 22:26
+Persona 5 Royal,PS5,2021-08-06 02:42,2021-08-06 06:51
+Persona 5 Royal,PS5,2021-08-06 00:37,2021-08-06 01:54
+Far Cry® 5,PS5,2021-08-01 23:27,2021-08-02 02:09
+Far Cry® 5,PS5,2021-08-01 18:10,2021-08-01 19:40
+STAR WARS™: Squadrons,PS5,2021-08-01 18:02,2021-08-01 18:10
+STAR WARS™: Squadrons,PS5,2021-08-01 00:24,2021-08-01 00:30
+STEEP,PS5,2021-08-01 00:15,2021-08-01 00:24
+Red Dead Redemption 2,PS5,2021-07-31 23:48,2021-08-01 00:13
+Persona 5 Royal,PS5,2021-07-30 19:09,2021-07-30 19:10
+Persona 5 Royal,PS5,2021-07-29 03:41,2021-07-29 04:59
+Persona 5 Royal,PS5,2021-07-28 02:32,2021-07-28 03:07
+Demon's Souls,PS5,2021-07-28 00:12,2021-07-28 02:32
+Red Dead Redemption 2,PS5,2021-07-27 23:20,2021-07-27 23:23
+Red Dead Redemption 2,PS5,2021-07-26 00:42,2021-07-26 01:13
+Ghost of Tsushima,PS5,2021-07-25 19:03,2021-07-25 22:12
+Ghost of Tsushima,PS5,2021-07-25 18:52,2021-07-25 18:55
+Rez Infinite,PS5,2021-07-25 18:32,2021-07-25 18:52
+Returnal,PS5,2021-07-25 05:24,2021-07-25 05:26
+Tom Clancy's The Division® 2,PS5,2021-07-25 02:12,2021-07-25 05:24
+Returnal,PS5,2021-07-25 00:00,2021-07-25 02:12
+Returnal,PS5,2021-07-24 16:13,2021-07-24 17:39
+Returnal,PS5,2021-07-24 03:02,2021-07-24 07:02
+Returnal,PS5,2021-07-23 18:08,2021-07-23 20:39
+Returnal,PS5,2021-07-23 14:36,2021-07-23 15:38
+Titanfall™ 2,PS5,2021-07-22 02:42,2021-07-22 03:20
+Returnal,PS5,2021-07-20 02:12,2021-07-20 05:40
+Returnal,PS5,2021-07-19 03:37,2021-07-19 05:24
+Concrete Genie,PS5,2021-07-19 03:35,2021-07-19 03:37
+Concrete Genie,PS5,2021-07-18 05:04,2021-07-18 05:30
+Stranded Deep,PS5,2021-07-18 04:32,2021-07-18 04:58
+Sniper Elite 4,PS5,2021-07-18 04:16,2021-07-18 04:32
+Oddworld: Soulstorm,PS5,2021-07-18 04:00,2021-07-18 04:14
+Zombie Army 4: Dead War,PS5,2021-07-18 03:48,2021-07-18 03:58
+Sekiro™: Shadows Die Twice,PS5,2021-07-18 03:00,2021-07-18 03:48
+Returnal,PS5,2021-07-17 17:41,2021-07-17 23:32
+Returnal,PS5,2021-07-17 01:35,2021-07-17 06:07
+Returnal,PS5,2021-07-17 00:23,2021-07-17 01:21
+Another World - 20th Anniversary Edition,PS5,2021-07-15 22:09,2021-07-15 23:33
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 21:52,2021-07-15 22:09
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 19:07,2021-07-15 20:13
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 01:50,2021-07-15 03:31
+Sekiro™: Shadows Die Twice,PS5,2021-07-15 00:12,2021-07-15 01:14
+Sekiro™: Shadows Die Twice,PS5,2021-07-14 03:19,2021-07-14 05:13
+Persona 5,PS5,2021-07-13 21:56,2021-07-13 21:58
+Persona 5,PS5,2021-07-13 01:32,2021-07-13 02:59
+Maquette,PS5,2021-07-13 01:30,2021-07-13 01:32
+Maquette,PS5,2021-07-12 23:59,2021-07-13 00:34
+ASTRO's PLAYROOM,PS5,2021-07-12 23:06,2021-07-12 23:59
+Crash Bandicoot N. Sane Trilogy,PS5,2021-07-12 23:01,2021-07-12 23:06
+Virtua Fighter 5 Ultimate Showdown,PS4,2021-07-02 19:46,2021-07-02 20:57
+Bloodborne™,PS4,2021-04-03 19:50,2021-04-03 23:52
+Tom Clancy's The Division® 2,PS4,2021-04-03 02:10,2021-04-03 05:22
+Bloodborne™,PS4,2021-04-02 21:34,2021-04-03 02:10
+Bloodborne™,PS4,2021-04-02 06:01,2021-04-02 08:11
+Tom Clancy's The Division® 2,PS4,2021-04-02 04:24,2021-04-02 06:01
+Tom Clancy's The Division® 2,PS4,2021-03-31 02:55,2021-03-31 05:50
+Tom Clancy's The Division® 2,PS4,2021-03-29 02:00,2021-03-29 02:02
+Tom Clancy's The Division® 2,PS4,2021-03-27 03:31,2021-03-27 06:29
+Tom Clancy's The Division® 2,PS4,2021-03-26 05:10,2021-03-26 06:03
+Remnant: From the Ashes,PS4,2021-03-23 03:20,2021-03-23 05:58
+DARK SOULS™ II: Scholar of the First Sin,PS4,2021-03-20 01:31,2021-03-20 01:34
+Remnant: From the Ashes,PS4,2021-03-12 01:29,2021-03-12 01:30
+Remnant: From the Ashes,PS4,2021-03-08 02:41,2021-03-08 05:38
+Remnant: From the Ashes,PS4,2021-03-07 03:21,2021-03-07 06:49
+13 Sentinels: Aegis Rim,PS4,2021-03-07 03:20,2021-03-07 03:21
+DARK SOULS™ II: Scholar of the First Sin,PS4,2020-10-24 23:43,2020-10-25 01:18
+Ghost of Tsushima,PS4,2020-10-24 23:14,2020-10-24 23:22

games/fixtures/sample.yaml

@@ -0,0 +1,71 @@
+- model: games.game
+  pk: 1
+  fields:
+    name: Nioh 2
+    wikidata: Q67482292
+- model: games.game
+  pk: 2
+  fields:
+    name: Elden Ring
+    wikidata: Q64826862
+- model: games.game
+  pk: 3
+  fields:
+    name: Cyberpunk 2077
+    wikidata: Q3182559
+- model: games.purchase
+  pk: 1
+  fields:
+    game: 1
+    platform: 1
+    date_purchased: 2021-02-13
+    date_refunded: null
+- model: games.purchase
+  pk: 2
+  fields:
+    game: 2
+    platform: 1
+    date_purchased: 2022-02-24
+    date_refunded: null
+- model: games.purchase
+  pk: 3
+  fields:
+    game: 3
+    platform: 1
+    date_purchased: 2020-12-07
+    date_refunded: null
+- model: games.platform
+  pk: 1
+  fields:
+    name: Steam
+    group: PC
+- model: games.platform
+  pk: 3
+  fields:
+    name: Xbox Gamepass
+    group: PC
+- model: games.platform
+  pk: 4
+  fields:
+    name: Epic Games Store
+    group: PC
+- model: games.platform
+  pk: 5
+  fields:
+    name: Playstation 5
+    group: Playstation
+- model: games.platform
+  pk: 6
+  fields:
+    name: Playstation 4
+    group: Playstation
+- model: games.platform
+  pk: 7
+  fields:
+    name: Nintendo Switch
+    group: Nintendo
+- model: games.platform
+  pk: 8
+  fields:
+    name: Nintendo 3DS
+    group: Nintendo

games/forms.py

@@ -0,0 +1,95 @@
+from django import forms
+
+from games.models import Game, Platform, Purchase, Session, Edition, Device
+
+custom_date_widget = forms.DateInput(attrs={"type": "date"})
+custom_datetime_widget = forms.DateTimeInput(
+    attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M"
+)
+autofocus_select_widget = forms.Select(attrs={"autofocus": "autofocus"})
+autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
+
+
+class SessionForm(forms.ModelForm):
+    # purchase = forms.ModelChoiceField(
+    #     queryset=Purchase.objects.filter(date_refunded=None).order_by("edition__name")
+    # )
+    purchase = forms.ModelChoiceField(
+        queryset=Purchase.objects.order_by("edition__name"),
+        widget=autofocus_select_widget,
+    )
+
+    class Meta:
+        widgets = {
+            "timestamp_start": custom_datetime_widget,
+            "timestamp_end": custom_datetime_widget,
+        }
+        model = Session
+        fields = [
+            "purchase",
+            "timestamp_start",
+            "timestamp_end",
+            "duration_manual",
+            "device",
+            "note",
+        ]
+
+
+class EditionChoiceField(forms.ModelChoiceField):
+    def label_from_instance(self, obj) -> str:
+        return f"{obj.name} ({obj.platform}, {obj.year_released})"
+
+
+class PurchaseForm(forms.ModelForm):
+    edition = EditionChoiceField(
+        queryset=Edition.objects.order_by("name"), widget=autofocus_select_widget
+    )
+    platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
+
+    class Meta:
+        widgets = {
+            "date_purchased": custom_date_widget,
+            "date_refunded": custom_date_widget,
+        }
+        model = Purchase
+        fields = [
+            "edition",
+            "platform",
+            "date_purchased",
+            "date_refunded",
+            "price",
+            "price_currency",
+            "ownership_type",
+        ]
+
+
+class EditionForm(forms.ModelForm):
+    game = forms.ModelChoiceField(
+        queryset=Game.objects.order_by("name"), widget=autofocus_select_widget
+    )
+    platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
+
+    class Meta:
+        model = Edition
+        fields = ["game", "name", "platform", "year_released", "wikidata"]
+
+
+class GameForm(forms.ModelForm):
+    class Meta:
+        model = Game
+        fields = ["name", "wikidata"]
+        widgets = {"name": autofocus_input_widget}
+
+
+class PlatformForm(forms.ModelForm):
+    class Meta:
+        model = Platform
+        fields = ["name", "group"]
+        widgets = {"name": autofocus_input_widget}
+
+
+class DeviceForm(forms.ModelForm):
+    class Meta:
+        model = Device
+        fields = ["name", "type"]
+        widgets = {"name": autofocus_input_widget}

games/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.1.4 on 2023-01-02 18:27
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -60,14 +60,14 @@ class Migration(migrations.Migration):
                 (
                     "game",
                     models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="tracker.game"
+                        on_delete=django.db.models.deletion.CASCADE, to="games.game"
                     ),
                 ),
                 (
                     "platform",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to="tracker.platform",
+                        to="games.platform",
                     ),
                 ),
             ],
@@ -93,7 +93,7 @@ class Migration(migrations.Migration):
                     "purchase",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to="tracker.purchase",
+                        to="games.purchase",
                     ),
                 ),
             ],

games/migrations/0002_alter_session_duration_manual.py

@@ -1,13 +1,14 @@
 # Generated by Django 4.1.4 on 2023-01-02 18:55
 
 import datetime
+
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("tracker", "0001_initial"),
+        ("games", "0001_initial"),
     ]
 
     operations = [

games/migrations/0003_alter_session_duration_manual_and_more.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("tracker", "0002_alter_session_duration_manual"),
+        ("games", "0002_alter_session_duration_manual"),
     ]
 
     operations = [

games/migrations/0004_alter_session_duration_manual.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.1.5 on 2023-01-09 14:49
+
+import datetime
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0003_alter_session_duration_manual_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="session",
+            name="duration_manual",
+            field=models.DurationField(
+                blank=True, default=datetime.timedelta(0), null=True
+            ),
+        ),
+    ]

games/migrations/0005_auto_20230109_1843.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.1.5 on 2023-01-09 17:43
+
+from datetime import timedelta
+
+from django.db import migrations
+
+
+def set_duration_calculated_none_to_zero(apps, schema_editor):
+    Session = apps.get_model("games", "Session")
+    for session in Session.objects.all():
+        if session.duration_calculated == None:
+            session.duration_calculated = timedelta(0)
+            session.save()
+
+
+def revert_set_duration_calculated_none_to_zero(apps, schema_editor):
+    Session = apps.get_model("games", "Session")
+    for session in Session.objects.all():
+        if session.duration_calculated == timedelta(0):
+            session.duration_calculated = None
+            session.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0004_alter_session_duration_manual"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            set_duration_calculated_none_to_zero,
+            revert_set_duration_calculated_none_to_zero,
+        )
+    ]

games/migrations/0006_auto_20230109_1904.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.1.5 on 2023-01-09 18:04
+
+from datetime import timedelta
+
+from django.db import migrations
+
+
+def set_duration_manual_none_to_zero(apps, schema_editor):
+    Session = apps.get_model("games", "Session")
+    for session in Session.objects.all():
+        if session.duration_manual == None:
+            session.duration_manual = timedelta(0)
+            session.save()
+
+
+def revert_set_duration_manual_none_to_zero(apps, schema_editor):
+    Session = apps.get_model("games", "Session")
+    for session in Session.objects.all():
+        if session.duration_manual == timedelta(0):
+            session.duration_manual = None
+            session.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0005_auto_20230109_1843"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            set_duration_manual_none_to_zero,
+            revert_set_duration_manual_none_to_zero,
+        )
+    ]

games/migrations/0007_alter_purchase_game_alter_purchase_platform_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.1.5 on 2023-01-19 18:30
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0006_auto_20230109_1904"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="purchase",
+            name="game",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="games.game"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="purchase",
+            name="platform",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="games.platform"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="session",
+            name="purchase",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="games.purchase"
+            ),
+        ),
+    ]

games/migrations/0008_edition.py

@@ -0,0 +1,41 @@
+# Generated by Django 4.1.5 on 2023-02-18 16:29
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0007_alter_purchase_game_alter_purchase_platform_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Edition",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                (
+                    "game",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="games.game"
+                    ),
+                ),
+                (
+                    "platform",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="games.platform"
+                    ),
+                ),
+            ],
+        ),
+    ]

games/migrations/0009_create_editions.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.5 on 2023-02-18 18:51
+
+from django.db import migrations
+
+
+def create_edition_of_game(apps, schema_editor):
+    Game = apps.get_model("games", "Game")
+    Edition = apps.get_model("games", "Edition")
+    Platform = apps.get_model("games", "Platform")
+    first_platform = Platform.objects.first()
+    all_games = Game.objects.all()
+    all_editions = Edition.objects.all()
+    for game in all_games:
+        existing_edition = None
+        try:
+            existing_edition = all_editions.objects.get(game=game.id)
+        except:
+            pass
+        if existing_edition == None:
+            edition = Edition()
+            edition.id = game.id
+            edition.game = game
+            edition.name = game.name
+            edition.platform = first_platform
+            edition.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0008_edition"),
+    ]
+
+    operations = [migrations.RunPython(create_edition_of_game)]

games/migrations/0010_alter_purchase_game.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.1.5 on 2023-02-18 19:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0009_create_editions"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="purchase",
+            name="game",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="games.edition"
+            ),
+        ),
+    ]

games/migrations/0011_rename_game_purchase_edition.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-02-18 19:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0010_alter_purchase_game"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="purchase",
+            old_name="game",
+            new_name="edition",
+        ),
+    ]

games/migrations/0012_purchase_price_purchase_price_currency.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.5 on 2023-02-18 19:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0011_rename_game_purchase_edition"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="price",
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name="purchase",
+            name="price_currency",
+            field=models.CharField(default="USD", max_length=3),
+        ),
+    ]

games/migrations/0013_purchase_ownership_type.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.1.5 on 2023-02-18 19:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0012_purchase_price_purchase_price_currency"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="purchase",
+            name="ownership_type",
+            field=models.CharField(
+                choices=[
+                    ("ph", "Physical"),
+                    ("di", "Digital"),
+                    ("du", "Digital Upgrade"),
+                    ("re", "Rented"),
+                    ("bo", "Borrowed"),
+                    ("tr", "Trial"),
+                    ("de", "Demo"),
+                    ("pi", "Pirated"),
+                ],
+                default="di",
+                max_length=2,
+            ),
+        ),
+    ]

games/migrations/0014_device_session_device.py

@@ -0,0 +1,52 @@
+# Generated by Django 4.1.5 on 2023-02-18 19:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0013_purchase_ownership_type"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Device",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[
+                            ("pc", "PC"),
+                            ("co", "Console"),
+                            ("ha", "Handheld"),
+                            ("mo", "Mobile"),
+                            ("sbc", "Single-board computer"),
+                        ],
+                        default="pc",
+                        max_length=3,
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddField(
+            model_name="session",
+            name="device",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="games.device",
+            ),
+        ),
+    ]

games/migrations/0015_edition_wikidata_edition_year_released.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.5 on 2023-02-20 14:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("games", "0014_device_session_device"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="edition",
+            name="wikidata",
+            field=models.CharField(blank=True, default=None, max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name="edition",
+            name="year_released",
+            field=models.IntegerField(default=2023),
+        ),
+    ]

games/models.py

@@ -0,0 +1,149 @@
+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):
+    name = models.CharField(max_length=255)
+    wikidata = models.CharField(max_length=50)
+
+    def __str__(self):
+        return self.name
+
+
+class Edition(models.Model):
+    game = models.ForeignKey("Game", on_delete=models.CASCADE)
+    name = models.CharField(max_length=255)
+    platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
+    year_released = models.IntegerField(default=datetime.today().year)
+    wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
+
+    def __str__(self):
+        return self.name
+
+
+class Purchase(models.Model):
+    PHYSICAL = "ph"
+    DIGITAL = "di"
+    DIGITALUPGRADE = "du"
+    RENTED = "re"
+    BORROWED = "bo"
+    TRIAL = "tr"
+    DEMO = "de"
+    PIRATED = "pi"
+    OWNERSHIP_TYPES = [
+        (PHYSICAL, "Physical"),
+        (DIGITAL, "Digital"),
+        (DIGITALUPGRADE, "Digital Upgrade"),
+        (RENTED, "Rented"),
+        (BORROWED, "Borrowed"),
+        (TRIAL, "Trial"),
+        (DEMO, "Demo"),
+        (PIRATED, "Pirated"),
+    ]
+
+    edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
+    platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
+    date_purchased = models.DateField()
+    date_refunded = models.DateField(blank=True, null=True)
+    price = models.IntegerField(default=0)
+    price_currency = models.CharField(max_length=3, default="USD")
+    ownership_type = models.CharField(
+        max_length=2, choices=OWNERSHIP_TYPES, default=DIGITAL
+    )
+
+    def __str__(self):
+        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)
+
+    def __str__(self):
+        return self.name
+
+
+class SessionQuerySet(models.QuerySet):
+    def total_duration_formatted(self):
+        return format_duration(self.total_duration_unformatted())
+
+    def total_duration_unformatted(self):
+        result = self.aggregate(
+            duration=Sum(F("duration_calculated") + F("duration_manual"))
+        )
+        return result["duration"]
+
+
+class Session(models.Model):
+    purchase = models.ForeignKey("Purchase", on_delete=models.CASCADE)
+    timestamp_start = models.DateTimeField()
+    timestamp_end = models.DateTimeField(blank=True, null=True)
+    duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
+    duration_calculated = models.DurationField(blank=True, null=True)
+    device = models.ForeignKey("Device", on_delete=models.CASCADE, null=True)
+    note = models.TextField(blank=True, null=True)
+
+    objects = SessionQuerySet.as_manager()
+
+    def __str__(self):
+        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 = datetime.now(ZoneInfo(settings.TIME_ZONE))
+
+    def start_now():
+        self.timestamp_start = datetime.now(ZoneInfo(settings.TIME_ZONE))
+
+    def duration_seconds(self) -> timedelta:
+        manual = timedelta(0)
+        calculated = timedelta(0)
+        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
+        return timedelta(seconds=(manual + calculated).total_seconds())
+
+    def duration_formatted(self) -> str:
+        result = format_duration(self.duration_seconds(), "%02.0H:%02.0m")
+        return result
+
+    @property
+    def duration_sum(self) -> str:
+        return Session.objects.all().total_duration_formatted()
+
+    def save(self, *args, **kwargs):
+        if self.timestamp_start != None and self.timestamp_end != None:
+            self.duration_calculated = self.timestamp_end - self.timestamp_start
+        else:
+            self.duration_calculated = timedelta(0)
+        super(Session, self).save(*args, **kwargs)
+
+
+class Device(models.Model):
+    PC = "pc"
+    CONSOLE = "co"
+    HANDHELD = "ha"
+    MOBILE = "mo"
+    SBC = "sbc"
+    DEVICE_TYPES = [
+        (PC, "PC"),
+        (CONSOLE, "Console"),
+        (HANDHELD, "Handheld"),
+        (MOBILE, "Mobile"),
+        (SBC, "Single-board computer"),
+    ]
+    name = models.CharField(max_length=255)
+    type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=PC)
+
+    def __str__(self):
+        return f"{self.name} ({self.get_type_display()})"

games/static/base.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -31,6 +31,7 @@
 3. Use a more readable tab size.
 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.
 */
 
 html {
@@ -43,10 +44,12 @@ html {
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: Inter, sans-serif;
+  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 */
 }
 
 /*
@@ -126,7 +129,7 @@ code,
 kbd,
 samp,
 pre {
-  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
   font-size: 1em;
   /* 2 */
@@ -188,6 +191,10 @@ select,
 textarea {
   font-family: inherit;
   /* 1 */
+  font-feature-settings: inherit;
+  /* 1 */
+  font-variation-settings: inherit;
+  /* 1 */
   font-size: 100%;
   /* 1 */
   font-weight: inherit;
@@ -338,6 +345,14 @@ menu {
   padding: 0;
 }
 
+/*
+Reset default styling for dialogs.
+*/
+
+dialog {
+  padding: 0;
+}
+
 /*
 Prevent resizing textareas horizontally by default.
 */
@@ -419,7 +434,7 @@ video {
   display: none;
 }
 
-[type='text'],[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select {
+[type='text'],input:where(:not([type])),[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select {
   -webkit-appearance: none;
      -moz-appearance: none;
           appearance: none;
@@ -436,7 +451,7 @@ video {
   --tw-shadow: 0 0 #0000;
 }
 
-[type='text']:focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus {
+[type='text']:focus, input:where(:not([type])):focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus {
   outline: 2px solid transparent;
   outline-offset: 2px;
   --tw-ring-inset: var(--tw-empty,/*!*/ /*!*/);
@@ -465,6 +480,11 @@ input::placeholder,textarea::placeholder {
 
 ::-webkit-date-and-time-value {
   min-height: 1.5em;
+  text-align: inherit;
+}
+
+::-webkit-datetime-edit {
+  display: inline-flex;
 }
 
 ::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field {
@@ -482,7 +502,7 @@ select {
           print-color-adjust: exact;
 }
 
-[multiple] {
+[multiple],[size]:where(select:not([size="1"])) {
   background-image: initial;
   background-position: initial;
   background-repeat: unset;
@@ -599,6 +619,9 @@ select {
   --tw-pan-y:  ;
   --tw-pinch-zoom:  ;
   --tw-scroll-snap-strictness: proximity;
+  --tw-gradient-from-position:  ;
+  --tw-gradient-via-position:  ;
+  --tw-gradient-to-position:  ;
   --tw-ordinal:  ;
   --tw-slashed-zero:  ;
   --tw-numeric-figure:  ;
@@ -646,6 +669,9 @@ select {
   --tw-pan-y:  ;
   --tw-pinch-zoom:  ;
   --tw-scroll-snap-strictness: proximity;
+  --tw-gradient-from-position:  ;
+  --tw-gradient-via-position:  ;
+  --tw-gradient-to-position:  ;
   --tw-ordinal:  ;
   --tw-slashed-zero:  ;
   --tw-numeric-figure:  ;
@@ -713,6 +739,10 @@ select {
   }
 }
 
+.invisible {
+  visibility: hidden;
+}
+
 .static {
   position: static;
 }
@@ -721,71 +751,165 @@ select {
   position: fixed;
 }
 
-.left-2 {
-  left: 0.5rem;
+.absolute {
+  position: absolute;
+}
+
+.relative {
+  position: relative;
 }
 
 .bottom-2 {
   bottom: 0.5rem;
 }
 
+.left-2 {
+  left: 0.5rem;
+}
+
+.right-3 {
+  right: 0.75rem;
+}
+
+.top-3 {
+  top: 0.75rem;
+}
+
+.mx-2 {
+  margin-left: 0.5rem;
+  margin-right: 0.5rem;
+}
+
 .mx-auto {
   margin-left: auto;
   margin-right: auto;
 }
 
-.mb-4 {
+.my-2 {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+}
+
+.my-4 {
+  margin-top: 1rem;
   margin-bottom: 1rem;
 }
 
-.mt-4 {
-  margin-top: 1rem;
+.my-6 {
+  margin-top: 1.5rem;
+  margin-bottom: 1.5rem;
+}
+
+.mb-1 {
+  margin-bottom: 0.25rem;
+}
+
+.mb-10 {
+  margin-bottom: 2.5rem;
+}
+
+.mb-4 {
+  margin-bottom: 1rem;
 }
 
 .ml-1 {
   margin-left: 0.25rem;
 }
 
+.ml-2 {
+  margin-left: 0.5rem;
+}
+
+.mr-4 {
+  margin-right: 1rem;
+}
+
+.mt-4 {
+  margin-top: 1rem;
+}
+
 .block {
   display: block;
 }
 
+.inline-block {
+  display: inline-block;
+}
+
+.inline {
+  display: inline;
+}
+
 .flex {
   display: flex;
 }
 
-.h-5 {
-  height: 1.25rem;
+.table {
+  display: table;
+}
+
+.hidden {
+  display: none;
 }
 
 .h-4 {
   height: 1rem;
 }
 
-.min-h-screen {
-  min-height: 100vh;
+.h-5 {
+  height: 1.25rem;
 }
 
-.w-full {
-  width: 100%;
+.h-6 {
+  height: 1.5rem;
+}
+
+.min-h-screen {
+  min-height: 100vh;
 }
 
 .w-5 {
   width: 1.25rem;
 }
 
+.w-6 {
+  width: 1.5rem;
+}
+
 .w-7 {
   width: 1.75rem;
 }
 
-.w-4 {
-  width: 1rem;
+.w-auto {
+  width: auto;
+}
+
+.w-full {
+  width: 100%;
 }
 
 .max-w-screen-lg {
   max-width: 1024px;
 }
 
+.max-w-sm {
+  max-width: 24rem;
+}
+
+.max-w-xs {
+  max-width: 20rem;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.animate-spin {
+  animation: spin 1s linear infinite;
+}
+
 .flex-col {
   flex-direction: column;
 }
@@ -798,10 +922,6 @@ select {
   align-items: center;
 }
 
-.justify-end {
-  justify-content: flex-end;
-}
-
 .justify-center {
   justify-content: center;
 }
@@ -810,14 +930,20 @@ select {
   justify-content: space-between;
 }
 
-.gap-4 {
-  gap: 1rem;
+.gap-2 {
+  gap: 0.5rem;
 }
 
 .self-center {
   align-self: center;
 }
 
+.truncate {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .whitespace-nowrap {
   white-space: nowrap;
 }
@@ -826,22 +952,27 @@ select {
   border-radius: 0.25rem;
 }
 
-.rounded-xl {
-  border-radius: 0.75rem;
-}
-
 .rounded-lg {
   border-radius: 0.5rem;
 }
 
+.rounded-sm {
+  border-radius: 0.125rem;
+}
+
 .border-gray-200 {
   --tw-border-opacity: 1;
   border-color: rgb(229 231 235 / var(--tw-border-opacity));
 }
 
-.bg-white {
+.border-slate-500 {
+  --tw-border-opacity: 1;
+  border-color: rgb(100 116 139 / var(--tw-border-opacity));
+}
+
+.bg-gray-200 {
   --tw-bg-opacity: 1;
-  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
+  background-color: rgb(229 231 235 / var(--tw-bg-opacity));
 }
 
 .bg-green-600 {
@@ -849,27 +980,28 @@ select {
   background-color: rgb(22 163 74 / var(--tw-bg-opacity));
 }
 
-.bg-blue-600 {
+.bg-violet-600 {
   --tw-bg-opacity: 1;
-  background-color: rgb(37 99 235 / var(--tw-bg-opacity));
+  background-color: rgb(124 58 237 / var(--tw-bg-opacity));
 }
 
-.bg-red-600 {
+.bg-white {
   --tw-bg-opacity: 1;
-  background-color: rgb(220 38 38 / var(--tw-bg-opacity));
+  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 }
 
 .p-4 {
   padding: 1rem;
 }
 
-.p-2 {
-  padding: 0.5rem;
+.px-2 {
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
 }
 
-.py-2 {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
+.px-4 {
+  padding-left: 1rem;
+  padding-right: 1rem;
 }
 
 .py-1 {
@@ -877,9 +1009,9 @@ select {
   padding-bottom: 0.25rem;
 }
 
-.px-2 {
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
+.py-2 {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
 }
 
 .pl-3 {
@@ -890,12 +1022,21 @@ select {
   padding-right: 1rem;
 }
 
+.pt-1 {
+  padding-top: 0.25rem;
+}
+
 .text-center {
   text-align: center;
 }
 
-.text-right {
-  text-align: right;
+.font-mono {
+  font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+}
+
+.text-3xl {
+  font-size: 1.875rem;
+  line-height: 2.25rem;
 }
 
 .text-4xl {
@@ -903,6 +1044,21 @@ select {
   line-height: 2.5rem;
 }
 
+.text-5xl {
+  font-size: 3rem;
+  line-height: 1;
+}
+
+.text-base {
+  font-size: 1rem;
+  line-height: 1.5rem;
+}
+
+.text-lg {
+  font-size: 1.125rem;
+  line-height: 1.75rem;
+}
+
 .text-xl {
   font-size: 1.25rem;
   line-height: 1.75rem;
@@ -913,23 +1069,17 @@ select {
   line-height: 1rem;
 }
 
-.text-lg {
-  font-size: 1.125rem;
-  line-height: 1.75rem;
-}
-
-.text-base {
-  font-size: 1rem;
-  line-height: 1.5rem;
-}
-
 .font-semibold {
   font-weight: 600;
 }
 
-.text-white {
+.italic {
+  font-style: italic;
+}
+
+.text-gray-700 {
   --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: rgb(55 65 81 / var(--tw-text-opacity));
 }
 
 .text-slate-300 {
@@ -937,15 +1087,22 @@ select {
   color: rgb(203 213 225 / var(--tw-text-opacity));
 }
 
-.text-red-400 {
+.text-white {
   --tw-text-opacity: 1;
-  color: rgb(248 113 113 / var(--tw-text-opacity));
+  color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
-.shadow {
-  --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
-  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+.text-yellow-300 {
+  --tw-text-opacity: 1;
+  color: rgb(253 224 71 / var(--tw-text-opacity));
+}
+
+.underline {
+  text-decoration-line: underline;
+}
+
+.decoration-slate-500 {
+  text-decoration-color: #64748b;
 }
 
 .shadow-md {
@@ -954,6 +1111,10 @@ select {
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
+.filter {
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
 .transition {
   transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
   transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
@@ -970,14 +1131,88 @@ select {
   transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
 }
 
-.dark form label {
+.max-w-20char {
+  max-width: 20ch;
+}
+
+.\[a-zA-Z\:\\-\] {
+  a-z-a--z: \-;
+}
+
+@font-face {
+  font-family: "IBM Plex Mono";
+
+  src: url("fonts/IBMPlexMono-regular.woff2") format("woff2");
+
+  font-weight: 400;
+
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "IBM Plex Sans";
+
+  src: url("fonts/IBMPlexSans-Regular.woff2") format("woff2");
+
+  font-weight: 400;
+
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "IBM Plex Serif";
+
+  src: url("fonts/IBMPlexSerif-Regular.woff2") format("woff2");
+
+  font-weight: 400;
+
+  font-style: normal;
+}
+
+:is(.dark form label) {
   --tw-text-opacity: 1;
   color: rgb(148 163 184 / var(--tw-text-opacity));
 }
 
-.dark form input,.dark 
-select,.dark 
-textarea {
+.responsive-table {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+:is(.dark .responsive-table) {
+  --tw-text-opacity: 1;
+  color: rgb(255 255 255 / var(--tw-text-opacity));
+}
+
+.responsive-table tr:nth-child(even) {
+  --tw-bg-opacity: 1;
+  background-color: rgb(30 41 59 / var(--tw-bg-opacity));
+}
+
+.responsive-table tbody tr:nth-child(odd) {
+  --tw-bg-opacity: 1;
+  background-color: rgb(15 23 42 / var(--tw-bg-opacity));
+}
+
+.responsive-table thead th {
+  border-bottom-width: 2px;
+  --tw-border-opacity: 1;
+  border-bottom-color: rgb(100 116 139 / var(--tw-border-opacity));
+  text-align: left;
+  font-size: 1.25rem;
+  line-height: 1.75rem;
+}
+
+.responsive-table thead th:not(:first-child),
+.responsive-table td:not(:first-child) {
+  border-left-width: 1px;
+  --tw-border-opacity: 1;
+  border-left-color: rgb(100 116 139 / var(--tw-border-opacity));
+}
+
+:is(.dark form input),:is(.dark 
+select),:is(.dark 
+textarea) {
   border-width: 1px;
   --tw-border-opacity: 1;
   border-color: rgb(15 23 42 / var(--tw-border-opacity));
@@ -987,9 +1222,20 @@ textarea {
   color: rgb(241 245 249 / var(--tw-text-opacity));
 }
 
-#session-table {
-  display: grid;
-  grid-template-columns: repeat(3, 2fr) 0.5fr 1fr;
+@media screen and (min-width: 768px) {
+  form input,
+  select,
+  textarea {
+    width: 300px;
+  }
+}
+
+@media screen and (max-width: 768px) {
+  form input,
+  select,
+  textarea {
+    width: 150px;
+  }
 }
 
 #button-container button {
@@ -997,19 +1243,93 @@ textarea {
   margin-right: 0.25rem;
 }
 
+th {
+  text-align: right;
+}
+
+th label {
+  margin-right: 1rem;
+}
+
+.basic-button-container {
+  display: flex;
+  justify-content: center;
+}
+
+.basic-button-container > :not([hidden]) ~ :not([hidden]) {
+  --tw-space-x-reverse: 0;
+  margin-right: calc(0.5rem * var(--tw-space-x-reverse));
+  margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)));
+}
+
+.basic-button {
+  display: inline-block;
+  border-radius: 0.25rem;
+  --tw-bg-opacity: 1;
+  background-color: rgb(37 99 235 / var(--tw-bg-opacity));
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  padding-top: 0.625rem;
+  padding-bottom: 0.625rem;
+  font-size: 0.75rem;
+  line-height: 1rem;
+  font-weight: 500;
+  text-transform: uppercase;
+  line-height: 1.25;
+  --tw-text-opacity: 1;
+  color: rgb(255 255 255 / var(--tw-text-opacity));
+  --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
+  transition-duration: 150ms;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.basic-button:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(29 78 216 / var(--tw-bg-opacity));
+  --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
+.basic-button:focus {
+  --tw-bg-opacity: 1;
+  background-color: rgb(29 78 216 / var(--tw-bg-opacity));
+  --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+  outline: 2px solid transparent;
+  outline-offset: 2px;
+  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
+  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
+}
+
+.basic-button:active {
+  --tw-bg-opacity: 1;
+  background-color: rgb(30 64 175 / var(--tw-bg-opacity));
+  --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
+.hover\:bg-gray-400:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgb(156 163 175 / var(--tw-bg-opacity));
+}
+
 .hover\:bg-green-700:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(21 128 61 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-blue-700:hover {
+.hover\:bg-violet-700:hover {
   --tw-bg-opacity: 1;
-  background-color: rgb(29 78 216 / var(--tw-bg-opacity));
-}
-
-.hover\:bg-red-700:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(185 28 28 / var(--tw-bg-opacity));
+  background-color: rgb(109 40 217 / var(--tw-bg-opacity));
 }
 
 .hover\:underline:hover {
@@ -1032,14 +1352,9 @@ textarea {
   --tw-ring-color: rgb(34 197 94 / var(--tw-ring-opacity));
 }
 
-.focus\:ring-blue-500:focus {
+.focus\:ring-violet-500:focus {
   --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
-}
-
-.focus\:ring-red-500:focus {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity));
+  --tw-ring-color: rgb(139 92 246 / var(--tw-ring-opacity));
 }
 
 .focus\:ring-offset-2:focus {
@@ -1050,44 +1365,72 @@ textarea {
   --tw-ring-offset-color: #bfdbfe;
 }
 
-.dark .dark\:border-white {
-  --tw-border-opacity: 1;
-  border-color: rgb(255 255 255 / var(--tw-border-opacity));
+.focus\:ring-offset-violet-200:focus {
+  --tw-ring-offset-color: #ddd6fe;
 }
 
-.dark .dark\:bg-gray-800 {
+.group:hover .group-hover\:block {
+  display: block;
+}
+
+:is(.dark .dark\:bg-gray-800) {
   --tw-bg-opacity: 1;
   background-color: rgb(31 41 55 / var(--tw-bg-opacity));
 }
 
-.dark .dark\:bg-gray-900 {
+:is(.dark .dark\:bg-gray-900) {
   --tw-bg-opacity: 1;
   background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 }
 
-.dark .dark\:bg-slate-700 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(51 65 85 / var(--tw-bg-opacity));
-}
-
-.dark .dark\:text-white {
+:is(.dark .dark\:text-slate-500) {
   --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: rgb(100 116 139 / var(--tw-text-opacity));
 }
 
-.dark .dark\:text-slate-600 {
+:is(.dark .dark\:text-slate-600) {
   --tw-text-opacity: 1;
   color: rgb(71 85 105 / var(--tw-text-opacity));
 }
 
-.dark .dark\:text-slate-400 {
+:is(.dark .dark\:text-white) {
   --tw-text-opacity: 1;
-  color: rgb(148 163 184 / var(--tw-text-opacity));
+  color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
-.dark .dark\:text-slate-300 {
-  --tw-text-opacity: 1;
-  color: rgb(203 213 225 / var(--tw-text-opacity));
+@media (min-width: 640px) {
+  .sm\:inline {
+    display: inline;
+  }
+
+  .sm\:table-cell {
+    display: table-cell;
+  }
+
+  .sm\:max-w-md {
+    max-width: 28rem;
+  }
+
+  .sm\:max-w-xl {
+    max-width: 36rem;
+  }
+
+  .sm\:px-4 {
+    padding-left: 1rem;
+    padding-right: 1rem;
+  }
+
+  .sm\:pl-2 {
+    padding-left: 0.5rem;
+  }
+
+  .sm\:pl-4 {
+    padding-left: 1rem;
+  }
+
+  .sm\:decoration-2 {
+    text-decoration-thickness: 2px;
+  }
 }
 
 @media (min-width: 768px) {
@@ -1102,4 +1445,32 @@ textarea {
   .md\:flex-row {
     flex-direction: row;
   }
+
+  .md\:px-6 {
+    padding-left: 1.5rem;
+    padding-right: 1.5rem;
+  }
+
+  .md\:py-2 {
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+  }
+
+  .md\:max-w-40char {
+    max-width: 40ch;
+  }
+}
+
+@media (min-width: 1024px) {
+  .lg\:table-cell {
+    display: table-cell;
+  }
+
+  .lg\:max-w-3xl {
+    max-width: 48rem;
+  }
+
+  .lg\:max-w-lg {
+    max-width: 32rem;
+  }
 }

games/static/js/add_edition.js

@@ -0,0 +1,29 @@
+/**
+ * @description Sync select field with input field until user focuses it.
+ * @param {HTMLSelectElement} sourceElementSelector
+ * @param {HTMLInputElement} targetElementSelector
+ */
+function syncSelectInputUntilChanged(
+  sourceElementSelector,
+  targetElementSelector
+) {
+  const sourceElement = document.querySelector(sourceElementSelector);
+  const targetElement = document.querySelector(targetElementSelector);
+  function sourceElementHandler(event) {
+    let selected = event.target.value;
+    let selectedValue = document.querySelector(
+      `#id_game option[value='${selected}']`
+    ).textContent;
+    targetElement.value = selectedValue;
+  }
+  function targetElementHandler(event) {
+    sourceElement.removeEventListener("change", sourceElementHandler);
+  }
+
+  sourceElement.addEventListener("change", sourceElementHandler);
+  targetElement.addEventListener("focus", targetElementHandler);
+}
+
+window.addEventListener("load", () => {
+  syncSelectInputUntilChanged("#id_game", "#id_name");
+});

games/static/js/add_session.js

@@ -0,0 +1,19 @@
+import { toISOUTCString } from "./utils.js";
+
+for (let button of document.querySelectorAll("[data-target]")) {
+  let target = button.getAttribute("data-target");
+  let type = button.getAttribute("data-type");
+  let targetElement = document.querySelector(`#id_${target}`);
+  button.addEventListener("click", (event) => {
+    event.preventDefault();
+    if (type == "now") {
+      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;
+    } else if (type == "toggle") {
+      if (targetElement.type == "datetime-local") targetElement.type = "text";
+      else targetElement.type = "datetime-local";
+    }
+  });
+}

games/static/js/utils.js

@@ -0,0 +1,16 @@
+/**
+ * @description Formats Date to a UTC string accepted by the datetime-local input field.
+ * @param {Date} date
+ * @returns {string}
+ */
+export function toISOUTCString(date) {
+  function stringAndPad(number) {
+    return number.toString().padStart(2, 0);
+  }
+  const year = date.getFullYear();
+  const month = stringAndPad(date.getMonth() + 1);
+  const day = stringAndPad(date.getDate());
+  const hours = stringAndPad(date.getHours());
+  const minutes = stringAndPad(date.getMinutes());
+  return `${year}-${month}-${day}T${hours}:${minutes}`;
+}

games/static/main.js

@@ -0,0 +1,43 @@
+function elt(type, props, ...children) {
+  let dom = document.createElement(type);
+  if (props) Object.assign(dom, props);
+  for (let child of children) {
+    if (typeof child != "string") dom.appendChild(child);
+    else dom.appendChild(document.createTextNode(child));
+  }
+  return dom;
+}
+
+/**
+ * @param {Node} targetNode
+ */
+function addToggleButton(targetNode) {
+  let manualToggleButton = elt(
+    "td",
+    {},
+    elt(
+      "div",
+      { className: "basic-button" },
+      elt(
+        "button",
+        {
+          onclick: (event) => {
+            let textInputField = elt("input", { type: "text", id: targetNode.id });
+            targetNode.replaceWith(textInputField);
+            event.target.addEventListener("click", (event) => {
+              textInputField.replaceWith(targetNode);
+            });
+          },
+        },
+        "Toggle manual"
+      )
+    )
+  );
+  targetNode.parentElement.appendChild(manualToggleButton);
+}
+
+const toggleableFields = ["#id_game", "#id_edition", "#id_platform"];
+
+toggleableFields.map((selector) => {
+  addToggleButton(document.querySelector(selector));
+});

games/static/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

games/templates/add.html

@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+
+{% 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>
+        </tr>
+        </table>
+    </form>
+{% endblock content %}

games/templates/add_edition.html

@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+{% 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>
+        </tr>
+        </table>
+    </form>
+{% endblock content %}
+
+{% block scripts %}
+{% load static %}
+<script type="module" src="{% static 'js/add_edition.js' %}"></script>
+{% endblock scripts %}

games/templates/add_session.html

@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+
+{% 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>
+            {% if field.name == "note" %}
+            <td>{{ field }}</td>
+            {% else %}
+            <td>{{ field }}</td>
+            {% endif %}
+            {% if field.name == "timestamp_start" or field.name == "timestamp_end" %}
+            <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="copy">Copy</button>
+                </div>
+            </td>
+            {% endif %}
+        </tr>
+        {% endfor %}
+        <tr>
+            <td></td>
+            <td><input type="submit" value="Submit"/></td>
+        </tr>
+        </table>
+    </form>
+    {% load static %}
+    <script type="module" src="{% static 'js/add_session.js' %}"></script>
+{% endblock content %}

games/templates/base.html

@@ -0,0 +1,72 @@
+<!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>
+        <script src="{% static 'js/htmx.min.js' %}"></script>
+        <link rel="stylesheet" href="{% static 'base.css' %}" />
+    </head>
+    
+    <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="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">
+                            <li class="relative group">
+                                <a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New</a>
+                                <ul class="absolute hidden text-gray-700 pt-1 group-hover:block  w-auto whitespace-nowrap">
+                                    {% if purchase_available %}
+                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_device' %}">Device</a></li>
+                                    {% endif %}
+                                    <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_game' %}">Game</a></li>
+                                    {% if game_available and platform_available %}
+                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_edition' %}">Edition</a></li>
+                                    {% endif %}
+                                    <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_platform' %}">Platform</a></li>
+                                    {% if edition_available %}
+                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_purchase' %}">Purchase</a></li>
+                                    {% endif %}
+                                    {% if purchase_available %}
+                                        <li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_session' %}">Session</a></li>
+                                    {% endif %}
+                                    
+                                </ul>
+                            </li>
+                            {% if session_count > 0 %}
+                                    <li class="relative group">
+                                        <a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'stats_current_year' %}">Stats</a>
+                                        <ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
+                                            {% for year in stats_dropdown_year_range %}
+                                                <li>
+                                                    <a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'stats_by_year' year %}">{{ year }}</a>
+                                                </li>
+                                            {% endfor %}
+                                        </ul>
+                                    </li>
+                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                </div>
+            </nav>
+            {% 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 %}
+    </body>
+
+</html>

games/templates/components/button.html

@@ -0,0 +1,26 @@
+{% comment %} 
+title
+text
+{% endcomment %}
+<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"
+      /> 
+    </svg>
+    {% endcomment %}
+  {{ text }}
+</a>

games/templates/components/button_start.html

@@ -0,0 +1,26 @@
+{% comment %} 
+title
+text
+{% endcomment %}
+<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"
+    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>
+  {{ text }}
+</button>

games/templates/components/edit_button.html

@@ -0,0 +1,21 @@
+<a href="{{ edit_url }}">
+  <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"
+      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"
+      />
+    </svg>
+  </button>
+</a>

games/templates/index.html

@@ -5,7 +5,7 @@
 {% block content %}
     <div class="text-slate-300 mx-auto max-w-screen-lg text-center">
         {% if session_count > 0 %}
-            You have played a total of {{ session_count }} sessions for a total of {{ total_duration }}.
+            You have played a total of {{ session_count }} sessions for a total of {{ total_duration_formatted }}.
         {% elif not game_available or not platform_available %}
             There are no games in the database. Start by clicking "New Game" and "New Platform".
         {% elif not purchase_available %}
@@ -14,4 +14,4 @@
             You haven't played any games yet. Click "New Session" to add one now.
         {% endif %}
     </div>
-{% endblock content %}
+{% endblock content %}

games/templates/list_sessions.html

@@ -0,0 +1,77 @@
+{% extends 'base.html' %}
+
+{% load static %}
+
+{% block title %}{{ title }}{% endblock title %}
+
+{% block content %}
+
+{% if dataset.count >= 1 %}
+<div class="mx-auto text-center my-4">
+  <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 %}"
+  >
+    {% include 'components/button_start.html' with text=last.purchase title="Start session of last played game" only %}
+  </a>
+</div>
+{% endif %}
+
+<table class="responsive-table">
+  <thead>
+    <tr>
+      <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
+      <th class="hidden sm:table-cell px-2 sm:px-4 md:px-6 md:py-2">Start</th>
+      <th class="hidden lg:table-cell px-2 sm:px-4 md:px-6 md:py-2">End</th>
+      <th class="px-2 sm:px-4 md:px-6 md:py-2">Duration</th>
+    </tr>
+  </thead>
+  <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"
+          href="{% url 'view_game' data.purchase.edition.game.id %}">
+            {{ data.purchase.edition }}
+        </a>
+      </td>
+      <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" }}
+      </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 %}"
+          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')"
+          >
+            <span class="text-yellow-300">Finish now?</span>
+        </a>
+        {% elif data.duration_manual %}
+            -- 
+        {% else %}
+            {{ 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>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endblock content %}

games/templates/stats.html

@@ -0,0 +1,98 @@
+{% extends "base.html" %}
+
+{% 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">
+                    {% for year_item in stats_dropdown_year_range %}
+                    <option value="{{ year_item }}" {% if year == year_item %}selected{% endif %}>{{ year_item }}</option>
+                    {% endfor %}
+                </select>
+            </form>
+        </div>
+        <table class="responsive-table">
+            <thead>
+                <tr>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Hours</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Games</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Games ({{ year }})</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Purchases</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Spendings ({{ total_spent_currency }})</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">{{ total_spent_currency }}/game</th>
+                </tr>
+            <tbody>
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_hours }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_games }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_2023_games }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year.count }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_spent }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ spent_per_game }}</td>
+                </tr>
+            </tbody>
+        </table>
+        <h1 class="text-5xl text-center my-6">Top games by playtime</h1>
+        <table class="responsive-table">
+            <thead>
+                <tr>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime (hours)</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% 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>
+                    </td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        <h1 class="text-5xl text-center my-6">Platforms by playtime</h1>
+        <table class="responsive-table">
+            <thead>
+                <tr>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Platform</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime (hours)</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for item in total_playtime_per_platform %}
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.platform_name }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.formatted_playtime }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        <h1 class="text-5xl text-center my-6">Purchases</h1>
+        <table class="responsive-table">
+            <thead>
+                <tr>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Price ({{ total_spent_currency }})</th>
+                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for purchase in all_purchased_this_year %}
+                <tr>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+{% endblock content %}

games/templates/view_game.html

@@ -0,0 +1,89 @@
+{% extends "base.html" %}
+
+{% 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">
+            {{ game.name }}
+            <span class="dark:text-slate-500">(#{{ game.pk }})</span>
+            {% url 'edit_game' game.id as edit_url %}
+            {% include 'components/edit_button.html' with edit_url=edit_url %}
+        </h1>
+        <h2 class="text-lg my-2 ml-2">
+            {{ total_hours }} <span class="dark:text-slate-500">total</span>
+            {{ session_average }} <span class="dark:text-slate-500">avg</span> 
+            ({{ first_session.timestamp_start | date:"M Y"}}
+             — 
+            {{ last_session.timestamp_start | date:"M Y"}}) </h2>
+        <hr class="border-slate-500">
+        <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">
+                {{ edition.name }} ({{ edition.platform }}, {{ edition.year_released }})
+                {% if edition.wikidata %}
+                <span class="hidden sm:inline">
+                    <a href="https://www.wikidata.org/wiki/{{ edition.wikidata }}">
+                        <img class="inline mx-2 w-6" src="{% static 'icons/wikidata.png' %}"/>
+                    </a>
+                </span>
+                {% endif %}
+                {% 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 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>
+            {% 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>
+            {% 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 %}
+        </h1>
+        <ul>
+            {% for session in sessions %}
+            <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>
+            {% 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/templatetags/version.py

@@ -1,7 +1,8 @@
+import os
+import time
+
 from django import template
 from django.conf import settings
-import time
-import os
 
 register = template.Library()
 
@@ -12,7 +13,7 @@ def version_date():
         "%d-%b-%Y %H:%m",
         time.gmtime(
             os.path.getmtime(
-                os.path.abspath(os.path.join(settings.BASE_DIR, "..", "..", ".git"))
+                os.path.abspath(os.path.join(settings.BASE_DIR, "pyproject.toml"))
             )
         ),
     )

games/urls.py

@@ -0,0 +1,82 @@
+from django.urls import path
+
+from games import views
+
+urlpatterns = [
+    path("", views.index, name="index"),
+    path(
+        "list-sessions/recent",
+        views.list_sessions,
+        {"filter": "recent"},
+        name="list_sessions_recent",
+    ),
+    path("add-game/", views.add_game, name="add_game"),
+    path("add-platform/", views.add_platform, name="add_platform"),
+    path("add-session/", views.add_session, name="add_session"),
+    path(
+        "update-session/by-session/<int:session_id>",
+        views.update_session,
+        name="update_session",
+    ),
+    path(
+        "start-session-same-as-last/<int:last_session_id>",
+        views.start_session_same_as_last,
+        name="start_session_same_as_last",
+    ),
+    path(
+        "start-session/<int:game_id>",
+        views.start_game_session,
+        name="start_game_session",
+    ),
+    # path(
+    #     "delete_session/by-id/<int:session_id>",
+    #     views.delete_session,
+    #     name="delete_session",
+    # ),
+    path("add-purchase/", views.add_purchase, name="add_purchase"),
+    path("add-edition/", views.add_edition, name="add_edition"),
+    path("edit-edition/<int:edition_id>", views.edit_edition, name="edit_edition"),
+    path("game/<int:game_id>/view", views.view_game, name="view_game"),
+    path("game/<int:game_id>/edit", views.edit_game, name="edit_game"),
+    path("edit-platform/<int:platform_id>", views.edit_platform, name="edit_platform"),
+    path("add-device/", views.add_device, name="add_device"),
+    path("edit-session/<int:session_id>", views.edit_session, name="edit_session"),
+    path("edit-purchase/<int:purchase_id>", views.edit_purchase, name="edit_purchase"),
+    path("list-sessions/", views.list_sessions, name="list_sessions"),
+    path(
+        "list-sessions/by-purchase/<int:purchase_id>",
+        views.list_sessions,
+        {"filter": "purchase"},
+        name="list_sessions_by_purchase",
+    ),
+    path(
+        "list-sessions/by-platform/<int:platform_id>",
+        views.list_sessions,
+        {"filter": "platform"},
+        name="list_sessions_by_platform",
+    ),
+    path(
+        "list-sessions/by-game/<int:game_id>",
+        views.list_sessions,
+        {"filter": "game"},
+        name="list_sessions_by_game",
+    ),
+    path(
+        "list-sessions/by-edition/<int:edition_id>",
+        views.list_sessions,
+        {"filter": "edition"},
+        name="list_sessions_by_edition",
+    ),
+    path(
+        "list-sessions/by-ownership/<str:ownership_type>",
+        views.list_sessions,
+        {"filter": "ownership_type"},
+        name="list_sessions_by_ownership_type",
+    ),
+    path("stats/", views.stats, name="stats_current_year"),
+    path(
+        "stats/<int:year>",
+        views.stats,
+        name="stats_by_year",
+    ),
+]

games/views.py

@@ -0,0 +1,395 @@
+from common.time import format_duration, now as now_with_tz
+from datetime import datetime, timedelta
+from django.conf import settings
+from django.db.models import Sum, F
+from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
+from django.shortcuts import redirect, render
+from django.urls import reverse
+from typing import Callable, Any
+from zoneinfo import ZoneInfo
+
+from .forms import (
+    GameForm,
+    PlatformForm,
+    PurchaseForm,
+    SessionForm,
+    EditionForm,
+    DeviceForm,
+)
+from .models import Game, Platform, Purchase, Session, Edition
+
+
+def model_counts(request):
+    return {
+        "game_available": Game.objects.count() != 0,
+        "edition_available": Edition.objects.count() != 0,
+        "platform_available": Platform.objects.count() != 0,
+        "purchase_available": Purchase.objects.count() != 0,
+        "session_count": Session.objects.count(),
+    }
+
+
+def stats_dropdown_year_range(request):
+    return {"stats_dropdown_year_range": range(2018, 2024)}
+
+
+def add_session(request):
+    context = {}
+    initial = {}
+
+    now = now_with_tz()
+    initial["timestamp_start"] = now
+
+    last = Session.objects.all().last()
+    if last != None:
+        initial["purchase"] = last.purchase
+
+    form = SessionForm(request.POST or None, initial=initial)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+
+    context["title"] = "Add New Session"
+    context["form"] = form
+    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]:
+    """
+    Will redirect to "return_path" session variable if set.
+    """
+
+    def wrapper(request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        response = func(request, *args, **kwargs)
+        if isinstance(response, HttpResponseRedirect) and (
+            next_url := request.session.get("return_path")
+        ):
+            return HttpResponseRedirect(next_url)
+        return response
+
+    return wrapper
+
+
+@use_custom_redirect
+def edit_session(request, session_id=None):
+    context = {}
+    session = Session.objects.get(id=session_id)
+    form = SessionForm(request.POST or None, instance=session)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Session"
+    context["form"] = form
+    return render(request, "add_session.html", context)
+
+
+@use_custom_redirect
+def edit_purchase(request, purchase_id=None):
+    context = {}
+    purchase = Purchase.objects.get(id=purchase_id)
+    form = PurchaseForm(request.POST or None, instance=purchase)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Purchase"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
+@use_custom_redirect
+def edit_game(request, game_id=None):
+    context = {}
+    purchase = Game.objects.get(id=game_id)
+    form = GameForm(request.POST or None, instance=purchase)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Game"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
+def view_game(request, game_id=None):
+    context = {}
+    game = Game.objects.get(id=game_id)
+    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")
+    )
+    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
+    context["last_session"] = context["sessions"].first()
+    context["first_session"] = context["sessions"].last()
+    context["sessions_with_notes"] = context["sessions"].exclude(note="")
+    request.session["return_path"] = request.path
+    return render(request, "view_game.html", context)
+
+
+@use_custom_redirect
+def edit_platform(request, platform_id=None):
+    context = {}
+    purchase = Platform.objects.get(id=platform_id)
+    form = PlatformForm(request.POST or None, instance=purchase)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Platform"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
+@use_custom_redirect
+def edit_edition(request, edition_id=None):
+    context = {}
+    edition = Edition.objects.get(id=edition_id)
+    form = EditionForm(request.POST or None, instance=edition)
+    if form.is_valid():
+        form.save()
+        return redirect("list_sessions")
+    context["title"] = "Edit Edition"
+    context["form"] = form
+    return render(request, "add.html", context)
+
+
+@use_custom_redirect
+def start_game_session(request, game_id: int):
+    last_session = (
+        Session.objects.filter(purchase__edition__game_id=game_id)
+        .order_by("-timestamp_start")
+        .first()
+    )
+    session = SessionForm(
+        {
+            "purchase": last_session.purchase.id,
+            "timestamp_start": now_with_tz(),
+            "device": last_session.device,
+        }
+    )
+    session.save()
+    return redirect("list_sessions")
+
+
+def start_session_same_as_last(request, last_session_id: int):
+    last_session = Session.objects.get(id=last_session_id)
+    session = SessionForm(
+        {
+            "purchase": last_session.purchase.id,
+            "timestamp_start": now_with_tz(),
+            "device": last_session.device,
+        }
+    )
+    session.save()
+    return redirect("list_sessions")
+
+
+# def delete_session(request, session_id=None):
+#     session = Session.objects.get(id=session_id)
+#     session.delete()
+#     return redirect("list_sessions")
+
+
+def list_sessions(
+    request,
+    filter="",
+    purchase_id="",
+    platform_id="",
+    game_id="",
+    edition_id="",
+    ownership_type: str = "",
+):
+    context = {}
+    context["title"] = "Sessions"
+
+    if filter == "purchase":
+        dataset = Session.objects.filter(purchase=purchase_id)
+        context["purchase"] = Purchase.objects.get(id=purchase_id)
+    elif filter == "platform":
+        dataset = Session.objects.filter(purchase__platform=platform_id)
+        context["platform"] = Platform.objects.get(id=platform_id)
+    elif filter == "edition":
+        dataset = Session.objects.filter(purchase__edition=edition_id)
+        context["edition"] = Edition.objects.get(id=edition_id)
+    elif filter == "game":
+        dataset = Session.objects.filter(purchase__edition__game=game_id)
+        context["game"] = Game.objects.get(id=game_id)
+    elif filter == "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 = 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.all().order_by("-timestamp_start")
+
+    for session in dataset:
+        if session.timestamp_end == None and session.duration_manual == timedelta(
+            seconds=0
+        ):
+            session.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
+            session.unfinished = True
+
+    context["total_duration"] = dataset.total_duration_formatted()
+    context["dataset"] = dataset
+    # 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)
+
+
+def stats(request, year: int = 0):
+    selected_year = request.GET.get("year")
+    if selected_year:
+        return HttpResponseRedirect(reverse("stats_by_year", args=[selected_year]))
+    if year == 0:
+        year = now_with_tz().year
+    first_day_of_year = datetime(year, 1, 1)
+    last_day_of_year = datetime(year + 1, 1, 1)
+    year_sessions = Session.objects.filter(timestamp_start__year=year)
+    year_played_purchases = Purchase.objects.filter(
+        session__in=year_sessions
+    ).distinct()
+
+    selected_currency = "CZK"
+    all_purchased_this_year = (
+        Purchase.objects.filter(date_purchased__year=year)
+        .filter(price_currency__exact=selected_currency)
+        .filter(date_refunded__exact=None)
+        .order_by("date_purchased")
+    )
+
+    this_year_spendings = all_purchased_this_year.aggregate(total_spent=Sum(F("price")))
+    total_spent = this_year_spendings["total_spent"]
+
+    games_with_playtime = (
+        Game.objects.filter(edition__purchase__session__in=year_sessions)
+        .annotate(
+            total_playtime=Sum(
+                F("edition__purchase__session__duration_calculated")
+                + F("edition__purchase__session__duration_manual")
+            )
+        )
+        .values("id", "name", "total_playtime")
+    )
+    top_10_games_by_playtime = games_with_playtime.order_by("-total_playtime")[:10]
+    for game in top_10_games_by_playtime:
+        game["formatted_playtime"] = format_duration(game["total_playtime"], "%2.0H")
+
+    total_playtime_per_platform = (
+        year_sessions.values("purchase__platform__name")
+        .annotate(total_playtime=Sum(F("duration_calculated") + F("duration_manual")))
+        .annotate(platform_name=F("purchase__platform__name"))
+        .values("platform_name", "total_playtime")
+        .order_by("-total_playtime")
+    )
+    for item in total_playtime_per_platform:
+        item["formatted_playtime"] = format_duration(item["total_playtime"], "%2.0H")
+
+    context = {
+        "total_hours": format_duration(
+            year_sessions.total_duration_unformatted(), "%2.0H"
+        ),
+        "total_games": year_played_purchases.count(),
+        "total_2023_games": year_played_purchases.filter(
+            edition__year_released=year
+        ).count(),
+        "top_10_games_by_playtime": top_10_games_by_playtime,
+        "year": year,
+        "total_playtime_per_platform": total_playtime_per_platform,
+        "total_spent": total_spent,
+        "total_spent_currency": selected_currency,
+        "all_purchased_this_year": all_purchased_this_year,
+        "spent_per_game": int(total_spent / all_purchased_this_year.count()),
+    }
+
+    request.session["return_path"] = request.path
+    return render(request, "stats.html", context)
+
+
+def add_purchase(request):
+    context = {}
+    now = datetime.now()
+    initial = {"date_purchased": now}
+    form = PurchaseForm(request.POST or None, initial=initial)
+    if form.is_valid():
+        form.save()
+        return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Purchase"
+    return render(request, "add.html", context)
+
+
+def add_game(request):
+    context = {}
+    form = GameForm(request.POST or None)
+    if form.is_valid():
+        form.save()
+        return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Game"
+    return render(request, "add.html", context)
+
+
+def add_edition(request):
+    context = {}
+    form = EditionForm(request.POST or None)
+    if form.is_valid():
+        form.save()
+        return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Edition"
+    return render(request, "add_edition.html", context)
+
+
+def add_platform(request):
+    context = {}
+    form = PlatformForm(request.POST or None)
+    if form.is_valid():
+        form.save()
+        return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Platform"
+    return render(request, "add.html", context)
+
+
+def add_device(request):
+    context = {}
+    form = DeviceForm(request.POST or None)
+    if form.is_valid():
+        form.save()
+        return redirect("index")
+
+    context["form"] = form
+    context["title"] = "Add New Device"
+    return render(request, "add.html", context)
+
+
+def index(request):
+    return redirect("list_sessions_recent")

manage.py

@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "web.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
-    "@tailwindcss/forms": "^0.5.3",
-    "@tailwindcss/typography": "^0.5.8",
-    "tailwindcss": "^3.2.4"
+    "@tailwindcss/forms": "^0.5.6",
+    "@tailwindcss/typography": "^0.5.10",
+    "tailwindcss": "^3.3.3"
   }
 }

poetry.lock

@@ -304,6 +304,24 @@ files = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 
+[[package]]
+name = "isort"
+version = "5.11.4"
+description = "A Python utility / library to sort Python imports."
+category = "dev"
+optional = false
+python-versions = ">=3.7.0"
+files = [
+    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
+    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
+]
+
+[package.extras]
+colors = ["colorama (>=0.4.3,<0.5.0)"]
+pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
+plugins = ["setuptools"]
+requirements-deprecated-finder = ["pip-api", "pipreqs"]
+
 [[package]]
 name = "jsbeautifier"
 version = "1.14.7"
@@ -814,4 +832,4 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "fd85e51c8fb99824a433b451c9712b7418c13688b9eb0e8ca6c51768f544e48f"
+content-hash = "7b531f96813f56c815a432a814e0aa75600946f37fe8a009d2b5edd8c9ce5d09"

pyproject.toml

@@ -1,10 +1,11 @@
 [tool.poetry]
 name = "timetracker"
-version = "0.1.2"
+version = "1.3.0"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"
 readme = "README.md"
+packages = [{include = "timetracker"}]
 
 [tool.poetry.dependencies]
 python = "^3.10"
@@ -21,12 +22,11 @@ django-extensions = "^3.2.1"
 werkzeug = "^2.2.2"
 djhtml = "^1.5.2"
 djlint = "^1.19.11"
+isort = "^5.11.4"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.pytest.ini_options]
-pythonpath = [
-  "src"
-]
+[tool.poetry.scripts]
+timetracker-import = "common.import_data:import_from_file"

src/input.css

@@ -1,22 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-form label {
-  @apply dark:text-slate-400;
-}
-
-form input,
-select,
-textarea {
-  @apply dark:border dark:border-slate-900 dark:bg-slate-500 dark:text-slate-100;
-}
-
-#session-table {
-  display: grid;
-  grid-template-columns: repeat(3, 2fr) 0.5fr 1fr;
-}
-
-#button-container button {
-  @apply mx-1;
-}

src/timelogger/timelogger.py

@@ -1,3 +0,0 @@
-import logging
-
-logging.basicConfig(level=logging.ERROR, filename="timelogger.log")

src/web/common/util/time.py

@@ -1,44 +0,0 @@
-from datetime import datetime, timedelta
-from django.conf import settings
-from zoneinfo import ZoneInfo
-import re
-
-
-def now() -> datetime:
-    return datetime.now(ZoneInfo(settings.TIME_ZONE))
-
-
-def format_duration(
-    duration: timedelta, format_string: str = "%H hours %m minutes"
-) -> str:
-    """
-    Format timedelta into the specified format_string.
-    Valid format variables:
-    - %H hours
-    - %m minutes
-    - %s seconds
-    - %r total seconds
-    """
-    minute_seconds = 60
-    hour_seconds = 60 * minute_seconds
-    day_seconds = 24 * hour_seconds
-    if not isinstance(duration, timedelta):
-        duration = timedelta(seconds=duration)
-    seconds_total = int(duration.total_seconds())
-    # timestamps where end is before start
-    if seconds_total < 0:
-        seconds_total = 0
-    days, remainder = divmod(seconds_total, day_seconds)
-    hours, remainder = divmod(remainder, hour_seconds)
-    minutes, seconds = divmod(remainder, minute_seconds)
-    literals = {
-        "%d": str(days),
-        "%H": str(hours),
-        "%m": str(minutes),
-        "%s": str(seconds),
-        "%r": str(seconds_total),
-    }
-    formatted_string = format_string
-    for pattern, replacement in literals.items():
-        formatted_string = re.sub(pattern, replacement, formatted_string)
-    return formatted_string

src/web/tracker/fixtures/sample.yaml

@@ -1,98 +0,0 @@
-- model: tracker.game
-  pk: 1
-  fields:
-    name: Nioh 2
-    wikidata: Q67482292
-- model: tracker.game
-  pk: 2
-  fields:
-    name: Elden Ring
-    wikidata: Q64826862
-- model: tracker.game
-  pk: 3
-  fields:
-    name: Cyberpunk 2077
-    wikidata: Q3182559
-- model: tracker.purchase
-  pk: 1
-  fields:
-    game: 1
-    platform: 1
-    date_purchased: 2021-02-13
-    date_refunded: null
-- model: tracker.purchase
-  pk: 2
-  fields:
-    game: 2
-    platform: 1
-    date_purchased: 2022-02-24
-    date_refunded: null
-- model: tracker.purchase
-  pk: 3
-  fields:
-    game: 3
-    platform: 1
-    date_purchased: 2020-12-07
-    date_refunded: null
-- model: tracker.platform
-  pk: 1
-  fields:
-    name: Steam
-    group: PC
-- model: tracker.platform
-  pk: 3
-  fields:
-    name: Xbox Gamepass
-    group: PC
-- model: tracker.platform
-  pk: 4
-  fields:
-    name: Epic Games Store
-    group: PC
-- model: tracker.platform
-  pk: 5
-  fields:
-    name: Playstation 5
-    group: Playstation
-- model: tracker.platform
-  pk: 6
-  fields:
-    name: Playstation 4
-    group: Playstation
-- model: tracker.platform
-  pk: 7
-  fields:
-    name: Nintendo Switch
-    group: Nintendo
-- model: tracker.platform
-  pk: 8
-  fields:
-    name: Nintendo 3DS
-    group: Nintendo
-- model: tracker.session
-  pk: 1
-  fields:
-    purchase: 2
-    timestamp_start: 2022-12-31 14:25:58+00:00
-    timestamp_end: 2022-12-31 16:25:22+00:00
-    duration_manual: null
-    duration_calculated: null
-    note: ''
-- model: tracker.session
-  pk: 3
-  fields:
-    purchase: 3
-    timestamp_start: 2023-01-01 22:00:23+00:00
-    timestamp_end: 2023-01-01 23:28:23+00:00
-    duration_manual: null
-    duration_calculated: null
-    note: ''
-- model: tracker.session
-  pk: 4
-  fields:
-    purchase: 3
-    timestamp_start: 2020-01-01 23:29:17+00:00
-    timestamp_end: 2020-01-01 23:29:17+00:00
-    duration_manual: '12:00:00'
-    duration_calculated: null
-    note: ''

src/web/tracker/forms.py

@@ -1,32 +0,0 @@
-from django import forms
-from .models import Session, Purchase, Game, Platform
-
-
-class SessionForm(forms.ModelForm):
-    class Meta:
-        model = Session
-        fields = [
-            "purchase",
-            "timestamp_start",
-            "timestamp_end",
-            "duration_manual",
-            "note",
-        ]
-
-
-class PurchaseForm(forms.ModelForm):
-    class Meta:
-        model = Purchase
-        fields = ["game", "platform", "date_purchased", "date_refunded"]
-
-
-class GameForm(forms.ModelForm):
-    class Meta:
-        model = Game
-        fields = ["name", "wikidata"]
-
-
-class PlatformForm(forms.ModelForm):
-    class Meta:
-        model = Platform
-        fields = ["name", "group"]

src/web/tracker/models.py

@@ -1,100 +0,0 @@
-from django.db import models
-from datetime import datetime, timedelta
-from django.conf import settings
-from zoneinfo import ZoneInfo
-from common.util.time import format_duration
-from django.db.models import Sum
-
-
-class Game(models.Model):
-    name = models.CharField(max_length=255)
-    wikidata = models.CharField(max_length=50)
-
-    def __str__(self):
-        return self.name
-
-
-class Purchase(models.Model):
-    game = models.ForeignKey("Game", on_delete=models.CASCADE)
-    platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
-    date_purchased = models.DateField()
-    date_refunded = models.DateField(blank=True, null=True)
-
-    def __str__(self):
-        return f"{self.game} ({self.platform})"
-
-
-class Platform(models.Model):
-    name = models.CharField(max_length=255)
-    group = models.CharField(max_length=255)
-
-    def __str__(self):
-        return self.name
-
-
-class Session(models.Model):
-    purchase = models.ForeignKey("Purchase", on_delete=models.CASCADE)
-    timestamp_start = models.DateTimeField()
-    timestamp_end = models.DateTimeField(blank=True, null=True)
-    duration_manual = models.DurationField(blank=True, null=True)
-    duration_calculated = models.DurationField(blank=True, null=True)
-    note = models.TextField(blank=True, null=True)
-
-    def __str__(self):
-        mark = ", manual" if self.duration_manual != None else ""
-        return f"{str(self.purchase)} {str(self.timestamp_start.date())} ({self.duration_any()}{mark})"
-
-    def finish_now(self):
-        self.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
-
-    def duration_seconds(self) -> timedelta:
-        if self.duration_manual == None:
-            if self.timestamp_end == None or self.timestamp_start == None:
-                return timedelta(0)
-            else:
-                value = self.timestamp_end - self.timestamp_start
-        else:
-            value = self.duration_manual
-        return timedelta(seconds=value.total_seconds())
-
-    def duration_formatted(self) -> str:
-        result = format_duration(self.duration_seconds(), "%H:%m")
-        return result
-
-    def duration_any(self):
-        return (
-            self.duration_formatted()
-            if self.duration_manual == None
-            else self.duration_manual
-        )
-
-    @staticmethod
-    def calculated_sum() -> timedelta:
-        calculated_sum_query = Session.objects.all().aggregate(
-            Sum("duration_calculated")
-        )
-        calculated_sum = (
-            timedelta(0)
-            if calculated_sum_query["duration_calculated__sum"] == None
-            else calculated_sum_query["duration_calculated__sum"]
-        )
-        return calculated_sum
-
-    @staticmethod
-    def manual_sum() -> timedelta:
-        manual_sum_query = Session.objects.all().aggregate(Sum("duration_manual"))
-        manual_sum = (
-            timedelta(0)
-            if manual_sum_query["duration_manual__sum"] == None
-            else manual_sum_query["duration_manual__sum"]
-        )
-        return manual_sum
-
-    @staticmethod
-    def total_sum() -> timedelta:
-        return Session.manual_sum() + Session.calculated_sum()
-
-    def save(self, *args, **kwargs):
-        if self.timestamp_start != None and self.timestamp_end != None:
-            self.duration_calculated = self.timestamp_end - self.timestamp_start
-        super(Session, self).save(*args, **kwargs)

src/web/tracker/templates/add.html

@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ title }}{% endblock title %}
-
-{% block content %}
-    <form method="post" enctype="multipart/form-data" class="mx-auto">
-        {% csrf_token %}
-
-        {{ form.as_p }}
-
-        <input type="submit" value="Submit"/>
-    </form>
-{% endblock content %}

src/web/tracker/templates/base.html

@@ -1,48 +0,0 @@
-<!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>
-        <link rel="stylesheet" href="https://rsms.me/inter/inter.css"/>
-        <link rel="stylesheet" href="{% static 'base.css' %}" />
-    </head>
-
-    <body class="dark">
-        <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 'index' %}" class="flex items-center">
-                        <span class="text-4xl">⌚</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">
-                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
-                            <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
-                            {% if game_available and platform_available %}
-                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
-                            {% endif %}
-                            {% if purchase_available %}
-                                <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
-                            {% endif %}
-                            {% if session_count > 0 %}
-                                <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 %}
-        </div>
-        {% load version %}
-        <span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span>
-    </body>
-
-</html>

src/web/tracker/templates/list_sessions.html

@@ -1,60 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}Sessions{% endblock title %}
-
-{% block content %}
-    {% if purchase %}
-        <div class="text-center text-xl mb-4 dark:text-slate-400">
-            <h1>Listing sessions only for purchase "{{ purchase }}"</h1>
-            <a class="dark:text-white hover:underline" href="{% url 'list_sessions' %}">View all sessions</a>
-        </div>
-    {% endif %}
-    <div id="session-table" class="gap-4 shadow rounded-xl max-w-screen-lg mx-auto dark:bg-slate-700 p-2 justify-center">
-        <div class="dark:border-white dark:text-slate-300 text-lg">Name</div>
-        <div class="dark:border-white dark:text-slate-300 text-lg text-center">Start</div>
-        <div class="dark:border-white dark:text-slate-300 text-lg text-center">End</div>
-        <div class="dark:border-white dark:text-slate-300 text-lg">Duration</div>
-        <div class="dark:border-white dark:text-slate-300 text-lg text-right">Manage</div>
-        {% for data in dataset %}
-            <div><a class="dark:text-white hover:underline" href="{% url 'list_sessions' data.purchase.id %}">{{ data.purchase }}</a></div>
-            <div class="dark:text-slate-400 text-center">{{ data.timestamp_start | date:"d/m/Y H:i" }}</div>
-            <div class="dark:text-slate-400 text-center">
-                {% if data.unfinished %}
-                    <span class="text-red-400">Not finished yet.</span>
-                {% elif data.duration_manual %}
-                    --
-                {% else %}
-                    {{ data.timestamp_end | date:"d/m/Y H:i" }}
-                {% endif %}
-            </div>
-            <div class="dark:text-slate-400 flex">{{ data.duration_formatted }}{% if data.duration_manual %} <svg title="Added manually" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5 ml-1 self-center">
-                <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a.75.75 0 000 1.5h.253a.25.25 0 01.244.304l-.459 2.066A1.75 1.75 0 0010.747 15H11a.75.75 0 000-1.5h-.253a.25.25 0 01-.244-.304l.459-2.066A1.75 1.75 0 009.253 9H9z" clip-rule="evenodd" />
-              </svg>
-              {% endif %}</div>
-            <div id="button-container" class="flex justify-end">
-                {% if data.unfinished %}
-                    <a href="{% url 'update_session' data.id %}">
-                        <button type="button" title="Set to finished" class="py-1 px-2 flex justify-center items-center  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 w-7 h-4 rounded-lg ">
-                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4 h-4">
-                                <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" clip-rule="evenodd" />
-                            </svg>
-                        </button>
-                    </a>
-                {% endif %}
-                <button type="button" title="Edit" class="py-1 px-2 flex justify-center items-center  bg-blue-600 hover:bg-blue-700 focus:ring-blue-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 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" />
-                    </svg>
-                </button>
-                <a href="{% url 'delete_session' data.id %}">
-                    <button type="button" edit="Delete" class="py-1 px-2 flex justify-center items-center  bg-red-600 hover:bg-red-700 focus:ring-red-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 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 fill-rule="evenodd" d="M8.75 1A2.75 2.75 0 006 3.75v.443c-.795.077-1.584.176-2.365.298a.75.75 0 10.23 1.482l.149-.022.841 10.518A2.75 2.75 0 007.596 19h4.807a2.75 2.75 0 002.742-2.53l.841-10.52.149.023a.75.75 0 00.23-1.482A41.03 41.03 0 0014 4.193V3.75A2.75 2.75 0 0011.25 1h-2.5zM10 4c.84 0 1.673.025 2.5.075V3.75c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25v.325C8.327 4.025 9.16 4 10 4zM8.58 7.72a.75.75 0 00-1.5.06l.3 7.5a.75.75 0 101.5-.06l-.3-7.5zm4.34.06a.75.75 0 10-1.5-.06l-.3 7.5a.75.75 0 101.5.06l.3-7.5z" clip-rule="evenodd" />
-                        </svg>
-                    </button>
-                </a>
-            </div>
-        {% endfor %}
-    </div>
-{% endblock content %}

src/web/tracker/urls.py

@@ -1,27 +0,0 @@
-from django.urls import path
-
-from . import views
-
-urlpatterns = [
-    path("", views.index, name="index"),
-    path("add-game/", views.add_game, name="add_game"),
-    path("add-platform/", views.add_platform, name="add_platform"),
-    path("add-session/", views.add_session, name="add_session"),
-    path(
-        "update-session/by-session/<int:session_id>",
-        views.update_session,
-        name="update_session",
-    ),
-    path(
-        "delete_session/by-id/<int:session_id>",
-        views.delete_session,
-        name="delete_session",
-    ),
-    path("add-purchase/", views.add_purchase, name="add_purchase"),
-    path("list-sessions/", views.list_sessions, name="list_sessions"),
-    path(
-        "list-sessions/by-purchase/<int:purchase_id>",
-        views.list_sessions,
-        name="list_sessions",
-    ),
-]

src/web/tracker/views.py

@@ -1,116 +0,0 @@
-from django.shortcuts import render, redirect
-
-from .models import Game, Platform, Purchase, Session
-from .forms import SessionForm, PurchaseForm, GameForm, PlatformForm
-from datetime import datetime, timedelta
-from zoneinfo import ZoneInfo
-from django.conf import settings
-from common.util.time import now as now_with_tz, format_duration
-from django.db.models import Sum
-import logging
-
-
-def model_counts(request):
-    return {
-        "game_available": Game.objects.count() != 0,
-        "platform_available": Platform.objects.count() != 0,
-        "purchase_available": Purchase.objects.count() != 0,
-        "session_count": Session.objects.count(),
-    }
-
-
-def add_session(request):
-    context = {}
-    now = now_with_tz()
-    initial = {"timestamp_start": now}
-    form = SessionForm(request.POST or None, initial=initial)
-    if form.is_valid():
-        form.save()
-        return redirect("list_sessions")
-
-    context["title"] = "Add New Session"
-    context["form"] = form
-    return render(request, "add.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 delete_session(request, session_id=None):
-    session = Session.objects.get(id=session_id)
-    session.delete()
-    return redirect("list_sessions")
-
-
-def list_sessions(request, purchase_id=None):
-    context = {}
-
-    if purchase_id != None:
-        dataset = Session.objects.filter(purchase=purchase_id)
-        context["purchase"] = Purchase.objects.get(id=purchase_id)
-    else:
-        dataset = Session.objects.all().order_by("timestamp_start")
-
-    for session in dataset:
-        if session.timestamp_end == None and session.duration_manual == None:
-            session.timestamp_end = datetime.now(ZoneInfo(settings.TIME_ZONE))
-            session.unfinished = True
-
-    context["dataset"] = dataset
-
-    return render(request, "list_sessions.html", context)
-
-
-def add_purchase(request):
-    context = {}
-    now = datetime.now()
-    initial = {"date_purchased": now}
-    form = PurchaseForm(request.POST or None, initial=initial)
-    if form.is_valid():
-        form.save()
-        return redirect("index")
-
-    context["form"] = form
-    context["title"] = "Add New Purchase"
-    return render(request, "add.html", context)
-
-
-def add_game(request):
-    context = {}
-    form = GameForm(request.POST or None)
-    if form.is_valid():
-        form.save()
-        return redirect("index")
-
-    context["form"] = form
-    context["title"] = "Add New Game"
-    return render(request, "add.html", context)
-
-
-def add_platform(request):
-    context = {}
-    form = PlatformForm(request.POST or None)
-    if form.is_valid():
-        form.save()
-        return redirect("index")
-
-    context["form"] = form
-    context["title"] = "Add New Platform"
-    return render(request, "add.html", context)
-
-
-def index(request):
-    context = {}
-    if Session.objects.count() == 0:
-        duration: str = ""
-    else:
-        context["total_duration"] = format_duration(
-            Session.total_sum(),
-            "%H hours %m minutes",
-        )
-    context["title"] = "Index"
-    return render(request, "index.html", context)

tailwind.config.js

@@ -1,14 +1,19 @@
+const defaultTheme = require('tailwindcss/defaultTheme')
+
 module.exports = {
     darkMode: 'class',
-    content: ["./src/**/*.{html,js}"],
+    content: ["./games/**/*.{html,js}"],
     theme: {
-        fontFamily: {
-            sans: ['Inter', 'sans-serif'],
+        extend: {
+          fontFamily: {
+            'sans': ['IBM Plex Sans', ...defaultTheme.fontFamily.sans],
+            'mono': ['IBM Plex Mono', ...defaultTheme.fontFamily.mono],
+            'serif': ['IBM Plex Serif', ...defaultTheme.fontFamily.serif],
+          }
         },
-        extend: {},
     },
     plugins: [
         require('@tailwindcss/typography'),
         require('@tailwindcss/forms')
     ],
-}
+}

tests/test_time.py

@@ -1,11 +1,11 @@
 import unittest
-from web.common.util.time import format_duration
 from datetime import timedelta
 
+from common.time import format_duration
+
 
 class FormatDurationTest(unittest.TestCase):
     def setUp(self) -> None:
-
         return super().setUp()
 
     def test_only_days(self):
@@ -18,15 +18,55 @@ class FormatDurationTest(unittest.TestCase):
         result = format_duration(delta, "%H hours")
         self.assertEqual(result, "1 hours")
 
+    def test_only_hours_fractional(self):
+        delta = timedelta(hours=1)
+        result = format_duration(delta, "%.1H hours")
+        self.assertEqual(result, "1.0 hours")
+
+    def test_less_than_hour_with_precision(self):
+        delta = timedelta(hours=0.5)
+        result = format_duration(delta, "%.1H hours")
+        self.assertEqual(result, "0.5 hours")
+
+    def test_less_than_hour_without_precision(self):
+        delta = timedelta(hours=0.5)
+        result = format_duration(delta, "%H hours")
+        self.assertEqual(result, "0 hours")
+
+    def test_overflow_hours(self):
+        delta = timedelta(hours=25)
+        result = format_duration(delta, "%H hours")
+        self.assertEqual(result, "25 hours")
+
+    def test_overflow_hours_into_days(self):
+        delta = timedelta(hours=25)
+        result = format_duration(delta, "%d days, %H hours")
+        self.assertEqual(result, "1 days, 1 hours")
+
     def test_only_minutes(self):
         delta = timedelta(minutes=34)
         result = format_duration(delta, "%m minutes")
         self.assertEqual(result, "34 minutes")
 
+    def test_only_overflow_minutes(self):
+        delta = timedelta(minutes=61)
+        result = format_duration(delta, "%m minutes")
+        self.assertEqual(result, "61 minutes")
+
+    def test_overflow_minutes_into_hours(self):
+        delta = timedelta(minutes=61)
+        result = format_duration(delta, "%H hours, %m minutes")
+        self.assertEqual(result, "1 hours, 1 minutes")
+
     def test_only_overflow_seconds(self):
         delta = timedelta(seconds=61)
         result = format_duration(delta, "%s seconds")
-        self.assertEqual(result, "1 seconds")
+        self.assertEqual(result, "61 seconds")
+
+    def test_overflow_seconds_into_minutes(self):
+        delta = timedelta(seconds=61)
+        result = format_duration(delta, "%m minutes, %s seconds")
+        self.assertEqual(result, "1 minutes, 1 seconds")
 
     def test_only_rawseconds(self):
         delta = timedelta(seconds=5690)
@@ -56,3 +96,12 @@ class FormatDurationTest(unittest.TestCase):
         delta = timedelta(hours=-2)
         result = format_duration(delta, "%H hours")
         self.assertEqual(result, "0 hours")
+
+    def test_none(self):
+        try:
+            format_duration(None)
+        except TypeError as exc:
+            assert False, f"format_duration(None) raised an exception {exc}"
+
+    def test_number(self):
+        self.assertEqual(format_duration(3600, "%H hour"), "1 hour")

timetracker/asgi.py

@@ -1,5 +1,5 @@
 """
-ASGI config for web project.
+ASGI config for timetracker project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "web.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
 
 application = get_asgi_application()

timetracker/settings.py

@@ -1,5 +1,5 @@
 """
-Django settings for web project.
+Django settings for timetracker project.
 
 Generated by 'django-admin startproject' using Django 4.1.4.
 
@@ -10,9 +10,8 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.1/ref/settings/
 """
 
-from pathlib import Path
-import logging
 import os
+from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -33,7 +32,7 @@ ALLOWED_HOSTS = ["*"]
 # Application definition
 
 INSTALLED_APPS = [
-    "tracker.apps.TrackerConfig",
+    "games.apps.GamesConfig",
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
@@ -41,9 +40,9 @@ INSTALLED_APPS = [
     "django.contrib.staticfiles",
 ]
 
-if DEBUG:
-    INSTALLED_APPS.append("django_extensions")
-    INSTALLED_APPS.append("django.contrib.admin")
+# if DEBUG:
+INSTALLED_APPS.append("django_extensions")
+INSTALLED_APPS.append("django.contrib.admin")
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
@@ -55,7 +54,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "web.urls"
+ROOT_URLCONF = "timetracker.urls"
 
 TEMPLATES = [
     {
@@ -68,13 +67,14 @@ TEMPLATES = [
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
-                "tracker.views.model_counts",
+                "games.views.model_counts",
+                "games.views.stats_dropdown_year_range",
             ],
         },
     },
 ]
 
-WSGI_APPLICATION = "web.wsgi.application"
+WSGI_APPLICATION = "timetracker.wsgi.application"
 
 
 # Database
@@ -145,7 +145,10 @@ LOGGING = {
     },
 }
 
-CSRF_TRUSTED_ORIGINS = []
+_csrf_trusted_origins = os.environ.get("CSRF_TRUSTED_ORIGINS")
+if _csrf_trusted_origins:
+    CSRF_TRUSTED_ORIGINS = _csrf_trusted_origins.split(",")
+else:
+    CSRF_TRUSTED_ORIGINS = []
 
-if os.environ.get("PROD"):
-    CSRF_TRUSTED_ORIGINS.append(os.environ.get("CSRF_TRUSTED_ORIGINS"))
+USE_L10N = False

timetracker/urls.py

@@ -1,4 +1,4 @@
-"""web URL Configuration
+"""timetracker URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/4.1/topics/http/urls/
@@ -13,16 +13,16 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
 from django.views.generic import RedirectView
-from django.conf import settings
-
 
 urlpatterns = [
-    path("", RedirectView.as_view(url="/tracker/list-sessions")),
-    path("tracker/", include("tracker.urls")),
+    path("", RedirectView.as_view(url="/tracker")),
+    path("tracker/", include("games.urls")),
 ]
 
-if settings.DEBUG:
-    urlpatterns.append(path("admin/", admin.site.urls))
+# if settings.DEBUG:
+#     urlpatterns.append(path("admin/", admin.site.urls))
+urlpatterns.append(path("admin/", admin.site.urls))

timetracker/wsgi.py

@@ -1,5 +1,5 @@
 """
-WSGI config for web project.
+WSGI config for timetracker project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "web.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
 
 application = get_wsgi_application()