Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'ConstructionConsent/add-new-import-cols' into 'master'

Browse Source 
add new import columns

See merge request fronk/thetool!1314
This commit is contained in:
Luca Haid
2025-05-12 07:42:40 +00:00
parent 333d358be1 003ed5d66a
commit 07db6d3a79
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/ConstructionConsent/ConstructionConsentController.php
View File

@@ -1175,6 +1175,9 @@ class ConstructionConsentController extends mfBaseController {
'GST',
'GSTNR',
'RIMO GN',
'Wohneinheiten',
'Bestellungen',
'Anfrageresultat',
'Nutzungslänge',
'Leerrohr am Grundstück',
'Leerrohr im Gebäude',
@@ -1211,6 +1214,22 @@ class ConstructionConsentController extends mfBaseController {
$item->adb_hausnummer->strasse->gemeinde->name;
}
$status_class = 'Blau';
$approve_override = $item->approve_override;
if (isset($approve_override) && $approve_override) {
$status_class = 'Grün';
} elseif (isset($item->owner_result_counts['denied']) && $item->owner_result_counts['denied'] > 0) {
$status_class = 'Rot';
} 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) ||
(isset($item->owner_result_counts['open']) && $item->owner_result_counts['open'] > 0)
) {
$status_class = 'Gelb'; // Yellow if at least one unresolvable or moved
} elseif (isset($item->owner_result_counts['accepted']) &&
$item->owner_result_counts['accepted'] === count($item->owners)) {
$status_class = 'Grün'; // Green if all accepted
}
$row = [
$item->project->name,
@@ -1222,6 +1241,9 @@ class ConstructionConsentController extends mfBaseController {
$item->gst,
$item->gstnr,
$item->rimo_gn,
$item->adb_hausnummer->unit_count ?? '',
$item->preorder_count,
$status_class,
$item->usage_length,
$item->usage_pipe_on_plot == 1 ? 'Ja' : 'Nein',
$item->usage_pipe_in_building == 1 ? 'Ja' : 'Nein',