Custom filter fot templates format_finance, format_registration

FRONTEND/fastparking/finance/templates/finance/payments_list.html

@@ -4,6 +4,7 @@
 <script src="{% static 'parking/js/misc.js' %}"></script>
 <script src="{% static 'parking/js/local_datetime.js' %}"></script>
 {% endblock %}
+{% load custom_filters %}
 {% block content %}
 <h3><i class="fa-solid fa-table-list"></i>  Payments List{% if filter_params.days %} for last {{ filter_params.days}} days {%endif%}. Total results: {{filter_params.total_rows}}</h3>
   <div class="container-fluid table-responsive bd-example">
@@ -23,11 +24,11 @@ <h3><i class="fa-solid fa-table-list"></i>  Payments List{% if filter_params.day
         {% for payment in page_obj.object_list %}
         <tr scope="row">
           <td>{{ payment.id }}</td>
-          <td class="font-monospace">{{ payment.registration_id.pk|stringformat:"06d" }}</td>
+          <td class="font-monospace">{{ payment.registration_id.pk|format_registration }}</td>
           <td class="datetime_utc" title="{{ payment.datetime|date:'Y-m-d H:i' }} UTC">{{ payment.datetime|date:'Y-m-d H:i' }}</td>
           <td>{{ payment.registration_id.car_number_in }}</td>
-          <td>{{ payment.amount }} {{ currency }}</td>
-          <td>{{ payment.registration_id.calculate_parking_fee }} {{ currency }}</td>
+          <td>{{ payment.amount|format_finance }}</td>
+          <td>{{ payment.registration_id.calculate_parking_fee|format_finance }}</td>
           <td>
             {% if payment.registration_id.exit_datetime %}
             <img src="{% static 'parking/icon-yes.svg' %}" alt="Yes" />

FRONTEND/fastparking/finance/templatetags/custom_filters.py

@@ -0,0 +1,22 @@
+from decimal import Decimal
+
+from django import template
+
+# from django.utils import formats
+
+register = template.Library()
+from parking.services import format_currency, format_registration_id
+
+
+@register.filter(name="format_finance")
+def format_finance(
+    value: Decimal | float | str | None,
+    short_format: bool | None = False,
+    thousands: bool = True,
+) -> str | Decimal | float | None:
+    return format_currency(value, short_format=short_format, thousands=thousands)
+
+
+@register.filter(name="format_registration")
+def format_registration(id: int | str | None) -> str | int | None:
+    return format_registration_id(id)

FRONTEND/fastparking/parking/templates/parking/registration_list.html

@@ -1,5 +1,6 @@
 {% extends "parking/base.html" %}
 {% load static %}
+{% load custom_filters %}
 {% block extra_head %}
 <script src="{% static 'parking/js/misc.js' %}"></script>
 <script src="{% static 'parking/js/local_datetime.js' %}"></script>
@@ -32,15 +33,15 @@ <h3><i class="fa-solid fa-car-building"></i> Registration List{% if filter_param
       <tbody>
         {% for registration in page_obj %}
         <tr scope="row">
-          <td class="font-monospace">{{ registration.id|stringformat:"06d" }}</td>
+          <td class="font-monospace">{{ registration.id|format_registration }}</td>
           <td>{{ registration.parking }}</td>
           <td class="datetime_utc" title="{{ registration.entry_datetime|date:'Y-m-d H:i' }} UTC">{{ registration.entry_datetime|date:'Y-m-d H:i' }}</td>
-          <td class="text-center">{{ registration.tariff_in }}</td>
+          <td class="text-center" title="{{ registration.tariff_in|format_finance }} per hour">{{ registration.tariff_in|format_finance:True}}</td>
           <td class="datetime_utc" title="{{ registration.exit_datetime|date:'Y-m-d H:i' }} UTC">{{ registration.exit_datetime|date:'Y-m-d H:i' }}</td>
           <td title="{{ registration.duration_datatime }}">{{ registration.duration }}</td>
-          <td title="Calc: {{ registration.calculate_parking_fee }}">{{ registration.invoice}}</td>
-          <td title="Total paid for this registration">
-            {% if registration.total_amount %}{{ registration.total_amount }}{% endif %}
+          <td title="Calc: {{ registration.calculate_parking_fee|format_finance }}">{{ registration.invoice}}</td>
+          <td title="Total paid for this registration: {{ registration.total_amount|format_finance }}">
+            {% if registration.total_amount %}{{ registration.total_amount|format_finance:True }}{% endif %}
           </td>
           <td class="">{{ registration.car_number_in }}</td>
           <td class="">{{ registration.car_number_out }}</td>

FRONTEND/fastparking/parking/templatetags/custom_filters.py

@@ -0,0 +1,22 @@
+from decimal import Decimal
+
+from django import template
+
+# from django.utils import formats
+
+register = template.Library()
+from parking.services import format_currency, format_registration_id
+
+
+@register.filter(name="format_finance")
+def format_finance(
+    value: Decimal | float | str | None,
+    short_format: bool | None = False,
+    thousands: bool = True,
+) -> str | Decimal | float | None:
+    return format_currency(value, short_format=short_format, thousands=thousands)
+
+
+@register.filter(name="format_registration")
+def format_registration(id: int | str | None) -> str | int | None:
+    return format_registration_id(id)