diff --git a/Layout/default/Admin/RtrReporting/Index.php b/Layout/default/Admin/RtrReporting/Index.php index 37373f717..ebcef571f 100644 --- a/Layout/default/Admin/RtrReporting/Index.php +++ b/Layout/default/Admin/RtrReporting/Index.php @@ -22,18 +22,29 @@

RTR Reporting CSVs herunterladen

- - -
+ diff --git a/Layout/default/ConstructionConsent/Form.php b/Layout/default/ConstructionConsent/Form.php index 2b8bfbd80..1a2ef0219 100644 --- a/Layout/default/ConstructionConsent/Form.php +++ b/Layout/default/ConstructionConsent/Form.php @@ -8,8 +8,12 @@ + - + +

Zustimmungserklärung

@@ -37,7 +41,7 @@
@@ -204,7 +208,7 @@
Plan Vorschau
- file && $item->file->file && $item->file->file->fileExists()) ? "src=".$item->file->file->asDataUrl()."" : "" ?> /> + file && $item->file->file && $item->file->file->fileExists()) ? "src=".$item->file->file->asDataUrl()."" : "" ?> />
diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php index d25ea17d5..3d0868573 100644 --- a/Layout/default/ConstructionConsent/Index.php +++ b/Layout/default/ConstructionConsent/Index.php @@ -37,7 +37,7 @@ $pagination_entity_name = "Zustimmungserklärungen"; @@ -328,10 +328,10 @@ $pagination_entity_name = "Zustimmungserklärungen"; Name Objekttyp Objektadresse + KG GST-Nr. Einlagezahl Anzahl Eigentümer - Anfragestatus Anfrageresultat @@ -351,9 +351,9 @@ $pagination_entity_name = "Zustimmungserklärungen"; adb_hausnummer->strasse->gemeinde->name?> + kg?> gst?> ez?> - - - status) ? __($item->status,"consent") : ""?> owner_result_counts['denied']) && $item->owner_result_counts['denied'] > 0) { - $status_class = 'red'; // Red if at least one denied + $approve_override = $item->approve_override; + if (isset($approve_override) && $approve_override) { + $status_class = 'green'; // Blue if approve override + } elseif (isset($item->owner_result_counts['denied']) && $item->owner_result_counts['denied'] > 0) { + $status_class = 'red'; + // Red if at least one denied } elseif ((isset($item->owner_result_counts['unresolvable']) && $item->owner_result_counts['unresolvable'] > 0) || (isset($item->owner_result_counts['moved']) && $item->owner_result_counts['moved'] > 0)) { $status_class = 'yellow'; // Yellow if at least one unresolvable or moved diff --git a/Layout/default/ConstructionConsent/View.php b/Layout/default/ConstructionConsent/View.php index f5dcfc1fd..79906f5e1 100644 --- a/Layout/default/ConstructionConsent/View.php +++ b/Layout/default/ConstructionConsent/View.php @@ -111,6 +111,12 @@ $pagination_entity_name = "Adressen"; Die Nutzung der Liegenschaft seitens BB dient der Eigenversorgung der GE und/oder dessen Nutzer(in) und wird dieser entgeltlos zugestimmt + + Genehmigung überschreiben + + approve_override) ? "checked='checked'" : ""?> /> + + object_type == "building"): ?>

Metadaten

@@ -223,15 +229,21 @@ $pagination_entity_name = "Adressen"; contacts as $type => $contacts): ?> - - + phone, 0, 2) != "43" && substr($contact->phone, 0, 2) != "49" && substr($contact->phone, 0, 1) != "0") { + $phone = "0".$contact->phone; + } else { + $phone = $contact->phone; + } + ?> + type, "consent")?> name?> - phone?> + fax?> email?> - + $contact->id])?>" onclick="if(!confirm('Ansprechpartner wirklich löschen?')) return false;" class="text-danger" title="Löschen"> @@ -303,8 +315,14 @@ $pagination_entity_name = "Adressen"; Ergebnis - owners as $owner): ?> - "> + 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; + } + ?> + "> $owner->id])?>" title="Zustimmungserklärungsformular herunterladen"> @@ -316,7 +334,7 @@ $pagination_entity_name = "Adressen"; country?> - phone?>
+
fax?>
email?> @@ -461,6 +479,15 @@ $pagination_entity_name = "Adressen";