From 5f8d692a804be6d4e0689a3c4c8ba71b0ce82f2b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 2 Oct 2018 01:23:43 +0200 Subject: Sheet refactoring with images --- .../templates/ishtar/sheet_basefind.html | 87 +++++++++++++++ .../templates/ishtar/sheet_find.html | 118 ++++----------------- 2 files changed, 107 insertions(+), 98 deletions(-) create mode 100644 archaeological_finds/templates/ishtar/sheet_basefind.html (limited to 'archaeological_finds') diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html new file mode 100644 index 000000000..c20ca66ee --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_basefind.html @@ -0,0 +1,87 @@ +{% load i18n window_field from_dict link_to_window window_tables window_header humanize %} +

{{base_find.complete_id }}

+

{{base_find.short_id }}

+ {% if base_find.external_id %} +

+ + + {{base_find.external_id|default:''}} + +

{% endif %} + +
+ {% field_flex_detail "Operation" base_find.context_record.operation first %} + {% field_flex_detail "Archaeological site" base_find.context_record.archaeological_site first %} + {% field_flex_detail "Context record" base_find.context_record first %} + {% field_flex "Town" base_find.context_record.town.label_with_areas '' '' first %} + {% field_flex "Parcel" base_find.context_record.parcel '' '' first %} + + {# START discovery dates #} + {% if not base_find.discovery_date_taq %} + {% trans "Discovery date" as discovery_date_label %} + {% field_flex discovery_date_label base_find.discovery_date '' '' first %} + {% elif base_find.discovery_date.year == base_find.discovery_date_taq.year and base_find.discovery_date_taq|date:"d-m" == "31-12" and base_find.discovery_date|date:"d-m" == "01-01" %} + {% trans "Discovery year" as discovery_year_label %} + {% field_flex discovery_year_label base_find.discovery_date.year '' '' first %} + {% else %} + {% trans "Discovery date (TPQ)" as discovery_tpq_label %} + {% field_flex discovery_tpq_label base_find.discovery_date '' '' first %} + {% trans "Discovery date (TAQ)" as discovery_taq_label %} + {% field_flex discovery_taq_label base_find.discovery_date_taq '' '' first %} + {% endif %} + {# END discovery dates #} + + {% field_flex "Excavation ID" base_find.excavation_id '' '' first %} + {% field_flex "Batch/object" base_find.batch '' '' first %} + {% if base_find.history_object and base_find.history_object.IS_ISOLATED_DICT %} + {% field_flex "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT '' '' first %} + {% endif %} + + {% field_flex "Special interest" base_find.special_interest '' '' first %} + {% field_flex_full "Description" base_find.description "
" "
" first %} + {% field_flex_full "Comment" base_find.comment "
" "
" first %} +
+ + {% if base_find.x or base_find.y or base_find.topographic_localisation %} +

{% trans "Coordinates"%}

+
+ {% field_flex "Point of topographic reference" base_find.topographic_localisation %} +
+
{% trans "Coordinates" %}
+
+ {% trans "X:"%} {{base_find.x|default_if_none:"-"}} + {% if base_find.estimated_error_x %} ({% trans "error:" %} {{base_find.estimated_error_x}}){% endif %}, + {% trans "Y:"%} {{base_find.y|default_if_none:"-"}}, + {% if base_find.estimated_error_y %} ({% trans "error:" %} {{base_find.estimated_error_y}}){% endif %}, + {% trans "Z:"%} {{base_find.z|default_if_none:"-"}} + {% if base_find.estimated_error_z %} ({% trans "error:" %} {{base_find.estimated_error_z}}){% endif %} + {% if base_find.spatial_reference_system %} + – {{base_find.spatial_reference_system.label}}{% if base_find.spatial_reference_system.srid %} - + {% trans "SRID"%} {{base_find.spatial_reference_system.srid}}{% endif %} + {% endif %} +
+
+
+ {% endif %} +

{% trans "Sheet"%}

+
+ {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} + {% with item.history_creator.ishtaruser.full_label|add:"
"|add:creation_date|add:"" as creator %} + {% field_flex "Created by" creator|safe '' '' first %} + {% endwith %}{% endwith %} + {% if item.history_creation_date != item.last_edition_date %} + {% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %} + {% with item.history_modifier.ishtaruser.full_label|add:"
"|add:edition_date|add:"" as modifier %} + {% trans "Last modified by" as lastmodifiedby_label %} + {% field_flex lastmodifiedby_label modifier|safe '' '' first %} + {% endwith %}{% endwith %} + {% endif %} +
+ +{% if first %} + + +
+{% endif %} + +{% if forloop.counter0 %}
{% endif %} diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index f36dd6afe..55c02d8c7 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -9,114 +9,36 @@ {% block content %} -
-
-
- {% include "ishtar/blocks/window_image.html" %} -
-

-

{{ item.denomination|default:"" }}

-

{{ item.label|default:"" }}

-

{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.complete_id}}{% endfor %}

-

{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.short_id}}{% endfor %}

-

{{ item.administrative_index|default:"" }}

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

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

{% trans "Associated base finds"%}

- -
- {% for base_find in item.base_finds.all %} -

{{base_find.complete_id }}

-

{{base_find.short_id }}

- {% if base_find.external_id %} -

- - - {{base_find.external_id|default:''}} - -

{% endif %} - -
- {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} - {% with item.history_creator.ishtaruser.full_label|add:"
"|add:creation_date|add:"" as creator %} - {% field_flex "Created by" creator|safe %} - {% endwith %}{% endwith %} - {% if item.history_creation_date != item.last_edition_date %} - {% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %} - {% with item.history_modifier.ishtaruser.full_label|add:"
"|add:edition_date|add:"" as modifier %} - {% trans "Last modified by" as lastmodifiedby_label %} - {% field_flex lastmodifiedby_label modifier|safe %} - {% endwith %}{% endwith %} - {% endif %} - {% field_flex "Excavation ID" base_find.excavation_id %} - {% field_flex "Batch/object" base_find.batch %} - {% if base_find.history_object and base_find.history_object.IS_ISOLATED_DICT %} - {% field_flex "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT %} - {% endif %} +
+
+ {% include "ishtar/blocks/window_image.html" %} +
+

+

+
+
- {# START discovery dates #} - {% if not base_find.discovery_date_taq %} - {% trans "Discovery date" as discovery_date_label %} - {% field_flex discovery_date_label base_find.discovery_date %} - {% elif base_find.discovery_date.year == base_find.discovery_date_taq.year and base_find.discovery_date_taq|date:"d-m" == "31-12" and base_find.discovery_date|date:"d-m" == "01-01" %} - {% trans "Discovery year" as discovery_year_label %} - {% field_flex discovery_year_label base_find.discovery_date.year %} - {% else %} - {% trans "Discovery date (TPQ)" as discovery_tpq_label %} - {% field_flex discovery_tpq_label base_find.discovery_date %} - {% trans "Discovery date (TAQ)" as discovery_taq_label %} - {% field_flex discovery_taq_label base_find.discovery_date_taq %} - {% endif %} - {# END discovery dates #} +

{% trans "Associated base finds"%}

- {% field_flex "Special interest" base_find.special_interest %} - {% field_flex_detail "Context record" base_find.context_record %} - {% field_flex "Town" base_find.context_record.town.label_with_areas %} - {% field_flex "Parcel" base_find.context_record.parcel %} - {% field_flex_detail "Operation" base_find.context_record.operation %} - {% field_flex_detail "Archaeological site" base_find.context_record.archaeological_site %} - {% field_flex_full "Description" base_find.description "
" "
" %} - {% field_flex_full "Comment" base_find.comment "
" "
" %} +
+ {% for base_find in item.base_finds.all %} + {% with first=forloop.first|add:item.images.count %} + {% include "ishtar/sheet_basefind.html" %} + {% endwith %} + {% endfor %}
- {% if base_find.x or base_find.y or base_find.topographic_localisation %} -

{% trans "Coordinates"%}

-
- {% field_flex "Point of topographic reference" base_find.topographic_localisation %} -
-
{% trans "Coordinates" %}
-
- {% trans "X:"%} {{base_find.x|default_if_none:"-"}} - {% if base_find.estimated_error_x %} ({% trans "error:" %} {{base_find.estimated_error_x}}){% endif %}, - {% trans "Y:"%} {{base_find.y|default_if_none:"-"}}, - {% if base_find.estimated_error_y %} ({% trans "error:" %} {{base_find.estimated_error_y}}){% endif %}, - {% trans "Z:"%} {{base_find.z|default_if_none:"-"}} - {% if base_find.estimated_error_z %} ({% trans "error:" %} {{base_find.estimated_error_z}}){% endif %} - {% if base_find.spatial_reference_system %} - – {{base_find.spatial_reference_system.label}}{% if base_find.spatial_reference_system.srid %} - - {% trans "SRID"%} {{base_find.spatial_reference_system.srid}}{% endif %} - {% endif %} -
-
-
- {% endif %} +

{% trans "Identification" %}

+
+ {% include "ishtar/blocks/sheet_external_id.html" %}
-{% if forloop.counter0 %}
{% endif %} -{% endfor %} - -

{% trans "Identification" %}

{% field_flex "Denomination" item.denomination %} @@ -127,7 +49,6 @@ {% field_flex "Seal number" item.seal_number %} {% trans "Administrative index" as admin_index_label %} {% field_flex admin_index_label item.administrative_index %} - {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_flex_full "Mark" item.mark "
" "
" %}
@@ -176,6 +97,7 @@ {% field_flex checked_label item.checked|from_dict:item.history_object.CHECK_DICT %} {% endif%} {% field_flex "Check date" item.check_date %} + {% include "ishtar/blocks/sheet_creation_section.html" %}
{% if item.integrities.count or item.remarkabilities.count or item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.appraisal_date or item.treatment_emergency or item.insurance_value or item.estimated_value %} -- cgit v1.2.3