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

Added pipeplanner and lineplanner

Browse Source
This commit is contained in:
Frank Schubert
2021-06-29 21:41:20 +02:00
parent 81b6889627
commit 9d643fdfa2
6 changed files with 82 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Address/Form.php
+2
View File
@@ -128,6 +128,8 @@
<option value="salespartner" <?=(array_key_exists("salespartner", $address->types)) ? "selected='selected'" : "salespartner"?>><?=__("salespartner")?></option> <option value="salespartner" <?=(array_key_exists("salespartner", $address->types)) ? "selected='selected'" : "salespartner"?>><?=__("salespartner")?></option>
<option value="pipeworker" <?=(array_key_exists("pipeworker", $address->types)) ? "selected='selected'" : "pipeworker"?>><?=__("pipeworker")?></option> <option value="pipeworker" <?=(array_key_exists("pipeworker", $address->types)) ? "selected='selected'" : "pipeworker"?>><?=__("pipeworker")?></option>
<option value="lineworker" <?=(array_key_exists("lineworker", $address->types)) ? "selected='selected'" : "lineworker"?>><?=__("lineworker")?></option> <option value="lineworker" <?=(array_key_exists("lineworker", $address->types)) ? "selected='selected'" : "lineworker"?>><?=__("lineworker")?></option>
<option value="pipeplanner" <?=(array_key_exists("pipeplanner", $address->types)) ? "selected='selected'" : "pipeplanner"?>><?=__("pipeplanner")?></option>
<option value="lineplanner" <?=(array_key_exists("lineplanner", $address->types)) ? "selected='selected'" : "lineplanner"?>><?=__("lineplanner")?></option>
<option value="netoperator" <?=(array_key_exists("netoperator", $address->types)) ? "selected='selected'" : "netoperator"?>><?=__("netoperator")?></option> <option value="netoperator" <?=(array_key_exists("netoperator", $address->types)) ? "selected='selected'" : "netoperator"?>><?=__("netoperator")?></option>
<option value="planner" <?=(array_key_exists("planner", $address->types)) ? "selected='selected'" : "planner"?>><?=__("planner")?></option> <option value="planner" <?=(array_key_exists("planner", $address->types)) ? "selected='selected'" : "planner"?>><?=__("planner")?></option>
<option value="support" <?=(array_key_exists("support", $address->types)) ? "selected='selected'" : "support"?>><?=__("support")?></option> <option value="support" <?=(array_key_exists("support", $address->types)) ? "selected='selected'" : "support"?>><?=__("support")?></option>
Layout/default/Network/Index.php
+69 -38
View File
@@ -70,55 +70,86 @@
<div class="tab-content"> <div class="tab-content">
<div id="net-detail-<?=$network->id?>-detail" class="tab-pane show active"> <div id="net-detail-<?=$network->id?>-detail" class="tab-pane show active">
<h4>Details zu <strong><?=$network->name?></strong></h4> <h4>Details zu <strong><?=$network->name?></strong></h4>
<table class="table table-bordered"> <div class="card">
<tr class="bg-white"> <div class="card-body">
<th>Name</th> <table class="table table-bordered">
<td><?=$network->name?></td> <tr class="bg-white">
</tr> <th>Name</th>
<tr class="bg-white"> <td><?=$network->name?></td>
<th>Besitzer</th> </tr>
<td><?=$network->owner->getCompanyOrName()?></td> <tr class="bg-white">
</tr> <th>Besitzer</th>
<tr class="bg-white"> <td><?=$network->owner->getCompanyOrName()?></td>
<th>Interne Notiz</th> </tr>
<td><?=nl2br($network->note)?></td> <tr class="bg-white">
</tr> <th>Interne Notiz</th>
</table> <td><?=nl2br($network->note)?></td>
</tr>
</table>
</div>
</div>
</div> </div>
<div id="net-detail-<?=$network->id?>-pops" class="tab-pane"> <div id="net-detail-<?=$network->id?>-pops" class="tab-pane">
<h4>POPs in <strong><?=$network->name?></strong></h4> <h4>POPs in <strong><?=$network->name?></strong></h4>
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<?php if(is_array($network->pops) && count($network->pops)): ?> <?php if(is_array($network->pops) && count($network->pops)): ?>
<table class="table" > <table class="table" >
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>GPS (Breite, Länge)</th> <th>GPS (Breite, Länge)</th>
<th>Standortinfo</th> <th>Standortinfo</th>
<th></th> <th></th>
</tr> </tr>
<?php foreach($network->pops as $pop): ?> <?php foreach($network->pops as $pop): ?>
<tr> <tr>
<td><?=$pop->name?></td> <td><?=$pop->name?></td>
<td><?=$pop->gps_lat?>, <?=$pop->gps_long?></td> <td><?=$pop->gps_lat?>, <?=$pop->gps_long?></td>
<td><?=nl2br($pop->location)?></td> <td><?=nl2br($pop->location)?></td>
<td class="controls" style="text-align: left; letter-spacing: 4px; font-size: 1.1em;"> <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", "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", "delete", ["id" => $pop->id])?>" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
<?php else: ?> <?php else: ?>
<p><i>Keine POPs vorhanden</i></p> <p><i>Keine POPs vorhanden.</i></p>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
<a class="btn btn-primary" href="<?=self::getUrl("Pop", "add", ['network_id' => $network->id])?>"><i class="fas fa-plus"></i> Neuen POP anlegen</a> <a class="btn btn-primary" href="<?=self::getUrl("Pop", "add", ['network_id' => $network->id])?>"><i class="fas fa-plus"></i> Neuen POP anlegen</a>
</div> </div>
<div id="net-detail-<?=$network->id?>-third" class="tab-pane"> <div id="net-detail-<?=$network->id?>-third" class="tab-pane">
<h4>Berechtigungen</h4> <h4>Berechtigungen</h4>
<div class="card">
<div class="card-body">
<?php if(is_array($network->pops) && count($network->pops)): ?>
<table class="table">
<tr>
<th>Name</th>
<th>GPS (Breite, Länge)</th>
<th>Standortinfo</th>
<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>
<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>
</td>
</tr>
<?php endforeach; ?>
</table>
<?php else: ?>
<p><i>Keine berechtigten Firmen/Personen vorhanden.</i></p>
<?php endif; ?>
</div>
</div>
</div> </div>
</div> </div>
Layout/default/Pop/Form.php
+2 -2
View File
@@ -56,14 +56,14 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-2 col-form-label" for="gps_lat">GPS Breite</label> <label class="col-lg-2 col-form-label" for="gps_lat">GPS Breite</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="text" class="form-control" name="gps_lat" id="name" value="<?=$pop->gps_lat?>"> <input type="number" class="form-control" name="gps_lat" id="name" value="<?=$pop->gps_lat?>">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-2 col-form-label" for="gps_long">GPS Länge</label> <label class="col-lg-2 col-form-label" for="gps_long">GPS Länge</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="text" class="form-control" name="gps_long" id="name" value="<?=$pop->gps_long?>"> <input type="number" class="form-control" name="gps_long" id="name" value="<?=$pop->gps_long?>">
</div> </div>
</div> </div>
application/Address/AddressModel.php
+6
View File
@@ -109,6 +109,12 @@ class AddressModel {
if(in_array("lineworker", $at)) { if(in_array("lineworker", $at)) {
$in[] = "Addresstype.type = 'lineworker'"; $in[] = "Addresstype.type = 'lineworker'";
} }
if(in_array("pipeplanner", $at)) {
$in[] = "Addresstype.type = 'pipeplanner'";
}
if(in_array("lineplanner", $at)) {
$in[] = "Addresstype.type = 'lineplanner'";
}
if(in_array("netoperator", $at)) { if(in_array("netoperator", $at)) {
$in[] = "Addresstype.type = 'netoperator'"; $in[] = "Addresstype.type = 'netoperator'";
} }
contrib/migrations/20210629-01-addresstype-planner-vlan.sql
+1 -1
View File
@@ -1,4 +1,4 @@
ALTER TABLE `Addresstype` CHANGE `type` `type` ENUM('systemowner','netowner','salespartner','pipeworker','lineworker','netoperator','planner','support','billing','employee','customer','supplier','contact'); ALTER TABLE `Addresstype` CHANGE `type` `type` ENUM('systemowner','netowner','salespartner','pipeworker','lineworker','pipeplanner','lineplanner','netoperator','support','billing','employee','customer','supplier','contact') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci NOT NULL;
ALTER TABLE `Pop` ADD `vlan_public` INT(4) NULL DEFAULT NULL AFTER `location`; ALTER TABLE `Pop` ADD `vlan_public` INT(4) NULL DEFAULT NULL AFTER `location`;
ALTER TABLE `Pop` ADD `vlan_nat` INT(4) NULL DEFAULT NULL AFTER `vlan_public`; ALTER TABLE `Pop` ADD `vlan_nat` INT(4) NULL DEFAULT NULL AFTER `vlan_public`;
ALTER TABLE `Pop` ADD `vlan_ipv6` INT(4) NULL DEFAULT NULL AFTER `vlan_nat`; ALTER TABLE `Pop` ADD `vlan_ipv6` INT(4) NULL DEFAULT NULL AFTER `vlan_nat`;
lang/de.php
+2
View File
@@ -6,6 +6,8 @@ $l['netowner'] = "Netzeigentümer";
$l['salespartner'] = "Vertriebspartner"; $l['salespartner'] = "Vertriebspartner";
$l['pipeworker'] = "Tiefbau"; $l['pipeworker'] = "Tiefbau";
$l['lineworker'] = "Leitungsbau"; $l['lineworker'] = "Leitungsbau";
$l['pipeplanner'] = "Rohrplaner";
$l['lineplanner'] = "Faserplaner";
$l['netoperator'] = "Netzbetreiber"; $l['netoperator'] = "Netzbetreiber";
$l['planner'] = "Planer"; $l['planner'] = "Planer";
$l['support'] = "Support"; $l['support'] = "Support";