diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php index 3d0868573..28a769ae8 100644 --- a/Layout/default/ConstructionConsent/Index.php +++ b/Layout/default/ConstructionConsent/Index.php @@ -99,6 +99,18 @@ $pagination_entity_name = "Zustimmungserklärungen"; +
+ + +
+ + +
+
-
-
- -
+
inspection_electrician) ? "checked='checked'" : ""?> /> diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php index 06d493d33..380427dfc 100644 --- a/Layout/default/Linework/Index.php +++ b/Layout/default/Linework/Index.php @@ -78,7 +78,7 @@ id) ? "selected='selected'" : ""?> - id == 3) ? "selected='selected'" : ""?> + id, ["145","62","56"]) && $status->id == 3) ? "selected='selected'" : ""?> > code?> - name."-t")?> @@ -104,6 +104,15 @@
+
+ + +
+ diff --git a/Layout/default/Patching/Index.php b/Layout/default/Patching/Index.php index 168dfbf56..cef8eb61d 100644 --- a/Layout/default/Patching/Index.php +++ b/Layout/default/Patching/Index.php @@ -1,198 +1,451 @@ getUrl($Mod,"Index"); - $pagination_baseurl_params = ["filter" => $filter]; - $pagination_entity_name = "Patchungen"; - - if(!is_array($filter)) $filter = []; +// --- Configuration --- +$pagination_baseurl = $this->getUrl($Mod,"Index"); +$pagination_baseurl_params = ["filter" => $filter]; // Filters passed via GET +$pagination_entity_name = "Patchungen"; + +// Ensure $filter is always an array +if(!is_array($filter)) { + $filter = []; +} + +// Helper function for safe output (assuming not already handled by framework/template engine) +function e($string) { + return htmlspecialchars($string ?? '', ENT_QUOTES, 'UTF-8'); +} + +$additionalHead = [ + '' +]; + ?> -
-
-
-
-
    -
  1. ">
    2. -
  2. Patchungen
    3. -
-
-

Patchungen

+
+
+
+
    +
  1. ">
    2. +
  2. Patchungen
    3. +
+
+

Patchungen

+
-
- -
-
- -
-
-

Filter

- -
"> -
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- - - - -
-
-
- - ">Filter zurücksetzen -
-
-
- -
-
- - -
-
-

Patchungen

+
- - +
+
+

Filter

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StandortODFAbschluss/Device
NetzgebietPOPKundeStandortPatchposition ODFODF PortTypSplitter / GerätPortGepatchedVon
building->network->name?> - getPop()): ?> - getPop()->name?> - - building->pop->name?> - - order->owner) ? $term->order->owner->customer_number : ""?>
order->owner) ? $term->order->owner->getCompanyOrName() : ""?>		 - building->street?>
- building->zip?> building->city?> - 		value->id) ? $term->workflowitems["ist_schrank"]->value->value_string : $term->workflowitems["schrank"]->value->value_string?> / Einschub: workflowitems["ist_baugruppe"]->value->id) ? $term->workflowitems["ist_baugruppe"]->value->value_string : $term->workflowitems["baugruppe"]->value->value_string?> / Modul: workflowitems["ist_modul"]->value->id) ? $term->workflowitems["ist_modul"]->value->value_string : $term->workflowitems["modul"]->value->value_string?> / Port: workflowitems["ist_ports"]->value->id) ? $term->workflowitems["ist_ports"]->value->value_string : $term->workflowitems["ports"]->value->value_string?>"> - workflowitems["ist_schrank"]->value->id) ? $term->workflowitems["ist_schrank"]->value->value_string : $term->workflowitems["schrank"]->value->value_string?> / - workflowitems["ist_baugruppe"]->value->id) ? $term->workflowitems["ist_baugruppe"]->value->value_string : $term->workflowitems["baugruppe"]->value->value_string?> / - workflowitems["ist_modul"]->value->id) ? $term->workflowitems["ist_modul"]->value->value_string : $term->workflowitems["modul"]->value->value_string?> / - workflowitems["ist_ports"]->value->id) ? $term->workflowitems["ist_ports"]->value->value_string : $term->workflowitems["ports"]->value->value_string?> - - - - - patching->patched == 1) ? "checked='checked'" : ""?> />patching->patched == 1 && $term->patching->patched_by) ? "title='Gepatched: ".date("d.m.Y H:i",$term->patching->patched_date)." von ".$term->patching->patcher->name." (".$term->patching->patcher->address->getCompanyOrName(true).")'" : ""?>> - - patching->patched == 1 && $term->patching->patched_by): ?> - patching->patcher) ? $term->patching->patcher->getAbbrName() : ""?> - - -
$pagination['start'], "filter" => $filter])?>"> - - -
-
- - - -
+
"> +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+
+ + ">Filter zurücksetzen +
+
+
+ +
+
+
+
+

Patchungen

+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + workflowitems ?? []; + $istSchrankValue = $wfItems["ist_schrank"]->value ?? null; + $schrankValue = $wfItems["schrank"]->value ?? null; + $istBaugruppeValue = $wfItems["ist_baugruppe"]->value ?? null; + $baugruppeValue = $wfItems["baugruppe"]->value ?? null; + $istModulValue = $wfItems["ist_modul"]->value ?? null; + $modulValue = $wfItems["modul"]->value ?? null; + $istPortsValue = $wfItems["ist_ports"]->value ?? null; + $portsValue = $wfItems["ports"]->value ?? null; + + $schrank = ($istSchrankValue && $istSchrankValue->id) ? $istSchrankValue->value_string : ($schrankValue ? $schrankValue->value_string : ''); + $baugruppe = ($istBaugruppeValue && $istBaugruppeValue->id) ? $istBaugruppeValue->value_string : ($baugruppeValue ? $baugruppeValue->value_string : ''); + $modul = ($istModulValue && $istModulValue->id) ? $istModulValue->value_string : ($modulValue ? $modulValue->value_string : ''); + $ports = ($istPortsValue && $istPortsValue->id) ? $istPortsValue->value_string : ($portsValue ? $portsValue->value_string : ''); + + $odfPositionTitle = "Schrank: " . e($schrank) . " / Einschub: " . e($baugruppe) . " / Modul: " . e($modul) . " / Port: " . e($ports); + $odfPositionDisplay = e($schrank) . " / " . e($baugruppe) . " / " . e($modul) . " / " . e($ports); + + // Patched By Info + $patching = $term->patching ?? null; + $patcher = $patching ? ($patching->patcher ?? null) : null; + $patchedByTitle = ''; + $patchedByDisplay = ''; + if ($patching && $patching->patched == 1 && $patching->patched_by && $patcher) { + $patcherName = $patcher->name ?? 'Unbekannt'; + $patcherCompany = $patcher->address ? $patcher->address->getCompanyOrName(true) : 'N/A'; + $patchedDate = date("d.m.Y H:i", $patching->patched_date); + $patchedByTitle = "Gepatched: {$patchedDate} von " . e($patcherName) . " (" . e($patcherCompany) . ")"; + $patchedByDisplay = $patcher->getAbbrName() ?? ''; + } + + // Customer Info + $customer = $term->order->owner ?? null; + $customerNumber = $customer ? $customer->customer_number : ''; + $customerName = $customer ? $customer->getCompanyOrName() : ''; + + // Location Info + $building = $term->building ?? null; + $networkName = $building ? ($building->network->name ?? '') : ''; + $popName = ''; + $termPop = $term->getPop(); // Call potentially expensive method once + if ($termPop) { + $popName = $termPop->name ?? ''; + } elseif ($building && $building->pop) { + $popName = $building->pop->name ?? ''; + } + $street = $building->street ?? ''; + $zip = $building->zip ?? ''; + $city = $building->city ?? ''; + + // Linework Ports + $lineworkPorts = $term->getLineworkportPairs() ?? []; + $currentLineworkPort = $patching ? $patching->linework_ports : null; + + // Device Info + $deviceType = $patching ? $patching->device_type : ''; + $deviceName = $patching ? $patching->device_name : ''; + $devicePort = $patching ? $patching->device_port : ''; + $isPatched = $patching ? ($patching->patched == 1) : false; + ?> + + + + + + + + + + + + + + + + +
StandortODFAbschluss/DeviceAktion
NetzgebietPOP Kunde Standort Patchposition ODF ODF Port Typ Splitter / Gerät Port GepatchedVon Speichern

+
+ + 		+ + + + + + + + /> + > + + +
$pagination['start'] ?? 0, "filter" => $filter]))?>"> + + +
+
+
+ + + + + +
+
- -
- + + + + + + + + \ No newline at end of file diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php index 5edb5e961..6be5849b1 100644 --- a/Layout/default/Pipework/Index.php +++ b/Layout/default/Pipework/Index.php @@ -74,7 +74,7 @@ id) ? "selected='selected'" : ""?> - id == 3) ? "selected='selected'" : ""?> + id, ["145","62","56"]) && $status->id == 3) ? "selected='selected'" : ""?> > code?> - name."-b")?> @@ -91,6 +91,15 @@
+ +
+ + +
@@ -99,7 +108,10 @@
- ">Filter zurücksetzen + ">Filter zurücksetzen + is(["Admin"])) :?> + ">Zur Historie +
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index f3b850395..5682799d2 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -322,8 +322,8 @@ $pagination_entity_name = "Vorbestellungen";
-
- +
+
+
+ + +
+