diff --git a/.gitignore b/.gitignore index 1d22cf262..857b1be46 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ Thumbs.db *.bak *.swp +/Layout/default/DeviceDetail/ +/Layout/default/DeviceDetail/ diff --git a/Layout/default/Device/Detail.php b/Layout/default/Device/Detail.php new file mode 100644 index 000000000..3a075c56d --- /dev/null +++ b/Layout/default/Device/Detail.php @@ -0,0 +1,182 @@ + + + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. ">Devices +
    3. +
  3. Devices Detail
    4. +
+
+

Device data->name ?> + $devices->id]) ?>"> + + +

+
+
+
+ +price)) { + $price = $devices->price; +} else { + $price = $devices->devicetype->price; +} +?> +
+
+
+
+
+
+
+

Allgemeine Informationen

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Device Namename ?>
IP-Adresseip ?>
Geräte Typdevicetype->name ?>
Geräte Herstellerdevicetype->devicemanufactor->name ?>
Mac Adressemac ?>
Seriennummerserial ?>
Preis €
Bemerkungcomment) ?>
+
+ + +
+
+
+

Standort Informationen

+
+ pop->name))) { + ?> +
+ + + + + + + + + + + + +
Pop Namepop->name ?>
Adresse + pop->gps_lat, '0') ?> + , pop->gps_long, 0) ?>
+
+ +
Keine Standort Informationen vorhanden
+ + + + +
+
+
+

Config Backups

+
+ +
+ + + + + + + + + + + + + +
Datum/Uhrzeit
+
+ +
Keine Configs vorhanden
+ + +
+
+ +
+ +
+
+
+ + + + + + + \ No newline at end of file diff --git a/Layout/default/Device/Form.php b/Layout/default/Device/Form.php new file mode 100644 index 000000000..fb445a375 --- /dev/null +++ b/Layout/default/Device/Form.php @@ -0,0 +1,133 @@ + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. ">Devices
    3. +
  3. id) ? "bearbeiten" : "Neu" ?>
    4. + +
+
+

Geräte

+
+
+
+ + +
+
+ +
+
+

id) ? "Device bearbeiten" : "Neues Gerät" ?>

+ +
"> +
+
+ + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/Layout/default/Device/Index.php b/Layout/default/Device/Index.php new file mode 100644 index 000000000..93ef0c177 --- /dev/null +++ b/Layout/default/Device/Index.php @@ -0,0 +1,220 @@ +getUrl($Mod, "Index"); +$pagination_baseurl_params = ["filter" => $filter]; +$pagination_entity_name = "Device"; +?> + + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. Devices
    3. +
+
+

Devices

+
+
+
+ + + +
+
+
+
+
+

Liste aller Devices

+
+
+ "> Neues Device anlegen +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + price)) { + $price = $device->price; + } else { + $price = $device->devicetype->price; + } + ?> + + + + + + + + + + + + + + + + + + + + + +
Geräte NameGeräte TypHerstellerPopIP-AdresseMac-AdresseSeriennummerPreismax. Leistung
+ $device->id]) ?>">name ?> + devicetype->name ?>devicetype->devicemanufactor->name ?>pop->name ?>ip ?>mac ?>serial ?> €devicetype->power ?> Watt + $device->id]) ?>"> + $device->id]) ?>" + onclick="if(!confirm('Device wirklich löschen?')) return false;" class="text-danger" + title="Löschen"> + +
+ + + + + +
+
+ + + + + + + + + \ No newline at end of file diff --git a/Layout/default/Devicemanufactor/Form.php b/Layout/default/Devicemanufactor/Form.php new file mode 100644 index 000000000..a524cc9fc --- /dev/null +++ b/Layout/default/Devicemanufactor/Form.php @@ -0,0 +1,84 @@ + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. ">Gerätehersteller
    3. +
  3. id) ? "bearbeiten" : "Neu" ?>
    4. + +
+
+

id) ? "Gerätehersteller bearbeiten" : "Neuer Gerätehersteller" ?>

+
+
+
+ + +
+
+ +
+
+

id) ? "Gerätehersteller bearbeiten" : "Neuer Gerätehersteller" ?>

+ +
"> +
+
+ + + + +
+ +
+ +
+
+ + +
+
+ + +
+ +
+ +
+
+ + +
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/Layout/default/Devicemanufactor/Index.php b/Layout/default/Devicemanufactor/Index.php new file mode 100644 index 000000000..2eb12c5f3 --- /dev/null +++ b/Layout/default/Devicemanufactor/Index.php @@ -0,0 +1,186 @@ +getUrl($Mod, "Index"); +$pagination_baseurl_params = ["filter" => $filter]; +$pagination_entity_name = "Devicemanufactor"; +?> + + + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. Gerätehersteller
    3. +
+
+

Gerätehersteller

+
+
+
+ + + +
+
+
+
+
+

Liste aller Gerätehersteller

+
+
+ "> Neuen Gerätehersteller anlegen +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameErstellt von
name ?>creator->name ?> + (create) ?>) + + $devicemanufactor->id]) ?>"> + $devicemanufactor->id]) ?>" + onclick="if(!confirm('Gerätehersteller wirklich löschen?')) return false;" + class="text-danger" title="Löschen"> +
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/Layout/default/Devicetype/Form.php b/Layout/default/Devicetype/Form.php new file mode 100644 index 000000000..a0924f17f --- /dev/null +++ b/Layout/default/Devicetype/Form.php @@ -0,0 +1,112 @@ + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. ">Gerätetyp
    3. +
  3. id) ? "bearbeiten" : "Neu" ?>
    4. + +
+
+

id) ? "Gerätetyp bearbeiten" : "Neuer Gerätetyp" ?>

+
+
+
+ + +
+
+ +
+
+

id) ? "Gerätetyp bearbeiten" : "Neuer Gerätetyp" ?>

+ +
"> +
+
+ + + + +
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+ + + +
+
+ + +
+ +
+ +
+
+ + +
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/Layout/default/Devicetype/Index.php b/Layout/default/Devicetype/Index.php new file mode 100644 index 000000000..7830f643d --- /dev/null +++ b/Layout/default/Devicetype/Index.php @@ -0,0 +1,202 @@ +getUrl($Mod, "Index"); +$pagination_baseurl_params = ["filter" => $filter]; +$pagination_entity_name = "Devicetype"; +?> + + + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. Gerätetyp
    3. +
+
+

Gerätetyp

+
+
+
+ + + +
+
+
+
+
+

Liste aller Gerätetypen

+
+
+ "> Neuen Gerätetyp anlegen +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameHerstellerPreismax. Leistungerstellt von
NameHerstellerPreis
name ?>devicemanufactor->name ?>price ?> €power ?> Wattcreator->name ?> + (create) ?>) + + $devicetype->id]) ?>"> + $devicetype->id]) ?>" + onclick="if(!confirm('Gerätetyp wirklich löschen?')) return false;" class="text-danger" + title="Löschen"> +
+ + + + + +
+
+ + + + + + + + + \ No newline at end of file diff --git a/Layout/default/Pop/Detail.php b/Layout/default/Pop/Detail.php new file mode 100644 index 000000000..3a075c56d --- /dev/null +++ b/Layout/default/Pop/Detail.php @@ -0,0 +1,182 @@ + + + + + +
+
+
+
+
    +
  1. "> +
    2. +
  2. ">Devices +
    3. +
  3. Devices Detail
    4. +
+
+

Device data->name ?> + $devices->id]) ?>"> + + +

+
+
+
+ +price)) { + $price = $devices->price; +} else { + $price = $devices->devicetype->price; +} +?> +
+
+
+
+
+
+
+

Allgemeine Informationen

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Device Namename ?>
IP-Adresseip ?>
Geräte Typdevicetype->name ?>
Geräte Herstellerdevicetype->devicemanufactor->name ?>
Mac Adressemac ?>
Seriennummerserial ?>
Preis €
Bemerkungcomment) ?>
+
+ + +
+
+
+

Standort Informationen

+
+ pop->name))) { + ?> +
+ + + + + + + + + + + + +
Pop Namepop->name ?>
Adresse + pop->gps_lat, '0') ?> + , pop->gps_long, 0) ?>
+
+ +
Keine Standort Informationen vorhanden
+ + + + +
+
+
+

Config Backups

+
+ +
+ + + + + + + + + + + + + +
Datum/Uhrzeit
+
+ +
Keine Configs vorhanden
+ + +
+
+ +
+ +
+
+
+ + + + + + + \ No newline at end of file diff --git a/Layout/default/Pop/Index.php b/Layout/default/Pop/Index.php index 22163042c..01b475c6f 100644 --- a/Layout/default/Pop/Index.php +++ b/Layout/default/Pop/Index.php @@ -6,6 +6,37 @@ $pagination_entity_name = "Pops"; +
@@ -32,16 +63,17 @@ $pagination_entity_name = "Pops";

Liste aller Pops

- "pop"]) ?>"> Neuen Pop anlegen + "pop"]) ?>"> Neuen Pop anlegen
- - + + - +
+ @@ -49,8 +81,19 @@ $pagination_entity_name = "Pops"; - + + + + + + + + + + + + @@ -58,20 +101,28 @@ $pagination_entity_name = "Pops"; - + +
Name NetgebietVlan Public/Nat Koordinaten
network->name ?> location ?> vlan_public ?> / vlan_nat ?>gps_lat,'0') ?> , gps_long,0) ?>gps_lat, '0') ?> + , gps_long, 0) ?> - $pop->id, 'returnto' => "pop"])?>"> - " class="text-danger" title="Löschen"> + $pop->id, 'returnto' => "pop"]) ?>"> + " class="text-danger" title="Löschen">
- - - + + + @@ -243,6 +294,68 @@ $pagination_entity_name = "Pops"; //refreshMap(); + let table; + $('#filterrow th').each(function (i) { + let title = $('#datatable thead th').eq($(this).index()).text(); + + if ($(this).index() == "5") { + + } else { + $(this).html(''); + } + }); + + table = $('#datatable').DataTable({ + buttons: [ + { + extend: 'excelHtml5', + text: 'XLSX Export', + className: 'btn-success margina' + + } + ], + orderCellsTop: true, + stateSave: true, + "initComplete": function () { + $('#datatable_filter').append(''); + $('#clear_cookie').click(function () { + $('input').val(''); + + table.search('').columns().search('').draw(); + }); + }, + "dom": 'flBrtip' + + }); + + $('#filterrow').on('keyup', 'input', function () { + + table + .column($(this).data('index')) + .search(this.value) + .draw(); + + + }); + var state = table.state.loaded(); + if (state) { + table.columns().eq(0).each(function (colIdx) { + var colSearch = state.columns[colIdx].search; + + if (colSearch.search) { + + + $('#filterrow').find("[data-index='" + colIdx + "']").val(colSearch.search); + + + } + }); + + table.draw(); + } + $(document).ready(function () { + + }); diff --git a/Layout/default/header.php b/Layout/default/header.php index 2a268eb8a..a5645311a 100644 --- a/Layout/default/header.php +++ b/Layout/default/header.php @@ -19,6 +19,7 @@ + @@ -30,6 +31,8 @@ + +