arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix issues caused by thousands separator (#602)

Browse Source 
* Disable thousands separation in locale settings that caused issues updating rigs

* Update invoice dashboard to use "g" suffixed floatformats for thousands separation
This commit is contained in:
Joe Banks
2024-10-27 15:09:04 +00:00
committed by GitHub
parent c2ef469d5d
commit 6c32db3998
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyRIGS/settings.py
View File

@@ -224,7 +224,7 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
USE_THOUSAND_SEPARATOR = True USE_THOUSAND_SEPARATOR = False
# Need to allow seconds as datetime-local input type spits out a time that has seconds # Need to allow seconds as datetime-local input type spits out a time that has seconds
DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S') DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')

11
RIGS/templates/invoice_dashboard.html
View File

@@ -1,5 +1,6 @@
{% extends 'base_rigs.html' %} {% extends 'base_rigs.html' %}
{% load humanize %}
{% block content %} {% block content %}
<form method="GET" action="{% url 'invoice_dashboard' %}"> <form method="GET" action="{% url 'invoice_dashboard' %}">
@@ -31,7 +32,7 @@
<a href="{% url 'invoice_waiting' %}" class="text-decoration-none text-white"> <a href="{% url 'invoice_waiting' %}" class="text-decoration-none text-white">
<div class="card-body bg-primary"> <div class="card-body bg-primary">
<h5 class="card-title text-center">Total Waiting</h5> <h5 class="card-title text-center">Total Waiting</h5>
<p class="card-text text-center h3"><strong>£{{ total_waiting|floatformat:2 }}</strong></p> <p class="card-text text-center h3"><strong>£{{ total_waiting|floatformat:"2g" }}</strong></p>
</div> </div>
</a> </a>
</div> </div>
@@ -39,7 +40,7 @@
<a href="{% url 'invoice_list' %}" class="text-decoration-none text-dark"> <a href="{% url 'invoice_list' %}" class="text-decoration-none text-dark">
<div class="card-body bg-info"> <div class="card-body bg-info">
<h5 class="card-title text-center">Total Outstanding</h5> <h5 class="card-title text-center">Total Outstanding</h5>
<p class="card-text text-center h3"><strong>£{{ total_outstanding|floatformat:2 }}</strong></p> <p class="card-text text-center h3"><strong>£{{ total_outstanding|floatformat:"2g" }}</strong></p>
</div> </div>
</a> </a>
</div> </div>
@@ -71,7 +72,7 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title"><strong>{{ source.method }}</strong></h5> <h5 class="card-title"><strong>{{ source.method }}</strong></h5>
<p class="card-text h3">£{{ source.total|floatformat:2 }}</p> <p class="card-text h3">£{{ source.total|floatformat:"2g" }}</p>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
@@ -85,7 +86,7 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title text-center">Total Income</h5> <h5 class="card-title text-center">Total Income</h5>
<p class="card-text text-center h3"><strong>£{{ total_income|floatformat:2 }}</strong></p> <p class="card-text text-center h3"><strong>£{{ total_income|floatformat:"2g" }}</strong></p>
</div> </div>
</div> </div>
@@ -98,7 +99,7 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title text-center">Average Time to Pay</h5> <h5 class="card-title text-center">Average Time to Pay</h5>
<p class="card-text text-center h3"><strong>{{ mean_invoice_to_payment|floatformat:2 }} days</strong></p> <p class="card-text text-center h3"><strong>{{ mean_invoice_to_payment|floatformat:"2g" }} days</strong></p>
</div> </div>
</div> </div>