From 83c5b11987e1edf189538606f8cbfa96645faad6 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Tue, 25 Mar 2025 15:25:07 +0100
Subject: [PATCH] added new features

---
 Layout/default/ConstructionConsent/View.php | 30 ++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/Layout/default/ConstructionConsent/View.php b/Layout/default/ConstructionConsent/View.php
index a373b72a9..79906f5e1 100644
--- a/Layout/default/ConstructionConsent/View.php
+++ b/Layout/default/ConstructionConsent/View.php
@@ -229,11 +229,17 @@ $pagination_entity_name = "Adressen";
                                     <th></th>
                                 </tr>
                                 <?php foreach($item->contacts as $type => $contacts): ?>
-                                    <?php foreach($contacts as $contact): ?>
-                                        <tr id="contact-data-<?=$contact->id?>" data-name="<?=$contact->name?>" data-phone="<?=$contact->phone?>" data-fax="<?=$contact->fax?>" data-email="<?=$contact->email?>" data-type="<?=$contact->type?>" data-street="<?=$contact->street?>" data-zip="<?=$contact->zip?>" data-city="<?=$contact->city?>" data-country="<?=$contact->country?>">
+                                    <?php foreach($contacts as $contact):
+                                        if (substr($contact->phone, 0, 2) != "43" && substr($contact->phone, 0, 2) != "49" && substr($contact->phone, 0, 1) != "0") {
+                                            $phone = "0".$contact->phone;
+                                        } else {
+                                            $phone = $contact->phone;
+                                        }
+                                        ?>
+                                        <tr id="contact-data-<?=$contact->id?>" data-name="<?=$contact->name?>" data-phone="<?=$phone?>" data-fax="<?=$contact->fax?>" data-email="<?=$contact->email?>" data-type="<?=$contact->type?>" data-street="<?=$contact->street?>" data-zip="<?=$contact->zip?>" data-city="<?=$contact->city?>" data-country="<?=$contact->country?>">
                                             <td class="text-monospace"><?=__($contact->type, "consent")?></td>
                                             <td><?=$contact->name?></td>
-                                            <td><?=$contact->phone?></td>
+                                            <td><?=$phone?></td>
                                             <td><?=$contact->fax?></td>
                                             <td><?=$contact->email?></td>
                                             <td>
@@ -309,8 +315,14 @@ $pagination_entity_name = "Adressen";
                                     <th>Ergebnis</th>
                                     <th></th>
                                 </tr>
-                                <?php foreach($item->owners as $owner): ?>
-                                    <tr id="owner-data-<?=$owner->id?>" data-title="<?=$owner->title?>" data-firstname="<?=$owner->firstname?>" data-lastname="<?=$owner->lastname?>" data-street="<?=$owner->street?>" data-zip="<?=$owner->zip?>" data-city="<?=$owner->city?>" data-country="<?=$owner->country?>" data-phone="<?=$owner->phone?>" data-phone2="<?=$owner->phone2?>" data-fax="<?=$owner->fax?>" data-email="<?=$owner->email?>" data-birthdate="<?=($owner->birthdate) ? (new DateTime($owner->birthdate))->format("d.m.Y"): ""?>">
+                                <?php foreach($item->owners as $owner):
+                                    if (substr($owner->phone, 0, 2) != "43" && substr($owner->phone, 0, 2) != "49" && substr($owner->phone, 0, 1) != "0") {
+                                        $phone = "0".$owner->phone;
+                                    } else {
+                                        $phone = $owner->phone;
+                                    }
+                                    ?>
+                                    <tr id="owner-data-<?=$owner->id?>" data-title="<?=$owner->title?>" data-firstname="<?=$owner->firstname?>" data-lastname="<?=$owner->lastname?>" data-street="<?=$owner->street?>" data-zip="<?=$owner->zip?>" data-city="<?=$owner->city?>" data-country="<?=$owner->country?>" data-phone="<?=$phone?>" data-phone2="<?=$owner->phone2?>" data-fax="<?=$owner->fax?>" data-email="<?=$owner->email?>" data-birthdate="<?=($owner->birthdate) ? (new DateTime($owner->birthdate))->format("d.m.Y"): ""?>">
                                         <td style="font-size: 1.4em;">
                                             <a href="<?=self::getUrl("ConstructionConsent", "Download", ["owner_id" => $owner->id])?>" title="Zustimmungserklärungsformular herunterladen"><i class="far fa-fw fa-file-download"></i></a>
                                         </td>
@@ -322,7 +334,7 @@ $pagination_entity_name = "Adressen";
                                             <?=$owner->country?>
                                         </td>
                                         <td>
-                                            <?=$owner->phone?><br />
+                                            <?=$phone?><br />
                                             <?=$owner->fax?><br />
                                             <?=$owner->email?>
                                         </td>
@@ -459,6 +471,7 @@ $pagination_entity_name = "Adressen";
     <div class="modal fade" id="newOwnerModal" aria-hidden="true" aria-labelledby="#newOwnerModelLabel" tabindex="-1">
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
+                <form method="post" action="<?=self::getUrl("ConstructionConsentOwner", "save")?>">
                     <div class="modal-header">
                         <h3 class="modal-title" id="newOwnerModelLabel">Neuen Besitzer hinzufügen</h3>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -466,11 +479,10 @@ $pagination_entity_name = "Adressen";
                         </button>
                     </div>
                     <div class="modal-body">
-
                             <?php if ($is_admin): ?>
                         <div class="form-group">
-                            <label for="owner_id" class="col-form-label">Besitzer aus Vorbestellung suchen:</label>
-                            <select class="form-control" name="owner_id" id="search-owner">
+                            <label for="owner_id_not_included" class="col-form-label">Besitzer aus Vorbestellung suchen:</label>
+                            <select class="form-control" name="owner_id_not_included" id="search-owner">
                                 <option></option>
                             </select>
                         </div>