diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-23 19:48:56 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-23 19:48:56 +0100 |
| commit | 538348c38472391d1d30552666dd5d585e2d7c6a (patch) | |
| tree | 620cb8ec82e5b7540061bc0b376b0cdd123c0259 /archaeological_finds/templates | |
| parent | 639970fdaa37d0cb0368b6c35bbf0f0b8e83d8ff (diff) | |
| download | Ishtar-538348c38472391d1d30552666dd5d585e2d7c6a.tar.bz2 Ishtar-538348c38472391d1d30552666dd5d585e2d7c6a.zip | |
Better display of closing date for treatment and file treatments (refs #3388)
Diffstat (limited to 'archaeological_finds/templates')
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_treatment.html | 7 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_treatmentfile.html | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html index 887ae4e07..8ce8a0350 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatment.html +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -16,6 +16,11 @@ <p class="window-refs">{{ item.year }} - {{ item.index }}</p> {% if item.external_id %} <p class="window-refs">{{ item.external_id }}</p>{% endif %} +{% if item.end_date %} +<p class="window-refs">{% trans "Closed" %} ({{item.end_date}})</p>{% endif %} +{% else %} +<p class="window-refs">{% trans "Active" %}</p>{% endif %} +{% endif %} <ul class='form-flex'> {% field_li_multiple "Treatment type" item.treatment_types %} @@ -26,7 +31,7 @@ {% field_li "Responsible" item.person %} {% field_li "Organization" item.organization %} {% field_li "Start date" item.start_date %} - {% field_li "End date" item.end_date %} + {% field_li "Closing date" item.end_date %} </ul> {% if item.description or item.comment or item.goal %} {% field "Comment" item.comment "<pre>" "</pre>" %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html index 5632afbfd..58efe482a 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html @@ -12,6 +12,11 @@ <p class="window-refs">{{ item.year }} - {{ item.index }}</p> {% if item.external_id %} <p class="window-refs">{{ item.external_id }}</p>{% endif %} +{% if item.end_date %} +<p class="window-refs">{% trans "Closed" %} ({{item.end_date}})</p>{% endif %} +{% else %} +<p class="window-refs">{% trans "Active" %}</p>{% endif %} +{% endif %} <ul class='form-flex'> {% field_li "Type" item.type %} @@ -20,7 +25,7 @@ {% field_li "Applicant organisation" item.applicant_organisation %} {% field_li "Creation date" item.creation_date %} {% field_li "Reception date" item.reception_date %} - {% field_li "End date" item.end_date %} + {% field_li "Closing date" item.end_date %} </ul> {% field "Comment" item.comment "<pre>" "</pre>" %} |