diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-26 18:39:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-26 18:39:45 +0200 |
| commit | c6641be6f54e2aff0a4256e19b9c061cb4f4612b (patch) | |
| tree | c25424d9c4d45131f18dadf261854ffa54e6b631 /archaeological_finds/templates | |
| parent | 15611a7231ad6b16a9fb5586d036e3db53b3cc1b (diff) | |
| download | Ishtar-c6641be6f54e2aff0a4256e19b9c061cb4f4612b.tar.bz2 Ishtar-c6641be6f54e2aff0a4256e19b9c061cb4f4612b.zip | |
Finds - discovery date: add a TAQ field (refs #4039) - improve display of discovery date in sheet - better display for textarea field
Diffstat (limited to 'archaeological_finds/templates')
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 6b49a66b9..de1993634 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -239,7 +239,21 @@ {% field_flex "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT %} {% endif %} - {% field_flex "Discovery date" base_find.discovery_date %} + {# START discovery dates #} + {% if not base_find.discovery_date_taq %} + {% trans "Discovery date" as discovery_date_label %} + {% field_flex discovery_date_label base_find.discovery_date %} + {% 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 %} + {% else %} + {% trans "Discovery date (TPQ)" as discovery_tpq_label %} + {% field_flex discovery_tpq_label base_find.discovery_date %} + {% trans "Discovery date (TAQ)" as discovery_taq_label %} + {% field_flex discovery_taq_label base_find.discovery_date_taq %} + {% endif %} + {# END discovery dates #} + {% field_flex "Special interest" base_find.special_interest %} {% field_flex_detail "Context record" base_find.context_record %} {% field_flex "Town" base_find.context_record.parcel.town %} |