Mobile Integration,Pop Multiple Networks,DataTables responsible update,Migrations

Mobile Integration:
* in footer.php js eingefügt damit das mobile Menu funktioniert
* in menu.php bzw. app.css neue Klasse eingefügt mobile-hide um in der mobilen Version Menupünkte zu verstecken

Pop Multiple Networks
* Pops können nun mehrere Netzgebiete haben
* Netzgebiete und Pop ansicht angepasst
* (Script muss ausgeführt werden um die PopNetwork Table vom Bestand zu befüllen)

DataTables responsible update
* Datatables update und responsible addon
* Diverse Anpassungen für Responsible in:
  - Pops, Geräte Hersteller, Geräte Typen, Devices, Benutzer

Migrations
* PopNetwork
* Poprackmodulepatch

Layout/default/Device/Detail.php

@@ -5,6 +5,7 @@
     <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
           type="text/css"/>
     <style>
+
         .card-border {
 
             border-left: 1px solid #428bca;
@@ -180,7 +181,7 @@ if ($devices->power != "0.0") {
             <div class="card">
                 <div class="card-body">
                     <div class="row">
-                        <div class="col-5 card-border">
+                        <div class="col-12 col-lg-5 card-border">
                             <div>
                                 <h4>Allgemeine Informationen </h4>
 
@@ -262,7 +263,7 @@ if ($devices->power != "0.0") {
                         }
                         ?>
 
-                        <div class="col-4 card-border">
+                        <div class="col-12 col-lg-4 card-border">
                             <div>
                                 <h4><?= $StdHeader ?></h4>
                             </div>
@@ -325,7 +326,7 @@ if ($devices->power != "0.0") {
                             }
                             ?>
                         </div>
-                        <div class="col-3 card-border">
+                        <div class="col-12 col-lg-3 card-border">
                             <div class="overflow-auto">
                                 <h4 class="float-left">Config Backups</h4>
                                 <?php if ($devices->devicetype->devicemanufactor->config_backup > count()): ?>
@@ -390,7 +391,7 @@ if ($devices->power != "0.0") {
                     <?php
                     if ($devices->devicetype->olt && TT_MBI_API_ENABLE) :
                         ?>
-                        <button id="olt-info-button" class="btn btn-success">OLT/ONT Infos</button>
+                        <button id="olt-info-button" class="btn btn-success  d-none d-lg-block">OLT/ONT Infos</button>
                         <div class="spinner-big text-info" style="display:none">
                             <i class="fas fa-spinner fa-spin spinner-ico font-24  "></i>
                         </div>
@@ -1062,8 +1063,10 @@ if ($devices->power != "0.0") {
                 var portid = button.closest('table').data('portid');
                 if (typeof customers[button.data('snr')] !== "undefined") {
                     customerid = customers[button.data('snr')]['customer_number'];
-                    if (customers[button.data('snr')]['lastname'] != "") {
+                    if (customers[button.data('snr')]['lastname'] != "" && customers[button.data('snr')]['lastname'] != null) {
                         customername = customerid + " / " + customers[button.data('snr')]['lastname'] + " " + customers[button.data('snr')]['firstname'];
+                    } else if (customers[button.data('snr')]['lastname'] == null) {
+                        customername = customers[button.data('snr')]['street'] + ", " + customers[button.data('snr')]['zip'] + " " + customers[button.data('snr')]['city'];
                     } else {
                         customername = customerid + " / " + customers[button.data('snr')]['company'] + " (C)";
                     }
@@ -1083,6 +1086,7 @@ if ($devices->power != "0.0") {
                 $('#ont-detail-refresh').data('portid', button.data('portid'));
                 $('#ont-detail-refresh').data('port', button.data('port'));
                 $('#ont-detail-refresh').data('ontid', button.data('ontid'));
+                $('#ont-detail-refresh').data('snr', button.data('snr'));
                 $('#ont-detail-mac-refresh').data('snr', button.data('snr'));
                 $('#ont-detail-mac-refresh').data('portid', button.data('portid'));
                 $('#ont-detail-mac-refresh').data('port', button.data('port'));
@@ -1179,8 +1183,10 @@ if ($devices->power != "0.0") {
                 var portid = button.closest('table').data('portid');
                 if (typeof customers[button.data('snr')] !== "undefined") {
                     customerid = customers[button.data('snr')]['customer_number'];
-                    if (customers[button.data('snr')]['lastname'] != "") {
+                    if (customers[button.data('snr')]['lastname'] != "" && customers[button.data('snr')]['lastname'] != null) {
                         customername = customerid + " / " + customers[button.data('snr')]['lastname'] + " " + customers[button.data('snr')]['firstname'];
+                    } else if (customers[button.data('snr')]['lastname'] == null) {
+                        customername = customers[button.data('snr')]['street'] + ", " + customers[button.data('snr')]['zip'] + " " + customers[button.data('snr')]['city'];
                     } else {
                         customername = customerid + " / " + customers[button.data('snr')]['company'] + " (C)";
                     }

Layout/default/Device/Form.php

@@ -21,8 +21,11 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "device-detail") {
     $cancelUrl = self::getUrl("Device");
 }
 ?>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
     <link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?= date('U') ?>" rel="stylesheet"
           type="text/css"/>
+
     <!-- start page title -->
     <div class="row">
         <div class="col-12">

Layout/default/Device/Index.php

@@ -7,9 +7,8 @@ $pagination_entity_name = "Device";
     <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
           type="text/css"/>
     <style>
-        table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) {
-            padding-right: 1.5rem;
-        }
+
+
     </style>
     <!-- start page title -->
     <div class="row">
@@ -36,20 +35,21 @@ $pagination_entity_name = "Device";
                     <div class="float-left">
                         <h4 class="header-title">Liste aller Devices</h4>
                     </div>
-                    <div class="float-right">
+                    <div class="float-right ">
                         <a class="btn btn-primary mb-2" href="<?= self::getUrl("Device", "add") ?>"><i
-                                    class="fas fa-plus"></i> Neues Device anlegen</a>
+                                    class="fas fa-plus"></i><span
+                                    class="d-none d-lg-inline"> Neues Device anlegen</span></a>
                     </div>
                 </div>
             </div>
             <table id="datatable" class="table table-striped table-hover table-sm font-13">
                 <thead>
                 <tr>
-                    <th style="min-width: 250px;">Device Name</th>
-                    <th class="text-center">Geräte Typ</th>
-                    <th class="text-center">Hersteller</th>
-                    <th class="text-center">Pop/Adresse</th>
-                    <th class="text-center">IP-Adresse</th>
+                    <th class="all">Device Name</th>
+                    <th class="text-center ">Geräte Typ</th>
+                    <th class="text-center ">Hersteller</th>
+                    <th class="text-center ">Pop/Adresse</th>
+                    <th class="text-center all">IP-Adresse</th>
                     <th class="text-center">Mac-Adresse</th>
                     <th class="text-center">Seriennummer</th>
                     <th class="text-center">Preis</th>
@@ -112,8 +112,9 @@ $pagination_entity_name = "Device";
                     ?>
 
                     <tr>
-                        <td>
-                            <a href="<?= self::getUrl("Device", "Detail", ["id" => $device->id]) ?>"><?= $device->name ?></a>
+                        <td class="text-nowrap">
+                            <a class=" text-nowrap"
+                               href="<?= self::getUrl("Device", "Detail", ["id" => $device->id]) ?>"><?= $device->name ?></a>
                         </td>
                         <td class="text-center"><?= $device->devicetype->name ?></td>
                         <td class="text-center"><?= $device->devicetype->devicemanufactor->name ?></td>

Layout/default/Devicemanufactor/Index.php

@@ -31,7 +31,8 @@ $pagination_entity_name = "Devicemanufactor";
                     </div>
                     <div class="float-right">
                         <a class="btn btn-primary mb-2" href="<?= self::getUrl("Devicemanufactor", "add") ?>"><i
-                                    class="fas fa-plus"></i> Neuen Gerätehersteller anlegen</a>
+                                    class="fas fa-plus"></i><span
+                                    class="d-none d-lg-inline"> Neuen Gerätehersteller anlegen</span></a>
                     </div>
                 </div>
             </div>

Layout/default/Devicetype/Index.php

@@ -4,7 +4,8 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Devicetype";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?=self::getResourcePath()?>assets/css/datatables-std.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -32,14 +33,11 @@ $pagination_entity_name = "Devicetype";
                     </div>
                     <div class="float-right">
                         <a class="btn btn-primary mb-2" href="<?= self::getUrl("Devicetype", "add") ?>"><i
-                                    class="fas fa-plus"></i> Neuen Gerätetyp anlegen</a>
+                                    class="fas fa-plus"></i><span
+                                    class="d-none d-lg-inline"> Neuen Gerätetyp anlegen</span></a>
                     </div>
                 </div>
             </div>
-
-            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination.php"); ?>
-            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination-summary.php"); ?>
-
             <table id="datatable" class="table table-striped table-hover table-sm">
                 <thead>
                 <tr>
@@ -98,15 +96,15 @@ $pagination_entity_name = "Devicetype";
     </div>
 
 
-
     <script type="text/javascript">
-        var hidesearch=[5];
+        var hidesearch = [5];
 
         $(document).ready(function () {
 
         });
     </script>
-    <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js?<?=date('U')?>"></script>
+    <script type="text/javascript"
+            src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
 
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

Layout/default/Network/Index.php

@@ -106,13 +106,13 @@
                                 <th></th>
                               </tr>
                             <?php foreach($network->pops as $pop): ?>
-                              <tr>
-                                <td><?=$pop->name?></td>
-                                <td><?=$pop->gps_lat?>, <?=$pop->gps_long?></td>
-                                <td><?=nl2br($pop->location)?></td>
+                                <tr>
+                                <td><?=$pop->pop->name?></td>
+                                <td><?=$pop->pop->gps_lat?>, <?=$pop->pop->gps_long?></td>
+                                <td><?=nl2br($pop->pop->location)?></td>
                                 <td class="controls" style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                                  <a href="<?=self::getUrl("Pop", "edit", ["id" => $pop->id])?>"><i class="far fa-edit"  title="Bearbeiten"></i></a>
-                                  <a href="<?=self::getUrl("Pop", "delete", ["id" => $pop->id])?>" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
+                                  <a href="<?=self::getUrl("Pop", "edit", ["id" => $pop->pop->id])?>"><i class="far fa-edit"  title="Bearbeiten"></i></a>
+                                  <a href="<?=self::getUrl("Pop", "delete", ["id" => $pop->pop->id])?>" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
                                 </td>
                               </tr>
                             <?php endforeach; ?>

Layout/default/Pop/Detail.php

@@ -1,5 +1,5 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
+<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet" type="text/css"/>
 <style>
     .card-border {
 
@@ -134,18 +134,18 @@ $plugs[3] = "E2000";
 $vlans = "";
 
 if (!empty(trim($pops->vlan_public)))
-    $vlans .= '<span class="order-date-pill active mb-0">Public: <span class="font-weight-500">' . $pops->vlan_public . '</span class="font-weight-500"></span>';
+    $vlans .= '<span class="order-date-pill active mb-0 d-inline-block d-lg-inline">Public: <span class="font-weight-500">' . $pops->vlan_public . '</span class="font-weight-500"></span>';
 if (!empty(trim($pops->vlan_nat)))
-    $vlans .= '<span class="order-date-pill active mb-0">Nat: <span class="font-weight-500">' . $pops->vlan_nat . '</span></span>';
+    $vlans .= '<span class="order-date-pill active mb-0 d-inline-block d-lg-inline">Nat: <span class="font-weight-500">' . $pops->vlan_nat . '</span></span>';
 if (!empty(trim($pops->vlan_ipv6)))
-    $vlans .= '<span class="order-date-pill active mb-0">IPv6: <span class="font-weight-500">' . $pops->vlan_ipv6 . '</span></span>';
+    $vlans .= '<span class="order-date-pill active mb-0 d-inline-block d-lg-inline">IPv6: <span class="font-weight-500">' . $pops->vlan_ipv6 . '</span></span>';
 ?>
 <div class="row">
     <div class="col-12">
         <div class="card">
             <div class="card-body">
                 <div class="row">
-                    <div class="col-5 card-border">
+                    <div class="col-12 col-lg-5 card-border">
                         <div>
                             <h4>Allgemeine Informationen </h4>
 
@@ -154,8 +154,8 @@ if (!empty(trim($pops->vlan_ipv6)))
                             <table class="table table-sm">
                                 <tbody>
                                 <tr>
-                                    <th style="min-width: 250px; width: 300px;">Netzgebiet</th>
-                                    <td><?= $pops->network->name ?> </td>
+                                    <th class="w-30">Netzgebiet</th>
+                                    <td><?= $popnetwork ?> </td>
                                 </tr>
                                 <tr>
                                     <th>Name</th>
@@ -171,15 +171,15 @@ if (!empty(trim($pops->vlan_ipv6)))
                                             , <?= rtrim($pops->gps_long, 0) ?></a></td>
                                 </tr>
                                 <tr>
-                                    <th>Standort Info</th>
+                                    <th class="text-nowrap">Standort Info</th>
                                     <td><?= nl2br($pops->location) ?> </td>
                                 </tr>
                                 <tr>
-                                    <th>Access VLANs</th>
+                                    <th class="text-nowrap">Access VLANs</th>
                                     <td><?= $vlans ?> </td>
                                 </tr>
                                 <tr>
-                                    <th>Interne Notiz</th>
+                                    <th class="text-nowrap">Interne Notiz</th>
                                     <td><?= nl2br($pops->note) ?> </td>
                                 </tr>
 
@@ -189,7 +189,7 @@ if (!empty(trim($pops->vlan_ipv6)))
 
 
                     </div>
-                    <div class="col-7 card-border">
+                    <div class="col-12 col-lg-7 card-border">
                         <div>
                             <h4>Pop Devices</h4>
                         </div>
@@ -197,18 +197,18 @@ if (!empty(trim($pops->vlan_ipv6)))
                         if (!empty($devices)) {
                             ?>
                             <div>
-                                <table id="datatable" class="table table-striped table-hover">
+                                <table id="datatable" class="table table-striped table-hover" style="width: 100%">
                                     <thead>
                                     <tr>
-                                        <th>Geräte Name</th>
-                                        <th class="text-center">Geräte Typ</th>
-                                        <th class="text-center">Hersteller</th>
-                                        <th class="text-center">IP-Adresse</th>
-                                        <th class="text-center">Seriennummer</th>
-                                        <th class="text-center">Preis</th>
+                                        <th class="all">Geräte Name</th>
+                                        <th class="text-center ">Geräte Typ</th>
+                                        <th class="text-center ">Hersteller</th>
+                                        <th class="text-center all">IP-Adresse</th>
+                                        <th class="text-center " >Seriennummer</th>
+                                        <th class="text-center ">Preis</th>
                                         <th title="maximale Leistung" class="text-center text-nowrap">max. P.</th>
                                     </tr>
-                                    <tr id="filterrow">
+                                    <tr id="filterrow" class="d-none d-lg-table-row">
                                         <th></th>
                                         <th></th>
                                         <th></th>
@@ -309,6 +309,15 @@ if (!empty(trim($pops->vlan_ipv6)))
     </div>
 </div>
 <?php if ($popracks) : ?>
+    <div class="modal fade bd-example-modal-xl" tabindex="-1" role="dialog" aria-labelledby="myExtraLargeModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-xl">
+            <div class="modal-content">
+                ...
+            </div>
+        </div>
+    </div>
+
+
     <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">
@@ -498,7 +507,7 @@ if (!empty(trim($pops->vlan_ipv6)))
                                                             $extTextspan = "";
                                                             foreach ($module['slots'] as $slots) {
                                                                 $extText = "";
-                                                                $title=$slots['modulname'];
+                                                                $title = $slots['modulname'];
                                                                 if ($slots['type'] == '0') {
                                                                     $color = '#9fff6e';
                                                                     $colorclass = "rack-color-lwl";
@@ -507,7 +516,7 @@ if (!empty(trim($pops->vlan_ipv6)))
                                                                         $extTextspan = "<span style='font-size: 12px;font-weight: 400'>" . $extText . "</span>";
                                                                     }
                                                                 } else if ($slots['type'] == '1') {
-                                                                    $slots['modulname']='<a style="color: #000000;text-decoration: underline;" target="_self" href="'.self::getUrl("Device", "detail", ["id" => $slots['device_id']]).'">'.$slots['modulname'].'</a>';
+                                                                    $slots['modulname'] = '<a style="color: #000000;text-decoration: underline;" target="_self" href="' . self::getUrl("Device", "detail", ["id" => $slots['device_id']]) . '">' . $slots['modulname'] . '</a>';
                                                                     ?>
                                                                     <script>
                                                                         $("#module-device-id option[value='<?= $slots['device_id'] ?>']").remove();
@@ -605,542 +614,17 @@ if (!empty(trim($pops->vlan_ipv6)))
 <script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/Sortable.js"></script>
 <script type="text/javascript">
     var hidesearch = [5, 6];
-    var trigger;
-    $(document).ready(function () {
-        if ($('#sortracklist').length > 0) {
-            Sortable.create(sortracklist, {
-                handle: '.move-handle',
-                onEnd: function () {
-
-                    var popid = $('#sortracklist').data('popid');
-                    var racksortids = [];
-
-                    $('#sortracklist').find('th').each(function (index, value) {
-
-                        racksortids.push($(this).data('rackid'));
-                    });
-                    $.post("<?= self::getUrl("Poprack", "api", ['do' => 'sortRack']) ?>&pop_id=" + popid, {
-                        racksortids: racksortids
-                    }, function (data) {
-                        if (data.success === true) {
-
-                        }
-                    }, "json");
-
-                }
-
-            });
-        }
-        $('#pop-rack-div').show();
-        $('#rackModal').on('show.bs.modal', function (event) {
-                var thisclick = $(event.relatedTarget);
-                var rackhe = thisclick.closest('table').find('th').data('rackhe');
-                var rackid = thisclick.closest('table').find('th').data('rackid');
-                var rackname = $.trim(thisclick.closest('table').find('th').text());
-                var minhe = 1;
-                var modal = $(this);
-                var edit = 0;
-                modal.find('.alert').text('');
-                modal.find('.alert').hide();
-                if (rackid === undefined) {
-                    $('#rack-name').val('');
-                    $('#rack-he').val('');
-                    var popid = thisclick.data('popid');
-                    $('#rack-add').data('popid', popid);
-                    $('#rack-update').hide();
-                    $('#rack-remove').hide();
-                    $('#rack-add').show();
-                } else {
-                    edit = 1;
-                    $('#rack-remove').hide();
-                    $('#rack-add').hide();
-                    $('#rack-update').show();
-                    $('#rack-he').val(rackhe);
-                    $('#rack-name').val(rackname);
-                    for (let i = 1; i <= rackhe; i++) {
-                        if (!thisclick.closest('table').find('tbody').find('tr').eq(i - 1).find('td').eq(1).hasClass('he-free')) {
-                            minhe = i;
-                        }
-                    }
-                    if (minhe === 1) {
-
-                        $('#rack-remove').data('rackid', rackid);
-                        $('#rack-remove').show();
-                    }
-                    $('#rack-update').data('rackid', rackid);
-                    $('#rack-update').data('rackminhe', minhe);
-                }
-            }
-        )
-        ;
-        $('#rackModuleModal').on('show.bs.modal', function (event) {
-
-            trigger = $(event.relatedTarget);
-            var destinationname = trigger.closest('table').find('th').text();
-            var rackhe = trigger.closest('table').find('th').data('rackhe');
-            var modal = $(this);
-            modal.find('.modal-title').html('<span id="module-info">Modul (' + destinationname + ')</span>');
-            modal.find('.alert').text('');
-            modal.find('.alert').hide();
-            var options;
-            var selected;
-            var hemaxcount = 1;
-            var hemaxcountactive = 1;
-            var edit = 0;
-
-            var parent = trigger.closest('tr');
-            if (trigger.closest('tr').find('td').eq(1).html() === undefined) {
-                edit = 1;
-                parent = trigger.closest('tr').prev();
-                for (let i = 1; i <= rackhe; i++) {
-                    if (parent.find('td').eq(1).html() !== undefined) {
-                        break;
-                    } else {
-                        parent = parent.prev();
-                    }
-                }
-            }
-            if (parent.find('td').eq(1).data('id') || parent.find('td').eq(2).data('id') || parent.find('td').eq(3).data('id') || parent.find('td').eq(4).data('id')) {
-                var counttd = parent.find('td').length - 1;
-                var newmodule = false;
-                if (counttd > 1) {
-                    var options;
-                    for (let i = 1; i <= counttd; i++) {
-                        options = options + '<option value="' + i + '">' + i + '</option>';
-                    }
-                    $('#module-slot').html(options);
-                    $('#module-position').html(options);
-                    $('#module-slot-div').show();
-                }
-                $('#module-width').attr('disabled', 'disabled');
-                $('#he-count-div').html(`<select required="required" id="module-he-count" name="module-he-count" class="form-control" disabled="disabled"><option value="` + parent.find('td').eq(1).attr('rowspan') + `">` + parent.find('td').eq(1).attr('rowspan') + `</option><select>`);
-                $('#he-start-div').html(`<select required="required" id="module-he-start" name="module-he-start" class="form-control" disabled="disabled"><option value="` + parent.find('td').eq(0).data('he') + `">` + parent.find('td').eq(0).data('he') + `</option></select>`);
-                if (parent.find('td').eq(1).data('id') === undefined) {
-                    newmodule = true;
-                }
-                var modwidth = 12 / counttd;
-                $('#module-width').val(modwidth);
-
-                if (!newmodule) {
-                    $('#module-remove').show();
-                    $('#module-update').show();
-                    $('#module-add').hide();
-
-
-                    $('#module-type').val(parent.find('td').eq(1).data('type')).change();
-                    if ($('#module-type').val() == "1") {
-                        $('#module-device-id').hide();
-                        $('#module-device-text').text(parent.find('td').eq(1).data('name'));
-                        $('#module-device-text').show();
-                    }
-                    if (parent.find('td').eq(1).data('ports') != "") {
-                        $('#module-ports').val(parent.find('td').eq(1).data('ports')).change();
-                        $('#module-plug').val(parent.find('td').eq(1).data('plug'));
-                    }
-                    $('#module-type').attr('disabled', 'disabled');
-                    $('#module-name').val(parent.find('td').eq(1).data('name'));
-                    // $('#module-name').attr('disabled', 'disabled');
-
-
-                    $('#module-remove').data('moduleid', parent.find('td').eq(1).data('id'));
-                    $('#module-update').data('moduleid', parent.find('td').eq(1).data('id'));
-                } else {
-                    $('#module-remove').hide();
-                    $('#module-update').hide();
-                    $('#module-add').show();
-                    $('#module-name-div').show();
-                    $('#module-name').removeAttr('disabled');
-                    $('#module-device-div').hide();
-                    $('#module-device-id').show();
-                    $('#module-device-id').attr('disabled', 'disabled');
-                    $('#module-type').val('0').change();
-                    $('#module-type').removeAttr('disabled');
-                    $('#module-plug').removeAttr('disabled');
-                    $('#module-ports').removeAttr('disabled');
-                    $('#module-name').val('');
-                    $('#module-ports').val('48');
-                    $('#module-ports').trigger("change");
-                    $('#module-position-div').hide();
-                    $('#module-update').hide();
-                    $('#module-device-text').hide();
-                }
-            } else {
-                $('#module-remove').hide();
-                $('#module-update').hide();
-                $('#module-add').show();
-                for (let i = 1; i <= rackhe; i++) {
-                    if (i == trigger.data('he')) {
-                        selected = 'selected="selected"';
-                    } else {
-                        selected = '';
-                    }
-                    if (trigger.closest('tbody').find('tr').eq(i - 1).find('td').eq(1).hasClass('he-free')) {
-                        options = options + '<option ' + selected + ' value="' + i + '">' + i + '</option>';
-                    }
-                    if (hemaxcountactive == 1 && i > trigger.data('he') && !trigger.closest('tbody').find('tr').eq(i - 1).find('td').eq(1).hasClass('he-free')) {
-                        hemaxcountactive = 0;
-                    }
-                    if (hemaxcountactive == 1 && i > trigger.data('he') && trigger.closest('tbody').find('tr').eq(i - 1).find('td').eq(1).hasClass('he-free')) {
-                        hemaxcount++;
-                    }
-                }
-                $('#he-start-div').html(`<select required="required" id="module-he-start" name="module-he-start" class="form-control">` + options + `</select>`);
-                options = "";
-                selected = "";
-                for (let i = 1; i <= hemaxcount; i++) {
-                    options = options + '<option ' + selected + ' value="' + i + '">' + i + '</option>';
-                }
-                $('#he-count-div').html(`<select required="required" id="module-he-count" name="module-he-count" class="form-control">` + options + `</select>`);
-                if (edit == 0) {
-                    $('#module-name-div').show();
-                    $('#module-name').removeAttr('disabled');
-                    $('#module-device-div').hide();
-                    $('#module-device-id').attr('disabled', 'disabled');
-                    $('#module-type').val('0').change();
-                    $('#module-type').removeAttr('disabled');
-                    $('#module-width').removeAttr('disabled');
-                    $('#module-plug').removeAttr('disabled');
-                    $('#module-ports').removeAttr('disabled');
-                    $('#module-name').val('');
-                    $('#module-width').val('12');
-                    $('#module-ports').val('48');
-                    $('#module-ports').trigger("change");
-                    $('#module-position').empty();
-                    $('#module-position-div').hide();
-                    $('#module-device-text').hide();
-                    $('#module-device-id').show();
-
-                }
-            }
-        });
-
-        $("body").on("change", "#module-type", function () {
-            if (parseInt($(this).val()) === 1) {
-                $('#module-name-div').hide();
-                $('#module-name').attr('disabled', 'disabled');
-                $('#module-device-div').show();
-
-                $('#module-device-id').removeAttr('disabled');
-                $('#module-ports-div').hide();
-                $('#module-plug-div').hide();
-            } else if (parseInt($(this).val()) === 0) {
-                $('#module-name-div').show();
-                $('#module-name').removeAttr('disabled');
-                $('#module-device-div').hide();
-                $('#module-device-id').attr('disabled', 'disabled');
-                $('#module-ports-div').show();
-                $('#module-plug-div').show();
-            } else {
-                $('#module-name-div').show();
-                $('#module-name').removeAttr('disabled');
-                $('#module-device-div').hide();
-                $('#module-device-id').attr('disabled', 'disabled');
-                $('#module-ports-div').hide();
-                $('#module-plug-div').hide();
-            }
-        });
-
-        $("body").on("change", "#module-he-start", function () {
-            var rackhe = trigger.closest('table').find('th').data('rackhe');
-            var hemaxcount = 1;
-            var hemaxcountactive = 1
-            var options;
-            var selected;
-            for (let i = 1; i <= rackhe; i++) {
-                if (hemaxcountactive == 1 && i > $(this).val() && !trigger.closest('tbody').find('tr').eq(i - 1).find('td').eq(1).hasClass('he-free')) {
-                    hemaxcountactive = 0;
-                }
-
-                if (hemaxcountactive == 1 && i > $(this).val() && trigger.closest('tbody').find('tr').eq(i - 1).find('td').eq(1).hasClass('he-free')) {
-                    hemaxcount++;
-                }
-            }
-            for (let i = 1; i <= hemaxcount; i++) {
-                options = options + '<option ' + selected + ' value="' + i + '">' + i + '</option>';
-            }
-            $('#he-count-div').html(`<select required="required" id="module-he-count" name="module-he-count" class="form-control">` + options + `</select>`);
-        });
-
-        $("body").on("click", "#module-add", function () {
-            var error;
-            var rackid = trigger.closest('table').find('th').data('rackid');
-            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") {
-                error = "Modul Name darf nicht leer sein";
-            }
-            if ($.trim($('#module-type').val()) == "1" && !$.trim($('#module-device-id').val())) {
-                error = "Kein Device ausgewählt";
-            }
-
-
-            if (!error) {
-                $.post("<?= self::getUrl("Poprackmodule", "api", ['do' => 'addModule']) ?>&poprack_id=" + rackid, {
-                    type: $.trim($('#module-type').val()),
-                    device_id: $.trim($('#module-device-id').val()),
-                    name: $.trim($('#module-name').val()),
-                    start_he: $.trim($('#module-he-start').val()),
-                    end_he: endhe,
-                    ports: $.trim($('#module-ports').val()),
-                    plug: $.trim($('#module-plug').val()),
-                    width: $.trim($('#module-width').val()),
-                    position: $.trim($('#module-position').val())
-
-                }, function (data) {
-                    if (data.success === true) {
-                        $('#rackModuleModal').modal('toggle');
-                        $.get("<?= self::getUrl("Poprack", "api", ['do' => 'generateRack']) ?>&id=" + rackid, function (data, status) {
-                            trigger.closest('tbody').html(data);
-                        });
-                    }
-                }, "json");
-            } else {
-                $(this).closest('.modal').find('.alert').text(error);
-                $(this).closest('.modal').find('.alert').show();
-            }
-        });
-        $("body").on("click", "#module-remove", function () {
-            var moduleid = $(this).data('moduleid');
-            var rackid = trigger.closest('table').find('th').data('rackid');
-            if (confirm("Modul entfernen?")) {
-                $.post("<?= self::getUrl("Poprackmodule", "api", ['do' => 'removeModule']) ?>", {
-                    id: moduleid
-                }, function (data) {
-                    if (data.success === true) {
-                        $('#rackModuleModal').modal('toggle');
-                        $.get("<?= self::getUrl("Poprack", "api", ['do' => 'generateRack']) ?>&id=" + rackid, function (data, status) {
-                            trigger.closest('tbody').html(data);
-                        });
-                    }
-                }, "json");
-            }
-        });
-        $("body").on("click", "#module-update", function () {
-            var moduleid = $(this).data('moduleid');
-            var rackid = trigger.closest('table').find('th').data('rackid');
-            var error;
-            if (!$.trim($('#module-name').val())) {
-                error = "Modul Name darf nicht leer sein";
-            }
-            if (!error) {
-                $.post("<?= self::getUrl("Poprackmodule", "api", ['do' => 'updateModule']) ?>", {
-                    id: moduleid,
-                    name: $.trim($('#module-name').val()),
-                    ports: $.trim($('#module-ports').val()),
-                    plug: $.trim($('#module-plug').val())
-                }, function (data) {
-                    if (data.success === true) {
-                        $('#rackModuleModal').modal('toggle');
-                        $.get("<?= self::getUrl("Poprack", "api", ['do' => 'generateRack']) ?>&id=" + rackid, function (data, status) {
-                            trigger.closest('tbody').html(data);
-                        });
-                    }
-                }, "json");
-            } else {
-                $(this).closest('.modal').find('.alert').text(error);
-                $(this).closest('.modal').find('.alert').show();
-            }
-        });
-
-        $("body").on("click", "#rack-update", function () {
-            var rackid = $(this).data('rackid');
-            var rackmin = $(this).data('rackminhe');
-            var error;
-
-            if ($('#rack-he').val() < rackmin) {
-                error = "Minimale Höheneinheiten: " + rackmin;
-            }
-            if ($('#rack-he').val() > 60) {
-                error = "Maximale Höheneinheiten: 60";
-            }
-
-            if (!$.isNumeric($('#rack-he').val())) {
-                error = "Bitte Zahl bei Höheneinheiten eingeben";
-            }
-
-            if (!$.trim($('#rack-he').val())) {
-                error = "Höheneinheiten darf nicht leer sein";
-            }
-            if (!$.trim($('#rack-name').val())) {
-                error = "Schrank Name darf nicht leer sein";
-            }
-            if (!error) {
-                $.post("<?= self::getUrl("Poprack", "api", ['do' => 'editRack']) ?>&poprack_id=" + rackid, {
-                    name: $.trim($('#rack-name').val()),
-                    he: $.trim($('#rack-he').val())
-
-                }, function (data) {
-                    if (data.success === true) {
-                        $('#rackModal').modal('toggle');
-                        location.reload();
-                    }
-                }, "json");
-            } else {
-                $(this).closest('.modal').find('.alert').text(error);
-                $(this).closest('.modal').find('.alert').show();
-            }
-        });
-        $("body").on("click", "#rack-add", function () {
-            var popid = $(this).data('popid');
-            var error;
-
-            if ($('#rack-he').val() < 1) {
-                error = "Minimale Höheneinheiten: " + 1;
-            }
-            if ($('#rack-he').val() > 60) {
-                error = error = "Maximale Höheneinheiten: 60";
-            }
-
-            if (!$.isNumeric($('#rack-he').val())) {
-                error = "Bitte Zahl bei Höheneinheiten eingeben";
-            }
-
-            if (!$.trim($('#rack-he').val())) {
-                error = "Höheneinheiten darf nicht leer sein";
-            }
-            if (!$.trim($('#rack-name').val())) {
-                error = "Schrank Name darf nicht leer sein";
-            }
-            if (!error) {
-                $.post("<?= self::getUrl("Poprack", "api", ['do' => 'addRack']) ?>&pop_id=" + popid, {
-                    name: $.trim($('#rack-name').val()),
-                    he: $.trim($('#rack-he').val())
-
-                }, function (data) {
-                    if (data.success === true) {
-                        $('#rackModal').modal('toggle');
-                        location.reload();
-                    }
-                }, "json");
-            } else {
-                $(this).closest('.modal').find('.alert').text(error);
-                $(this).closest('.modal').find('.alert').show();
-            }
-        });
-
-        $("body").on("click", "#rack-remove", function () {
-            var rackid = $(this).data('rackid');
-
-            $.post("<?= self::getUrl("Poprack", "api", ['do' => 'removeRack']) ?>", {
-                id: rackid
-            }, function (data) {
-                if (data.success === true) {
-                    $('#rackModal').modal('toggle');
-                    location.reload();
-                }
-            }, "json");
-
-        });
-        $("body").on("change", "#module-width", function () {
-            if ($(this).val() == "12") {
-                $('#module-position-div').hide();
-            } else if ($(this).val() == "6") {
-                $('#module-position').html(`<option value="1">1</option>
-                                            <option value="2">2</option>
-`);
-                $('#module-position-div').show();
-            } else if ($(this).val() == "4") {
-                $('#module-position').html(`<option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                  `);
-                $('#module-position-div').show();
-            } else if ($(this).val() == "3") {
-                $('#module-position').html(`<option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                            <option value="4">4</option>
-`);
-                $('#module-position-div').show();
-            }
-        });
-
-
-        $("body").on("change", "#module-ports", function () {
-            var plugs = [];
-            if ($(this).find(':selected').data('plugs') !== undefined) {
-                plugs = $(this).find(':selected').data('plugs').split(';');
-                $("#module-plug option").each(function () {
-                    if (plugs.includes($(this).val())) {
-                        $(this).show();
-                    } else {
-                        if ($(this).val() == $('#module-plug').val()) {
-                            $('#module-plug').val(plugs[0]);
-                        }
-                        $(this).hide();
-                    }
-                });
-            }
-        });
-
-        $("body").on("change", "#module-slot", function () {
-            $('#module-position').val($(this).val());
-            var parent = trigger.closest('tr');
-            if (trigger.closest('tr').find('td').eq(1).html() === undefined) {
-                parent = trigger.closest('tr').prev();
-                for (let i = 1; i <= rackhe; i++) {
-                    if (parent.find('td').eq(1).html() !== undefined) {
-                        break;
-                    } else {
-                        parent = parent.prev();
-                    }
-                }
-            }
-            var newmodule = false;
-            var tdnumber = parseInt($(this).val())
-            if (parent.find('td').eq(tdnumber).data('id') === undefined) {
-                newmodule = true;
-            }
-            if (!newmodule) {
-                $('#module-remove').show();
-                $('#module-update').show();
-                $('#module-add').hide();
-
-
-                $('#module-type').val(parent.find('td').eq(tdnumber).data('type')).change();
-                if ($('#module-type').val() == "1") {
-                    $('#module-device-id').hide();
-                    $('#module-device-text').text(parent.find('td').eq(tdnumber).data('name'));
-                    $('#module-device-text').show();
-                }
-                if (parent.find('td').eq(tdnumber).data('ports') != "") {
-                    $('#module-ports').val(parent.find('td').eq(tdnumber).data('ports')).change();
-                    $('#module-plug').val(parent.find('td').eq(tdnumber).data('plug'));
-                }
-                $('#module-type').attr('disabled', 'disabled');
-                $('#module-name').val(parent.find('td').eq(tdnumber).data('name'));
-                // $('#module-name').attr('disabled', 'disabled');
-
-
-                $('#module-remove').data('moduleid', parent.find('td').eq(tdnumber).data('id'));
-                $('#module-update').data('moduleid', parent.find('td').eq(tdnumber).data('id'));
-            } else {
-                $('#module-remove').hide();
-                $('#module-update').hide();
-                $('#module-add').show();
-                $('#module-name-div').show();
-                $('#module-name').removeAttr('disabled');
-                $('#module-device-div').hide();
-                $('#module-device-id').show();
-                $('#module-device-id').attr('disabled', 'disabled');
-                $('#module-type').val('0').change();
-                $('#module-type').removeAttr('disabled');
-                $('#module-plug').removeAttr('disabled');
-                $('#module-ports').removeAttr('disabled');
-                $('#module-name').val('');
-                $('#module-ports').val('48');
-                $('#module-ports').trigger("change");
-                $('#module-position-div').hide();
-                $('#module-update').hide();
-                $('#module-device-text').hide();
-            }
-        });
-
-
-    });
-
+    let trigger;
+    let linkSorTracklist = "<?= self::getUrl("Poprack", "api", ['do' => 'sortRack']) ?>";
+    let linkAddModule = "<?= self::getUrl("Poprackmodule", "api", ['do' => 'addModule']) ?>";
+    let linkRemoveModule = "<?= self::getUrl("Poprackmodule", "api", ['do' => 'removeModule']) ?>";
+    let linkGenerateRack = "<?= self::getUrl("Poprack", "api", ['do' => 'generateRack']) ?>";
+    let linkUpdateModule = "<?= self::getUrl("Poprackmodule", "api", ['do' => 'updateModule']) ?>";
+    let linkEditRack = "<?= self::getUrl("Poprack", "api", ['do' => 'editRack']) ?>";
+    let linkAddRack = "<?= self::getUrl("Poprack", "api", ['do' => 'addRack']) ?>";
+    let linkRemoveRack = "<?= self::getUrl("Poprack", "api", ['do' => 'removeRack']) ?>";
 </script>
+<script type="text/javascript" src="<?= self::getResourcePath() ?>js/pages/pop/detail.js"></script>
 <script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js"></script>
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

Layout/default/Pop/Form.php

@@ -2,17 +2,16 @@
 
 if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
     $cancelUrl = self::getUrl("Pop", "Detail", ["id" => $pop->id]);
-    $cancelText="Pop Detail";
+    $cancelText = "Pop Detail";
 } else if (isset($_GET['returnto'])) {
     $cancelUrl = self::getUrl("Pop");
-    $cancelText="Pops";
-} else
-{
+    $cancelText = "Pops";
+} else {
     $cancelUrl = self::getUrl("Network");
 }
-
 ?>
-
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -31,7 +30,7 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
 
                             <li class="breadcrumb-item"><a
                                         href="<?= $cancelUrl ?>"><?= ucfirst($cancelText) ?>
-                                    </a></li>
+                                </a></li>
                             <?php
                         }
                         ?>
@@ -62,10 +61,11 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
                                 <div class="form-group row">
                                     <label class="col-lg-2 col-form-label" for="network_id">Netzgebiet</label>
                                     <div class="col-lg-10">
-                                        <select class="select2 form-control " name="network_id" id="owner_id">
+                                        <select class="select2 form-control " multiple="multiple" name="network_id[]"
+                                                id="owner_id">
                                             <option></option>
                                             <?php foreach ($networks as $network): ?>
-                                                <option value="<?= $network->id ?>" <?= ($pop->network_id == $network->id) ? "selected='selected'" : "" ?>><?= ($network->name) ?></option>
+                                                <option value="<?= $network->id ?>" <?= (in_array($network->id, $popnetwork)) ? "selected='selected'" : "" ?>><?= ($network->name) ?></option>
                                             <?php endforeach; ?>
                                         </select>
                                     </div>
@@ -183,6 +183,7 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
         $('form').on('blur', 'input[type=number]', function (e) {
             $(this).off('wheel.disableScroll')
         });
+        $(".select2").select2();
     </script>
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

Layout/default/Pop/Index.php

@@ -4,7 +4,8 @@ $pagination_baseurl_params = ["filter" => $filter];
 $pagination_entity_name = "Pops";
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
     <!-- start page title -->
     <div class="row">
         <div class="col-12">
@@ -24,7 +25,7 @@ $pagination_entity_name = "Pops";
 
 
     <div class="card">
-        <div class="card-body mb-3">
+        <div class="card-body mb-3  p-1 p-lg-3">
             <div class="row">
                 <div class="col-12">
                     <div class="float-left">
@@ -32,16 +33,12 @@ $pagination_entity_name = "Pops";
                     </div>
                     <div class="float-right">
                         <a class="btn btn-primary mb-2" href="<?= self::getUrl("Pop", "add", ['returnto' => "pop"]) ?>"><i
-                                    class="fas fa-plus"></i> Neuen Pop anlegen</a>
+                                    class="fas fa-plus"></i><span
+                                    class="d-none d-lg-inline"> Neuen Pop anlegen</span></a>
                     </div>
                 </div>
             </div>
-
-
-            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination.php"); ?>
-            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination-summary.php"); ?>
-
-            <table id="datatable" class="table table-striped table-hover table-sm font-13">
+            <table id="datatable" class="table table-striped table-hover table-sm font-13" style="width: 100%">
                 <thead>
                 <tr>
                     <th>Name</th>
@@ -75,9 +72,10 @@ $pagination_entity_name = "Pops";
                     ?>
 
                     <tr>
-                        <td><a href="<?= self::getUrl("Pop", "Detail", ["id" => $pop->id]) ?>"><?= $pop->name ?></a>
+                        <td class="text-nowrap"><a
+                                    href="<?= self::getUrl("Pop", "Detail", ["id" => $pop->id]) ?>"><?= $pop->name ?></a>
                         </td>
-                        <td><?= $pop->network->name ?></td>
+                        <td><?= $pop->networks ?></td>
                         <td><?= $pop->location ?></td>
                         <td class="text-center"><?= trim($vlans) ?></td>
                         <td class="text-center"><a
@@ -109,7 +107,7 @@ $pagination_entity_name = "Pops";
     </div>
     </div>
 
-
+    <script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
     <script type="text/javascript">
 
         function toggleBuilding(id) {

Layout/default/User/Index.php

@@ -105,7 +105,7 @@ $pagination_entity_name = "Benutzer";
                                 }
                                 ?>
                                 <tr>
-                                    <td><?= $user->username ?></td>
+                                    <td class="text-nowrap"><?= $user->username ?></td>
                                     <td><?= $user->name ?></td>
                                     <td><?= ($user->address->company) ? $user->address->company : $user->address->getFullName() ?></td>
                                     <td><?= $user->email ?></td>
@@ -121,7 +121,7 @@ $pagination_entity_name = "Benutzer";
                                             <a href="<?= self::getUrl("User", "delete", ['id' => $user->id]) ?>"
                                                class="text-danger" title="User löschen"
                                                onclick="if(!confirm('Benutzer wirklich löschen?')) return false;"><i
-                                                        class="far fa-trash-alt"></i></a>
+                                                        class="fas fa-trash"></i></a>
                                         <?php endif; ?>
                                     </td>
                                 </tr>

Layout/default/UserProfile/Form.php

@@ -1,4 +1,6 @@
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
     <!-- start page title -->
     <style>
 
@@ -8,6 +10,11 @@
             font-size: 16px;
             margin-left: 5px;
         }
+
+        .alert {
+            margin-bottom: 0px;
+        }
+
     </style>
     <div class="row">
         <div class="col-12">
@@ -67,9 +74,11 @@ if ($twofa == 0) {
                                                value="<?= $userprofile->email ?>" <?php if ($twofa == 1) : ?> disabled="disabled" <?php endif; ?> />
                                     </div>
                                     <?php if ($twofa == 1) : ?>
-                                        <div class="col-lg-4  col-form-label">
+                                        <div class="col-lg-4 ">
 
-                                            <span class="info-span alert alert-info"> Um die Email Adresse zu ändern bitte 2FA auf SMS umschalten.</span>
+                                            <div class="info-span alert alert-info"> Um die Email Adresse zu ändern
+                                                bitte 2FA auf SMS umschalten.
+                                            </div>
                                         </div>
                                     <?php endif; ?>
 
@@ -84,7 +93,7 @@ if ($twofa == 0) {
                                                value="<?= $userprofile->mobile ?>" <?php if ($twofa == 2) : ?> disabled="disabled" <?php endif; ?>/>
                                     </div>
                                     <?php if ($twofa == 2) : ?>
-                                        <div class="col-lg-4  col-form-label">
+                                        <div class="col-lg-4 ">
                                             <span class="info-span alert alert-info"> Um die Mobilnummer zu ändern bitte 2FA auf Email umschalten.</span>
                                         </div>
                                     <?php endif; ?>

Layout/default/UserProfile/Index.php

@@ -1,29 +1,8 @@
 <?php
-
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
-          type="text/css"/>
+<?php var_dump($userprofile); ?>
     <!-- start page title -->
-    <style>
-        .fa-exclamation-triangle {
-            font-size: 19px;
-            color: red;
-        }
-
-        .fa-new-code {
-            cursor: pointer;
-            color: #007bff;
-            font-size: 16px;
-            margin-left: 5px;
-        }
-
-        .fa-envelope, .fa-mobile-retro {
-            font-size: 25px;
-            vertical-align: sub;
-            margin-right: 5px;
-        }
-    </style>
     <div class="row">
         <div class="col-12">
             <div class="page-title-box">
@@ -31,151 +10,187 @@
                     <ol class="breadcrumb m-0">
                         <li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
                         </li>
+                        <li class="breadcrumb-item active">Gerätetyp</li>
                     </ol>
                 </div>
-                <h4 class="page-title">Benutzerprofil</h4>
+                <h4 class="page-title">Gerätetyp</h4>
             </div>
         </div>
     </div>
-
     <!-- end page title -->
 
-<?php
-if ($userprofile->twofactor == 0) {
-    $twoFactorsym = '<i class="fa fa-exclamation-triangle mr-1"></i>';
-    $twoFactorbtn = '<button class="btn btn-success mb-3 ">Aktivieren</button>';
-    $twoFactortype = '<div class="col-lg-2">
-                        <select class="select2 form-control" name="twofactor" id="twofactor">
-                          <option value="1">Email</option>
-                          <option value="2">SMS</option>
-                      </select></div>';
-    $twoFactorFormaction = "code2faaction";
-} else if ($userprofile->twofactor == 1) {
-    $twoFactorsym = '<i class="fa-regular fa-circle-check mr-1"></i>';
-    $twoFactorbtn = '<button class="btn btn-success mb-3 ">Ändern zu SMS</button>';
-    $twoFactortype = '<label class="col-lg-2 col-form-label"><input type="hidden" name="twofactor" value="2"/><i class="fa-light fa-envelope"></i> Email</label>';
-    $twoFactorFormaction = "change2faaction";
-} else if ($userprofile->twofactor == 2) {
-    $twoFactorsym = '<i class="fa-regular fa-circle-check mr-1"></i>';
-    $twoFactorbtn = '<button class="btn btn-success mb-3 ">Ändern zu Email</button>';
-    $twoFactortype = '<label class="col-lg-2 col-form-label"><input type="hidden" name="twofactor" value="1"/><i class="fa-light fa-mobile-retro"></i> Mobiltelefon (SMS)</label>';
-    $twoFactorFormaction = "change2faaction";
-}
 
-?>
-    <i class="bi bi-exclamation-triangle"></i>
-    <div class="row">
-        <div class="col-lg">
-            <div class="card">
-                <div class="card-body">
-                    <h4 class=" mb-2">Allgemeine Daten</h4>
-                    <div class="form-group row">
-                        <div class="col-lg-2 font-weight-500">Name</div>
-                        <div class="col-lg-10">
-                            <?= $userprofile->name ?>
-                        </div>
+    <div class="card">
+        <div class="card-body mb-3">
+            <div class="row">
+                <div class="col-12">
+                    <div class="float-left">
+                        <h4 class="header-title">Liste aller Gerätetypen</h4>
                     </div>
-                    <div class="form-group row">
-                        <div class="col-lg-2 font-weight-500">Email</div>
-                        <div class="col-lg-10">
-                            <?= $userprofile->email ?>
-                        </div>
+                    <div class="float-right">
+                        <a class="btn btn-primary mb-2" href="<?= self::getUrl("Devicetype", "add") ?>"><i
+                                class="fas fa-plus"></i> Neuen Gerätetyp anlegen</a>
                     </div>
-                    <div class="form-group row">
-                        <div class="col-lg-2 font-weight-500">Mobiltelefon</div>
-                        <div class="col-lg-10">
-                            <?= $userprofile->mobile ?>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <div class="col-lg-10">
-                            <a class="btn btn-primary mb-2"
-                               href="<?= self::getUrl("UserProfile", "edit") ?>">Bearbeiten</a>
-                        </div>
-                    </div>
-                    <div class="w-100 border-bottom"></div>
+                </div>
+            </div>
 
-                    <h4 class=" mb-2 mt-3">Passwort ändern</h4>
-                    <form class="form-horizontal" method="post"
-                          action="<?= self::getUrl("UserProfile", "changepwd") ?>">
-                        <div class="form-group row">
-                            <label class="col-lg-2 col-form-label" for="oldpwd">altes Passwort</label>
-                            <div class="col-lg-2">
-                                <input type="password" class="form-control" name="oldpwd" id="oldpwd"
-                                       value="">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-lg-2 col-form-label" for="newpwd">neues Passwort</label>
-                            <div class="col-lg-2">
-                                <input type="password" class="form-control" name="newpwd" id="newpwd"
-                                       value="">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-lg-2 col-form-label" for="checkpwd">Passwort bestätigen</label>
-                            <div class="col-lg-2">
-                                <input type="password" class="form-control" name="checkpwd" id="checkpwd"
-                                       value="">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <div class="col-lg-10">
-                                <button type="submit" class="btn btn-primary">Speichern</button>
-                            </div>
-                        </div>
-                    </form>
-                    <div class="w-100 border-bottom"></div>
-                    <h4 class="form-group mb-2 mt-3">2FA</h4>
-                    <?php if (!$verification || $verification == 0): ?>
-                        <form class="form-horizontal" method="post"
-                              action="<?= self::getUrl("UserProfile", $twoFactorFormaction) ?>">
-                            <div class="form-group row">
-                                <label class="col-lg-2 col-form-label" for="twofactor"><?= $twoFactorsym ?>
-                                    Zwei-Faktor-Authentifizierung</label>
-                                <?= $twoFactortype ?>
-                                <div class="col-lg-7">
-                                    <?= $twoFactorbtn ?>
+            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination.php"); ?>
+            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination-summary.php"); ?>
+
+            <table id="datatable" class="table table-striped table-hover">
+                <thead>
+                <tr>
+                    <th>Name</th>
+                    <th class="text-center">Hersteller</th>
+                    <th class="text-right">Preis</th>
+                    <th class="text-right">max. Leistung</th>
+                    <th class="text-right">erstellt von</th>
+                    <th class="edit-weight"></th>
+                </tr>
+                <tr id="filterrow">
+                    <th>Name</th>
+                    <th>Hersteller</th>
+                    <th>Preis</th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                </tr>
+
+                <thead>
+
+                <tbody>
+                <?php foreach ($devicetypes as $devicetype): ?>
+
+                    <tr>
+                        <td><?= $devicetype->name ?></td>
+                        <td class="text-center"><?= $devicetype->devicemanufactor->name ?></td>
+
+                        <td class="text-right"><?= $devicetype->price ?> €</td>
+                        <td class="text-right"><?= $devicetype->power ?> Watt</td>
+                        <td class="text-right"><?= $devicetype->creator->name ?>
+                            (<?= date("d.m.Y , H:i", $devicetype->create) ?>)
+                        </td>
+
+                        <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                            <a href="<?= self::getUrl("Devicetype", "edit", ["id" => $devicetype->id]) ?>"><i
+                                    class="far fa-edit" title="Bearbeiten"></i></a>
+                            <a href="<?= self::getUrl("Devicetype", "delete", ["id" => $devicetype->id]) ?>"
+                               onclick="if(!confirm('Gerätetyp wirklich löschen?')) return false;" class="text-danger"
+                               title="Löschen"><i class="fas fa-trash"></i></a>
+                        </td>
+                    </tr>
+
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    </div>
+    </div>
+
+
+
+    <script type="text/javascript">
+        var hidesearch=[5];
+
+        $(document).ready(function () {
+
+        });
+    </script>
+
+
+<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>                  <div class="col-lg-10">
+                                    <a class="btn btn-primary mb-2"
+                                       href="<?= self::getUrl("UserProfile", "edit") ?>">Bearbeiten</a>
                                 </div>
                             </div>
-                        </form>
-                    <?php elseif ($verification == 1 || $verification == 2) :
-                        if ($verification == 1) {
-                            $verificationType = "Email";
-                        } elseif ($verification == 2) {
-                            $verificationType = "SMS";
-                        }
-                        ?>
-                        <form class="form-horizontal" method="post"
-                              action="<?= self::getUrl("UserProfile", "activate2faaction") ?>">
-                            <div class="row">
-                                <div class="col-lg-2"></div>
-                                <label class="col-lg-3 col-form-label"
-                                       style="vertical-align: top;font-size: 15px;color: #000;"> Code wurde
-                                    per <?php echo $verificationType; ?> verschickt (5 Minuten gültig)</label>
+                            <div class="w-100 border-bottom"></div>
 
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-lg-2 col-form-label" for="code">Verifizierungscode: <i
-                                            data-codetype="<?= $verification ?>"
-                                            class="fa-solid fa-arrows-rotate fa-new-code" id="new-authcode"
-                                            title="Neuen Code anfordern."></i></label>
-                                <div class="col-lg-2">
-                                    <input type="number" required min="0" max="99999" class="form-control" name="code"
-                                           id="code"
-                                           value="">
-                                    <input type="hidden" name="twofactor" value="<?php echo $verification; ?>"/>
+                            <h4 class=" mb-2 mt-3">Passwort ändern</h4>
+                            <form class="form-horizontal" method="post"
+                                  action="<?= self::getUrl("UserProfile", "changepwd") ?>">
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="oldpwd">altes Passwort</label>
+                                    <div class="col-lg-2">
+                                        <input type="password" class="form-control" name="oldpwd" id="oldpwd"
+                                               value="">
+                                    </div>
                                 </div>
-                                <div class="col-lg-7">
-                                    <?= $twoFactorbtn ?>
-                                    <a href="<?= self::getUrl("UserProfile") ?>">
-                                        <button type="button" class="btn btn-secondary mb-3">Abbrechen</button>
-                                    </a>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="newpwd">neues Passwort</label>
+                                    <div class="col-lg-2">
+                                        <input type="password" class="form-control" name="newpwd" id="newpwd"
+                                               value="">
+                                    </div>
                                 </div>
-                            </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="checkpwd">Passwort bestätigen</label>
+                                    <div class="col-lg-2">
+                                        <input type="password" class="form-control" name="checkpwd" id="checkpwd"
+                                               value="">
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <div class="col-lg-10">
+                                        <button type="submit" class="btn btn-primary">Speichern</button>
+                                    </div>
+                                </div>
+                            </form>
+                            <div class="w-100 border-bottom"></div>
+                            <h4 class="form-group mb-2 mt-3">2FA</h4>
+                            <?php if (!$verification || $verification == 0): ?>
+                                <form class="form-horizontal" method="post"
+                                      action="<?= self::getUrl("UserProfile", $twoFactorFormaction) ?>">
+                                    <div class="form-group row">
+                                        <label class="col-lg-2 col-form-label" for="twofactor"><?= $twoFactorsym ?>
+                                            Zwei-Faktor-Authentifizierung</label>
+                                        <?= $twoFactortype ?>
+                                        <div class="col-lg-7">
+                                            <?= $twoFactorbtn ?>
+                                        </div>
+                                    </div>
+                                </form>
+                            <?php elseif ($verification == 1 || $verification == 2) :
+                                if ($verification == 1) {
+                                    $verificationType = "Email";
+                                } elseif ($verification == 2) {
+                                    $verificationType = "SMS";
+                                }
+                                ?>
+                                <form class="form-horizontal" method="post"
+                                      action="<?= self::getUrl("UserProfile", "activate2faaction") ?>">
+                                    <div class="row">
+                                        <div class="col-lg-2"></div>
+                                        <label class="col-lg-3 col-form-label"
+                                               style="vertical-align: top;font-size: 15px;color: #000;"> Code wurde
+                                            per <?php echo $verificationType; ?> verschickt (5 Minuten gültig)</label>
 
-                        </form>
-                    <?php endif; ?>
+                                    </div>
+                                    <div class="form-group row">
+                                        <label class="col-lg-2 col-form-label" for="code">Verifizierungscode: <i
+                                                    data-codetype="<?= $verification ?>"
+                                                    class="fa-solid fa-arrows-rotate fa-new-code" id="new-authcode"
+                                                    title="Neuen Code anfordern."></i></label>
+                                        <div class="col-lg-2">
+                                            <input type="number" required min="0" max="99999" class="form-control"
+                                                   name="code"
+                                                   id="code"
+                                                   value="">
+                                            <input type="hidden" name="twofactor" value="<?php echo $verification; ?>"/>
+                                        </div>
+                                        <div class="col-lg-7 check-button">
+                                            <?= $twoFactorbtn ?>
+                                            <a href="<?= self::getUrl("UserProfile") ?>">
+                                                <button type="button" class="btn btn-secondary mb-3">Abbrechen</button>
+                                            </a>
+                                        </div>
+                                    </div>
+
+                                </form>
+                            <?php endif; ?>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

Layout/default/footer.php

@@ -22,6 +22,20 @@
               tickIcon: "check",
               sanitize: false
             });
+            $('.navbar-toggle').on('click', function (event) {
+                console.log('cracy');
+                $(this).toggleClass('open');
+                $('#navigation').slideToggle(400);
+            });
+
+            $('.navigation-menu>li').slice(-2).addClass('last-elements');
+
+            $('.navigation-menu li.has-submenu a[href="#"]').on('click', function (e) {
+                if ($(window).width() < 992) {
+                    e.preventDefault();
+                    $(this).parent('li').toggleClass('open').find('.submenu:first').toggleClass('open');
+                }
+            });
         </script>
     </body>
 </html>

Layout/default/header.php

@@ -19,7 +19,7 @@
         <link href="<?=self::getResourcePath()?>assets/css/bootstrap-select.min.css" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
         <link href="<?=self::getResourcePath()?>plugins/summernote/summernote-bs4.css" rel="stylesheet" type="text/css" />
-        <link href="<?=self::getResourcePath()?>datatables/datatables.min.css" rel="stylesheet" type="text/css" />
+        <link href="<?=self::getResourcePath()?>datatables/datatables.min.css?<?=date('U')?>" rel="stylesheet" type="text/css" />
         
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/jquery.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/libs/select2/select2.full.min.js"></script>
@@ -32,7 +32,7 @@
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/bootstrap-select.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap-autocomplete.min.js"></script>
-        <script type="text/javascript" src="<?=self::getResourcePath()?>datatables/datatables.min.js"></script>
+        <script type="text/javascript" src="<?=self::getResourcePath()?>datatables/datatables.min.js?<?=date('U')?>"></script>
         
         <?php if(MFAPPNAME == "devthetool"): ?>
         <style type="text/css">

Layout/default/menu.php

@@ -38,26 +38,26 @@
             <ul class="submenu">
               <?php if($me->is(["Admin"])): ?>
               <li class="has-sub-submenu font-weight-bold"><a>Betriebsstammdaten</a></li>
-              <li><a href="<?=self::getUrl("Address")?>"><i class="fad fa-fw fa-user text-info"></i> Personen & Firmen</a></li>
-              <li><a href="<?=self::getUrl("Product")?>"><i class="far fa-fw fa-rectangle-list text-info"></i> Produkte</a></li>
-              <li><a href="<?=self::getUrl("Productgroup")?>"><i class="far fa-fw fa-list-tree text-info"></i> Produktgruppen</a></li>
+              <li class="mobile-hide"><a href="<?=self::getUrl("Address")?>"><i class="fad fa-fw fa-user text-info"></i> Personen & Firmen</a></li>
+              <li class="mobile-hide"><a href="<?=self::getUrl("Product")?>"><i class="far fa-fw fa-rectangle-list text-info"></i> Produkte</a></li>
+              <li class="mobile-hide"><a href="<?=self::getUrl("Productgroup")?>"><i class="far fa-fw fa-list-tree text-info"></i> Produktgruppen</a></li>
 
-              <li><a href="<?=self::getUrl("Network")?>"><i class="fad fa-fw fa-network-wired text-info"></i> Netzgebiete</a></li>
+              <li class="mobile-hide"><a href="<?=self::getUrl("Network")?>"><i class="fad fa-fw fa-network-wired text-info"></i> Netzgebiete</a></li>
 
               <li class="has-sub-submenu" ><a href="<?=self::getUrl("Pop")?>"><i class="fad fa-fw fa-house text-info"></i> Pops</a></li>
               <li ><a href="<?=self::getUrl("Devicemanufactor")?>"><i class="fad fa-fw fa-router text-info"></i> Geräte Hersteller</a></li>
               <li><a href="<?=self::getUrl("Devicetype")?>"><i class="fad fa-fw fa-router text-info"></i> Geräte Typen</a></li>
               <li class="has-sub-submenu"><a href="<?=self::getUrl("Device")?>"><i class="fad fa-fw fa-router text-info "></i> Devices</a></li>
                   <li class="has-sub-submenu"><a href="<?=self::getUrl("User")?>"><i class="fad fa-fw fa-users text-info"></i> Benutzer</a></li>
-              <li class="has-sub-submenu font-weight-bold mt-1"><a>Grundstammdaten</a></li>
+              <li class="has-sub-submenu font-weight-bold mt-1  mobile-hide"><a>Grundstammdaten</a></li>
               <?php endif; ?>
               <?php if($me->is(["Admin"]) || ($me->is("netowner") && $me->hasGwrNetworks())): ?>
-              <li><a href="<?=self::getUrl("AddressDB")?>"><i class="fas fa-fw fa-city text-info"></i> GWR / AddressDB</a></li>
+              <li class="mobile-hide"><a href="<?=self::getUrl("AddressDB")?>"><i class="fas fa-fw fa-city text-info "></i> GWR / AddressDB</a></li>
               <?php endif; ?>
               
               <?php if($me->is(["Admin"])): ?>
-              <li><a href="<?=self::getUrl("OpenAccessId")?>"><i class="fad fa-fw fa-link-simple text-info"></i> Open Access IDs</a></li>
-              <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-fw fa-microchip text-info"></i> Technologien</a></li>
+              <li class="mobile-hide"><a href="<?=self::getUrl("OpenAccessId")?>"><i class="fad fa-fw fa-link-simple text-info"></i> Open Access IDs</a></li>
+              <li class="mobile-hide"><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-fw fa-microchip text-info"></i> Technologien</a></li>
               <!--<li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fad fa-gear text-info"></i> ContractConfig</a></li>-->
               <?php endif; ?>
 
@@ -67,7 +67,7 @@
           
           
           <?php if($me->is(["Admin","netowner","lineplanner","pipeplanner","pipeworker","lineworker"])): ?>
-          <li class="has-submenu">
+          <li class="has-submenu mobile-hide">
             <a href="#">
               <i class="fas fa-fw fa-hard-hat"></i>Netzbau <div class="arrow-down"></div>
             </a>
@@ -82,7 +82,7 @@
           <?php endif; ?>
 
           <?php if($me->is(["Admin"]) || $me->can(["Cpeprovisioning", "Cpeshipping"])): ?>
-          <li class="has-submenu">
+          <li class="has-submenu mobile-hide">
             <a href="#">
               <i class="fad fa-fw fa-running"></i>Netzbetrieb <div class="arrow-down"></div>
             </a>
@@ -94,7 +94,7 @@
           <?php endif; ?>
 
           <?php if($me->is(["Admin"]) || $me->can("Voipnumbering")): ?>
-          <li class="has-submenu">
+          <li class="has-submenu mobile-hide">
             <a href="#">
               <i class="fad fa-fw fa-phone"></i>Telefonie <div class="arrow-down"></div>
             </a>
@@ -106,7 +106,7 @@
           <?php endif; ?>
         
           <?php if($me->is(["Admin","netowner","salespartner"]) || $me->can(["Order", "Preorder"])): ?>
-          <li class="has-submenu">
+          <li class="has-submenu mobile-hide">
             <a href="#">
               <i class="fal fa-fw fa-money-bill-wave"></i>Verkauf <div class="arrow-down"></div>
             </a>

Layout/default/mfLogin/Index.php

@@ -31,8 +31,8 @@ if ($requesttype == "2fa" || $requesttype == "false2fa") {
                         <div class="row justify-content-center mb-3 mt-1">
                     
                         <div class="form-check">
-                            <input type="checkbox" value="true" name="Remember" class="form-check-input">
-                            <label class="form-check-label text-bold" for="Remember">
+                            <input type="checkbox" value="true" name="Remember" id="Remember" class="form-check-input">
+                            <label class="form-check-label text-bold noselect" for="Remember">
                             angemeldet bleiben
                             </label>
                        
@@ -87,6 +87,16 @@ if ($requesttype == "2fa" || $requesttype == "false2fa") {
         .cursor-pointer {
             cursor: pointer;
         }
+        .noselect {
+            -webkit-touch-callout: none; /* iOS Safari */
+            -webkit-user-select: none; /* Safari */
+            -khtml-user-select: none; /* Konqueror HTML */
+            -moz-user-select: none; /* Old versions of Firefox */
+            -ms-user-select: none; /* Internet Explorer/Edge */
+            user-select: none; /* Non-prefixed version, currently
+                                  supported by Chrome, Edge, Opera and Firefox */
+            cursor: pointer;
+        }
     </style>
 </head>
 <body class="hold-transition login-page" onload="setFocus()">
@@ -144,6 +154,14 @@ if ($requesttype == "2fa" || $requesttype == "false2fa") {
         document.getElementById('mfUsername').focus();
     }
 
+    $('body').on('click', '.form-check-label', function (event) {
+        if ($('Remember').prop("checked")) {
+            $('Remember').prop("checked", false);
+        } else {
+            $('Remember').prop("checked", true);
+        }
+    });
+
     $('body').on('click', '#new-authcode', function (event) {
         $('#TwofactorCode').remove();
         $('form').submit();