summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-20 16:22:13 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-20 16:22:13 +0100
commit37516c94c396fbeb843de3992309fcac5dbc9595 (patch)
tree33d537b7adc7c142985f2f265436d8a31a44139c /archaeological_finds
parentf74748eb047236f4ceaec1bd7da0c69ba4be4d19 (diff)
downloadIshtar-37516c94c396fbeb843de3992309fcac5dbc9595.tar.bz2
Ishtar-37516c94c396fbeb843de3992309fcac5dbc9595.zip
Sheet find container - fix date and float format
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/templates/ishtar/sheet_basefind.html10
1 files changed, 7 insertions, 3 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html
index f3b200fe4..85987c320 100644
--- a/archaeological_finds/templates/ishtar/sheet_basefind.html
+++ b/archaeological_finds/templates/ishtar/sheet_basefind.html
@@ -21,18 +21,22 @@
{% field_flex "Parcel" base_find.context_record.parcel '' '' first %}
{# START discovery dates #}
+ {% with base_find.discovery_date|date:"SHORT_DATE_FORMAT" as discovery_date %}
{% if not base_find.discovery_date_taq %}
{% trans "Discovery date" as discovery_date_label %}
- {% field_flex discovery_date_label base_find.discovery_date '' '' first %}
+ {% field_flex discovery_date_label discovery_date '' '' first %}
{% elif base_find.discovery_date.year == base_find.discovery_date_taq.year and base_find.discovery_date_taq|date:"d-m" == "31-12" and base_find.discovery_date|date:"d-m" == "01-01" %}
{% trans "Discovery year" as discovery_year_label %}
{% field_flex discovery_year_label base_find.discovery_date.year '' '' first %}
{% else %}
{% trans "Discovery date (exact or beginning)" as discovery_tpq_label %}
- {% field_flex discovery_tpq_label base_find.discovery_date '' '' first %}
+ {% field_flex discovery_tpq_label discovery_date '' '' first %}
{% trans "Discovery date (end)" as discovery_taq_label %}
- {% field_flex discovery_taq_label base_find.discovery_date_taq '' '' first %}
+ {% with base_find.discovery_date_taq|date:"SHORT_DATE_FORMAT" as discovery_date_taq %}
+ {% field_flex discovery_taq_label discovery_date_taq '' '' first %}
+ {% endwith %}
{% endif %}
+ {% endwith %}
{# END discovery dates #}
{% field_flex "Excavation ID" base_find.excavation_id '' '' first %}