From baf7f6d5da382877425a526e3a2044e9bf5fad56 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 29 Jan 2015 00:08:22 +0100 Subject: Fix display of operations - fix bibracte import of operations --- .../templates/ishtar/sheet_operation.html | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'archaeological_operations/templates') diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 138a94d14..5f0626a02 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -27,7 +27,7 @@

{% trans "General"%}

{% if item.common_name %}

{{ item.common_name }}

{% endif %} -

{{ item.year }}

+{% if item.year %}

{{ item.year }}

{% endif %} {% if item.operation_code %}

{{ item.operation_code }}

{% endif %} {% if item.code_patriarche %}

{{ item.code_patriarche }}

{%else%} @@ -90,7 +90,12 @@ {% endif %} {% trans "Document from this operation" as operation_docs %} -{% if item.source.count %} {% table_document operation_docs item.source.all %}{% endif %} +{% if item.source.count %} +{% table_document operation_docs item.source.all|slice:":15" %} +{% if item.source.count > 15 %} +Seuls les 15 premiers éléments ont été affichés sur un total de {{item.source.count}}. +{% endif %} +{% endif %} @@ -102,7 +107,7 @@ - {% for context_record in item.context_record.all %} + {% for context_record in item.context_record.all|slice:"15" %} @@ -115,9 +120,12 @@ {% endfor %}
{%trans "Context records"%}
{% trans "Parcel" %}  
{{ context_record.label }} {{context_record.unit|default:""}}
{% trans "No context record associated to this operation" %}
+{% if item.context_record.count > 15 %} +Seuls les 15 premiers éléments ont été affichés sur un total de {{item.context_record.count}}. +{% endif %} {% trans "Documents from associated context records" as cr_docs %} -{% if item.context_record_docs_q.count %} {% table_document cr_docs item.context_record_docs_q.all %}{% endif %} +{% if item.context_record_docs_q.count %} {% table_document cr_docs item.context_record_docs_q.all|slice:"15" %}{% endif %}
@@ -136,8 +144,8 @@ - {% for context_record in item.context_record.all %} - {% for find in context_record.base_finds.all %} + {% for context_record in item.context_record.all|slice:"5" %} + {% for find in context_record.base_finds.all|slice:"15" %} {# OPE|MAT.CODE|UE|FIND_index #} @@ -163,8 +171,11 @@ {% endfor %}
{% trans "Warehouse" %}  
{{ find.complete_id|default:""}}
+Seuls les 15 premiers éléments des 5 premières UEs sont affichées +{% comment %} {% trans "Documents from associated finds" as find_docs %} {% if item.find_docs_q.count %} {% table_document find_docs item.find_docs_q.all %}{% endif %} +{% endcomment %} {% endblock %} -- cgit v1.2.3