From 0484b879c737c4714f0c4b6e71dbd67d0ce74468 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 1 Sep 2016 12:43:18 +0200 Subject: Organization, Person sheets: add link to files --- ishtar_common/templates/ishtar/sheet_organization.html | 14 ++++++++++++-- ishtar_common/templates/ishtar/sheet_person.html | 13 +++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) (limited to 'ishtar_common') 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 %}

{{item.mobile_phone}}

{% endif %} - +
@@ -35,4 +35,14 @@ {% endfor %}
{%trans "Person in the organization"%}
{% trans "Name" %}
+{% 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 %} -- cgit v1.2.3