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

Pop Feature Erweiterungen

Browse Source 
* Project 8454 (Erweiterung Felder Status, Speicherort, Dokustand Datum)
* Schrank breite um 1ne Col verbreitert
* neue Migration
This commit is contained in:
Daniel Spitzer
2025-05-11 19:53:31 +02:00
parent 14bcb7b3c2
commit 09aaede76b
6 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Pop/Detail.php
+14 -5
View File
@@ -1,5 +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"/>
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<style>
.card-border {
@@ -178,6 +179,14 @@ if (!empty(trim($pops->vlan_ipv6)))
<th class="text-nowrap">Access VLANs</th>
<td><?= $vlans ?> </td>
</tr>
<tr>
<th class="text-nowrap">Dokustand | Status</th>
<td><?= ($pops->doku_date) ? date("d.m.Y") : '-' ?><span class="ml-2 mr-2">|</span><?= ($pops->state) ? $stateArray[$pops->state] : '-' ?> </td>
</tr>
<tr>
<th class="text-nowrap">Fotospeicherort</th>
<td><?php if ($pops->folder_link): ?> <a href="file://<?= $pops->folder_link ?>"><?= $pops->folder_link ?></a><?php endif; ?></td>
</tr>
<tr>
<th class="text-nowrap">Interne Notiz</th>
<td><?= nl2br($pops->note) ?> </td>
@@ -204,7 +213,7 @@ if (!empty(trim($pops->vlan_ipv6)))
<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 ">Seriennummer</th>
<th class="text-center ">Preis</th>
<th title="maximale Leistung" class="text-center text-nowrap">max. P.</th>
</tr>
@@ -309,7 +318,8 @@ 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 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">
...
@@ -465,10 +475,9 @@ if (!empty(trim($pops->vlan_ipv6)))
<div>
<h4>Schränke </h4>
</div>
<div id="sortracklist" class="row" data-popid="<?= $pops->id ?>">
<?php foreach ($popracks as $poprack) : ?>
<div class="col-lg-2 list-group-item-move">
<div class="col-lg-3 col-12 list-group-item-move mb-3">
<table class="w-100 p-0 font-13"
style="max-width: 100%; box-shadow: 2px 2px 5px 2px rgba(0,0,0,0.31);border-radius: 5px 5px 5px 5px;">
<thead>
Layout/default/Pop/Form.php
+38 -3
View File
@@ -10,9 +10,13 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
$cancelUrl = self::getUrl("Network");
}
?>
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<link href="<?= self::getResourcePath() ?>assets/css/select2-cstm.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<!-- start page title -->
<style>
</style>
<div class="row">
<div class="col-12">
<div class="page-title-box">
@@ -139,6 +143,35 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
<div class="card">
<div class="card-body">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="state">Status</label>
<div class="col-lg-3">
<select class="select2 form-control " name="state"
id="state">
<option value="">&nbsp;</option>
<?php foreach ($stateArray as $key => $value): ?>
<option value="<?= $key ?>" <?= ($key == $pop->state) ? "selected='selected'" : "" ?>><?= $value ?></option>
<?php endforeach; ?>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="note">Dokustand</label>
<div class="col-lg-2">
<input type="date"
min="<?php //($pop->doku_date) ? date("Y-m-d", $pop->doku_date) : "" ?>"
value="<?= ($pop->doku_date) ? date("Y-m-d", $pop->doku_date) : "" ?>"
class="form-control" name="doku_date" id="doku_date">
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="folder_link">Fotospeicherort</label>
<div class="col-lg-4">
<input type="text"
value="<?= ($pop->folder_link) ? : "" ?>"
class="form-control" name="folder_link" id="folder_link">
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="note">Interne Notiz</label>
<div class="col-lg-10">
@@ -146,6 +179,7 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
rows="5"><?= $pop->note ?></textarea>
</div>
</div>
</div>
</div>
@@ -183,7 +217,8 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
$('form').on('blur', 'input[type=number]', function (e) {
$(this).off('wheel.disableScroll')
});
$(".select2").select2();
$(".select2").select2({
});
// network_id // owner_id
@@ -191,7 +226,7 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
const urlParams = new URLSearchParams(window.location.search);
const network_id = urlParams.get('network_id');
if(network_id) {
if (network_id) {
console.log("network_id", network_id);
$("#owner_id").val(network_id).trigger('change');
}