From d55a5ec58047dc53118dce1d3aecbeb398cf57de Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 7 Jun 2024 13:34:38 +0200 Subject: 🐛 Sheet: add missing fields, improve layout (refs #5863, #5864, #5865, #5866, #5867, #5868, #5869, #5870, #5871, #5872) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ishtar/blocks/sheet_address_section.html | 2 +- .../templates/ishtar/blocks/sheet_dating_list.html | 33 ++++++++++++++++++++++ ishtar_common/templates/ishtar/sheet_document.html | 30 ++++++++++---------- 3 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_dating_list.html (limited to 'ishtar_common') diff --git a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html index 80dbc07a4..5f577c9c9 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html @@ -5,6 +5,6 @@ 
{% if item.get_address %}{{item.get_address}}{% endif %}{% if item.get_address_complement %}
 {{item.get_address_complement}}{% endif %}{% if item.get_postal_code or item.get_town or item.get_precise_town %}
-{{item.get_postal_code}} {% if item.get_precise_town %}{{item.get_precise_town}}{% else %}{{item.get_town}}{% endif %}{% endif %}
+{{item.get_postal_code}} {% if item.get_precise_town %}{{item.get_precise_town.name}}{% else %}{{item.get_town}}{% endif %}{% endif %}
{% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html new file mode 100644 index 000000000..6135bbf77 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html @@ -0,0 +1,33 @@ +{% load i18n %} + + + + + + + + + + {% for dating in dating_list %} + + + + + + + + + {% endfor %} +
{% trans "Chronological period" %}{% trans "Start date" %}{% trans "End date" %}{% trans "Dating type" %}{% trans "Quality" %}{% trans "Precise on this dating" %}
+ {{dating.period}} + + {{dating.start_date|default_if_none:"-"}} + + {{dating.end_date|default_if_none:"-"}} + + {{dating.dating_type|default_if_none:"-"}} + + {{dating.quality|default_if_none:"-"}} + + {{dating.precise_dating|default_if_none:"-"}} +
diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 258243a24..2ffcc451b 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -46,12 +46,14 @@ {% field_flex "Type" item.source_type_html "" "" 1 %} {% include "ishtar/blocks/sheet_creation_section.html" %} - {% if item.format_type or item.support_type or item.scale or item.shooting_angle %} + {% if item.format_type or item.support_type or item.scale or item.shooting_angle or item.duplicate != None or item.item_number != 1 %}

{% trans "Format" %}

{% field_flex "Format" item.format_type %} {% field_flex "Support" item.support_type %} {% field_flex "Scale" item.scale %} {% field_flex "Shooting angle" item.shooting_angle %} + {% if item.duplicate != None %}{% field_flex "Has a duplicate" item.duplicate %}{% endif %} + {% if item.item_number != 1 %}{% field_flex "Item number" item.item_number %}{% endif %} {% endif %} {% if item.associated_file or item.associated_url or item.tags.count %} @@ -99,12 +101,10 @@ {% field_flex_detail "Pages" item.source_page_range %} {% endif %} - {% if item.container or item.container_ref or item.item_number != 1 or item.duplicate %} + {% if item.container or item.container_ref %}

{% trans "Container" %}

{% field_flex_detail "Container" item.container 2 %} {% field_flex_detail "Reference container" item.container_ref 2 %} - {% if item.item_number != 1 %}{% field_flex "Item number" item.item_number %}{% endif %} - {% if item.duplicate %}{% field_flex "Has a duplicate" item.duplicate %}{% endif %} {% endif %} {% if item.description or item.comment or item.additional_information %} @@ -122,17 +122,17 @@ {% if item.has_related %}

{% trans "Related items" %}

{% field_flex_full _("Files") item.files|add_links %} -{% field_flex_full "Administrative acts" item.administrativeacts|add_links %} -{% field_flex_full "Sites" item.sites|add_links %} -{% field_flex_full "Operations" item.operations|add_links %} -{% field_flex_full "Context records" item.context_records|add_links %} -{% field_flex_full "Finds" item.finds|add_links %} -{% field_flex_full "Treatments" item.treatments|add_links %} -{% field_flex_full "Treatment files" item.treatment_files|add_links %} -{% field_flex_full "Warehouses" item.warehouses|add_links %} -{% field_flex_full "Containers" item.containers|add_links %} -{% field_flex_full "Towns" item.towns|add_links %} -{% field_flex_full "Areas" item.areas|add_links %} +{% field_flex_full _("Administrative acts") item.administrativeacts|add_links %} +{% field_flex_full _("Sites") item.sites|add_links %} +{% field_flex_full _("Operations") item.operations|add_links %} +{% field_flex_full _("Context records") item.context_records|add_links %} +{% field_flex_full _("Finds") item.finds|add_links %} +{% field_flex_full _("Treatments") item.treatments|add_links %} +{% field_flex_full _("Treatment files") item.treatment_files|add_links %} +{% field_flex_full _("Warehouses") item.warehouses|add_links %} +{% field_flex_full _("Containers") item.containers|add_links %} +{% field_flex_full _("Towns") item.towns|add_links %} +{% field_flex_full _("Areas") item.areas|add_links %} {% endif %} {{ item.coins_tag|default:""|safe }} {% endblock %} -- cgit v1.2.3