From bba3881e7f11a27ff9d2f08f92542a2d24cac7c6 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 26 Nov 2018 20:52:00 +0100
Subject: Sheet treatment: fix document list - improve display with tabs

---
 .../templates/ishtar/sheet_treatment.html          | 176 +++++++++++++--------
 .../0076_migrate_treatmentfile_permissions.py      |   1 -
 2 files changed, 113 insertions(+), 64 deletions(-)

diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html
index 94569b5f6..ced305798 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatment.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatment.html
@@ -9,78 +9,128 @@
 
 {% block content %}
 
-<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">
-            {% include "ishtar/blocks/window_image.html" %}
-            <div class="card-body">
-                <p class="card-text">
-                    <p class="window-refs">{{ item.label|default:"" }}</p>
-                    {% if item.other_reference %}
-                    <p class="window-refs">{{ item.other_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" %} ({{item.end_date}})</p>
-                    {% else %}
-                    <p class="window-refs">{% trans "Active" context "Treatment" %}</p>
-                    {% endif %}
-                    </p>
+<ul class="nav nav-tabs" id="{{window_id}}-tabs" role="tablist">
+    <li class="nav-item">
+        <a class="nav-link active" id="{{window_id}}-treatment-tab"
+           data-toggle="tab" href="#{{window_id}}-treatment" role="tab"
+           aria-controls="{{window_id}}-treatment" aria-selected="true">
+            {% trans "Treatment" %}
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="{{window_id}}-find-tab"
+           data-toggle="tab" href="#{{window_id}}-find" role="tab"
+           aria-controls="{{window_id}}-find" aria-selected="true">
+            {% trans "Finds" %}
+        </a>
+    </li>
+    {% if item.documents.count %}
+    <li class="nav-item">
+        <a class="nav-link" id="{{window_id}}-documents-tab"
+           data-toggle="tab" href="#{{window_id}}-documents" role="tab"
+           aria-controls="{{window_id}}-documents" aria-selected="true">
+            {% trans "Documents" %}
+        </a>
+    </li>
+    {% endif %}
+    {% if item.administrative_act.count %}
+    <li class="nav-item">
+        <a class="nav-link" id="{{window_id}}-admin-tab"
+           data-toggle="tab" href="#{{window_id}}-admin" role="tab"
+           aria-controls="{{window_id}}-admin" aria-selected="true">
+            {% trans "Administrative acts" %}
+        </a>
+    </li>
+    {% endif %}
+</ul>
+
+<div class="tab-content" id="{{window_id}}-tab-content">
+    <div class="tab-pane fade show active" id="{{window_id}}-treatment"
+         role="tabpanel" aria-labelledby="{{window_id}}-treatment-tab">
+        <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">
+                    {% include "ishtar/blocks/window_image.html" %}
+                    <div class="card-body">
+                        <p class="card-text">
+                            <p class="window-refs">{{ item.label|default:"" }}</p>
+                            {% if item.other_reference %}
+                            <p class="window-refs">{{ item.other_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" %} ({{item.end_date}})</p>
+                            {% else %}
+                            <p class="window-refs">{% trans "Active" context "Treatment" %}</p>
+                            {% endif %}
+                            </p>
+                    </div>
+                </div>
             </div>
         </div>
+
+        <div class="row">
+            {% field_flex_multiple "Treatment type" item.treatment_types %}
+            {% field_flex "State" item.treatment_state %}
+            {% field_flex_detail "Associated request" item.file %}
+            {% field_flex "Location" item.location %}
+            {% field_flex "Container" item.container %}
+            {% field_flex "Responsible" item.person %}
+            {% field_flex "Organization" item.organization %}
+            {% field_flex "Start date" item.start_date %}
+            {% field_flex "Closing date" item.end_date %}
+            {% 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 %}
+            {% field_flex "Insurance cost" item.insurance_cost|intcomma '' " "|add:CURRENCY %}
+            {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
+            {% field_flex_full "Description" item.description "<pre>" "</pre>" %}
+            {% field_flex_full "Goal" item.goal "<pre>" "</pre>" %}
+
+            {% include "ishtar/blocks/sheet_json.html" %}
+        </div>
     </div>
-</div>
 
-<div class="row">
-    {% field_flex_multiple "Treatment type" item.treatment_types %}
-    {% field_flex "State" item.treatment_state %}
-    {% field_flex_detail "Associated request" item.file %}
-    {% field_flex "Location" item.location %}
-    {% field_flex "Container" item.container %}
-    {% field_flex "Responsible" item.person %}
-    {% field_flex "Organization" item.organization %}
-    {% field_flex "Start date" item.start_date %}
-    {% field_flex "Closing date" item.end_date %}
-    {% 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 %}
-    {% field_flex "Insurance cost" item.insurance_cost|intcomma '' " "|add:CURRENCY %}
-    {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
-    {% field_flex_full "Description" item.description "<pre>" "</pre>" %}
-    {% field_flex_full "Goal" item.goal "<pre>" "</pre>" %}
-
-    {% include "ishtar/blocks/sheet_json.html" %}
-</div>
+    <div class="tab-pane fade" id="{{window_id}}-find"
+         role="tabpanel" aria-labelledby="{{window_id}}-find-tab">
+        {% trans "Related finds" as finds %}
+        {% if item.finds.count %}
+        {% dynamic_table_document finds 'finds_for_treatment' 'treatments' item.pk 'TABLE_COLS_FOR_OPE' output %}
+        {% endif %}
 
-{% trans "Related finds" as finds %}
-{% if item.finds.count %}
-{% dynamic_table_document finds 'finds_for_treatment' 'treatments' item.pk 'TABLE_COLS_FOR_OPE' output %}
-{% endif %}
+        {% trans "Upstream finds" as finds %}
+        {% if item.upstream.count %}
+        {% dynamic_table_document finds 'finds_for_treatment' 'downstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %}
+        {% endif %}
 
-{% trans "Upstream finds" as finds %}
-{% if item.upstream.count %}
-{% dynamic_table_document finds 'finds_for_treatment' 'downstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %}
-{% endif %}
+        {% trans "Downstream finds" as finds %}
+        {% if item.downstream.count %}
+        {% dynamic_table_document finds 'finds_for_treatment' 'upstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %}
+        {% endif %}
 
-{% trans "Downstream finds" as finds %}
-{% if item.downstream.count %}
-{% dynamic_table_document finds 'finds_for_treatment' 'upstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %}
-{% endif %}
+        {% trans "Related operations" as related_operations %}
+        {% dynamic_table_document related_operations 'operations' 'related_treatment' item.pk 'TABLE_COLS' output %}
 
-{% trans "Related operations" as related_operations %}
-{% dynamic_table_document related_operations 'operations' 'related_treatment' item.pk 'TABLE_COLS' output %}
 
-{% comment %}
-{% if item.source.count %}
-{% trans "Associated documents" as associated_docs %}
-{% dynamic_table_document associated_docs 'treatments_docs' 'treatment' item.pk '' output %}
-{% endif %}
-{% endcomment %}
+    </div>
+
+    {% if item.documents.count %}
+    <div class="tab-pane fade" id="{{window_id}}-documents"
+         role="tabpanel" aria-labelledby="{{window_id}}-documents-tab">
+        {% trans "Associated documents" as treat_docs %}
+        {% dynamic_table_document treat_docs 'documents' 'treatments' item.pk '' output %}
+    </div>
+    {% endif %}
+
+    {% if item.administrative_act.count %}
+    <div class="tab-pane fade" id="{{window_id}}-admin"
+         role="tabpanel" aria-labelledby="{{window_id}}-admin-tab">
+        {% trans "Administrative acts" as admact_lbl %}
+        {% table_administrativact admact_lbl item.administrative_act.all %}
+    </div>
+    {% endif %}
 
-{% if item.administrative_act.count %}
-{% trans "Administrative acts" as admact_lbl %}
-{% table_administrativact admact_lbl item.administrative_act.all %}
-{% endif %}
 
+</div>
 {% endblock %}
diff --git a/ishtar_common/migrations/0076_migrate_treatmentfile_permissions.py b/ishtar_common/migrations/0076_migrate_treatmentfile_permissions.py
index 0defa4efe..4edef4a44 100644
--- a/ishtar_common/migrations/0076_migrate_treatmentfile_permissions.py
+++ b/ishtar_common/migrations/0076_migrate_treatmentfile_permissions.py
@@ -18,7 +18,6 @@ def migrate_perm(apps, schema_editor):
             for gp in Group.objects.filter(permissions=q.all()[0]):
                 gp.permissions.add(perm)
             q.all()[0].delete()
-        print(new_codename)
         perm.codename = new_codename
         perm.save()
 
-- 
cgit v1.2.3