summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-01 12:43:18 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-01 12:43:18 +0200
commit86a6641073739918e83d6b99441cf61bd86bdd4a (patch)
treeb94111060876ac74d2a530c866c6d3bc9dededfd
parent0af04bcd8d16bd5f140bc82cd7f56a7b90f0f61c (diff)
downloadIshtar-86a6641073739918e83d6b99441cf61bd86bdd4a.tar.bz2
Ishtar-86a6641073739918e83d6b99441cf61bd86bdd4a.zip
Organization, Person sheets: add link to files
-rw-r--r--ishtar_common/templates/ishtar/sheet_organization.html14
-rw-r--r--ishtar_common/templates/ishtar/sheet_person.html13
2 files changed, 23 insertions, 4 deletions
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 2ece97a8b..8a47c35f5 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -1,5 +1,5 @@
{% extends "ishtar/sheet.html" %}
-{% load i18n window_header %}
+{% load i18n window_header window_tables %}
{% block head_title %}{% trans "Organization" %}{% endblock %}
@@ -15,7 +15,7 @@
{% if item.mobile_phone %}<p><label>{% trans "Mobile phone" %}</label> <span class='value'>{{item.mobile_phone}}</span></p> {% endif %}
-<table>
+<table class='simple'>
<caption>{%trans "Person in the organization"%}</caption>
<tr>
<th>{% trans "Name" %}</th>
@@ -35,4 +35,14 @@
{% endfor %}
</table>
+{% trans "General contractor organization of archaelogical files" as af %}
+{% if item.general_contractor_files.count %}
+{% dynamic_table_document af 'files' 'corporation_general_contractor' item.pk '' output %}
+{% endif %}
+
+{% trans "Town planning service of archaelogical files" as af %}
+{% if item.planning_service_files.count %}
+{% dynamic_table_document af 'files' 'planning_service' item.pk '' output %}
+{% endif %}
+
{% endblock %}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index f5c42c11a..8fc2d9211 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -76,12 +76,21 @@
{% dynamic_table_document ao 'operations' 'in_charge' item.pk '' output %}
{% endif %}
-
-{% trans "Associated archaelogical files" as af %}
+{% trans "In charge of archaelogical files" as af %}
{% if item.file_responsability.count %}
{% dynamic_table_document af 'files' 'in_charge' item.pk '' output %}
{% endif %}
+{% trans "General contractor of archaelogical files" as af %}
+{% if item.general_contractor_files.count %}
+{% dynamic_table_document af 'files' 'general_contractor' item.pk '' output %}
+{% endif %}
+
+{% trans "Responsible for town planning service of archaelogical files" as af %}
+{% if item.responsible_town_planning_service_files.count %}
+{% dynamic_table_document af 'files' 'responsible_town_planning_service' item.pk '' output %}
+{% endif %}
+
{% if item.operation_docs_q.count %}
{% trans "Documents associated to operations" as operation_docs %}
{% dynamic_table_document operation_docs 'operation_docs' 'person' item.pk '' output %}