From 3d3e6c76dea0bc6eddd2e6380d5be9f7c8a2aba2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 9 Oct 2018 17:41:26 +0200 Subject: Sheet person: add collaborator table --- archaeological_operations/models.py | 1 + ishtar_common/templates/ishtar/sheet_person.html | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 3be4dd95d..637bbb7be 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -424,6 +424,7 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, 'towns_label': 'towns', 'scientist__pk': 'scientist__pk', 'in_charge__pk': 'in_charge__pk', + 'collaborators__pk': 'collaborators__pk', } COL_LABELS = { diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index ef8bb9064..308739619 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -83,11 +83,17 @@ {% if item.operation_scientist_responsability.count %} {% dynamic_table_document ao 'operations' 'scientist__pk' item.pk '' output %} {% endif %} + {% trans "Associated operations as responsible" as ao %} {% if item.operation_responsability.count %} {% dynamic_table_document ao 'operations' 'in_charge__pk' item.pk '' output %} {% endif %} +{% trans "Associated operations as collaborator" as colla %} +{% if item.operation_collaborator.count %} +{% dynamic_table_document colla 'operations' 'collaborators__pk' item.pk '' output %} +{% endif %} + {% trans "In charge of archaeological files" as af %} {% if item.file_responsability.count %} {% dynamic_table_document af 'files' 'in_charge__pk' item.pk '' output %} -- cgit v1.2.3