summaryrefslogtreecommitdiff
path: root/archaeological_finds/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-30 18:47:14 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-30 18:48:21 +0100
commitf5f97fb1d89a4ccfc0219c17aa3e8bac6f7fd357 (patch)
treee091e17882ca67be8e6040e938439fa5a5e6bc5a /archaeological_finds/templates
parent0493613840e21a9b72ea6d9d5eaa90968dc7f472 (diff)
downloadIshtar-f5f97fb1d89a4ccfc0219c17aa3e8bac6f7fd357.tar.bz2
Ishtar-f5f97fb1d89a4ccfc0219c17aa3e8bac6f7fd357.zip
Manage basket to treatment file association
Diffstat (limited to 'archaeological_finds/templates')
-rw-r--r--archaeological_finds/templates/ishtar/sheet_treatmentfile.html1
-rw-r--r--archaeological_finds/templates/ishtar/wizard/wizard_findbasket_deletion.html18
-rw-r--r--archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html4
3 files changed, 21 insertions, 2 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
index 08398a6c2..072285262 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
@@ -34,6 +34,7 @@
<div class="row">
{% field_flex "Type" item.type %}
{% field_flex_detail "Responsible" item.in_charge %}
+ {% field_flex_detail "Associated basket" item.associated_basket %}
{% field_flex "Creation date" item.creation_date %}
{% field_flex "Reception date" item.reception_date %}
{% field_flex "Closing date" item.end_date %}
diff --git a/archaeological_finds/templates/ishtar/wizard/wizard_findbasket_deletion.html b/archaeological_finds/templates/ishtar/wizard/wizard_findbasket_deletion.html
new file mode 100644
index 000000000..02f7253d7
--- /dev/null
+++ b/archaeological_finds/templates/ishtar/wizard/wizard_findbasket_deletion.html
@@ -0,0 +1,18 @@
+{% extends "ishtar/wizard/confirm_wizard.html" %}
+{% load i18n link_to_window %}
+
+{% block "warning_message" %}
+{% if current_object.treatment_files.count %}
+<div class="alert alert-{% if has_downstream %}danger{% else %}warning{% endif%}">
+ <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+ {% trans "This basket is attached to treatments requests:" %}
+ <ul>{% for tf in current_object.treatment_files.all %}
+ <li>{{ tf }} {{tf|link_to_window}}</li>
+ {% endfor %}</ul>
+ {% trans "Are you sure you want to delete this basket?" %}
+</div>
+{% endif %}
+<div class="alert alert-info">
+ {% trans "Basket informations:" %}
+</div>
+{% endblock %}
diff --git a/archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html b/archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html
index b0ebe7409..be46bfd05 100644
--- a/archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html
+++ b/archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html
@@ -1,5 +1,5 @@
{% extends "ishtar/wizard/confirm_wizard.html" %}
-{% load i18n %}
+{% load i18n link_to_window %}
{% block "warning_message" %}
{% with has_downstream=current_object.downstream.count %}
@@ -10,7 +10,7 @@
{% trans "The following finds will be deleted and restored to a previous version."%}
<ul>{% for item in current_object.downstream.all %}
<li>
- {{item}}
+ {{item}} {{item|link_to_window}}
</li>
{% endfor %}</ul>
{% trans "All changes made to the associated finds since this treatment record will be lost!" %}