From b1ffc2eace642fea9badd7645d500de944d7f51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= Date: Fri, 15 Nov 2024 18:03:08 +0100 Subject: [PATCH] consistently format prices everywhere --- games/templates/stats.html | 8 +++++--- games/views/game.py | 5 +++-- games/views/purchase.py | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/games/templates/stats.html b/games/templates/stats.html index af2c012..4a204be 100644 --- a/games/templates/stats.html +++ b/games/templates/stats.html @@ -142,7 +142,9 @@ Spendings ({{ total_spent_currency }}) - {{ total_spent }} ({{ spent_per_game }}/game) + + {{ total_spent | floatformat }} ({{ spent_per_game | floatformat }}/game) + @@ -253,7 +255,7 @@ {% for purchase in purchased_unfinished %} {% partial purchase-name %} - {{ purchase.converted_price }} + {{ purchase.converted_price | floatformat }} {{ purchase.date_purchased | date:"d/m/Y" }} {% endfor %} @@ -274,7 +276,7 @@ {% for purchase in all_purchased_this_year %} {% partial purchase-name %} - {{ purchase.converted_price }} + {{ purchase.converted_price | floatformat }} {{ purchase.date_purchased | date:"d/m/Y" }} {% endfor %} diff --git a/games/views/game.py b/games/views/game.py index 4b1a76c..7ade64f 100644 --- a/games/views/game.py +++ b/games/views/game.py @@ -5,6 +5,7 @@ from django.core.paginator import Paginator from django.db.models import Prefetch from django.http import HttpRequest, HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render +from django.template.defaultfilters import floatformat from django.template.loader import render_to_string from django.urls import reverse @@ -25,7 +26,7 @@ from common.time import ( local_strftime, timeformat, ) -from common.utils import format_float_or_int, safe_division, truncate +from common.utils import safe_division, truncate from games.forms import GameForm from games.models import Edition, Game, Purchase, Session from games.views.general import use_custom_redirect @@ -247,7 +248,7 @@ def view_game(request: HttpRequest, game_id: int) -> HttpResponse: ), purchase.get_type_display(), purchase.date_purchased.strftime(dateformat), - f"{format_float_or_int(purchase.price)} {purchase.price_currency}", + f"{floatformat(purchase.price)} {purchase.price_currency}", render_to_string( "cotton/button_group.html", { diff --git a/games/views/purchase.py b/games/views/purchase.py index 005f08f..1b2ca12 100644 --- a/games/views/purchase.py +++ b/games/views/purchase.py @@ -9,13 +9,13 @@ from django.http import ( HttpResponseRedirect, ) from django.shortcuts import get_object_or_404, redirect, render +from django.template.defaultfilters import floatformat from django.template.loader import render_to_string from django.urls import reverse from django.utils import timezone from common.components import A, Button, Icon, LinkedNameWithPlatformIcon from common.time import dateformat -from common.utils import format_float_or_int from games.forms import PurchaseForm from games.models import Edition, Purchase from games.views.general import use_custom_redirect @@ -66,7 +66,7 @@ def list_purchases(request: HttpRequest) -> HttpResponse: platform=purchase.platform, ), purchase.get_type_display(), - format_float_or_int(purchase.price), + floatformat(purchase.price), purchase.price_currency, purchase.infinite, purchase.date_purchased.strftime(dateformat),