Treatment file: adapt forms, models and sheet

1 files changed, 44 insertions, 30 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
index 9567d3081..f474aab7c 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
@@ -1,46 +1,60 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n window_field from_dict link_to_window window_tables window_ope_tables window_header humanize %}
 
-{% block head_title %}{% trans "Treatment request" %}{% endblock %}
-{% block content %}
+{% block head_title %}<strong>{% trans "Treatment request" %}</strong> - {{ item.name|default:"" }}{% endblock %}
+
+{% block toolbar %}
 {% window_nav item window_id 'show-treatmentfile' 'treatmentfile_modify' 'show-historized-treatmentfile' 'revert-treatmentfile' previous next 1 %}
+{% endblock %}
 
-<p class="window-refs">{{ item.name|default:"" }}</p>
-{% if item.internal_reference %}
-<p class="window-refs">{{ item.internal_reference }}</p>{% endif %}
-<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" context "Treatment request" %} ({{item.end_date}})</p>
-{% else %}
-<p class="window-refs">{% trans "Active" context "Treatment request" %}</p>
-{% endif %}
+{% block content %}
 
-<ul class='form-flex'>
-    {% field_li "Type" item.type %}
-    {% field_li_detail "Responsible" item.in_charge %}
-    {% field_li "Creation date" item.creation_date %}
-    {% field_li "Reception date" item.reception_date %}
-    {% field_li "Closing date" item.end_date %}
-</ul>
-{% field "Comment" item.comment "<pre>" "</pre>" %}
+<div class="row">
+    <div class="offset-lg-4 col-lg-4 offset-md-3 col-md-6 offset-sm-1 col-sm-10 col-12">
+        <div class="card">
+            <div class="card-body">
+                <p class="card-text">
+                    <p class="window-refs">{{ item.name|default:"" }}</p>
+                    {% if item.internal_reference %}
+                    <p class="window-refs">{{ item.internal_reference }}</p>{% endif %}
+                    <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" context "Treatment request" %} ({{item.end_date}})</p>
+                    {% else %}
+                    <p class="window-refs">{% trans "Active" context "Treatment request" %}</p>
+                    {% endif %}
+                </p>
+            </div>
+        </div>
+    </div>
+</div>
 
-{% include "ishtar/blocks/sheet_json.html" %}
+<div class="row">
+    {% field_flex "Type" item.type %}
+    {% field_flex_detail "Responsible" item.in_charge %}
+    {% field_flex "Creation date" item.creation_date %}
+    {% field_flex "Reception date" item.reception_date %}
+    {% field_flex "Closing date" item.end_date %}
+    {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
+    {% include "ishtar/blocks/sheet_json.html" %}
+</div>
 
 {% if item.applicant %}
 <h3>{% trans "Applicant" %}</h3>
-<ul class='form-flex'>
-    {% field_li_detail "Name" item.applicant %}
-</ul>
-{% field "Contact" item.applicant.address_lbl %}
+<div class="row">
+    {% field_flex_detail "Name" item.applicant %}
+    {% field_flex_full "Contact" item.applicant.address_lbl %}
+</div>
 {% endif %}
+
 {% if item.applicant_organisation %}
 <h3>{% trans "Applicant organisation" %}</h3>
-<ul class='form-flex'>
-    {% field_li_detail "Name" item.applicant_organisation %}
-</ul>
-{% field "Contact" item.applicant.address_lbl %}
+<div class="row">
+    {% field_flex_detail "Name" item.applicant_organisation %}
+    {% field_flex_full "Contact" item.applicant.address_lbl %}
+</div>
 {% endif %}
 
 {% if item.treatments.count %}