From db6c6772636e7d5f5ff106f5109b0d984a1700f2 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 21 Sep 2021 23:28:53 +0200
Subject: [PATCH] swapped Port inputs

---
 Layout/default/Patching/Index.php       | 22 +++++++++++-----------
 application/Termination/Termination.php |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Layout/default/Patching/Index.php b/Layout/default/Patching/Index.php
index fa4fc7e17..20a9044d2 100644
--- a/Layout/default/Patching/Index.php
+++ b/Layout/default/Patching/Index.php
@@ -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; ?>
diff --git a/application/Termination/Termination.php b/application/Termination/Termination.php
index 79d72a5b0..791901dca 100644
--- a/application/Termination/Termination.php
+++ b/application/Termination/Termination.php
@@ -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);
           }
         }