From 1e71763dc8583af4d67d18a410434b945c3229b2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Nov 2017 20:07:38 +0100 Subject: UI: improve sheets --- .../templates/ishtar/sheet_operation.html | 141 ++++++++++++--------- 1 file changed, 84 insertions(+), 57 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 53d1d407d..934a3ee19 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -3,75 +3,102 @@ {% block head_title %}{% trans "Operation:" %} {{item.short_label}}{% endblock %} -{% block content %} +{% block toolbar %} {% window_nav item window_id 'show-operation' 'operation_modify' 'show-historized-operation' 'revert-operation' previous next 1 %} +{% endblock %} + +{% block content %} + +
+
+
+ {% if item.image %} + + {% endif%} +
+
+
+ {% if item.year or item.operation_code %} + {{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}
+ {% if item.code_patriarche %}OA{{item.code_patriarche}}{% endif %} +
+
+ {% include "ishtar/blocks/sheet_external_id.html" %} +
+
+

+

{{item.common_name|default:''}}

+

{{item.address|default:''}}

+

+
+
+
+
+ +

{% trans "General"%}

+ + {% field_li "Old code" item.old_code %} + {% include "ishtar/blocks/sheet_creation_section.html" %} + {% trans "Begining date" as begining_date_label %} + {% field_li begining_date_label item.start_date %} + {% field_li "Excavation end date" item.excavation_end_date|default:"-" %} + {% field_li_detail "Head scientist" item.scientist %} + {% field_li_detail "In charge" item.in_charge %} + {% field_li_multiple "Collaborators" item.collaborators %} + {% field_li_detail "Operator" item.operator %} +
  • {% if item.is_active %}{%trans "Active file"%}

    + {% else %}{%trans "Closed operation"%}
    • {% endif %} + {% if item.closing.date %}
  • {{ item.closing.date }} {%trans "by" %} {{ item.closing.user }}
    • {% endif %} + {% field_li "Type" 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_li_multiple "Remains" item.remains %} + {% field_li_multiple "Periods" item.periods %} + {% if item.QUALITY_DICT %}{% field_li "Record quality" item.record_quality|from_dict:item.QUALITY_DICT %}{% endif %} + {% if item.history_object and item.history_object.QUALITY_DICT %}{% field_li "Record quality" item.record_quality|from_dict:item.history_object.QUALITY_DICT %}{% endif %} + {% field_li "Report delivery date" item.report_delivery_date %} + {% field_li "Report processing" item.report_processing %} + {% field_li "Deadline for submission of the documentation" item.documentation_deadline %} + {% field_li "Documentation received" item.documentation_received %} + {% field_li "Deadline for submission of the finds" item.finds_deadline %} + {% field_li "Finds received" item.finds_received %} + {% field_li_detail "Associated file" item.associated_file %} + {% field_li "Responsible for planning service" item.associated_file.responsible_town_planning_service.full_address %} + {% if item.associated_file.town_planning_service %} + {% field_li "Planning service organization" item.associated_file.town_planning_service.full_address %} + {% else %} + {% field_li "Planning service organization" item.associated_file.responsible_town_planning_service.attached_to.full_address %} + {% endif %} + {% field_li "Permit type" item.associated_file.permit_type %} + {% field_li "Permit reference" item.associated_file.permit_reference %} + {% field_li "General contractor" item.associated_file.general_contractor.full_address %} + {% if item.associated_file.corporation_general_contractor %} + {% field_li "General contractor organization" item.associated_file.corporation_general_contractor.full_address %} + {% else%} + {% field_li "General contractor organization" item.associated_file.general_contractor.attached_to.full_address %} + {% endif %} + + {% field "Comment" item.comment "
    " "
    " %} + {% field "Abstract" item.abstract "
    " "
    " %} + {% field "Comment about scientific documentation" item.scientific_documentation_comment "
    " "
    " %} + + {% include "ishtar/blocks/sheet_json.html" %} +

    + + -{% if item.image %} - -{% endif%} {% if item.virtual_operation %}

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

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

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

    {% endif %} -

    {% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} – OA{{item.code_patriarche}}{% endif %} -

    -

    {{item.common_name|default:''}}

    -

    {{item.address|default:''}}

    -{% include "ishtar/blocks/sheet_external_id.html" %} -

    {% trans "General"%}

    -{% field "Comment" item.comment "
    " "
    " %} -{% field "Abstract" item.abstract "
    " "
    " %} -{% field "Comment about scientific documentation" item.scientific_documentation_comment "
    " "
    " %} - -{% include "ishtar/blocks/sheet_json.html" %} {% if not next %} {% if item.towns.count %} -- cgit v1.2.3