Compare commits

..

2 Commits

Author SHA1 Message Date
Lukáš Kucharczyk a84209eb81
sort by timestamp
Django CI/CD / test (push) Successful in 51s Details
Django CI/CD / build-and-push (push) Has been skipped Details
2024-08-11 21:39:14 +02:00
Lukáš Kucharczyk 498cd69328
improve display of game names, durations 2024-08-11 20:29:47 +02:00
4 changed files with 24 additions and 10 deletions

View File

@ -7,6 +7,7 @@ from django.shortcuts import render
from django.template.loader import render_to_string
from django.urls import reverse
from common.utils import truncate_with_popover
from games.models import Game
from games.views import dateformat
@ -44,8 +45,12 @@ def list_games(request: HttpRequest) -> HttpResponse:
],
"rows": [
[
game.name,
game.sort_name,
truncate_with_popover(game.name),
truncate_with_popover(
game.sort_name
if game.sort_name is not None and game.name != game.sort_name
else "(identical)"
),
game.year_released,
game.wikidata,
game.created_at.strftime(dateformat),

View File

@ -2,12 +2,12 @@ from typing import Any
from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator
from django.db.models.manager import BaseManager
from django.http import HttpRequest, HttpResponse
from django.shortcuts import render
from django.template.loader import render_to_string
from django.urls import reverse
from common.utils import truncate_with_popover
from games.models import Purchase
from games.views import dateformat
@ -50,7 +50,7 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
],
"rows": [
[
purchase.edition.name,
truncate_with_popover(purchase.edition.name),
purchase.platform,
purchase.price,
purchase.price_currency,

View File

@ -8,8 +8,15 @@ from django.template.loader import render_to_string
from django.urls import reverse
from common.time import format_duration
from common.utils import truncate_with_popover
from games.models import Session
from games.views import dateformat, datetimeformat, timeformat
from games.views import (
dateformat,
datetimeformat,
durationformat,
durationformat_manual,
timeformat,
)
@login_required
@ -17,7 +24,7 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
context: dict[Any, Any] = {}
page_number = request.GET.get("page", 1)
limit = request.GET.get("limit", 10)
sessions = Session.objects.order_by("-created_at")
sessions = Session.objects.order_by("-timestamp_start")
page_obj = None
if int(limit) != 0:
paginator = Paginator(sessions, limit)
@ -46,15 +53,15 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
],
"rows": [
[
session.purchase.edition.name,
truncate_with_popover(session.purchase.edition.name),
f"{session.timestamp_start.strftime(datetimeformat)}{f"{session.timestamp_end.strftime(timeformat)}" if session.timestamp_end else ""}",
(
format_duration(session.duration_calculated, "%2.1H hours")
format_duration(session.duration_calculated, durationformat)
if session.duration_calculated
else "-"
),
(
format_duration(session.duration_manual)
format_duration(session.duration_manual, durationformat_manual)
if session.duration_manual
else "-"
),

View File

@ -29,7 +29,9 @@ from .models import Edition, Game, Platform, Purchase, Session
dateformat: str = "%d/%m/%Y"
datetimeformat: str = "%d/%m/%Y %H:%M"
timeformat = "%H:%M"
timeformat: str = "%H:%M"
durationformat: str = "%2.1H hours"
durationformat_manual: str = "%H hours"
def model_counts(request: HttpRequest) -> dict[str, bool]: