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

Merge branch 'devbyspi' into 'master'

Browse Source 
MBI API Config Server-Configuration hinzugefügt.

See merge request fronk/thetool!8
This commit is contained in:
Frank Schubert
2023-04-19 15:56:36 +00:00
parent c5a9e3e9d7 1d394a7852
commit 91b71747d3
18 changed files with 1289 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

803
Layout/default/Cpeprovisioning/Index.php
View File

@@ -1,381 +1,476 @@
<?php
if(!is_array($filter)) $filter = [];
if (!is_array($filter)) $filter = [];
$pagination_baseurl = $this->getUrl($Mod, "Index");
$pagination_baseurl_params = ["filter" => $filter];
$pagination_entity_name = "Zu provisionierende CPEs";
?>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
<!-- start page title -->
<div class="row">
<div class="col-12">
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
<?php echo $cpecounter; ?>
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box">
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item active">CPE Provisioning</li>
</ol>
</div>
<h4 class="page-title">CPE Provisioning</h4>
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
</li>
<li class="breadcrumb-item active">CPE Provisioning</li>
</ol>
</div>
<h4 class="page-title">CPE Provisioning</h4>
</div>
</div>
</div>
<!-- end page title -->
</div>
<!-- end page title -->
<div class="row">
<div class="col-lg-12">
<div class="row">
<div class="col-lg-12">
<div class="card">
<div class="card-body mb-3">
<h4 class="header-title mb-3">Filter</h4>
<form method="get" action="<?=self::getUrl("Cpeprovisioning")?>">
<div class="row">
<div class="col-1">
<label class="form-label" for="filter_network_id">Netzgebiet</label>
<select name="filter[network_id]" id="filter_network_id" class="form-control">
<option></option>
<?php foreach(NetworkModel::getAll() as $fnet): ?>
<option value="<?=$fnet->id?>" <?=($filter['network_id'] == $fnet->id) ? "selected='selected'" : ""?>><?=$fnet->name?></option>
<?php endforeach; ?>
</select>
</div>
<div class="col-2">
<label class="form-label" for="filter_routerconfig_finished">Provisioningstatus</label>
<select name="filter[routerconfig_finished]" id="filter_routerconfig_finished" class="form-control">
<option value="0" <?=($filter['routerconfig_finished'] == 0) ? "selected='selected'" : ""?>>Offen</option>
<option value="1" <?=($filter['routerconfig_finished'] == 1) ? "selected='selected'" : ""?>>Abgeschlossen</option>
</select>
</div>
<div class="col-2">
<label class="form-label" for="filter_hide_delayed_finish">Verzögerte Herstellung</label>
<select name="filter[hide_delayed_finish]" id="filter_hide_delayed_finish" class="form-control">
<option value="0" <?=(array_key_exists("hide_delayed_finish", $filter) &&$filter['hide_delayed_finish'] != 1) ? "selected='selected'" : ""?>>Anzeigen</option>
<option value="1" <?=(!array_key_exists("hide_delayed_finish", $filter) || $filter['hide_delayed_finish'] == 1) ? "selected='selected'" : ""?>>Nicht anzeigen</option>
</select>
</div>
<div class="col-2">
<label class="form-label" for="filter_owner">Kunde</label>
<input type="text" class="form-control" name="filter[owner]" id="filter_owner" value="<?=$filter['owner']?>" />
</div>
</div>
<div class="row mt-2">
<div class="col">
<button type="submit" class="btn btn-primary">Filter anwenden</button>
<a class="btn btn-secondary" href="<?=self::getUrl("Cpeprovisioning")?>">Filter zurücksetzen</a>
</div>
</div>
</form>
</div>
</div>
<div class="card">
<div class="card-body mb-3">
<div class="float-left">
<h4 class="header-title">CPE Provisioning</h4>
</div>
<div class="pagination justify-content-center">
<?php if(count($products)): ?>
Zu provisionierende CPEs 1 bis <?=count($products)?>
<?php else: ?>
Keine zu provisionierende CPEs gefunden
<?php endif; ?>
</div>
<table class="table">
<?php $prov_count = 0; ?>
<?php foreach($products as $product): ?>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> bottom-no-border">
<th>Netzgebiet</th>
<th>Service PIN</th>
<th>Kunde</th>
<th>Produkt</th>
<th>Access Type</th>
<th>VLANs</th>
<th></th>
</tr>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> top-no-border bottom-no-border">
<td class="pb-0">
<?=($product->termination_id) ? $product->termination->building->network->name : $product->order->owner->zip." ".$product->order->owner->city?>
</td>
<td class="text-pink pb-0"><?=$product->order->owner->spin?></td>
<td class="pb-0"><?=$product->order->owner->getCompanyOrName()?></td>
<td class="pb-0"><?=$product->product->name?><?=($product->termination_id) ? " <small class='text-pink'>".$product->termination->code."</small>" : ""?></td>
<td class="pb-0"><?=$product->product->attributes['bras_type']->value?> - Down: <?=$product->product->attributes["bw_down"]->value?> / Up: <?=$product->product->attributes["bw_up"]->value?></td>
<td class="text-monospace pb-0">
<?php if($product->termination_id): ?>
<?php if($product->termination->getPop()->vlan_public): ?>
<label class="order-date-pill active pointer mb-0">
Public: <strong><?=$product->termination->getPop()->vlan_public?></strong>
<input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_public?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->getPop()->vlan_nat): ?>
<label class="order-date-pill active pointer mb-0">
NAT: <strong><?=$product->termination->getPop()->vlan_nat?></strong>
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_nat?>" <?=($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->getPop()->vlan_ipv6): ?>
<label class="order-date-pill active pointer mb-0">
IPv6: <strong><?=$product->termination->getPop()->vlan_ipv6?></strong>
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_ipv6?>" <?=($product->cpeprovisioning->vlan_ipv6) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php else: ?>
<?php if($product->product->attributes['vlan_default_public']->value): ?>
<label class="order-date-pill active pointer mb-0">
Public: <strong><?=$product->product->attributes['vlan_default_public']->value?></strong>
<input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_public']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->product->attributes['vlan_default_nat']->value): ?>
<label class="order-date-pill active pointer mb-0">
NAT: <strong><?=$product->product->attributes['vlan_default_nat']->value?></strong>
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_nat']->value?>" <?=($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->product->attributes['vlan_default_ipv6']->value): ?>
<label class="order-date-pill active pointer mb-0">
IPv6: <strong><?=$product->product->attributes['vlan_default_ipv6']->value?></strong>
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_ipv6']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php endif; ?>
</td>
<td class="pb-0" style="min-width: 180px; font-size: 1.1em;">
<?php
$vot = false;
$vo_termin = false;
$hw = false;
$voip = false;
foreach($product->order->products as $prod) {
if(is_array($prod->product->attributes) && count($prod->product->attributes)) {
if(array_key_exists("hw_only", $prod->product->attributes)) {
if($prod->product->attributes["hw_only"]->value) {
$hw[] = (int)$prod->amount."x ".$prod->product->name;
}
}
if(array_key_exists("voip_chan", $prod->product->attributes)) {
if($prod->product->attributes["voip_chan"]->value) {
$voip = true;
}
}
if(array_key_exists("vot", $prod->product->attributes)) {
if($prod->product->attributes["vot"]->value) {
$vot = true;
}
}
if($product->order->install_date) {
$vo_termin = $product->order->install_date;
}
if($hw && $voip_chan) {
break;
}
}
}
?>
<?=($vot || $vo_termin) ? "<i class='fas fa-tools text-purple mr-2' data-toggletooltip='tooltip' title='Vorortinstallation'></i>" : ""?>
<?=($hw) ? "<a href='#' class='fas fa-shopping-bag text-purple mr-2' onclick='return false;' title='Hardware' data-toggle='popover' data-placement='top' data-content='".implode("<br />",$hw)."' ></a>" : ""?>
<?=($voip) ? "<i class='fas fa-phone text-purple mr-2' data-toggletooltip='tooltip' title='Voice Produkt vorhanden'></i>" : ""?>
<?=($product->order->note) ? "<a href='#' class='fas fa-clipboard-list text-purple' onclick='return false;' data-toggle='popover' data-placement='top' data-content='".str_replace('"', '&#34;', str_replace("\n",'<br />',$product->order->note))."'></a>" : ""?>
</td>
</tr>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> bottom-no-border top-no-border">
<td>
<?php if($product->termination_id && $product->termination->getPop()): ?>
<strong>POP</strong>: <?=$product->termination->getPop()->name?>
<?php endif; ?>
</td>
<td><strong>Telefon:</strong> <?=$product->order->owner->phone?></td>
<td><strong>Email:</strong> <?=$product->order->owner->email?></td>
<td><a target="_blank" href="<?=self::getUrl("Order", "Index", ["id" => $product->order_id, "addJournal" => 1])?>"><i class="fas fa-scroll"></i> Bestelljournal</a></td>
<td colspan="3"></td>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> bottom-no-border">
<td colspan="6">
<form method="post" id="cpeprovform-<?=$product->id?>" action="<?=self::getUrl("Cpeprovisioning", "Save", ["filter" => $filter])?>">
<input type="hidden" name="id" value="<?=$product->cpeprovisioning->id?>" />
<input type="hidden" name="order_id" value="<?=$product->order_id?>" />
<input type="hidden" name="orderproduct_id" value="<?=$product->id?>" />
<input type="hidden" name="termination_id" value="<?=$product->termination_id?>" />
<div class="card-body mb-3">
<h4 class="header-title mb-3">Filter</h4>
<form method="get" action="<?= self::getUrl("Cpeprovisioning") ?>">
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label for="routertype-<?=$product->id?>">Router</label>
<select class="form-control" name="routertype" id="routertype-<?=$product->id?>">
<option></option>
<option value="eigener Router" <?=($product->cpeprovisioning->routertype == "eigener Router") ? "selected='selected'" : ""?>>Eigener Router</option>
<option value="anderes CPE" <?=($product->cpeprovisioning->routertype == "anderes CPE") ? "selected='selected'" : ""?>>Anderes CPE</option>
<?php if(preg_match('/^(pppoe|dhcp)$/', $product->product->attributes['bras_type']->value)): ?>
<option value="TP-Link Archer C80" <?=($product->cpeprovisioning->routertype == "TP-Link Archer C80") ? "selected='selected'" : ""?>>TP-Link Archer C80 (Inet, IPTV)</option>
<option value="FritzBox 4040" <?=($product->cpeprovisioning->routertype == "FritzBox 4040") ? "selected='selected'" : ""?>>FritzBox 4040 (Inet, IPTV)</option>
<option value="FritzBox 7530" <?=($product->cpeprovisioning->routertype == "FritzBox 7530") ? "selected='selected'" : ""?>>FritzBox 7530 (Inet, Phone, IPTV)</option>
<option value="FritzBox 7590" <?=($product->cpeprovisioning->routertype == "FritzBox 7590") ? "selected='selected'" : ""?>>FritzBox 7590 (Inet, Phone, IPTV)</option>
<?php elseif($product->product->attributes['bras_type']->value = "static"): ?>
<option value="Mikrotik HAP AC" <?=($product->cpeprovisioning->routertype == "Mikrotik HAP AC") ? "selected='selected'" : ""?>>Mikrotik HAP AC (Inet, IPTV)</option>
<option value="Mikrotik HEX S" <?=($product->cpeprovisioning->routertype == "Mikrotik HEX S") ? "selected='selected'" : ""?>>Mikrotik HEX S (Inet, IPTV)</option>
<option value="Mikrotik RB3011" <?=($product->cpeprovisioning->routertype == "Mikrotik RB3011") ? "selected='selected'" : ""?>>Mikrotik RB3011 (Inet, IPTV)</option>
<?php elseif($product->product->attributes['bras_type']->value == "cmts"): ?>
<option value="FritzBox 6490 Cable" <?=($product->cpeprovisioning->routertype == "FritzBox 6490 Cable") ? "selected='selected'" : ""?>>FritzBox 6490 Cable (Inet, Phone, IPTV)</option>
<?php endif; ?>
</select>
<div class="col-1">
<label class="form-label" for="filter_network_id">Netzgebiet</label>
<select name="filter[network_id]" id="filter_network_id" class="form-control">
<option></option>
<?php foreach (NetworkModel::getAll() as $fnet): ?>
<option value="<?= $fnet->id ?>" <?= ($filter['network_id'] == $fnet->id) ? "selected='selected'" : "" ?>><?= $fnet->name ?></option>
<?php endforeach; ?>
</select>
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="wifi_ssid-<?=$product->id?>">WLAN SSID</label>
<input class="form-control" type="text" name="wifi_ssid" id="router_wifi_ssid-<?=$product->id?>" value="<?=$product->cpeprovisioning->wifi_ssid?>" />
<div class="col-2">
<label class="form-label" for="filter_routerconfig_finished">Provisioningstatus</label>
<select name="filter[routerconfig_finished]" id="filter_routerconfig_finished"
class="form-control">
<option value="0" <?= ($filter['routerconfig_finished'] == 0) ? "selected='selected'" : "" ?>>
Offen
</option>
<option value="1" <?= ($filter['routerconfig_finished'] == 1) ? "selected='selected'" : "" ?>>
Abgeschlossen
</option>
</select>
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="wifi_pass-<?=$product->id?>">WPA Key</label>
<input class="form-control" type="text" name="wifi_pass" id="router_wifi_pass-<?=$product->id?>" value="<?=$product->cpeprovisioning->wifi_pass?>" />
<div class="col-2">
<label class="form-label" for="filter_hide_delayed_finish">Verzögerte Herstellung</label>
<select name="filter[hide_delayed_finish]" id="filter_hide_delayed_finish"
class="form-control">
<option value="0" <?= (array_key_exists("hide_delayed_finish", $filter) && $filter['hide_delayed_finish'] != 1) ? "selected='selected'" : "" ?>>
Anzeigen
</option>
<option value="1" <?= (!array_key_exists("hide_delayed_finish", $filter) || $filter['hide_delayed_finish'] == 1) ? "selected='selected'" : "" ?>>
Nicht anzeigen
</option>
</select>
</div>
</div>
<?php if($vot || $vo_termin): ?>
<div class="col-md-5"></div>
<?php else: ?>
<div class="col-md-1">
<div class="form-group text-center">
<label class="form-label" for="shipping-<?=$product->id?>">Versandauftrag</label>
<input class="form-control" type="checkbox" value="1" name="shipping" id="shipping-<?=$product->id?>" <?=($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : ""?> <?=($product->cpeprovisioning->shipping) ? "checked='checked'" : ""?> />
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="ship_weight-<?=$product->id?>">Gewicht</label>
<input class="form-control" type="text" name="ship_weight" id="ship_weight-<?=$product->id?>" value="<?=$product->cpeprovisioning->ship_weight?>" <?=($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : ""?> />
<div class="col-2">
<label class="form-label" for="filter_owner">Kunde</label>
<input type="text" class="form-control" name="filter[owner]" id="filter_owner"
value="<?= $filter['owner'] ?>"/>
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="ship_length-<?=$product->id?>">Länge</label>
<input class="form-control" type="text" name="ship_length" id="ship_length-<?=$product->id?>" value="<?=$product->cpeprovisioning->ship_length?>" <?=($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : ""?> />
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="ship_width-<?=$product->id?>">Breite</label>
<input class="form-control" type="text" name="ship_width" id="ship_width-<?=$product->id?>" value="<?=$product->cpeprovisioning->ship_width?>" <?=($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : ""?> />
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="ship_height-<?=$product->id?>">Höhe</label>
<input class="form-control" type="text" name="ship_height" id="ship_height-<?=$product->id?>" value="<?=$product->cpeprovisioning->ship_height?>" <?=($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : ""?> />
</div>
</div>
<?php endif; ?>
<div class="col-md-1">
<div class="form-group text-center">
<label class="form-label text-success" for="routerconfig_finished-<?=$product->id?>">Routerkonfig <i class="fas fa-check"></i></label>
<input class="form-control" type="checkbox" value="1" name="routerconfig_finished" id="routerconfig_finished-<?=$product->id?>" <?=($product->cpeprovisioning->routerconfig_finished) ? "checked='checked'" : ""?> />
</div>
</div>
</div>
</form>
</td>
<td></td>
</tr>
<tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> top-no-border">
<td colspan="6">
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="form-label" for="mac-<?=$product->id?>">Router MAC Adresse</label>
<input class="form-control" form="cpeprovform-<?=$product->id?>" type="text" name="mac" id="mac-<?=$product->id?>" value="<?=$product->cpeprovisioning->mac?>" />
</div>
</div>
<div class="col-md-2">
<?php if($product->termination_id): ?>
<div class="form-group">
<label class="form-label" for="mac-<?=$product->id?>">ONT montiert / ONT SN</label>
<div class="input-group">
<div class="input-group-prepend">
<?php if($product->termination->getWorkflowValue("ont_deployed", "int")): ?>
<button type="button" class="btn btn-outline-success" disabled="disabled"><i class="fas fa-check"></i></button>
<?php else: ?>
<button type="button" class="btn btn-outline-secondary" disabled="disabled"><i class="fas fa-times"></i></button>
<?php endif; ?>
</div>
<input class="form-control" form="cpeprovform-<?=$product->id?>" type="text" name="ont_sn" id="ont_sn-<?=$product->id?>" value="<?=($product->termination_id) ? $product->termination->getWorkflowValue("ont_sn", "string") : ""?>" />
</div>
<div class="row mt-2">
<div class="col">
<button type="submit" class="btn btn-primary">Filter anwenden</button>
<a class="btn btn-secondary" href="<?= self::getUrl("Cpeprovisioning") ?>">Filter
zurücksetzen</a>
</div>
<?php endif; ?>
</div>
</form>
<div class="col-md-1"></div>
<div class="col-md-4">
<div class="form-group">
<label class="form-label" for="note-<?=$product->id?>">Kommentar</label>
<textarea class="form-control" form="cpeprovform-<?=$product->id?>" name="note" id="note-<?=$product->id?>"><?=htmlentities($product->cpeprovisioning->note)?></textarea>
</div>
</div>
<div class="col-md-1"></div>
<div class="col-md-2">
<div class="form-group">
<label class="form-label">&nbsp;</label>
<button class="form-control btn btn-primary" form="cpeprovform-<?=$product->id?>" type="submit"><i class="fas fa-save"></i> Speichern</button>
</div>
</div>
</div>
</td>
<td></td>
</tr>
<?php $prov_count++ ?>
<?php endforeach; ?>
</table>
<div class="pagination justify-content-center">
<?php if(count($products)): ?>
Zu provisionierende CPEs 1 bis <?=count($products)?>
<?php endif; ?>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function() {
<div class="card">
<div class="card-body mb-3">
<div class="overflow-auto">
<div class="float-left">
<h4 class="header-title">CPE Provisioning</h4>
</div>
</div>
<?php include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination.php"); ?>
<?php include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination-summary.php"); ?>
<div class="pagination justify-content-center">
</div>
<table class="table">
<?php $prov_count = 0; ?>
<?php foreach ($products as $product): ?>
<tr class="<?= ($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd" ?> bottom-no-border">
<th>Netzgebiet</th>
<th>Service PIN</th>
<th>Kunde</th>
<th>Produkt</th>
<th>Access Type</th>
<th>VLANs</th>
<th></th>
</tr>
<tr class="<?= ($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd" ?> top-no-border bottom-no-border">
<td class="pb-0">
<?= ($product->termination_id) ? $product->termination->building->network->name : $product->order->owner->zip . " " . $product->order->owner->city ?>
</td>
<td class="text-pink pb-0"><?= $product->order->owner->spin ?></td>
<td class="pb-0"><?= $product->order->owner->getCompanyOrName() ?></td>
<td class="pb-0"><?= $product->product->name ?><?= ($product->termination_id) ? " <small class='text-pink'>" . $product->termination->code . "</small>" : "" ?></td>
<td class="pb-0"><?= $product->product->attributes['bras_type']->value ?> -
Down: <?= $product->product->attributes["bw_down"]->value ?> /
Up: <?= $product->product->attributes["bw_up"]->value ?></td>
<td class="text-monospace pb-0">
<?php if ($product->termination_id): ?>
<?php if ($product->termination->getPop()->vlan_public): ?>
<label class="order-date-pill active pointer mb-0">
Public: <strong><?= $product->termination->getPop()->vlan_public ?></strong>
<input type="checkbox" name="vlan_public"
form="cpeprovform-<?= $product->id ?>"
value="<?= $product->termination->getPop()->vlan_public ?>" <?= ($product->cpeprovisioning->vlan_public) ? "checked='checked'" : "" ?> />
</label>
<?php endif; ?>
<?php if ($product->termination->getPop()->vlan_nat): ?>
<label class="order-date-pill active pointer mb-0">
NAT: <strong><?= $product->termination->getPop()->vlan_nat ?></strong>
<input type="checkbox" name="vlan_nat"
form="cpeprovform-<?= $product->id ?>"
value="<?= $product->termination->getPop()->vlan_nat ?>" <?= ($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : "" ?> />
</label>
<?php endif; ?>
<?php if ($product->termination->getPop()->vlan_ipv6): ?>
<label class="order-date-pill active pointer mb-0">
IPv6: <strong><?= $product->termination->getPop()->vlan_ipv6 ?></strong>
<input type="checkbox" name="vlan_ipv6"
form="cpeprovform-<?= $product->id ?>"
value="<?= $product->termination->getPop()->vlan_ipv6 ?>" <?= ($product->cpeprovisioning->vlan_ipv6) ? "checked='checked'" : "" ?> />
</label>
<?php endif; ?>
<?php else: ?>
<?php if ($product->product->attributes['vlan_default_public']->value): ?>
<label class="order-date-pill active pointer mb-0">
Public:
<strong><?= $product->product->attributes['vlan_default_public']->value ?></strong>
<input type="checkbox" name="vlan_public"
form="cpeprovform-<?= $product->id ?>"
value="<?= $product->product->attributes['vlan_default_public']->value ?>" <?= ($product->cpeprovisioning->vlan_public) ? "checked='checked'" : "" ?> />
</label>
<?php endif; ?>
<?php if ($product->product->attributes['vlan_default_nat']->value): ?>
<label class="order-date-pill active pointer mb-0">
NAT:
<strong><?= $product->product->attributes['vlan_default_nat']->value ?></strong>
<input type="checkbox" name="vlan_nat"
form="cpeprovform-<?= $product->id ?>"
value="<?= $product->product->attributes['vlan_default_nat']->value ?>" <?= ($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : "" ?> />
</label>
<?php endif; ?>
<?php if ($product->product->attributes['vlan_default_ipv6']->value): ?>
<label class="order-date-pill active pointer mb-0">
IPv6:
<strong><?= $product->product->attributes['vlan_default_ipv6']->value ?></strong>
<input type="checkbox" name="vlan_ipv6"
form="cpeprovform-<?= $product->id ?>"
value="<?= $product->product->attributes['vlan_default_ipv6']->value ?>" <?= ($product->cpeprovisioning->vlan_public) ? "checked='checked'" : "" ?> />
</label>
<?php endif; ?>
<?php endif; ?>
</td>
<td class="pb-0" style="min-width: 180px; font-size: 1.1em;">
<?php
$vot = false;
$vo_termin = false;
$hw = false;
$voip = false;
foreach ($product->order->products as $prod) {
if (is_array($prod->product->attributes) && count($prod->product->attributes)) {
if (array_key_exists("hw_only", $prod->product->attributes)) {
if ($prod->product->attributes["hw_only"]->value) {
$hw[] = (int)$prod->amount . "x " . $prod->product->name;
}
}
if (array_key_exists("voip_chan", $prod->product->attributes)) {
if ($prod->product->attributes["voip_chan"]->value) {
$voip = true;
}
}
if (array_key_exists("vot", $prod->product->attributes)) {
if ($prod->product->attributes["vot"]->value) {
$vot = true;
}
}
if ($product->order->install_date) {
$vo_termin = $product->order->install_date;
}
if ($hw && $voip_chan) {
break;
}
}
}
?>
<?= ($vot || $vo_termin) ? "<i class='fas fa-tools text-purple mr-2' data-toggletooltip='tooltip' title='Vorortinstallation'></i>" : "" ?>
<?= ($hw) ? "<a href='#' class='fas fa-shopping-bag text-purple mr-2' onclick='return false;' title='Hardware' data-toggle='popover' data-placement='top' data-content='" . implode("<br />", $hw) . "' ></a>" : "" ?>
<?= ($voip) ? "<i class='fas fa-phone text-purple mr-2' data-toggletooltip='tooltip' title='Voice Produkt vorhanden'></i>" : "" ?>
<?= ($product->order->note) ? "<a href='#' class='fas fa-clipboard-list text-purple' onclick='return false;' data-toggle='popover' data-placement='top' data-content='" . str_replace('"', '&#34;', str_replace("\n", '<br />', $product->order->note)) . "'></a>" : "" ?>
</td>
</tr>
<tr class="<?= ($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd" ?> bottom-no-border top-no-border">
<td>
<?php if ($product->termination_id && $product->termination->getPop()): ?>
<strong>POP</strong>: <?= $product->termination->getPop()->name ?>
<?php endif; ?>
</td>
<td><strong>Telefon:</strong> <?= $product->order->owner->phone ?></td>
<td><strong>Email:</strong> <?= $product->order->owner->email ?></td>
<td><a target="_blank"
href="<?= self::getUrl("Order", "Index", ["id" => $product->order_id, "addJournal" => 1]) ?>"><i
class="fas fa-scroll"></i> Bestelljournal</a></td>
<td colspan="3"></td>
<tr class="<?= ($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd" ?> bottom-no-border">
<td colspan="6">
<form method="post" id="cpeprovform-<?= $product->id ?>"
action="<?= self::getUrl("Cpeprovisioning", "Save", ["filter" => $filter]) ?>">
<input type="hidden" name="id" value="<?= $product->cpeprovisioning->id ?>"/>
<input type="hidden" name="order_id" value="<?= $product->order_id ?>"/>
<input type="hidden" name="orderproduct_id" value="<?= $product->id ?>"/>
<input type="hidden" name="termination_id" value="<?= $product->termination_id ?>"/>
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label for="routertype-<?= $product->id ?>">Router</label>
<select class="form-control" name="routertype"
id="routertype-<?= $product->id ?>">
<option></option>
<option value="eigener Router" <?= ($product->cpeprovisioning->routertype == "eigener Router") ? "selected='selected'" : "" ?>>
Eigener Router
</option>
<option value="anderes CPE" <?= ($product->cpeprovisioning->routertype == "anderes CPE") ? "selected='selected'" : "" ?>>
Anderes CPE
</option>
<?php if (preg_match('/^(pppoe|dhcp)$/', $product->product->attributes['bras_type']->value)): ?>
<option value="TP-Link Archer C80" <?= ($product->cpeprovisioning->routertype == "TP-Link Archer C80") ? "selected='selected'" : "" ?>>
TP-Link Archer C80 (Inet, IPTV)
</option>
<option value="FritzBox 4040" <?= ($product->cpeprovisioning->routertype == "FritzBox 4040") ? "selected='selected'" : "" ?>>
FritzBox 4040 (Inet, IPTV)
</option>
<option value="FritzBox 7530" <?= ($product->cpeprovisioning->routertype == "FritzBox 7530") ? "selected='selected'" : "" ?>>
FritzBox 7530 (Inet, Phone, IPTV)
</option>
<option value="FritzBox 7590" <?= ($product->cpeprovisioning->routertype == "FritzBox 7590") ? "selected='selected'" : "" ?>>
FritzBox 7590 (Inet, Phone, IPTV)
</option>
<?php elseif ($product->product->attributes['bras_type']->value = "static"): ?>
<option value="Mikrotik HAP AC" <?= ($product->cpeprovisioning->routertype == "Mikrotik HAP AC") ? "selected='selected'" : "" ?>>
Mikrotik HAP AC (Inet, IPTV)
</option>
<option value="Mikrotik HEX S" <?= ($product->cpeprovisioning->routertype == "Mikrotik HEX S") ? "selected='selected'" : "" ?>>
Mikrotik HEX S (Inet, IPTV)
</option>
<option value="Mikrotik RB3011" <?= ($product->cpeprovisioning->routertype == "Mikrotik RB3011") ? "selected='selected'" : "" ?>>
Mikrotik RB3011 (Inet, IPTV)
</option>
<?php elseif ($product->product->attributes['bras_type']->value == "cmts"): ?>
<option value="FritzBox 6490 Cable" <?= ($product->cpeprovisioning->routertype == "FritzBox 6490 Cable") ? "selected='selected'" : "" ?>>
FritzBox 6490 Cable (Inet, Phone, IPTV)
</option>
<?php endif; ?>
</select>
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="wifi_ssid-<?= $product->id ?>">WLAN
SSID</label>
<input class="form-control" type="text" name="wifi_ssid"
id="router_wifi_ssid-<?= $product->id ?>"
value="<?= $product->cpeprovisioning->wifi_ssid ?>"/>
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="wifi_pass-<?= $product->id ?>">WPA
Key</label>
<input class="form-control" type="text" name="wifi_pass"
id="router_wifi_pass-<?= $product->id ?>"
value="<?= $product->cpeprovisioning->wifi_pass ?>"/>
</div>
</div>
<?php if ($vot || $vo_termin): ?>
<div class="col-md-5"></div>
<?php else: ?>
<div class="col-md-1">
<div class="form-group text-center">
<label class="form-label" for="shipping-<?= $product->id ?>">Versandauftrag</label>
<input class="form-control" type="checkbox" value="1"
name="shipping"
id="shipping-<?= $product->id ?>" <?= ($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : "" ?> <?= ($product->cpeprovisioning->shipping) ? "checked='checked'" : "" ?> />
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="ship_weight-<?= $product->id ?>">Gewicht</label>
<input class="form-control" type="text" name="ship_weight"
id="ship_weight-<?= $product->id ?>"
value="<?= $product->cpeprovisioning->ship_weight ?>" <?= ($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : "" ?> />
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="ship_length-<?= $product->id ?>">Länge</label>
<input class="form-control" type="text" name="ship_length"
id="ship_length-<?= $product->id ?>"
value="<?= $product->cpeprovisioning->ship_length ?>" <?= ($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : "" ?> />
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label" for="ship_width-<?= $product->id ?>">Breite</label>
<input class="form-control" type="text" name="ship_width"
id="ship_width-<?= $product->id ?>"
value="<?= $product->cpeprovisioning->ship_width ?>" <?= ($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : "" ?> />
</div>
</div>
<div class="col-md-1">
<div class="form-group">
<label class="form-label"
for="ship_height-<?= $product->id ?>">Höhe</label>
<input class="form-control" type="text" name="ship_height"
id="ship_height-<?= $product->id ?>"
value="<?= $product->cpeprovisioning->ship_height ?>" <?= ($vot) ? "disabled='disabled' title='Vorortinstallation bestellt'" : "" ?> />
</div>
</div>
<?php endif; ?>
<div class="col-md-1">
<div class="form-group text-center">
<label class="form-label text-success"
for="routerconfig_finished-<?= $product->id ?>">Routerkonfig <i
class="fas fa-check"></i></label>
<input class="form-control" type="checkbox" value="1"
name="routerconfig_finished"
id="routerconfig_finished-<?= $product->id ?>" <?= ($product->cpeprovisioning->routerconfig_finished) ? "checked='checked'" : "" ?> />
</div>
</div>
</div>
</form>
</td>
<td></td>
</tr>
<tr class="<?= ($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd" ?> top-no-border">
<td colspan="6">
<div class="row">
<div class="col-md-2">
<div class="form-group">
<label class="form-label" for="mac-<?= $product->id ?>">Router MAC
Adresse</label>
<input class="form-control" form="cpeprovform-<?= $product->id ?>"
type="text" name="mac" id="mac-<?= $product->id ?>"
value="<?= $product->cpeprovisioning->mac ?>"/>
</div>
</div>
<div class="col-md-2">
<?php if ($product->termination_id): ?>
<div class="form-group">
<label class="form-label" for="mac-<?= $product->id ?>">ONT montiert /
ONT SN</label>
<div class="input-group">
<div class="input-group-prepend">
<?php if ($product->termination->getWorkflowValue("ont_deployed", "int")): ?>
<button type="button" class="btn btn-outline-success"
disabled="disabled"><i class="fas fa-check"></i>
</button>
<?php else: ?>
<button type="button" class="btn btn-outline-secondary"
disabled="disabled"><i class="fas fa-times"></i>
</button>
<?php endif; ?>
</div>
<input class="form-control" form="cpeprovform-<?= $product->id ?>"
type="text" name="ont_sn" id="ont_sn-<?= $product->id ?>"
value="<?= ($product->termination_id) ? $product->termination->getWorkflowValue("ont_sn", "string") : "" ?>"/>
</div>
</div>
<?php endif; ?>
</div>
<div class="col-md-1"></div>
<div class="col-md-4">
<div class="form-group">
<label class="form-label" for="note-<?= $product->id ?>">Kommentar</label>
<textarea class="form-control" form="cpeprovform-<?= $product->id ?>"
name="note"
id="note-<?= $product->id ?>"><?= htmlentities($product->cpeprovisioning->note) ?></textarea>
</div>
</div>
<div class="col-md-1"></div>
<div class="col-md-2">
<div class="form-group">
<label class="form-label">&nbsp;</label>
<button class="form-control btn btn-primary"
form="cpeprovform-<?= $product->id ?>" type="submit"><i
class="fas fa-save"></i> Speichern
</button>
</div>
</div>
</div>
</td>
<td></td>
</tr>
<?php $prov_count++ ?>
<?php endforeach; ?>
</table>
<div class="pagination justify-content-center">
<?php include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination.php"); ?>
</div>
<div class="pagination justify-content-center">
<?php if (count($products)): ?>
<?php include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination-summary.php"); ?>
<?php endif; ?>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function () {
$(function () {
$('[data-toggle="popover"]').popover({html: true})
$('[data-toggle="popover"]').popover({html: true})
})
});
$(function () {
});
$(function () {
$('[data-toggletooltip="tooltip"]').tooltip({html: true})
})
</script>
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
})
</script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

2
Layout/default/Device/Index.php
View File

@@ -127,7 +127,7 @@ $pagination_entity_name = "Device";
<script type="text/javascript">
var hidesearch=[9];
var columndefs={ type: 'ip-address', targets: 4 };
$(document).ready(function () {
});

68
Layout/default/Filestore/Form.php
View File

@@ -8,7 +8,7 @@
<li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
</li>
<li class="breadcrumb-item"><a href="<?= self::getUrl("Filestore") ?>">Dateiablage</a></li>
<li class="breadcrumb-item active"><?= ($building->id) ? "bearbeiten" : "Neu" ?></li>
<li class="breadcrumb-item active"><?= ($file->id) ? "bearbeiten" : "Neu" ?></li>
</ol>
</div>
<h4 class="page-title">Datei</h4>
@@ -16,6 +16,19 @@
</div>
</div>
<!-- end page title -->
<?php
if (!$me->permissions->isAdmin) {
foreach ($networkaddresses as $networkaddress) {
if ($me->address->id == $networkaddress->address_id) {
$allowedNetworks[$networkaddress->network_id] = "ok";
}
}
}
if (empty($mode) && $filestorehistory) {
$mode = "edit-history";
}
?>
<div class="row">
<div class="col-lg-12">
@@ -23,18 +36,52 @@
<div class="card">
<div class="card-body">
<h4 class="header-title mb-2"><?= ($file->id) ? "Datei bearbeiten" : "Neue Datei" ?></h4>
<form class="form-horizontal" method="post" enctype="multipart/form-data"
action="<?= self::getUrl("Filestore", "save") ?>">
action="<?= self::getUrl("Filestore", "save", ["mode" => $mode]) ?>">
<div class="card">
<div class="card-body">
<input type="hidden" name="id" value="<?= $file->id ?>"/>
<input type="hidden" name="mode" value="<?= $mode ?>"/>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="name">Name *</label>
<div class="col-lg-10">
<input value="<?= $file->name ?>" class="form-control" name="name" id="name">
<?php if (empty($mode) && !$filestorehistory) : ?>
<input value="<?= $file->name ?>" class="form-control"
name="name"
id="name">
<?php else : ?>
<span><?= $file->name ?></span>
<?php endif; ?>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="network_id">Netzgebiet *</label>
<div class="col-lg-10">
<?php if (empty($mode) && !$filestorehistory) : ?>
<select class="select2 form-control "
name="network_id" id="network_id">
<option value="">&nbsp;</option>
<?php foreach ($networks as $key => $network):
if (!$me->permissions->isAdmin) {
if (!array_key_exists($network->id, $allowedNetworks)) {
continue;
}
}
?>
<option value="<?= $network->id ?>" <?= ($file->network_id == $network->id) ? "selected='selected'" : "" ?>><?= ($network->name) ?></option>
<?php endforeach; ?>
</select>
<?php else :
foreach ($networks as $key => $network):
if (($file->network_id == $network->id)) :
$networkName = $network->name;
endif;
endforeach;
?>
<span class="col-form-label"><?= $networkName ?></span>
<?php endif; ?>
</div>
</div>
<div class="form-group row">
@@ -44,12 +91,15 @@
id="description"><?= htmlentities($file->description) ?></textarea>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="filestore">Datei</label>
<div class="col-lg-10">
<input type="file" class="form-control-file" id="filestore" name="filestore">
<?php if (empty($mode) || $mode=="add-version") : ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="filestore">Datei</label>
<div class="col-lg-10">
<input type="file" class="form-control-file" id="filestore"
name="filestore">
</div>
</div>
</div>
<?php endif; ?>
<div class="form-group row">
<label class="col-lg-2"></label>
<div class="col-lg-10">

121
Layout/default/Filestore/Index.php
View File

@@ -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" rel="stylesheet" type="text/css"/>
<!-- start page title -->
<div class="row">
@@ -33,17 +33,26 @@
</div>
</div>
<?php include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination.php"); ?>
<?php include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination-summary.php"); ?>
<?php
if (!$me->permissions->isAdmin) {
foreach ($networkaddresses as $networkaddress) {
if ($me->address->id == $networkaddress->address_id) {
$allowedNetworks[$networkaddress->network_id] = "ok";
}
}
}
?>
<table id="datatable" class="table table-striped table-hover">
<thead>
<tr>
<th>Name</th>
<th>Beschreibung</th>
<th>Ersteller</th>
<th>Bearbeiter</th>
<th ></th>
<th>Netzgebiet</th>
<th style="min-width: 270px;">Bearbeiter</th>
<th>Datum/Uhrzeit</th>
<th class="edit-width-large"></th>
</tr>
<tr id="filterrow">
<th></th>
@@ -51,19 +60,48 @@
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<?php foreach ($files as $file): ?>
<?php foreach ($files as $file):
if (!$me->permissions->isAdmin) {
if (!array_key_exists($file->networkid, $allowedNetworks)) {
continue;
}
}
?>
<tr>
<td><?= $file->name ?></td>
<td><?= $file->description ?></td>
<td><?= $file->creator->name ?> (<?= date("d.m.Y , H:i", $file->create) ?>)</td>
<td><?= $file->editor->name ?> (<?= date("d.m.Y , H:i", $file->edit) ?>)</td>
<td><?= $file->network ?></td>
<!--<td>--><?php //= $file->creator->name
?><!-- (-->
<?php //= date("d.m.Y , H:i", $file->create)
?><!--)</td>-->
<td><?= $file->editor->name ?></td>
<td><?= date("d.m.Y , H:i", $file->edit) ?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?=self::getUrl("File", "download", ["id" => $file->file_id, 's' => $pagination['start']])?>"><i class="far fa-download" title="Download"></i></a>
<a href="<?=self::getUrl("Filestore", "edit", ["id" => $file->id, 's' => $pagination['start']])?>"><i class="far fa-edit" title="Bearbeiten"></i></a>
<a href="<?=self::getUrl("Filestore", "delete", ["id" => $file->id, 's' => $pagination['start']])?>" onclick="if(!confirm('Person/Firma wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
<a href="<?= self::getUrl("File", "download", ["id" => $file->file_id]) ?>"><i
class="far fa-download" title="Download"></i></a>
<a href="<?= self::getUrl("Filestore", "edit", ["id" => $file->id, "mode" => "add-version"]) ?>"><i
class="far fa-file-circle-plus" title="Dateiversion hinzufügen"></i></a>
<?php if (!empty($fileshistory[$file->id])) : ?>
<i data-id="<?= $file->id ?>" title="Versionsverlauf"
class="fa-solid fa-clock-rotate-left history-ico check-history"></i>
<?php endif; ?>
<a href="<?= self::getUrl("Filestore", "edit", ["id" => $file->id]) ?>"><i
class="far fa-edit" title="Bearbeiten"></i></a>
<?php if ($me->permissions->isAdmin) : ?>
<a style="float: right"
href="<?= self::getUrl("Filestore", "delete", ["id" => $file->id]) ?>"
onclick="if(!confirm('Datei wirklich löschen?')) return false;"
class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
<?php endif; ?>
</td>
</tr>
@@ -72,7 +110,6 @@
</table>
</div>
</div>
@@ -81,13 +118,67 @@
<script type="text/javascript">
var hidesearch=[2,3,4];
var hidesearch = [3, 4, 5];
var cstmdom = "flrtip";
$(document).ready(function () {
$(".check-history").click(function () {
let dataobject = $(this);
let fsiid = $(this).data('id');
if ($('.filestore-history-' + fsiid).length) {
$('.filestore-history-' + fsiid).remove();
} else {
$.getJSON("/Filestore/api",
{id: $(this).data('id')},
function (data) {
if (data) {
let expandtr;
expandtr = `<tr class="filestore-history-tr filestore-history-` + fsiid + `">
<td colspan="7" class="filestore-history-td" >
<table class="float-right table table-bordered table-condensed" style="width: 1300px;">
<thead>
<tr style="background-color: #fff">
<th>Beschreibung</th>
<th style="width: 270px;">Bearbeiter</th>
<th style="width: 235px;">Datum/Uhrzeit</th>
<th></th>
</tr>
</thead>
`;
$.each(data, function (i, item) {
let isdelete = '';
var date = new Date(item.edit * 1000);
var day = "0" + date.getDay();
var month = "0" + date.getMonth();
var year = date.getFullYear();
var hours = date.getHours();
var minutes = "0" + date.getMinutes();
var formattedTime = day + '.' + month + '.' + year + ', ' + hours + ':' + minutes.substr(-2);
if (item.is_delete == "1") {
isdelete = `<a style="float: right" href="/FilestoreHistory/delete/?id=` + item.id + `&amp;s=0" onclick="if(!confirm('Datei wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>`;
}
expandtr = expandtr + `<tr class="filestore-history">
<td>` + item.description + `</td>
<td>` + item.workername + `</td>
<td>` + formattedTime + `</td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;width: 140px;">
<a href="/File/download/?id=` + item.file_id + `&amp;s=0"><i class="far fa-download" title="Download"></i></a>
` + isdelete + `
</td>
</tr>`;
});
expandtr = expandtr + `</table></td></tr>`;
dataobject.closest('tr').after(expandtr);
}
});
}
});
});
</script>
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js"></script>
<script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js"></script>
<script>
</script>

2
Layout/default/Preorder/Index.php
View File

@@ -212,7 +212,7 @@
</tr>
<?php foreach($preorders as $preorder): ?>
<tr>
<?php if(!$me->is("preorderfront")): ?><td><?=$preorder->campaign->name?></td><?php endif; ?>
<?php //if(!$me->is("preorderfront")): ?><td><?=$preorder->campaign->name?></td><?php //endif; ?>
<td><?=__($preorder->type, "preorder")?></td>
<td>Aufgenommen</td>
<?php if($preorder->building_id): ?>