summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-05-09 19:26:07 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-05-09 19:26:07 +0200
commit3b81ab17c92fd6cef76cd253d1bd9d4dde5e21e0 (patch)
treee95baab0842afe5de1d1a1b54270e47855c2858c /archaeological_warehouse/templates
parent75c29dbc41ebcd2d633824f7ffcbf6b7d7e3d5bb (diff)
downloadIshtar-3b81ab17c92fd6cef76cd253d1bd9d4dde5e21e0.tar.bz2
Ishtar-3b81ab17c92fd6cef76cd253d1bd9d4dde5e21e0.zip
Sheet container: fix weight display (refs #5233)
Diffstat (limited to 'archaeological_warehouse/templates')
-rw-r--r--archaeological_warehouse/templates/ishtar/sheet_container.html10
1 files changed, 6 insertions, 4 deletions
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 5472d04cd..84bbd2f14 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -112,18 +112,20 @@
{% endif %}
{% field_flex "Old reference" item.old_reference %}
{% with calculated_weight_percent=item.get_calculated_weight_percent%}
+ {% trans "Measured weight (kg)" as weight_kg_trans %}
+ {% trans "Calculated weight (kg)" as calculated_weight_kg_trans %}
{% if calculated_weight_percent > 10 or calculated_weight_percent < -10 %}
<div class="alert alert-warning col-12" role="alert">
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> &nbsp;
{% trans "Calculated weight and measured weight are too different (over 10%)." %}
</div>
- {% field_flex "Measured weight (g)" item.weight %}
- {% field_flex "Calculated weight (g)" item.calculated_weight %}
+ {% field_flex weight_kg_trans item.weight_kg %}
+ {% field_flex calculated_weight_kg_trans item.calculated_weight_kg %}
{% else %}
{% if item.weight %}
- {% field_flex "Measured weight (g)" item.weight %}
+ {% field_flex weight_kg_trans item.weight_kg %}
{% elif item.calculated_weight %}
- {% field_flex "Calculated weight (g)" item.calculated_weight %}
+ {% field_flex calculated_weight_kg_trans item.calculated_weight_kg %}
{% endif %}
{% endif %}{% endwith %}
{% include "ishtar/blocks/sheet_creation_section.html" %}