From 3b81ab17c92fd6cef76cd253d1bd9d4dde5e21e0 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 9 May 2022 19:26:07 +0200
Subject: Sheet container: fix weight display (refs #5233)

---
 archaeological_warehouse/models.py                             | 10 ++++++++++
 archaeological_warehouse/templates/ishtar/sheet_container.html | 10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'archaeological_warehouse')

diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index b1dc6a54f..de499d2b7 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -1135,6 +1135,16 @@ class Container(
             return self.location.external_id
         return self.parent.external_id
 
+    @property
+    def calculated_weight_kg(self):
+        if self.calculated_weight:
+            return self.calculated_weight / 1000
+
+    @property
+    def weight_kg(self):
+        if self.weight:
+            return self.weight / 1000
+
     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 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" %}
-- 
cgit v1.2.3