Improve how editions and purchases are displayed

CHANGELOG.md

@@ -1,3 +1,14 @@
+## Unreleased
+
+## Improved
+* game overview: improve how editions and purchases are displayed
+
+## 1.5.1 / 2023-11-14 21:10+01:00
+
+## Improved
+* Disallow choosing non-game purchase as related purchase
+* Improve display of purchases
+
 ## 1.5.0 / 2023-11-14 19:27+01:00
 
 ## New

Dockerfile

@@ -6,7 +6,7 @@ RUN npm install && \
 
 FROM python:3.10.9-slim-bullseye
 
-ENV VERSION_NUMBER 1.5.0
+ENV VERSION_NUMBER 1.5.1
 ENV PROD 1
 ENV PYTHONUNBUFFERED=1
 

games/forms.py

@@ -56,7 +56,9 @@ class PurchaseForm(forms.ModelForm):
     )
     platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
     related_purchase = forms.ModelChoiceField(
-        queryset=Purchase.objects.order_by("edition__sort_name")
+        queryset=Purchase.objects.filter(type=Purchase.GAME).order_by(
+            "edition__sort_name"
+        )
     )
 
     class Meta:

games/migrations/0029_alter_purchase_related_purchase.py

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

games/models.py

@@ -124,14 +124,24 @@ class Purchase(models.Model):
         max_length=255, default="Unknown Name", null=True, blank=True
     )
     related_purchase = models.ForeignKey(
-        "Purchase", on_delete=models.SET_NULL, default=None, null=True, blank=True
+        "Purchase",
+        on_delete=models.SET_NULL,
+        default=None,
+        null=True,
+        blank=True,
+        related_name="related_purchases",
     )
 
     def __str__(self):
-        platform_info = self.platform
+        additional_info = [
-        if self.platform != self.edition.platform:
+            self.get_type_display() if self.type != Purchase.GAME else "",
-            platform_info = f"{self.edition.platform} version on {self.platform}"
+            f"{self.edition.platform} version on {self.platform}"
-        return f"{self.edition} ({platform_info}, {self.edition.year_released}, {self.get_ownership_type_display()})"
+            if self.platform != self.edition.platform
+            else self.platform,
+            self.edition.year_released,
+            self.get_ownership_type_display(),
+        ]
+        return f"{self.edition} ({', '.join(filter(None, map(str, additional_info)))})"
 
     def is_game(self):
         return self.type == self.GAME

games/static/base.css

@@ -1429,6 +1429,10 @@ th label {
     padding-right: 1rem;
   }
 
+  .sm\:pl-12 {
+    padding-left: 3rem;
+  }
+
   .sm\:pl-2 {
     padding-left: 0.5rem;
   }

games/static/js/add_purchase.js

@@ -1,4 +1,9 @@
-import { syncSelectInputUntilChanged, getEl, conditionalElementHandler } from "./utils.js";
+import {
+  syncSelectInputUntilChanged,
+  getEl,
+  disableElementsWhenTrue,
+  disableElementsWhenFalse,
+} from "./utils.js";
 
 let syncData = [
   {
@@ -11,21 +16,15 @@ let syncData = [
 
 syncSelectInputUntilChanged(syncData, "form");
 
-
+function setupElementHandlers() {
-let myConfig = [
+  disableElementsWhenTrue("#id_type", "game", [
-  () => {
+    "#id_name",
-    return getEl("#id_type").value == "game";
+    "#id_related_purchase",
-  },
+  ]);
-  ["#id_name", "#id_related_purchase"],
+  disableElementsWhenFalse("#id_type", "game", ["#id_date_finished"]);
-  (el) => {
-    el.disabled = "disabled";
-  },
-  (el) => {
-    el.disabled = "";
-  }
-]
-
-document.DOMContentLoaded = conditionalElementHandler(...myConfig)
-getEl("#id_type").onchange = () => {
-  conditionalElementHandler(...myConfig)
 }
+
+document.addEventListener("DOMContentLoaded", setupElementHandlers);
+getEl("#id_type").onchange = () => {
+  setupElementHandlers();
+};

games/static/js/utils.js

@@ -99,37 +99,72 @@ function getEl(selector) {
     return document.getElementsByClassName(selector)
   }
   else {
-    return document.getElementsByName(selector)
+    return document.getElementsByTagName(selector)
   }
 }
 
 /**
- * @description Does something to elements when something happens.
+ * @description Applies different behaviors to elements based on multiple conditional configurations.
- * @param {() => boolean} condition The condition that is being tested.
+ * Each configuration is an array containing a condition function, an array of target element selectors,
- * @param {string[]} targetElements
+ * and two callback functions for handling matched and unmatched conditions.
- * @param {(elementName: HTMLElement) => void} callbackfn1 Called when the condition matches.
+ * @param {...Array} configs Each configuration is an array of the form:
- * @param {(elementName: HTMLElement) => void} callbackfn2 Called when the condition doesn't match.
+ *   - 0: {function(): boolean} condition - Function that returns true or false based on a condition.
+ *   - 1: {string[]} targetElements - Array of CSS selectors for target elements.
+ *   - 2: {function(HTMLElement): void} callbackfn1 - Function to execute when condition is true.
+ *   - 3: {function(HTMLElement): void} callbackfn2 - Function to execute when condition is false.
  */
-function conditionalElementHandler(condition, targetElements, callbackfn1, callbackfn2) {
+function conditionalElementHandler(...configs) {
+  configs.forEach(([condition, targetElements, callbackfn1, callbackfn2]) => {
     if (condition()) {
-    targetElements.forEach((elementName) => {
+      targetElements.forEach(elementName => {
         let el = getEl(elementName);
         if (el === null) {
-        console.error("Element ${elementName} doesn't exist.");
+          console.error(`Element ${elementName} doesn't exist.`);
         } else {
           callbackfn1(el);
         }
       });
     } else {
-    targetElements.forEach((elementName) => {
+      targetElements.forEach(elementName => {
         let el = getEl(elementName);
         if (el === null) {
-        console.error("Element ${elementName} doesn't exist.");
+          console.error(`Element ${elementName} doesn't exist.`);
         } else {
           callbackfn2(el);
         }
       });
     }
+  });
 }
 
-export { toISOUTCString, syncSelectInputUntilChanged, getEl, conditionalElementHandler };
+function disableElementsWhenFalse(targetSelect, targetValue, elementList) {
+  return conditionalElementHandler([
+    () => {
+      return getEl(targetSelect).value != targetValue;
+    },
+    elementList,
+    (el) => {
+      el.disabled = "disabled";
+    },
+    (el) => {
+      el.disabled = "";
+    },
+  ]);
+}
+
+function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
+  return conditionalElementHandler([
+    () => {
+      return getEl(targetSelect).value == targetValue;
+    },
+    elementList,
+    (el) => {
+      el.disabled = "disabled";
+    },
+    (el) => {
+      el.disabled = "";
+    },
+  ]);
+}
+
+export { toISOUTCString, syncSelectInputUntilChanged, getEl, conditionalElementHandler, disableElementsWhenFalse, disableElementsWhenTrue, getValueFromProperty };

games/templates/view_game.html

@@ -13,11 +13,12 @@
             {% 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>
+            {{ hours_sum }} <span class="dark:text-slate-500">total</span>
             {{ session_average }} <span class="dark:text-slate-500">avg</span> 
             ({{ playrange }}) </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>
+        <h1 class="text-3xl mt-4 mb-1">Editions <span class="dark:text-slate-500">({{ edition_count }})</span> and Purchases <span class="dark:text-slate-500">({{ purchase_count }})</span></h1>
+
         <ul>
             {% for edition in editions %}
             <li class="sm:pl-2 flex items-center">
@@ -32,32 +33,27 @@
                 {% 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 %}
+                    {% for purchase in edition.game_purchases %}
-            <li class="sm:pl-2 flex items-center">
+                    <li class="sm:pl-6 flex items-center">
-                {{ purchase.platform }}
+                        {{ purchase.get_ownership_type_display }}, {{ purchase.date_purchased | date:"Y" }}, {{ purchase.price }} {{ purchase.price_currency}}
-                ({{ 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 %}
-                {% if purchase.related_purchases %}
+                    </li>
-                    <li>
                     <ul>
-                            {% for related_purchase in purchase.related_purchases %}
+                        {% for related_purchase in purchase.nongame_related_purchases %}
-                                <li class="sm:pl-6 flex items-center">
+                            <li class="sm:pl-12 flex items-center">
-                                    {{ related_purchase.name}} ({{ related_purchase.get_type_display }}, {{ related_purchase.date_purchased | date:"Y" }}, {{ related_purchase.price }} {{ related_purchase.price_currency}})
+                                {{ related_purchase.name }} ({{ related_purchase.get_type_display }}, {{ purchase.platform }}, {{ related_purchase.date_purchased | date:"Y" }}, {{ related_purchase.price }} {{ related_purchase.price_currency}})
                                 {% url 'edit_purchase' related_purchase.id as edit_url %}
                                 {% include 'components/edit_button.html' with edit_url=edit_url %}
                             </li>
                         {% endfor %}
                     </ul>
-                    </li>
-                {% endif %}
-            </li>
                     {% endfor %}
                 </ul>
+            {% endfor %}
+        </ul>
+
         <h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center">
             Sessions
             <span class="dark:text-slate-500">

games/views.py

@@ -2,7 +2,7 @@ from common.time import format_duration, now as now_with_tz
 from common.utils import safe_division
 from datetime import datetime, timedelta
 from django.conf import settings
-from django.db.models import Sum, F, Count
+from django.db.models import Sum, F, Count, Prefetch
 from django.db.models.functions import TruncDate
 from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect, render
@@ -136,44 +136,52 @@ def edit_game(request, game_id=None):
 
 
 def view_game(request, game_id=None):
-    context = {}
     game = Game.objects.get(id=game_id)
-    context["title"] = "View Game"
+    nongame_related_purchases_prefetch = Prefetch(
-    context["game"] = game
+        "related_purchases",
-    context["editions"] = Edition.objects.filter(game_id=game_id)
+        queryset=Purchase.objects.exclude(type=Purchase.GAME),
-    game_purchases = (
+        to_attr="nongame_related_purchases",
-        Purchase.objects.filter(edition__game_id=game_id)
+    )
-        .filter(type=Purchase.GAME)
+    game_purchases_prefetch = Prefetch(
-        .order_by("date_purchased")
+        "purchase_set",
+        queryset=Purchase.objects.filter(type=Purchase.GAME).prefetch_related(
+            nongame_related_purchases_prefetch
+        ),
+        to_attr="game_purchases",
+    )
+    editions = (
+        Edition.objects.filter(game=game)
+        .prefetch_related(game_purchases_prefetch)
+        .order_by("year_released")
     )
-    for purchase in game_purchases:
-        purchase.related_purchases = Purchase.objects.exclude(
-            type=Purchase.GAME
-        ).filter(related_purchase=purchase.id)
 
-    context["purchases"] = game_purchases
+    sessions = Session.objects.filter(purchase__edition__game=game)
-    context["sessions"] = Session.objects.filter(
+    session_count = sessions.count()
-        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
-    playrange_start = context["sessions"].last().timestamp_start.strftime("%b %Y")
-    playrange_end = context["sessions"].first().timestamp_start.strftime("%b %Y")
 
-    context["playrange"] = (
+    playrange_start = sessions.first().timestamp_start.strftime("%b %Y")
+    playrange_end = sessions.last().timestamp_start.strftime("%b %Y")
+
+    playrange = (
         playrange_start
         if playrange_start == playrange_end
         else f"{playrange_start} — {playrange_end}"
     )
+    total_hours = float(format_duration(sessions.total_duration_unformatted(), "%2.1H"))
+
+    context = {
+        "edition_count": editions.count(),
+        "editions": editions,
+        "game": game,
+        "playrange": playrange,
+        "purchase_count": Purchase.objects.filter(edition__game=game).count(),
+        "session_average": round(total_hours / int(session_count), 1),
+        "session_count": session_count,
+        "sessions_with_notes": sessions.exclude(note=""),
+        "sessions": sessions.order_by("-timestamp_start"),
+        "title": f"Game Overview - {game.name}",
+        "hours_sum": total_hours,
+    }
 
-    context["sessions_with_notes"] = context["sessions"].exclude(note="")
     request.session["return_path"] = request.path
     return render(request, "view_game.html", context)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "timetracker"
-version = "1.5.0"
+version = "1.5.1"
 description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"