diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-02-21 17:06:53 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-02-24 18:09:08 +0100 |
| commit | bc6cf94def73926e6f6bb986d61e5861a17584e2 (patch) | |
| tree | ba4a7438cd6594c02938ad3211d523c6dd28a79f /archaeological_finds/templates | |
| parent | 1b72554283f5c9e0644262a3f182409376870991 (diff) | |
| download | Ishtar-bc6cf94def73926e6f6bb986d61e5861a17584e2.tar.bz2 Ishtar-bc6cf94def73926e6f6bb986d61e5861a17584e2.zip | |
✨ treatment state refactoring -> distinct input status and treatment status (refs #6182) - treatments: search criteria
Diffstat (limited to 'archaeological_finds/templates')
| -rw-r--r-- | archaeological_finds/templates/ishtar/forms/exhibition_form.html | 3 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_treatment.html | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/archaeological_finds/templates/ishtar/forms/exhibition_form.html b/archaeological_finds/templates/ishtar/forms/exhibition_form.html new file mode 100644 index 000000000..56259b265 --- /dev/null +++ b/archaeological_finds/templates/ishtar/forms/exhibition_form.html @@ -0,0 +1,3 @@ +{% extends "ishtar/forms/base_form.html" %} +{% load i18n inline_formset table_form from_dict %} + diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html index ac11d9b70..7fa2097f0 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatment.html +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -66,11 +66,6 @@ <p class="window-refs">{{ item.year|unlocalize }} - {{ item.index|unlocalize }}</p> {% if item.external_id %} <p class="window-refs">{{ item.external_id }}</p>{% endif %} - {% if item.end_date %} - <p class="window-refs">{% trans "Closed" context "Treatment" %} ({{item.end_date}})</p> - {% else %} - <p class="window-refs">{% trans "Active" context "Treatment" %}</p> - {% endif %} </div> </div> </div> @@ -78,15 +73,15 @@ <div class="row"> {% field_flex_multiple_obj "Treatment type" item 'treatment_types' %} - {% field_flex "State" item.treatment_state %} + {% field_flex _("Status") item.treatment_status %} {% field_flex_detail "Associated request" item.file %} {% field_flex_detail "Location" item.location %} {% field_flex_detail "Container" item.container %} {% field_flex_detail "Scientific monitoring manager" item.scientific_monitoring_manager %} - {% field_flex_detail "Responsible" item.person %} + {% field_flex_detail _("Responsible of the treatment") item.person %} {% field_flex_detail "Organization" item.organization %} {% field_flex "Start date" item.start_date|date:"DATE_FORMAT" %} - {% field_flex "Closing date" item.end_date|date:"DATE_FORMAT" %} + {% field_flex _("End date") item.end_date|date:"DATE_FORMAT" %} {% field_flex "Estimated cost" item.estimated_cost|intcomma '' " "|add:CURRENCY %} {% field_flex "Quoted cost" item.quoted_cost|intcomma '' " "|add:CURRENCY %} {% field_flex "Realized cost" item.realized_cost|intcomma '' " "|add:CURRENCY %} @@ -102,6 +97,7 @@ {% if item.history_creator or item.last_edition_date or item.created %} <h3>{% trans "Sheet"%}</h3> <div class="row"> + {% field_flex _("Input status") item.input_status %} {% include "ishtar/blocks/sheet_creation_section.html" %} </div> {% endif %} |