Organize better

This reverts commit 6ac4209492.

.github/workflows/build-docker.yml

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

.gitignore

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

CHANGELOG.md

@@ -1,13 +1,8 @@
-## 1.5.2 / 2024-01-14 21:27+01:00
+## Unreleased
 
 ## Improved
-* game overview:
+* game overview: improve how editions and purchases are displayed
-  * improve how editions and purchases are displayed
-  * make it possible to end session from overview
 * add purchase: only allow choosing purchases of selected edition
-* session list:
-  * starting and ending sessions is much faster/doest not reload the page
-  * listing sessions is much faster
 
 ## 1.5.1 / 2023-11-14 21:10+01:00
 

Dockerfile

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

games/forms.py

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

games/migrations/0034_purchase_date_dropped_purchase_infinite.py

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

games/models.py

@@ -116,8 +116,6 @@ class Purchase(models.Model):
     date_purchased = models.DateField()
     date_refunded = models.DateField(blank=True, null=True)
     date_finished = models.DateField(blank=True, null=True)
-    date_dropped = models.DateField(blank=True, null=True)
-    infinite = models.BooleanField(default=False)
     price = models.IntegerField(default=0)
     price_currency = models.CharField(max_length=3, default="USD")
     ownership_type = models.CharField(

games/static/base.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.0 | MIT License | https://tailwindcss.com
+! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -32,11 +32,9 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
-7. Disable tap highlights on iOS
 */
 
-html,
+html {
-:host {
   line-height: 1.5;
   /* 1 */
   -webkit-text-size-adjust: 100%;
@@ -46,14 +44,12 @@ html,
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: IBM Plex Sans, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: IBM Plex Sans, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
   font-variation-settings: normal;
   /* 6 */
-  -webkit-tap-highlight-color: transparent;
-  /* 7 */
 }
 
 /*
@@ -125,10 +121,8 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font-family by default.
+1. Use the user's configured `mono` font family by default.
-2. Use the user's configured `mono` font-feature-settings by default.
+2. Correct the odd `em` font sizing in all browsers.
-3. Use the user's configured `mono` font-variation-settings by default.
-4. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -137,12 +131,8 @@ samp,
 pre {
   font-family: IBM Plex Mono, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-feature-settings: normal;
-  /* 2 */
-  font-variation-settings: normal;
-  /* 3 */
   font-size: 1em;
-  /* 4 */
+  /* 2 */
 }
 
 /*
@@ -577,26 +567,10 @@ select {
   background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
 }
 
-@media (forced-colors: active)  {
-  [type='checkbox']:checked {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='radio']:checked {
   background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e");
 }
 
-@media (forced-colors: active)  {
-  [type='radio']:checked {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='checkbox']:checked:hover,[type='checkbox']:checked:focus,[type='radio']:checked:hover,[type='radio']:checked:focus {
   border-color: transparent;
   background-color: currentColor;
@@ -611,14 +585,6 @@ select {
   background-repeat: no-repeat;
 }
 
-@media (forced-colors: active)  {
-  [type='checkbox']:indeterminate {
-    -webkit-appearance: auto;
-       -moz-appearance: auto;
-            appearance: auto;
-  }
-}
-
 [type='checkbox']:indeterminate:hover,[type='checkbox']:indeterminate:focus {
   border-color: transparent;
   background-color: currentColor;
@@ -834,11 +800,6 @@ select {
   margin-bottom: 1.5rem;
 }
 
-.mx-1 {
-  margin-left: 0.25rem;
-  margin-right: 0.25rem;
-}
-
 .mb-1 {
   margin-bottom: 0.25rem;
 }
@@ -907,18 +868,6 @@ select {
   height: 1.5rem;
 }
 
-.h-8 {
-  height: 2rem;
-}
-
-.h-2 {
-  height: 0.5rem;
-}
-
-.h-3 {
-  height: 0.75rem;
-}
-
 .min-h-screen {
   min-height: 100vh;
 }
@@ -935,10 +884,6 @@ select {
   width: 1.75rem;
 }
 
-.w-8 {
-  width: 2rem;
-}
-
 .w-auto {
   width: auto;
 }
@@ -947,14 +892,6 @@ select {
   width: 100%;
 }
 
-.w-4 {
-  width: 1rem;
-}
-
-.w-3 {
-  width: 0.75rem;
-}
-
 .max-w-screen-lg {
   max-width: 1024px;
 }
@@ -967,10 +904,6 @@ select {
   max-width: 20rem;
 }
 
-.transform {
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
 @keyframes spin {
   to {
     transform: rotate(360deg);
@@ -1005,12 +938,6 @@ select {
   gap: 0.5rem;
 }
 
-.space-x-1 > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(0.25rem * var(--tw-space-x-reverse));
-  margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse)));
-}
-
 .self-center {
   align-self: center;
 }
@@ -1037,10 +964,6 @@ select {
   border-radius: 0.125rem;
 }
 
-.rounded-full {
-  border-radius: 9999px;
-}
-
 .border-gray-200 {
   --tw-border-opacity: 1;
   border-color: rgb(229 231 235 / var(--tw-border-opacity));
@@ -1071,16 +994,6 @@ select {
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 }
 
-.bg-green-400 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(74 222 128 / var(--tw-bg-opacity));
-}
-
-.bg-green-500 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(34 197 94 / var(--tw-bg-opacity));
-}
-
 .p-4 {
   padding: 1rem;
 }
@@ -1105,16 +1018,6 @@ select {
   padding-bottom: 0.5rem;
 }
 
-.py-4 {
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-}
-
-.px-1 {
-  padding-left: 0.25rem;
-  padding-right: 0.25rem;
-}
-
 .pl-3 {
   padding-left: 0.75rem;
 }
@@ -1276,7 +1179,7 @@ a:hover {
   transition: all 0.2s ease-out;
 }
 
-:is(:where(.dark) form label) {
+:is(.dark form label) {
   --tw-text-opacity: 1;
   color: rgb(148 163 184 / var(--tw-text-opacity));
 }
@@ -1286,7 +1189,7 @@ a:hover {
   margin-right: auto;
 }
 
-:is(:where(.dark) .responsive-table) {
+:is(.dark .responsive-table) {
   --tw-text-opacity: 1;
   color: rgb(255 255 255 / var(--tw-text-opacity));
 }
@@ -1317,8 +1220,8 @@ a:hover {
   border-left-color: rgb(100 116 139 / var(--tw-border-opacity));
 }
 
-:is(:where(.dark) form input),:is(:where(.dark) 
+:is(.dark form input),:is(.dark 
-select),:is(:where(.dark) 
+select),:is(.dark 
 textarea) {
   border-width: 1px;
   --tw-border-opacity: 1;
@@ -1329,8 +1232,8 @@ textarea) {
   color: rgb(241 245 249 / var(--tw-text-opacity));
 }
 
-:is(:where(.dark) form input:disabled),:is(:where(.dark) 
+:is(.dark form input:disabled),:is(.dark 
-select:disabled),:is(:where(.dark) 
+select:disabled),:is(.dark 
 textarea:disabled) {
   --tw-bg-opacity: 1;
   background-color: rgb(51 65 85 / var(--tw-bg-opacity));
@@ -1502,6 +1405,36 @@ th label {
   display: block;
 }
 
+:is(.dark .dark\:bg-gray-800) {
+  --tw-bg-opacity: 1;
+  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
+}
+
+:is(.dark .dark\:bg-gray-900) {
+  --tw-bg-opacity: 1;
+  background-color: rgb(17 24 39 / var(--tw-bg-opacity));
+}
+
+:is(.dark .dark\:text-slate-400) {
+  --tw-text-opacity: 1;
+  color: rgb(148 163 184 / var(--tw-text-opacity));
+}
+
+:is(.dark .dark\:text-slate-500) {
+  --tw-text-opacity: 1;
+  color: rgb(100 116 139 / var(--tw-text-opacity));
+}
+
+:is(.dark .dark\:text-slate-600) {
+  --tw-text-opacity: 1;
+  color: rgb(71 85 105 / var(--tw-text-opacity));
+}
+
+:is(.dark .dark\:text-white) {
+  --tw-text-opacity: 1;
+  color: rgb(255 255 255 / var(--tw-text-opacity));
+}
+
 @media (min-width: 640px) {
   .sm\:inline {
     display: inline;
@@ -1586,33 +1519,3 @@ th label {
     max-width: 32rem;
   }
 }
-
-:is(:where(.dark) .dark\:bg-gray-800) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
-}
-
-:is(:where(.dark) .dark\:bg-gray-900) {
-  --tw-bg-opacity: 1;
-  background-color: rgb(17 24 39 / var(--tw-bg-opacity));
-}
-
-:is(:where(.dark) .dark\:text-slate-400) {
-  --tw-text-opacity: 1;
-  color: rgb(148 163 184 / var(--tw-text-opacity));
-}
-
-:is(:where(.dark) .dark\:text-slate-500) {
-  --tw-text-opacity: 1;
-  color: rgb(100 116 139 / var(--tw-text-opacity));
-}
-
-:is(:where(.dark) .dark\:text-slate-600) {
-  --tw-text-opacity: 1;
-  color: rgb(71 85 105 / var(--tw-text-opacity));
-}
-
-:is(:where(.dark) .dark\:text-white) {
-  --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
-}

games/static/js/utils.js

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

games/templates/base.html

@@ -1,4 +1,3 @@
-{% load django_htmx %}
 <!DOCTYPE html>
 <html lang="en">
     {% load static %}
@@ -13,7 +12,6 @@
             {% endblock title %}
         </title>
         <script src="{% static 'js/htmx.min.js' %}"></script>
-        {% django_htmx_script %}
         <link rel="stylesheet" href="{% static 'base.css' %}" />
     </head>
     <body class="dark" hx-indicator="#indicator">

games/templates/list_sessions.html

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

games/templates/stats.html

@@ -43,11 +43,11 @@
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year_count }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year.count }}</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Finished ({{ year }})</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year_count }}</td>
+                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ this_year_finished_this_year.count }}</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Longest session</td>
@@ -63,14 +63,6 @@
                         {{ highest_session_average }} ({{ highest_session_average_game }})
                     </td>
                 </tr>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">First play</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ first_play_name }} ({{ first_play_date }})</td>
-                </tr>
-                <tr>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2">Last play</td>
-                    <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ last_play_name }} ({{ last_play_date }})</td>
-                </tr>
             </tbody>
         </table>
         <h1 class="text-5xl text-center my-6">Purchases</h1>
@@ -78,18 +70,18 @@
             <tbody>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Total</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">{{ all_purchased_this_year.count }}</td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Refunded</td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ all_purchased_refunded_this_year_count }} ({{ refunded_percent }}%)
+                        {{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)
                     </td>
                 </tr>
                 <tr>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2">Unfinished</td>
                     <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                        {{ purchased_unfinished_count }} ({{ unfinished_purchases_percent }}%)
+                        {{ purchased_unfinished.count }} ({{ unfinished_purchases_percent }}%)
                     </td>
                 </tr>
                 <tr>
@@ -205,33 +197,6 @@
                 {% endfor %}
             </tbody>
         </table>
-
-        <h1 class="text-5xl text-center my-6">Unfinished Purchases</h1>
-        <table class="responsive-table">
-            <thead>
-                <tr>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Price ({{ total_spent_currency }})</th>
-                    <th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for purchase in purchased_unfinished %}
-                    <tr>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
-                            <a class="underline decoration-slate-500 sm:decoration-2"
-                               href="{% url 'edit_purchase' purchase.id %}">
-                                {{ purchase.edition.name }}
-                                {% if purchase.type == "dlc" %}({{ purchase.name }}, {{ purchase.get_type_display }}){% endif %}
-                            </a>
-                        </td>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
-                        <td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
         <h1 class="text-5xl text-center my-6">All Purchases</h1>
         <table class="responsive-table">
             <thead>

games/templates/view_game.html

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

games/urls.py

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

games/views.py

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

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand.
+# This file is automatically @generated by Poetry and should not be changed by hand.
 
 [[package]]
 name = "aniso8601"
@@ -18,6 +18,7 @@ dev = ["black", "coverage", "isort", "pre-commit", "pyenchant", "pylint"]
 name = "asgiref"
 version = "3.7.2"
 description = "ASGI specs, helper code, and adapters"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -32,6 +33,7 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
 name = "black"
 version = "22.12.0"
 description = "The uncompromising code formatter."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -65,6 +67,7 @@ uvloop = ["uvloop (>=0.15.2)"]
 name = "cfgv"
 version = "3.4.0"
 description = "Validate configuration and produce human readable error messages."
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -76,6 +79,7 @@ files = [
 name = "click"
 version = "8.1.7"
 description = "Composable command line interface toolkit"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -90,6 +94,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 name = "colorama"
 version = "0.4.6"
 description = "Cross-platform colored terminal text."
+category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 files = [
@@ -101,6 +106,7 @@ files = [
 name = "cssbeautifier"
 version = "1.14.11"
 description = "CSS unobfuscator and beautifier."
+category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -116,6 +122,7 @@ six = ">=1.13.0"
 name = "distlib"
 version = "0.3.7"
 description = "Distribution utilities"
+category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -127,6 +134,7 @@ files = [
 name = "django"
 version = "4.2.7"
 description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -147,6 +155,7 @@ bcrypt = ["bcrypt"]
 name = "django-debug-toolbar"
 version = "4.2.0"
 description = "A configurable set of panels that display various debug information about the current request/response."
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -162,6 +171,7 @@ sqlparse = ">=0.2"
 name = "django-extensions"
 version = "3.2.3"
 description = "Extensions for Django"
+category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -172,43 +182,11 @@ files = [
 [package.dependencies]
 Django = ">=3.2"
 
-[[package]]
-name = "django-htmx"
-version = "1.17.2"
-description = "Extensions for using Django with htmx."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "django-htmx-1.17.2.tar.gz", hash = "sha256:4089f2ed38727e9846c2f4cd1daddf6b010c7be8d834cfbcffc8c5ecf445c04e"},
-    {file = "django_htmx-1.17.2-py3-none-any.whl", hash = "sha256:f4971432d2ca45dbb31d9b58add1c50ae54354afe4bf59cafd591b1711b502c0"},
-]
-
-[package.dependencies]
-asgiref = ">=3.6"
-Django = ">=3.2"
-
-[[package]]
-name = "django-template-partials"
-version = "23.4"
-description = "django-template-partials"
-optional = false
-python-versions = "*"
-files = [
-    {file = "django-template-partials-23.4.tar.gz", hash = "sha256:f762b0b7b2222462df0845f0556792640b769eb832eae218a0e7dadd4e5606cc"},
-    {file = "django_template_partials-23.4-py2.py3-none-any.whl", hash = "sha256:d83d9c2d2836be769919e9aaf394d5feb1ac86e1187083030398308070122fca"},
-]
-
-[package.dependencies]
-Django = "*"
-
-[package.extras]
-docs = ["Sphinx"]
-tests = ["coverage", "django_coverage_plugin"]
-
 [[package]]
 name = "djhtml"
 version = "1.5.2"
 description = "Django/Jinja template indenter"
+category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -222,6 +200,7 @@ dev = ["black", "flake8", "isort", "nox", "pre-commit"]
 name = "djlint"
 version = "1.34.0"
 description = "HTML Template Linter and Formatter"
+category = "dev"
 optional = false
 python-versions = ">=3.8.0,<4.0.0"
 files = [
@@ -246,6 +225,7 @@ tqdm = ">=4.62.2,<5.0.0"
 name = "editorconfig"
 version = "0.12.3"
 description = "EditorConfig File Locator and Interpreter for Python"
+category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -257,6 +237,7 @@ files = [
 name = "filelock"
 version = "3.13.1"
 description = "A platform independent file lock."
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -342,6 +323,7 @@ graphql-core = ">=3.2,<3.3"
 name = "gunicorn"
 version = "20.1.0"
 description = "WSGI HTTP Server for UNIX"
+category = "main"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -362,6 +344,7 @@ tornado = ["tornado (>=0.2)"]
 name = "h11"
 version = "0.14.0"
 description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -373,6 +356,7 @@ files = [
 name = "html-tag-names"
 version = "0.1.2"
 description = "List of known HTML tag names"
+category = "dev"
 optional = false
 python-versions = ">=3.7,<4.0"
 files = [
@@ -384,6 +368,7 @@ files = [
 name = "html-void-elements"
 version = "0.1.0"
 description = "List of HTML void tag names."
+category = "dev"
 optional = false
 python-versions = ">=3.7,<4.0"
 files = [
@@ -395,6 +380,7 @@ files = [
 name = "identify"
 version = "2.5.32"
 description = "File identification library for Python"
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -409,6 +395,7 @@ license = ["ukkonen"]
 name = "iniconfig"
 version = "2.0.0"
 description = "brain-dead simple config-ini parsing"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -420,6 +407,7 @@ files = [
 name = "isort"
 version = "5.12.0"
 description = "A Python utility / library to sort Python imports."
+category = "dev"
 optional = false
 python-versions = ">=3.8.0"
 files = [
@@ -437,6 +425,7 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"]
 name = "jsbeautifier"
 version = "1.14.11"
 description = "JavaScript unobfuscator and beautifier."
+category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -451,6 +440,7 @@ six = ">=1.13.0"
 name = "json5"
 version = "0.9.14"
 description = "A Python implementation of the JSON5 data format."
+category = "dev"
 optional = false
 python-versions = "*"
 files = [
@@ -465,6 +455,7 @@ dev = ["hypothesis"]
 name = "markupsafe"
 version = "2.1.3"
 description = "Safely add untrusted strings to HTML/XML markup."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -534,6 +525,7 @@ files = [
 name = "mypy"
 version = "0.991"
 description = "Optional static typing for Python"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -583,6 +575,7 @@ reports = ["lxml"]
 name = "mypy-extensions"
 version = "1.0.0"
 description = "Type system extensions for programs checked with the mypy type checker."
+category = "dev"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -594,6 +587,7 @@ files = [
 name = "nodeenv"
 version = "1.8.0"
 description = "Node.js virtual environment builder"
+category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 files = [
@@ -608,6 +602,7 @@ setuptools = "*"
 name = "packaging"
 version = "23.2"
 description = "Core utilities for Python packages"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -619,6 +614,7 @@ files = [
 name = "pathspec"
 version = "0.11.2"
 description = "Utility library for gitignore style pattern matching of file paths."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -628,13 +624,14 @@ files = [
 
 [[package]]
 name = "platformdirs"
-version = "4.0.0"
+version = "3.11.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"},
+    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
-    {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"},
+    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
 ]
 
 [package.extras]
@@ -645,6 +642,7 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co
 name = "pluggy"
 version = "1.3.0"
 description = "plugin and hook calling mechanisms for python"
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -660,6 +658,7 @@ testing = ["pytest", "pytest-benchmark"]
 name = "pre-commit"
 version = "3.5.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -694,6 +693,7 @@ test = ["coveralls", "futures", "mock", "pytest (>=2.7.3)", "pytest-benchmark",
 name = "pytest"
 version = "7.4.3"
 description = "pytest: simple powerful testing with Python"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -714,6 +714,7 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no
 name = "pyyaml"
 version = "6.0.1"
 description = "YAML parser and emitter for Python"
+category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -773,6 +774,7 @@ files = [
 name = "regex"
 version = "2023.10.3"
 description = "Alternative regular expression module, to replace re."
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -868,17 +870,18 @@ files = [
 
 [[package]]
 name = "setuptools"
-version = "69.0.2"
+version = "68.2.2"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-69.0.2-py3-none-any.whl", hash = "sha256:1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2"},
+    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
-    {file = "setuptools-69.0.2.tar.gz", hash = "sha256:735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6"},
+    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -886,6 +889,7 @@ testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jar
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 files = [
@@ -897,6 +901,7 @@ files = [
 name = "sqlparse"
 version = "0.4.4"
 description = "A non-validating SQL parser."
+category = "main"
 optional = false
 python-versions = ">=3.5"
 files = [
@@ -924,6 +929,7 @@ files = [
 name = "tqdm"
 version = "4.66.1"
 description = "Fast, Extensible Progress Meter"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -944,6 +950,7 @@ telegram = ["requests"]
 name = "typing-extensions"
 version = "4.8.0"
 description = "Backported and Experimental Type Hints for Python 3.8+"
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -955,6 +962,7 @@ files = [
 name = "tzdata"
 version = "2023.3"
 description = "Provider of IANA time zone data"
+category = "main"
 optional = false
 python-versions = ">=2"
 files = [
@@ -966,6 +974,7 @@ files = [
 name = "uvicorn"
 version = "0.20.0"
 description = "The lightning-fast ASGI server."
+category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -982,19 +991,20 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)",
 
 [[package]]
 name = "virtualenv"
-version = "20.24.7"
+version = "20.24.6"
 description = "Virtual Python Environment builder"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.24.7-py3-none-any.whl", hash = "sha256:a18b3fd0314ca59a2e9f4b556819ed07183b3e9a3702ecfe213f593d44f7b3fd"},
+    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
-    {file = "virtualenv-20.24.7.tar.gz", hash = "sha256:69050ffb42419c91f6c1284a7b24e0475d793447e35929b488bf6a0aade39353"},
+    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
 ]
 
 [package.dependencies]
 distlib = ">=0.3.7,<1"
 filelock = ">=3.12.2,<4"
-platformdirs = ">=3.9.1,<5"
+platformdirs = ">=3.9.1,<4"
 
 [package.extras]
 docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
@@ -1004,6 +1014,7 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 name = "werkzeug"
 version = "2.3.8"
 description = "The comprehensive WSGI web application library."
+category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -1019,5 +1030,5 @@ watchdog = ["watchdog (>=2.3)"]
 
 [metadata]
 lock-version = "2.0"
-python-versions = "^3.11"
+python-versions = "^3.12"
-content-hash = "4662e73ad621b11cbe5b517ca08aae4cbeb350bfcc855a6c067861942e232d2a"
+content-hash = "49b33333953d875c6c2a26ffd1a1a2d21f75e06fe59e6619ba2900e39d2cf1bf"

pyproject.toml

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

timetracker/settings.py

@@ -38,9 +38,7 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "template_partials",
     "graphene_django",
-    "django_htmx",
 ]
 
 GRAPHENE = {"SCHEMA": "games.schema.schema"}
@@ -58,7 +56,6 @@ MIDDLEWARE = [
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django_htmx.middleware.HtmxMiddleware",
 ]
 
 if DEBUG:
@@ -82,7 +79,6 @@ TEMPLATES = [
                 "games.views.model_counts",
                 "games.views.stats_dropdown_year_range",
             ],
-            "builtins": ["template_partials.templatetags.partials"],
         },
     },
 ]