From 9dbbb48ee0b27582101976f1c9aa574115f1a961 Mon Sep 17 00:00:00 2001 From: Akira Date: Mon, 16 Mar 2026 17:15:14 +0900 Subject: [PATCH] =?UTF-8?q?=E9=81=8B=E6=90=AC=E8=A8=88=E7=94=BBPDF:=20?= =?UTF-8?q?=E8=A2=8B=E6=95=B0=E3=82=92=E6=95=B4=E6=95=B0=20or=20=E5=B0=8F?= =?UTF-8?q?=E6=95=B01=E6=A1=81=E3=81=A7=E8=A1=A8=E7=A4=BA=EF=BC=884?= =?UTF-8?q?=E6=A1=81=E8=A1=A8=E7=A4=BA=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 --- .../templates/fertilizer/delivery_pdf.html | 7 ++++--- backend/apps/fertilizer/templatetags/__init__.py | 0 .../fertilizer/templatetags/fertilizer_tags.py | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 backend/apps/fertilizer/templatetags/__init__.py create mode 100644 backend/apps/fertilizer/templatetags/fertilizer_tags.py diff --git a/backend/apps/fertilizer/templates/fertilizer/delivery_pdf.html b/backend/apps/fertilizer/templates/fertilizer/delivery_pdf.html index dd8acb5..64ebee1 100644 --- a/backend/apps/fertilizer/templates/fertilizer/delivery_pdf.html +++ b/backend/apps/fertilizer/templates/fertilizer/delivery_pdf.html @@ -1,3 +1,4 @@ +{% load fertilizer_tags %} @@ -47,7 +48,7 @@ ★{{ group.name }} {% for total in group.totals %} - {% if total %}{{ total }}{% else %}-{% endif %} + {% if total %}{{ total|bags_fmt }}{% else %}-{% endif %} {% endfor %} {# 圃場サブ行 #} @@ -55,7 +56,7 @@ {{ row.field.name }}（{{ row.field.area_tan }}反） {% for cell in row.cells %} - {% if cell %}{{ cell }}{% else %}-{% endif %} + {% if cell %}{{ cell|bags_fmt }}{% else %}-{% endif %} {% endfor %} {% endfor %} @@ -65,7 +66,7 @@ 合計 {% for total in page.fert_totals %} - {{ total }} + {{ total|bags_fmt }} {% endfor %} diff --git a/backend/apps/fertilizer/templatetags/__init__.py b/backend/apps/fertilizer/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/apps/fertilizer/templatetags/fertilizer_tags.py b/backend/apps/fertilizer/templatetags/fertilizer_tags.py new file mode 100644 index 0000000..b0c7997 --- /dev/null +++ b/backend/apps/fertilizer/templatetags/fertilizer_tags.py @@ -0,0 +1,15 @@ +from decimal import Decimal +from django import template + +register = template.Library() + + +@register.filter +def bags_fmt(value): + """袋数を整数 or 小数点以下1桁で表示する。""" + if value is None or value == '': + return value + d = Decimal(str(value)) + if d == d.to_integral_value(): + return str(int(d)) + return str(d.quantize(Decimal('0.1')))