Workorder mph/improve

application/WorkorderMphAdmin/WorkorderMphAdminController.php

@@ -8,11 +8,13 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
 
     protected array $columns = [
         ['key' => 'id', 'text' => 'Auftrags-Nr.', 'table' => ['sortable' => true, 'filter' => 'numberRange']],
+        ['key' => 'netOwnerId', 'text' => 'Netzeigentümer', 'modal' => false, 'table' => ['filter' => 'select', 'sortable' => false], 'required' => false],
         ['key' => 'hausnummerInfo', 'text' => 'Adresse', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => false]],
-        ['key' => 'netzgebietName', 'text' => 'Netzgebiet', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => true]],
-        ['key' => 'companyName', 'text' => 'Firma', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => true]],
-        ['key' => 'wohneinheitCount', 'text' => 'WE', 'modal' => false, 'table' => ['sortable' => false]],
-        ['key' => 'additionalInfo', 'text' => 'Notiz', 'modal' => false, 'table' => ['sortable' => true]],
+        ['key' => 'netzgebietName', 'text' => 'Netzgebiet', 'modal' => false, 'table' => ['filter' => 'select', 'sortable' => false]],
+        ['key' => 'rimoFcpName', 'text' => 'FCP', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => false]],
+        ['key' => 'companyName', 'text' => 'Firma', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => false]],
+        ['key' => 'wohneinheitCount', 'text' => 'WE', 'modal' => false, 'table' => ['sortable' => true, 'filter' => 'numberRange']],
+        ['key' => 'additionalInfo', 'text' => 'Notiz', 'modal' => false, 'table' => ['sortable' => false]],
         ['key' => 'deadlineDate', 'text' => 'Deadline', 'modal' => false, 'table' => ['filter' => 'date', 'sortable' => true]],
         ['key' => 'appointmentDate', 'text' => 'Termin', 'modal' => false, 'table' => ['filter' => 'date', 'sortable' => true]],
     ];
@@ -21,11 +23,49 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
     {
         $hausnummerInfoColIdx = array_search('hausnummerInfo', array_column($this->columns, 'key'));
         array_splice($this->columns, $hausnummerInfoColIdx + 1, 0, [$this->statusColumn]);
+
+        // Handle netOwnerId column - only visible for admins
+        $netOwnerColIdx = array_search('netOwnerId', array_column($this->columns, 'key'));
+        if ($netOwnerColIdx !== false) {
+            if ($this->user->isAdmin()) {
+                $netOwners = Helper::getMphNetworkOwners();
+                $this->columns[$netOwnerColIdx]['table']['filterOptions'] = array_map(fn($o) => ['value' => $o->id, 'text' => $o->company], $netOwners);
+            } else {
+                $this->columns[$netOwnerColIdx]['table'] = false;
+            }
+        }
+
+        // Populate netzgebiet filter options
+        $netzgebietColIdx = array_search('netzgebietName', array_column($this->columns, 'key'));
+        if ($netzgebietColIdx !== false) {
+            $db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME);
+
+            // Apply network ownership filtering
+            $netzgebietFilter = "";
+            if (!$this->user->isAdmin()) {
+                $allowedNetzgebietIds = Helper::getADBNetworksFromUser($this->user);
+                if (!empty($allowedNetzgebietIds)) {
+                    $escapedIds = array_map(fn($id) => $db->escape($id), $allowedNetzgebietIds);
+                    $netzgebietFilter = " AND ng.id IN (" . implode(',', $escapedIds) . ")";
+                }
+            }
+
+            $fronkDbName = FRONKDB_DBNAME;
+            $sql = "SELECT DISTINCT ng.id, ng.name FROM Netzgebiet ng
+                    INNER JOIN Hausnummer hn ON ng.id = hn.netzgebiet_id
+                    INNER JOIN `$fronkDbName`.`WorkorderMph` wm ON wm.hausnummerId = hn.id
+                    WHERE ng.name IS NOT NULL AND ng.name != ''
+                    $netzgebietFilter
+                    ORDER BY ng.name ASC";
+            $result = $db->query($sql);
+            $netzgebiete = $result ? $result->fetch_all(MYSQLI_ASSOC) : [];
+            $this->columns[$netzgebietColIdx]['table']['filterOptions'] = array_map(fn($ng) => ['value' => $ng['id'], 'text' => $ng['name']], $netzgebiete);
+        }
     }
 
     public function indexAction()
     {
-        $this->createWorkordersFromHausnummer();
+        // Note: Workorder creation is now handled by cronjob script: scripts/workorder-mph-create-from-hausnummer.php
         parent::indexAction();
     }
 
@@ -41,6 +81,18 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
 
         $whereClauses = "WHERE 1=1";
 
+        // Apply network ownership filtering (similar to WorkorderAdmin)
+        if (!$this->user->isAdmin()) {
+            $allowedNetzgebietIds = Helper::getADBNetworksFromUser($this->user);
+            if (!empty($allowedNetzgebietIds)) {
+                $escapedIds = array_map(fn($id) => $db->escape($id), $allowedNetzgebietIds);
+                $whereClauses .= " AND hn.netzgebiet_id IN (" . implode(',', $escapedIds) . ")";
+            } else {
+                // User has no networks assigned, show no results
+                $whereClauses .= " AND 1=0";
+            }
+        }
+
         if (empty($filters['status'])) {
             $whereClauses .= " AND w.status NOT IN ('completed', 'cancelled', 'archived')";
         } else {
@@ -48,12 +100,15 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
         }
 
         if (!empty($filters['id'])) $whereClauses .= Helper::generateFilterCondition($filters['id'], 'w.id', true);
+        if (!empty($filters['netOwnerId'])) $whereClauses .= Helper::generateFilterCondition($filters['netOwnerId'], 'n.owner_id');
         if (!empty($filters['hausnummerInfo'])) {
             $searchColumns = "str.name|hn.hausnummer|hn.stiege|plz.plz|ort.name|w.additionalInfo";
             $whereClauses .= Helper::generateFilterCondition($filters['hausnummerInfo'], $searchColumns);
         }
-        if (!empty($filters['netzgebietName'])) $whereClauses .= Helper::generateFilterCondition($filters['netzgebietName'], 'ng.name');
+        if (!empty($filters['netzgebietName'])) $whereClauses .= Helper::generateFilterCondition($filters['netzgebietName'], 'ng.id');
+        if (!empty($filters['rimoFcpName'])) $whereClauses .= Helper::generateFilterCondition($filters['rimoFcpName'], 'hn.rimo_fcp_name');
         if (!empty($filters['companyName'])) $whereClauses .= Helper::generateFilterCondition($filters['companyName'], 'c.name');
+        if (!empty($filters['wohneinheitCount'])) $whereClauses .= Helper::generateFilterCondition($filters['wohneinheitCount'], '(SELECT COUNT(*) FROM `' . $addressDbName . '`.`Wohneinheit` we WHERE we.hausnummer_id = hn.id)', true);
         if (!empty($filters['deadlineDate'])) $whereClauses .= Helper::generateFilterCondition($filters['deadlineDate'], 'w.deadlineDate');
         if (!empty($filters['additionalInfo'])) $whereClauses .= Helper::generateFilterCondition($filters['additionalInfo'], 'w.additionalInfo');
 
@@ -63,7 +118,9 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
                 IFNULL(c.name, 'Nicht zugewiesen') as companyName,
                 CONCAT_WS(' ', str.name, hn.hausnummer, hn.stiege) as hausnummerInfo,
                 str.name as street, hn.hausnummer, hn.stiege, plz.plz, ort.name as city,
-                IFNULL(ng.name, '-') as netzgebietName,
+                ng.id as netzgebietName,
+                n.owner_id as netOwnerId,
+                hn.rimo_fcp_name as rimoFcpName,
                 (SELECT COUNT(*) FROM `$addressDbName`.`Wohneinheit` we WHERE we.hausnummer_id = hn.id) as wohneinheitCount
             FROM `$fronkDbName`.`WorkorderMph` w
             LEFT JOIN `$fronkDbName`.`WorkorderCompany` c ON w.companyId = c.id
@@ -72,12 +129,13 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
             LEFT JOIN `$addressDbName`.`Plz` plz ON hn.plz_id = plz.id
             LEFT JOIN `$addressDbName`.`Ortschaft` ort ON hn.ortschaft_id = ort.id
             LEFT JOIN `$addressDbName`.`Netzgebiet` ng ON hn.netzgebiet_id = ng.id
+            LEFT JOIN `$fronkDbName`.`Network` n ON n.adb_netzgebiet_id = ng.id
             $whereClauses
         ";
 
         $orderBy = "";
         if (!empty($order['key'])) {
-            $sortableColumns = ['id', 'status', 'deadlineDate', 'companyName', 'additionalInfo', 'appointmentDate', 'netzgebietName'];
+            $sortableColumns = ['id', 'status', 'deadlineDate', 'appointmentDate', 'wohneinheitCount'];
             if (in_array($order['key'], $sortableColumns)) {
                 $sortOrder = (strtoupper($order['order']) === 'DESC') ? 'DESC' : 'ASC';
                 $orderBy = " ORDER BY " . $db->escape($order['key']) . " " . $sortOrder;
@@ -95,8 +153,9 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
                      LEFT JOIN `$addressDbName`.`Plz` plz ON hn.plz_id = plz.id
                      LEFT JOIN `$addressDbName`.`Ortschaft` ort ON hn.ortschaft_id = ort.id
                      LEFT JOIN `$addressDbName`.`Netzgebiet` ng ON hn.netzgebiet_id = ng.id
+                     LEFT JOIN `$fronkDbName`.`Network` n ON n.adb_netzgebiet_id = ng.id
                      $whereClauses";
-        $totalCount = $db->query($countSql)->fetch_assoc()['count'];
+        $totalCount = (int)$db->query($countSql)->fetch_assoc()['count'];
 
         // Add pagination
         if ($pagination['per_page'] !== null) {
@@ -109,10 +168,10 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
         self::returnJson([
             'rows' => $rows,
             'pagination' => [
-                'page' => $pagination['page'],
-                'per_page' => $pagination['per_page'],
+                'page' => (int)$pagination['page'],
+                'per_page' => (int)$pagination['per_page'],
                 'total_rows' => $totalCount,
-                'total_pages' => ceil($totalCount / $pagination['per_page']),
+                'total_pages' => (int)ceil($totalCount / $pagination['per_page']),
                 'filtered_available' => $totalCount
             ]
         ]);