Hotfix template

nens · Dec 13, 2024 · 6b6fafe · 6b6fafe
1 parent 64086e4
commit 6b6fafe
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/api/bro_upload/templates/move_GMW_Construction.html b/api/bro_upload/templates/move_GMW_Construction.html
@@ -30,7 +30,7 @@
             <ns:maintenanceResponsibleParty>{{ sourcedocs_data.maintenanceResponsibleParty }}</ns:maintenanceResponsibleParty>
             <ns:wellHeadProtector codeSpace="urn:bro:gmw:WellHeadProtector">{{ sourcedocs_data.wellHeadProtector }}</ns:wellHeadProtector>
             <ns:wellConstructionDate>
-{%              if not sourcedocs_data.wellConstructionDate %}
+{%              if sourcedocs_data.wellConstructionDate in ['', None, 'Invalid date'] %}
                 <ns1:date>onbekend</ns1:date>
 {%              elif sourcedocs_data.wellConstructionDate  %}
                 <ns1:date>{{ sourcedocs_data.wellConstructionDate }}</ns1:date>

diff --git a/api/bro_upload/templates/registration_GMW_Construction.html b/api/bro_upload/templates/registration_GMW_Construction.html
@@ -28,7 +28,7 @@
             <ns:maintenanceResponsibleParty>{{ sourcedocs_data.maintenanceResponsibleParty }}</ns:maintenanceResponsibleParty>
             <ns:wellHeadProtector codeSpace="urn:bro:gmw:WellHeadProtector">{{ sourcedocs_data.wellHeadProtector }}</ns:wellHeadProtector>
             <ns:wellConstructionDate>
-{%              if not sourcedocs_data.wellConstructionDate %}
+{%              if sourcedocs_data.wellConstructionDate in ['', None, 'Invalid date'] %}
                 <ns1:date>onbekend</ns1:date>
 {%              elif sourcedocs_data.wellConstructionDate  %}
                 <ns1:date>{{ sourcedocs_data.wellConstructionDate }}</ns1:date>

diff --git a/api/bro_upload/templates/replace_GMW_Construction.html b/api/bro_upload/templates/replace_GMW_Construction.html
@@ -30,7 +30,7 @@
             <ns:maintenanceResponsibleParty>{{ sourcedocs_data.maintenanceResponsibleParty }}</ns:maintenanceResponsibleParty>
             <ns:wellHeadProtector codeSpace="urn:bro:gmw:WellHeadProtector">{{ sourcedocs_data.wellHeadProtector }}</ns:wellHeadProtector>
             <ns:wellConstructionDate>
-{%              if not sourcedocs_data.wellConstructionDate %}
+{%              if sourcedocs_data.wellConstructionDate in ['', None, 'Invalid date'] %}
                 <ns1:date>onbekend</ns1:date>
 {%              elif sourcedocs_data.wellConstructionDate  %}
                 <ns1:date>{{ sourcedocs_data.wellConstructionDate }}</ns1:date>

diff --git a/api/bro_upload/utils.py b/api/bro_upload/utils.py
@@ -5,6 +5,8 @@
 import requests
 from django.conf import settings
 
+import api.models as api_models
+
 logger = logging.getLogger(__name__)
 
 
@@ -124,3 +126,20 @@ def check_delivery_status(
     except requests.RequestException as e:
         logger.exception(e)
         raise RuntimeError(f"Delivery info check error: {e}")
+
+
+def include_delivery_responsible_party(
+    delivery_responsible_party: str, data_owner: str
+) -> bool:
+    """Check if delivery_responsible_party is equal to data_owner.kvk
+
+    If not, than the delivery responsible party should be included in the document.
+    """
+    if not data_owner:
+        return True
+
+    if not delivery_responsible_party:
+        return False
+
+    org = api_models.Organisation.objects.get(uuid=data_owner)
+    return org.kvk_number != delivery_responsible_party