From ee3c42a0868ec4601701bd7e3bb5a2d088c2fa05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Thu, 30 Mar 2023 11:11:23 +0200
Subject: [PATCH] show DOB when available and can be viewed, improve address
formatting
---
.../templates/contracts/view_contract.html | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/contracts/templates/contracts/view_contract.html b/contracts/templates/contracts/view_contract.html
index b533e30..4d2e96b 100644
--- a/contracts/templates/contracts/view_contract.html
+++ b/contracts/templates/contracts/view_contract.html
@@ -343,10 +343,11 @@
{{ signature.contractee.address_street_with_number }}<br>
{{ signature.contractee.address_zip }} {{ signature.contractee.address_district }}<br>
- {{ signature.contractee.get_address_country_display }}<br>
+ {{ signature.contractee.address_country }}
{% if signature.contractee.ico_number %}
- IČO: {{ signature.contractee.ico_number }}<br>
+ <br><br>
+ IČO: {{ signature.contractee.ico_number }}
{% endif %}
</address>
@@ -404,7 +405,7 @@
{{ signature.signee.get_entity_type_display }}
</div>
- {% if user.can_view_confidential %}
+ {% if user.can_view_confidential and not signature.signee.entity_has_public_address %}
<div class="border !bg-red-100 border-red-200 p-1.5 rounded-md mt-1.5 mb-2 inline-block">
{% endif %}
@@ -423,16 +424,22 @@
{% if user.can_view_confidential or signature.signee.entity_has_public_address %}
{{ signature.signee.address_street_with_number }}<br>
{{ signature.signee.address_zip }} {{ signature.signee.address_district }}<br>
- {{ signature.signee.get_address_country_display }}<br>
+ {{ signature.signee.address_country }}
{% else %}
- {{ signature.signee.address_district }}<br>
+ {{ signature.signee.address_district }}, {{ signature.signee.address_country }}
{% endif %}
{% if signature.signee.ico_number %}
- IČO: {{ signature.signee.ico_number }}<br>
+ <br><br>
+ <strong>IČO</strong>: {{ signature.signee.ico_number }}
{% endif %}
- {% if user.can_view_confidential %}
+ {% if user.can_view_confidential and signature.signee.date_of_birth %}
+ <br><br>
+ <strong>Datum narození</strong>: {{ signature.signee.date_of_birth }}
+ {% endif %}
+
+ {% if user.can_view_confidential and not signature.signee.entity_has_public_address %}
</div>
{% endif %}
</address>
--
GitLab