lukas/timetracker
1
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Packages Projects 1 Releases 20 Wiki Activity

add table header actions
All checks were successful
Django CI/CD / test (push) Successful in 1m3s
Details
Django CI/CD / build-and-push (push) Successful in 2m23s
Details

Browse Source
This commit is contained in:
Lukáš Kucharczyk
2024-09-08 21:03:37 +02:00
parent c1b3493c80
commit 58cfaca1a9
23 changed files with 645 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
games/views/device.py
View File

@ -7,8 +7,8 @@ from django.shortcuts import get_object_or_404, redirect, render
from django.template.loader import render_to_string
from django.urls import reverse
from common.components import A, Button, Icon
from common.time import dateformat, local_strftime
from common.utils import A, Button
from games.forms import DeviceForm
from games.models import Device
@ -49,17 +49,17 @@ def list_devices(request: HttpRequest) -> HttpResponse:
device.get_type_display(),
local_strftime(device.created_at, dateformat),
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse("edit_device", args=[device.pk]),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse("delete_device", args=[device.pk]),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]

9
games/views/edition.py
View File

@ -7,8 +7,9 @@ from django.shortcuts import get_object_or_404, redirect, render
from django.template.loader import render_to_string
from django.urls import reverse
from common.components import A, Button, Icon
from common.time import dateformat, local_strftime
from common.utils import A, Button, truncate_with_popover
from common.utils import truncate_with_popover
from games.forms import EditionForm
from games.models import Edition, Game
@ -77,19 +78,19 @@ def list_editions(request: HttpRequest) -> HttpResponse:
edition.wikidata,
local_strftime(edition.created_at, dateformat),
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse("edit_edition", args=[edition.pk]),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse(
"delete_edition", args=[edition.pk]
),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]

75
games/views/game.py
View File

@ -8,6 +8,7 @@ from django.shortcuts import get_object_or_404, redirect, render
from django.template.loader import render_to_string
from django.urls import reverse
from common.components import A, Button, Div, Icon, Popover
from common.time import (
dateformat,
durationformat,
@ -16,7 +17,7 @@ from common.time import (
local_strftime,
timeformat,
)
from common.utils import A, Button, safe_division, truncate_with_popover
from common.utils import safe_division, truncate, truncate_with_popover
from games.forms import GameForm
from games.models import Edition, Game, Purchase, Session
from games.views.general import use_custom_redirect
@ -77,17 +78,17 @@ def list_games(request: HttpRequest) -> HttpResponse:
game.wikidata,
local_strftime(game.created_at, dateformat),
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse("edit_game", args=[game.pk]),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse("delete_game", args=[game.pk]),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]
@ -206,17 +207,17 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
edition.platform,
edition.year_released,
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse("edit_edition", args=[edition.pk]),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse("delete_edition", args=[edition.pk]),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]
@ -235,17 +236,17 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
purchase.get_type_display(),
f"{purchase.price} {purchase.price_currency}",
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse("edit_purchase", args=[purchase.pk]),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse("delete_purchase", args=[purchase.pk]),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]
@ -259,6 +260,7 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
sessions_all = Session.objects.filter(purchase__edition__game=game).order_by(
"-timestamp_start"
)
last_session = sessions_all.latest()
session_count = sessions_all.count()
session_paginator = Paginator(sessions_all, 5)
page_number = request.GET.get("page", 1)
@ -266,6 +268,38 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
sessions = session_page_obj.object_list
session_data: dict[str, Any] = {
"header_action": Div(
children=[
A(
url="add_session",
children=Button(
icon=True,
size="xs",
children=[Icon("play"), "LOG"],
),
),
A(
url=reverse(
"list_sessions_start_session_from_session",
args=[last_session.pk],
),
children=Popover(
popover_content=last_session.purchase.edition.name,
children=[
Button(
icon=True,
color="gray",
size="xs",
children=[
Icon("play"),
truncate(f"{last_session.purchase.edition.name}"),
],
)
],
),
),
],
),
"columns": ["Date", "Duration", "Actions"],
"rows": [
[
@ -276,17 +310,32 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse:
else f"{format_duration(session.duration_manual, durationformat_manual)}*"
),
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse(
"list_sessions_end_session", args=[session.pk]
),
"slot": Icon("end"),
"title": "Finish session now",
"color": "green",
"hover": "green",
}
if session.timestamp_end is None
# this only works without leaving an empty
# a element and wrong rounding of button edges
# because we check if button.href is not None
# in the button group component
else {},
{
"href": reverse("edit_session", args=[session.pk]),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse("delete_session", args=[session.pk]),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]

8
games/views/platform.py
View File

@ -7,8 +7,8 @@ from django.shortcuts import get_object_or_404, redirect, render
from django.template.loader import render_to_string
from django.urls import reverse
from common.components import A, Button, Icon
from common.time import dateformat, local_strftime
from common.utils import A, Button
from games.forms import PlatformForm
from games.models import Platform
from games.views.general import use_custom_redirect
@ -50,21 +50,21 @@ def list_platforms(request: HttpRequest) -> HttpResponse:
platform.group,
local_strftime(platform.created_at, dateformat),
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse(
"edit_platform", args=[platform.pk]
),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse(
"delete_platform", args=[platform.pk]
),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]

21
games/views/purchase.py
View File

@ -13,8 +13,9 @@ from django.template.loader import render_to_string
from django.urls import reverse
from django.utils import timezone
from common.time import dateformat, local_strftime
from common.utils import A, Button, truncate_with_popover
from common.components import A, Button, Icon
from common.time import dateformat
from common.utils import truncate_with_popover
from games.forms import PurchaseForm
from games.models import Edition, Purchase
from games.views.general import use_custom_redirect
@ -81,39 +82,39 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
purchase.price,
purchase.price_currency,
purchase.infinite,
local_strftime(purchase.date_purchased, dateformat),
purchase.date_purchased.strftime(dateformat),
(
local_strftime(purchase.date_refunded, dateformat)
purchase.date_refunded.strftime(dateformat)
if purchase.date_refunded
else "-"
),
(
local_strftime(purchase.date_finished, dateformat)
purchase.date_finished.strftime(dateformat)
if purchase.date_finished
else "-"
),
(
local_strftime(purchase.date_dropped, dateformat)
purchase.date_dropped.strftime(dateformat)
if purchase.date_dropped
else "-"
),
local_strftime(purchase.created_at, dateformat),
purchase.created_at.strftime(dateformat),
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse(
"edit_purchase", args=[purchase.pk]
),
"text": "Edit",
"slot": Icon("edit"),
"color": "gray",
},
{
"href": reverse(
"delete_purchase", args=[purchase.pk]
),
"text": "Delete",
"slot": Icon("delete"),
"color": "red",
},
]

68
games/views/session.py
View File

@ -8,6 +8,7 @@ from django.template.loader import render_to_string
from django.urls import reverse
from django.utils import timezone
from common.components import A, Button, Div, Icon, Popover
from common.time import (
dateformat,
durationformat,
@ -16,7 +17,7 @@ from common.time import (
local_strftime,
timeformat,
)
from common.utils import A, Button, truncate_with_popover
from common.utils import truncate, truncate_with_popover
from games.forms import SessionForm
from games.models import Purchase, Session
from games.views.general import use_custom_redirect
@ -28,6 +29,7 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
page_number = request.GET.get("page", 1)
limit = request.GET.get("limit", 10)
sessions = Session.objects.order_by("-timestamp_start")
last_session = sessions.latest()
page_obj = None
if int(limit) != 0:
paginator = Paginator(sessions, limit)
@ -45,7 +47,40 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
else None
),
"data": {
"header_action": A([], Button([], "Add session"), url="add_session"),
"header_action": Div(
children=[
A(
url="add_session",
children=Button(
icon=True,
size="xs",
children=[Icon("play"), "LOG"],
),
),
A(
url=reverse(
"list_sessions_start_session_from_session",
args=[last_session.pk],
),
children=Popover(
popover_content=last_session.purchase.edition.name,
children=[
Button(
icon=True,
color="gray",
size="xs",
children=[
Icon("play"),
truncate(
f"{last_session.purchase.edition.name}"
),
],
)
],
),
),
],
),
"columns": [
"Name",
"Date",
@ -72,20 +107,39 @@ def list_sessions(request: HttpRequest) -> HttpResponse:
session.device,
session.created_at.strftime(dateformat),
render_to_string(
"cotton/button_group_sm.html",
"cotton/button_group.html",
{
"buttons": [
{
"href": reverse(
"list_sessions_end_session", args=[session.pk]
),
"slot": Icon("end"),
"title": "Finish session now",
"color": "green",
"hover": "green",
}
if session.timestamp_end is None
# this only works without leaving an empty
# a element and wrong rounding of button edges
# because we check if button.href is not None
# in the button group component
else {},
{
"href": reverse("edit_session", args=[session.pk]),
"text": "Edit",
"color": "gray",
"slot": Icon("edit"),
"title": "Edit",
# "color": "gray",
"hover": "green",
},
{
"href": reverse(
"delete_session", args=[session.pk]
),
"text": "Delete",
"slot": Icon("delete"),
"title": "Delete",
"color": "red",
"hover": "red",
},
]
},
@ -155,7 +209,6 @@ def clone_session_by_id(session_id: int) -> Session:
@login_required
@use_custom_redirect
def new_session_from_existing_session(
request: HttpRequest, session_id: int, template: str = ""
) -> HttpResponse:
@ -170,7 +223,6 @@ def new_session_from_existing_session(
@login_required
@use_custom_redirect
def end_session(
request: HttpRequest, session_id: int, template: str = ""
) -> HttpResponse: