Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

datatables-std.css für Standard DT erstellt

Browse Source 
datatables-std.js für Standard DT erstellt
zugewiesen an:
Device,Devicetype,Devicemanufactor,Pop,Filestore

Pop Detail Ansicht erstellt
Filestore auf DT umgebaut

Bugfixing:
* Bearbeiten aus verschiedenen Ansichten werden nun richtig zurückgeleitet (Devices/Pops)
* Sortierung Devicetype in Devices wurde nun per Arraysort durchgeführt
This commit is contained in:
Spitzer_Daniel
2023-02-20 22:15:36 +01:00
parent 2af021040f
commit 71d9675350
18 changed files with 427 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Layout/default/Device/Form.php
View File

@@ -1,5 +1,13 @@
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
<?php
foreach ($devicetypes as $devicetype) {
$deviceTypes[$devicetype->id]=$devicetype->devicemanufactor->name . " " . $devicetype->name;
}
asort($deviceTypes);
?>
<link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css" rel="stylesheet" type="text/css"/>
<!-- start page title -->
<div class="row">
<div class="col-12">
@@ -14,7 +22,7 @@
</ol>
</div>
<h4 class="page-title">Geräte</h4>
<h4 class="page-title">Devices</h4>
</div>
</div>
</div>
@@ -28,7 +36,7 @@
<h4 class="header-title mb-2"><?= ($device->id) ? "Device bearbeiten" : "Neues Gerät" ?></h4>
<form class="form-horizontal" method="post"
action="<?= self::getUrl("Device", "save") ?>">
action="<?= self::getUrl("Device", "save", ["returnto" => $_GET["returnto"]]) ?>">
<div class="card">
<div class="card-body">
@@ -46,9 +54,9 @@
<label class="col-lg-2 col-form-label" for="devicetype_id">Gerätetyp *</label>
<div class="col-lg-10">
<select class="select2 form-control " name="devicetype_id" id="devicetype_id">
<option></option>
<?php foreach ($devicetypes as $devicetype): ?>
<option value="<?= $devicetype->id ?>" <?= ($device->devicetype_id == $devicetype->id) ? "selected='selected'" : "" ?>><?= ($devicetype->devicemanufactor->name . " " . $devicetype->name) ?></option>
<option>&nbsp;</option>
<?php foreach ($deviceTypes as $key => $devicetype): ?>
<option value="<?= $key ?>" <?= ($device->devicetype_id == $key) ? "selected='selected'" : "" ?>><?= ($devicetype) ?></option>
<?php endforeach; ?>
</select>
</div>
@@ -57,7 +65,7 @@
<label class="col-lg-2 col-form-label" for="pop_id">Pop</label>
<div class="col-lg-10">
<select class="select2 form-control " name="pop_id" id="pop_id">
<option></option>
<option value="0">&nbsp;</option>
<?php foreach ($pops as $pop): ?>
<option value="<?= $pop->id ?>" <?= ($device->pop_id == $pop->id) ? "selected='selected'" : "" ?>><?= ($pop->devicemanufactor->name . " " . $pop->name) ?></option>
<?php endforeach; ?>
@@ -117,7 +125,7 @@
allowClear: true,
placeholder: ""
});
$("#addresstypes").select2();
$(".select2").select2();
// disable mousewheel on a input number field when in focus
$('form').on('focus', 'input[type=number]', function (e) {