akira/keinasystem
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

運搬計画PDF: 袋数を整数 or 小数1桁で表示（4桁表示を修正）

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Akira
2026-03-16 17:15:14 +09:00
parent 1f26d5001b
commit 9dbbb48ee0
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/apps/fertilizer/templates/fertilizer/delivery_pdf.html
View File

@@ -1,3 +1,4 @@
{% load fertilizer_tags %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ja"> <html lang="ja">
<head> <head>
@@ -47,7 +48,7 @@
<tr class="group-row"> <tr class="group-row">
<td class="col-name"><span class="group-star">★</span>{{ group.name }}</td> <td class="col-name"><span class="group-star">★</span>{{ group.name }}</td>
{% for total in group.totals %} {% for total in group.totals %}
<td>{% if total %}{{ total }}{% else %}<span class="zero">-</span>{% endif %}</td> <td>{% if total %}{{ total|bags_fmt }}{% else %}<span class="zero">-</span>{% endif %}</td>
{% endfor %} {% endfor %}
</tr> </tr>
{# 圃場サブ行 #} {# 圃場サブ行 #}
@@ -55,7 +56,7 @@
<tr class="field-row"> <tr class="field-row">
<td class="col-name field-indent">{{ row.field.name }}（{{ row.field.area_tan }}反）</td> <td class="col-name field-indent">{{ row.field.name }}（{{ row.field.area_tan }}反）</td>
{% for cell in row.cells %} {% for cell in row.cells %}
<td>{% if cell %}{{ cell }}{% else %}<span class="zero">-</span>{% endif %}</td> <td>{% if cell %}{{ cell|bags_fmt }}{% else %}<span class="zero">-</span>{% endif %}</td>
{% endfor %} {% endfor %}
</tr> </tr>
{% endfor %} {% endfor %}
@@ -65,7 +66,7 @@
<tr class="total-row"> <tr class="total-row">
<td class="col-name">合計</td> <td class="col-name">合計</td>
{% for total in page.fert_totals %} {% for total in page.fert_totals %}
<td>{{ total }}</td> <td>{{ total|bags_fmt }}</td>
{% endfor %} {% endfor %}
</tr> </tr>
</tfoot> </tfoot>

0
backend/apps/fertilizer/templatetags/__init__.py Normal file
View File

15
backend/apps/fertilizer/templatetags/fertilizer_tags.py Normal file
View File

@@ -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')))