From 0b545ef62a7ddf9cf31a2699ed8a6920ca7d0ce3 Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Sun, 12 Oct 2025 12:10:37 +0200
Subject: [PATCH] Pop Update Features: * Komplettes kabelmanagement auf Rack He
 Modul Basis

---
 Layout/default/Pop/Detail.php                 |  4 +-
 application/Poprack/PoprackModel.php          |  2 +-
 ...2095453_poprackmodule_add_field_status.php | 31 ++++++++++++++
 .../20251012100137_poprackmodulecable.php     | 41 +++++++++++++++++++
 public/js/pages/pop/detail.js                 |  4 +-
 5 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 db/migrations/20251012095453_poprackmodule_add_field_status.php
 create mode 100644 db/migrations/20251012100137_poprackmodulecable.php

diff --git a/Layout/default/Pop/Detail.php b/Layout/default/Pop/Detail.php
index e495e2868..763af59bb 100644
--- a/Layout/default/Pop/Detail.php
+++ b/Layout/default/Pop/Detail.php
@@ -278,7 +278,7 @@ if (!empty(trim($pops->vlan_ipv6)))
 </div>
 <div class="modal fade" id="rackModal" tabindex="-1" role="dialog" aria-labelledby="rackModalLabel"
      aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-dialog  modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="rackModalLabel">Schrank</h5>
@@ -332,7 +332,7 @@ if (!empty(trim($pops->vlan_ipv6)))
 
     <div class="modal fade " id="rackModuleModal" tabindex="-1" role="dialog" aria-labelledby="rackModuleModalLabel"
          aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title" id="rackModuleModalLabel">Modul hinzufügen</h5>
diff --git a/application/Poprack/PoprackModel.php b/application/Poprack/PoprackModel.php
index 54c377522..40f517a6d 100644
--- a/application/Poprack/PoprackModel.php
+++ b/application/Poprack/PoprackModel.php
@@ -75,7 +75,7 @@ class PoprackModel
                     $items[$counter]['rack']['he'] = $data['he'];
                     $modulecounter = 0;
                 }
-                if ($data['modulname']) {
+//                if ($data['modulname']) {
                     if ($data['device_id']) {
                         $items[$counter]['modules'][$data['moduleside']][$data['start_he']]['slots'][$data['moduleid']]['device_id'] = $data['device_id'];
                     }
diff --git a/db/migrations/20251012095453_poprackmodule_add_field_status.php b/db/migrations/20251012095453_poprackmodule_add_field_status.php
new file mode 100644
index 000000000..01d6d4e2f
--- /dev/null
+++ b/db/migrations/20251012095453_poprackmodule_add_field_status.php
@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class PoprackmoduleAddFieldStatus extends AbstractMigration
+{
+    public function up(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $table = $this->table("Poprackmodule");
+            $table->addColumn("status", "enum", ['values' => ['productive', 'planned'],'null' => false,'default' => 'front', "after" => "side"]);
+            $table->update();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+
+    public function down(): void
+    {
+        if($this->getEnvironment() == "thetool") {
+            $this->table("Poprackmodule")->removeColumn("status")->save();
+        }
+        
+        if($this->getEnvironment() == "addressdb") {
+          
+        }
+    }
+}
diff --git a/db/migrations/20251012100137_poprackmodulecable.php b/db/migrations/20251012100137_poprackmodulecable.php
new file mode 100644
index 000000000..81a175057
--- /dev/null
+++ b/db/migrations/20251012100137_poprackmodulecable.php
@@ -0,0 +1,41 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+final class Poprackmodulecable extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $table = $this->table("Poprackmodulecable", ["signed" => true]);
+
+            $table->addColumn("poprackmodule_id", "integer", ["null" => false]);
+            $table->addColumn("cable_name", "", ["null" => false]);
+            $table->addColumn("port_start", "integer", ["null" => false]);
+            $table->addColumn("port_end", "integer", ["null" => false]);
+            $table->addColumn("fiber_start", "integer", ["null" => true]);
+            $table->addColumn("fiber_end", "integer", ["null" => true]);
+            $table->addColumn("description", "text", ["null" => true]);
+            $table->addColumn("create_by", "integer", ["null" => false]);
+            $table->addColumn("edit_by", "integer", ["null" => false]);
+            $table->addColumn("create", "integer", ["null" => false]);
+            $table->addColumn("edit", "integer", ["null" => false]);
+            $table->save();
+        }
+
+        if ($this->getEnvironment() == "addressdb") {
+
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $this->table("Poprackmodulecable")->drop()->save();
+        }
+        if ($this->getEnvironment() == "addressdb") {
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/public/js/pages/pop/detail.js b/public/js/pages/pop/detail.js
index 0c192c305..a7ead299f 100644
--- a/public/js/pages/pop/detail.js
+++ b/public/js/pages/pop/detail.js
@@ -261,7 +261,7 @@ $(document).ready(function () {
         var endhe = parseInt($.trim($('#module-he-start').val())) + parseInt($.trim($('#module-he-count').val())) - 1;
 
 
-        if (!$.trim($('#module-name').val()) && $.trim($('#module-type').val()) != "1") {
+        if (!$.trim($('#module-name').val()) && $.trim($('#module-type').val()) != "1" && $.trim($('#module-type').val()) != "0") {
             error = "Modul Name darf nicht leer sein";
         }
         if ($.trim($('#module-type').val()) == "1" && !$.trim($('#module-device-id').val())) {
@@ -318,7 +318,7 @@ $(document).ready(function () {
         var rackid = trigger.closest('table').find('th').data('rackid');
         var error;
         let side = trigger.closest('tbody').data('side');
-        if (!$.trim($('#module-name').val())) {
+        if (!$.trim($('#module-name').val()) && $.trim($('#module-type').val()) != "1" && $.trim($('#module-type').val()) != "0") {
             error = "Modul Name darf nicht leer sein";
         }
         if (!error) {