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

swapped Port inputs

Browse Source
This commit is contained in:
Frank Schubert
2021-09-21 23:28:53 +02:00
parent 270cb3f32b
commit db6c677263
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Layout/default/Patching/Index.php
View File

@@ -90,18 +90,8 @@
<?=$term->workflowitems["modul"]->value->value_string?> /
<?=$term->workflowitems["ports"]->value->value_string?>
</td>
<td><input type="text" class="form-control" name="linework_port" value="" placeholder="ODF Port" /></td>
<td>
<select name="device_type" class="form-control">
<option></option>
<option value="splitter">Splitter</option>
<option value="pon">Shared PON-Port</option>
<option value="switch">Switch</option>
</select>
</td>
<td><input type="text" class="form-control" name="device_name" value="" placeholder="ODF Port" /></td>
<td>
<select name="device_ports" class="form-control">
<select name="lienwork_port" class="form-control">
<option></option>
<?php foreach($term->getLineworkportPairs() as $ports): ?>
<?php foreach($ports as $p): ?>
@@ -110,6 +100,16 @@
<?php endforeach; ?>
</select>
</td>
<td>
<select name="device_type" class="form-control">
<option></option>
<option value="splitter">Splitter</option>
<option value="pon">Shared PON-Port</option>
<option value="switch">Switch</option>
</select>
</td>
<td><input type="text" class="form-control" name="device_name" value="" placeholder="Gerät" /></td>
<td><input type="text" class="form-control" name="device_ports" value="" placeholder="Port" /></td>
<td><input type="checkbox" class="form-control" name="patched" value="1" /></td>
</tr>
<?php endforeach; ?>

4
application/Termination/Termination.php
View File

@@ -99,11 +99,11 @@ class Termination extends mfBaseModel {
$range = [];
$pairs = [];
$mod = $from % 2;
for($i = $from; $i <= $to; $i++) {
$range[] = intval($i);
if($i % 2 == $mod && $i + 1 <= $to) {
if($i + 1 <= $to) {
$pairs[] = $i."-".($i+1);
}
}