diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/models.py | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_container.html | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 5d96e6863..4fcb1b1d7 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -1285,12 +1285,12 @@ class Container( @property def calculated_weight_kg(self): if self.calculated_weight: - return self.calculated_weight / 1000 + return self.calculated_weight / 1000.0 @property def weight_kg(self): if self.weight: - return self.weight / 1000 + return self.weight / 1000.0 def natural_key(self): return (self.uuid,) diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 6c0edc3dc..4cea9b732 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -133,13 +133,16 @@ <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans "Calculated weight and measured weight are too different (over 10%)." %} </div> - {% field_flex weight_kg_trans item.weight_kg %} - {% field_flex calculated_weight_kg_trans item.calculated_weight_kg %} + {% if item.weight %} + {% field_flex weight_kg_trans item.weight_kg|floatformat:"-3" %} + {% endif %}{% if item.calculated_weight %} + {% field_flex calculated_weight_kg_trans item.calculated_weight_kg|floatformat:"-3" %} + {% endif %} {% else %} {% if item.weight %} - {% field_flex weight_kg_trans item.weight_kg %} + {% field_flex weight_kg_trans item.weight_kg|floatformat:"-3" %} {% elif item.calculated_weight %} - {% field_flex calculated_weight_kg_trans item.calculated_weight_kg %} + {% field_flex calculated_weight_kg_trans item.calculated_weight_kg|floatformat:"-3" %} {% endif %} {% endif %}{% endwith %} {% include "ishtar/blocks/sheet_creation_section.html" %} |