From c65f286ced76d12d18dc1606e1e5b279a28a8966 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 30 Aug 2024 15:41:17 +0200 Subject: 🐛 improve file sheet layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archaeological_files/templates/ishtar/sheet_file.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'archaeological_files') diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 9f86edc41..ef5dfc7cd 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -1,7 +1,7 @@ {% extends "ishtar/sheet.html" %} {% load i18n l10n ishtar_helpers window_ope_tables window_field window_header window_tables %} -{% block head_title %}{% trans "Archaeological file" %} - {{item.full_internal_ref|default:''}}{% endblock %} +{% block head_title %}{% trans "Archaeological file" %} - {% if item.internal_reference %}{{item.internal_reference}}{% else %}{{item.full_internal_ref|default:''}}{% endif %}{% endblock %} {% block toolbar %} {% window_nav item window_id 'show-file' 'file_modify' 'show-historized-file' 'revert-file' previous next 1 %} @@ -120,22 +120,21 @@ {% field_flex "Saisine type" item.saisine_type %} {% field_flex_detail "Responsible for planning service" item.responsible_town_planning_service %} - {% field_flex _("Responsible for planning service address") item.responsible_town_planning_service.full_address %} {% if item.town_planning_service %} - {% field_flex "Planning service organization" item.town_planning_service.full_address %} + {% field_flex_detail "Planning service organization" item.town_planning_service %} {% else %} - {% field_flex "Planning service organization" item.responsible_town_planning_service.attached_to.full_address %} + {% field_flex_detail "Planning service organization" item.responsible_town_planning_service.attached_to %} {% endif %} {% field_flex "Permit type" item.permit_type %} {% field_flex _("Permit/order reference") item.permit_reference %} {% field_flex "Date of planning service file" item.planning_service_date|date:"DATE_FORMAT" %} - {% field_flex "General contractor" item.general_contractor.full_address %} + {% field_flex_detail "General contractor" item.general_contractor %} {% if item.corporation_general_contractor %} - {% field_flex "General contractor organization" item.corporation_general_contractor.full_address %} + {% field_flex_detail "General contractor organization" item.corporation_general_contractor %} {% else%} - {% field_flex "General contractor organization" item.general_contractor.attached_to.full_address %} + {% field_flex_detail "General contractor organization" item.general_contractor.attached_to %} {% endif %} -- cgit v1.2.3