Change session datetime display format

Filtering sessions by purchase
Enable logging
2023-01-03 19:03:46 +01:00 · 2023-01-03 19:03:30 +01:00 · 2023-01-03 19:01:17 +01:00 · 2023-01-03 19:01:10 +01:00
7 changed files with 108 additions and 27 deletions
--- a/src/input.css
+++ b/src/input.css
@ -1,3 +1,15 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
+
+form label {
+    @apply dark:text-slate-400;
+}
+
+form input,select,textarea {
+    @apply dark:bg-slate-500 dark:border dark:border-slate-900 dark:text-slate-100;
+}
+
+form input[type=submit] {
+    @apply p-2 bg-purple-900;
+}
--- a/src/web/tracker/static/base.css
+++ b/src/web/tracker/static/base.css
@ -742,6 +742,10 @@ select {
  display: grid;
 }

+.h-screen {
+  height: 100vh;
+}
+
 .w-full {
  width: 100%;
 }
@ -825,6 +829,10 @@ select {
  padding-right: 1rem;
 }

+.text-center {
+  text-align: center;
+}
+
 .text-4xl {
  font-size: 2.25rem;
  line-height: 2.5rem;
@ -855,6 +863,27 @@ select {
  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }

+.dark form label {
+  --tw-text-opacity: 1;
+  color: rgb(148 163 184 / var(--tw-text-opacity));
+}
+
+.dark form input,.dark select,.dark textarea {
+  border-width: 1px;
+  --tw-border-opacity: 1;
+  border-color: rgb(15 23 42 / var(--tw-border-opacity));
+  --tw-bg-opacity: 1;
+  background-color: rgb(100 116 139 / var(--tw-bg-opacity));
+  --tw-text-opacity: 1;
+  color: rgb(241 245 249 / var(--tw-text-opacity));
+}
+
+form input[type=submit] {
+  --tw-bg-opacity: 1;
+  background-color: rgb(88 28 135 / var(--tw-bg-opacity));
+  padding: 0.5rem;
+}
+
 .hover\:underline:hover {
  text-decoration-line: underline;
 }
@ -864,6 +893,11 @@ select {
  border-color: rgb(255 255 255 / var(--tw-border-opacity));
 }

+.dark .dark\:bg-gray-800 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(31 41 55 / var(--tw-bg-opacity));
+}
+
 .dark .dark\:bg-gray-900 {
  --tw-bg-opacity: 1;
  background-color: rgb(17 24 39 / var(--tw-bg-opacity));
@ -874,9 +908,9 @@ select {
  background-color: rgb(51 65 85 / var(--tw-bg-opacity));
 }

-.dark .dark\:text-slate-300 {
+.dark .dark\:text-white {
  --tw-text-opacity: 1;
-  color: rgb(203 213 225 / var(--tw-text-opacity));
+  color: rgb(255 255 255 / var(--tw-text-opacity));
 }

 .dark .dark\:text-slate-400 {
@ -884,6 +918,11 @@ select {
  color: rgb(148 163 184 / 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: 768px) {
  .md\:block {
    display: block;
--- a/src/web/tracker/templates/base.html
+++ b/src/web/tracker/templates/base.html
@ -6,30 +6,32 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{% block title %}No Title{% endblock title %}</title>
+    <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">
-    <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="#" 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">
-                    <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_purchase' %}">New Purchase</a></li>
-                    <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
-                    <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
-                </ul>
+    <div class="dark:bg-gray-800 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="#" 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_purchase' %}">New Purchase</a></li>
+                        <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
+                        <li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
+                    </ul>
+                </div>
            </div>
-        </div>
-    </nav>
-    {% block content %}No content here.{% endblock %}
+        </nav>
+        {% block content %}No content here.{% endblock %}
+    </div>
 </body>

 </html>
--- a/src/web/tracker/templates/list_sessions.html
+++ b/src/web/tracker/templates/list_sessions.html
@ -1,17 +1,23 @@
 {% extends 'base.html' %}

-{% block title %}Tracker Entry List{% endblock title %}
+{% 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 class="grid grid-cols-4 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">Start</div>
    <div class="dark:border-white dark:text-slate-300 text-lg">End</div>
    <div class="dark:border-white dark:text-slate-300 text-lg">Duration</div>
    {% for data in dataset %}
-    <div class="dark:text-slate-400">{{ data.purchase }}</div>
-    <div class="dark:text-slate-400">{{ data.timestamp_start }}</div>
-    <div class="dark:text-slate-400">{{ data.timestamp_end }}</div>
+    <div class=""><a class="dark:text-white hover:underline" href="{% url 'list_sessions' data.purchase.id %}">{{ data.purchase }}</a></div>
+    <div class="dark:text-slate-400">{{ data.timestamp_start | date:"d/m/Y H:i" }}</div>
+    <div class="dark:text-slate-400">{{ data.timestamp_end | date:"d/m/Y H:i" }}</div>
    <div class="dark:text-slate-400">{{ data.time_delta }}</div>
    {% endfor %}
 </div>
--- a/src/web/tracker/urls.py
+++ b/src/web/tracker/urls.py
@ -7,4 +7,9 @@ urlpatterns = [
    path("add-session/", views.add_session, name="add_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",
+    ),
 ]
--- a/src/web/tracker/views.py
+++ b/src/web/tracker/views.py
@ -4,6 +4,7 @@ from .models import Game, Platform, Purchase, Session
 from .forms import SessionForm, PurchaseForm, GameForm
 from datetime import datetime
 from django.db.models import ExpressionWrapper, F, DurationField
+import logging


 def add_session(request):
@ -18,9 +19,16 @@ def add_session(request):
    return render(request, "add_session.html", context)


-def list_sessions(request):
+def list_sessions(request, purchase_id=None):
    context = {}
-    dataset = Session.objects.annotate(
+
+    if purchase_id != None:
+        dataset = Session.objects.filter(purchase=purchase_id)
+        context["purchase"] = Purchase.objects.get(id=purchase_id)
+    else:
+        dataset = Session.objects.all()
+
+    dataset = dataset.annotate(
        time_delta=ExpressionWrapper(
            F("timestamp_end") - F("timestamp_start"), output_field=DurationField()
        )
--- a/src/web/web/settings.py
+++ b/src/web/web/settings.py
@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/4.1/ref/settings/
 """

 from pathlib import Path
+import logging

 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@ -122,3 +123,11 @@ STATIC_URL = "static/"
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field

 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+# https://docs.djangoproject.com/en/4.1/topics/logging/
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "handlers": {"console": {"class": "logging.StreamHandler"}},
+    "root": {"handlers": ["console"], "level": "WARNING"},
+}
Author	SHA1	Message	Date
Lukáš Kucharczyk	6e4db38ee4	Change session datetime display format continuous-integration/drone/push Build is passing Details	2023-01-03 19:03:46 +01:00
Lukáš Kucharczyk	aae05f23e7	Filtering sessions by purchase	2023-01-03 19:03:30 +01:00
Lukáš Kucharczyk	cd35af471a	Enable logging	2023-01-03 19:01:17 +01:00
Lukáš Kucharczyk	d896a37779	Fix dark mode issues	2023-01-03 19:01:10 +01:00