From 10c8a694f2ffcfc001f5deddcb7d633d9f00b7cc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 5 Sep 2016 17:05:03 +0200 Subject: Operation: display statistics on the sheet (refs #2989) --- .../templates/ishtar/sheet_operation.html | 230 ++++++++++++--------- 1 file changed, 138 insertions(+), 92 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 f0846f11f..f8421c830 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -6,110 +6,69 @@ {% block content %} {% window_nav item window_id 'show-operation' 'operation_modify' 'show-historized-operation' 'revert-operation' previous next %} -{% if previous or next %} -
-{%if previous%} -{%trans "Previous version"%} ({{previous}}) -{% endif %} -{% if previous and next %} - {% endif %} -{%if next%} -Rollback - -{%trans "Next version"%} ({{next}}) -{% endif %} -
-{% endif %} - -
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
- -
{% trans "Modify" %}
- {% if item.virtual_operation %}

{% trans "This operation is virtual." %}

{% endif %} - -

{% trans "General"%}

-{% if item.common_name %}

{{ item.common_name }}

{% endif %} -{% if item.year %}

{{ item.year }}

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

{{ item.operation_code }}

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

OA{{ item.code_patriarche }}

{%else%} -

{%trans "Patriarche OA code not yet recorded!"%}

{%endif%} -{% field "Old code" item.old_code %} - -

{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}

-

{{ item.history_creator.ishtaruser.full_label }}

- -{% if item.start_date %}

{{ item.start_date }}

-

{{ item.excavation_end_date|default:"-" }}

-{%endif%} -{% if item.scientist %}

{{ item.scientist.full_label }}

{%endif%} -{% if item.in_charge %}

{{ item.in_charge.full_label }}

{%endif%} -{% if item.operator %}

{{ item.operator }}

{% endif %} -

{% if item.is_active %}{%trans "Active file"%}

-{% else %}{%trans "Closed operation"%}

-{% if item.closing.date %}

{{ item.closing.date }} {%trans "by" %} {{ item.closing.user }}

{% endif %} -{% endif %} -{% field "Report delivery date" item.report_delivery_date %} -{% field "Report processing" item.report_processing %} -

{{ item.operation_type }}

-{% if item.surface %}

{{ item.surface }} m2 ({{ item.surface_ha }} ha)

{% endif %} -{% if item.cost %}

{{ item.cost }} €{% if item.cost_by_m2 %}, ({{ item.cost_by_m2 }} €/m2){%endif%}

{%endif%} -{% if item.duration %}

{{ item.duration }} {%trans "Day"%}s

{%endif%} - -{% field_multiple "Remains" item.remains %} -{% field_multiple "Periods" item.periods %} - -{% if item.QUALITY_DICT %} -{% field "Record quality" item.record_quality|from_dict:item.QUALITY_DICT %} +{% if not item.code_patriarche %} +

{%trans "Patriarche OA code not yet recorded!"%}

{% endif %} -{% if item.history_object and item.history_object.QUALITY_DICT %} -{% field "Record quality" item.record_quality|from_dict:item.history_object.QUALITY_DICT %} -{% endif %} - -{% field "Abstract" item.abstract %} -{% if item.associated_file %} -

{{ item.associated_file }}

-{% if item.associated_file.is_preventive %} -{#{% if item.operator_reference_code %}

{{ item.operator_reference_code }}

{% endif %}#} - -{% field "Responsible for town planning service" item.associated_file.responsible_town_planning_service.full_address %} +

{% trans "General"%}

+ {% if item.towns.count %}

{% trans "Localisation"%}

-

{{ item.towns.all|join:", " }}

+ {% endif %} -{% if item.associated_file.address %}

{{ item.associated_file.address }}

-{% if item.associated_file.address_complement %}

{{ item.associated_file.address_complement }}

{%endif%} -{% if item.associated_file.postal_code %}

{{ item.associated_file.postal_code }}

{%endif%} -{%endif%} -{% comment %} -

{{ item.lambert_x }}

-

{{ item.lambert_y }}

-

{{ item.altitude }}

-{% endcomment %} - {% if item.right_relations.count %}

{% trans "Relations"%}

{% for rel in item.right_relations.all %} @@ -130,8 +89,8 @@ {% include "ishtar/blocks/window_tables/parcels.html" %} {% if item.administrative_act %} -{% trans "Administrative acts" as administrativeacts_label %} -{% table_administrativact administrativeacts_label item.administrative_act.all %} +

{% trans "Administrative acts" %}

+{% table_administrativact "" item.administrative_act.all %} {% endif %} {% trans "Document from this operation" as operation_docs %} @@ -139,9 +98,9 @@ {% dynamic_table_document operation_docs 'operation_docs' 'operation' item.pk '' output %} {% endif %} -{% trans "Context records" as context_records %} {% if item.context_record.count %} -{% dynamic_table_document context_records 'context_records_for_ope' 'operation' item.pk 'TABLE_COLS_FOR_OPE' output %} +

{% trans "Context records" %}

+{% dynamic_table_document '' 'context_records_for_ope' 'operation' item.pk 'TABLE_COLS_FOR_OPE' output %} {% endif %} {% trans "Documents from associated context records" as cr_docs %} @@ -159,4 +118,91 @@ {% dynamic_table_document finds_docs 'finds_docs' 'find__base_finds__context_record__operation' item.pk '' output %} {% endif %} +

{% trans "Statistics" %}

+ +

{% trans "Administrative acts" %}

+ + +

{% trans "Context records" %}

+ + + +

{% trans "Finds" %}

+ + + +

{% trans "Sources" %}

+ + + +{% if item.nb_stats_finds_by_ue %} +

{% trans "Finds by context records" %}

+ +{% endif %} + {% endblock %} -- cgit v1.2.3