Browse Source

Muestra las nap en la carga de onu, en caso de que no este posicionada la nap.

Gabriel Gosparo 7 years ago
parent
commit
1a0f42810e
1 changed files with 16 additions and 3 deletions
  1. 16 3
      src/FTTHBundle/Controller/ONUController.php

+ 16 - 3
src/FTTHBundle/Controller/ONUController.php

@@ -211,11 +211,11 @@ class ONUController extends Controller
         $without_olt = $translator->trans("without_olt", array(), "FTTHBundle");
         $out_of_range = " [" . $translator->trans("out_of_range", array(), "FTTHBundle") . "]";
         $onu_distance_nap_not_configurated = " [" . $translator->trans("onu_distance_nap_not_configurated", array(), "FTTHBundle") . "]";
-        $onu_not_positioned = " [" . $translator->trans("onu_not_positioned", array(), "FTTHBundle") . "]";
+        $nap_not_positioned = " [" . $translator->trans("nap_not_positioned", array(), "FTTHBundle") . "]";
         foreach ($napsQuery as $nap) {
             if ($nap->getExtraData() != null) {
                 $nap->setContainer($this->container);
-                // Seteamos la dirección - dirección o null
+                // Seteamos la dirección - dirección o null
                 $address = $nap->getData('address');
                 $dataNap = [
                     'id' => $nap->getId(),
@@ -241,9 +241,22 @@ class ONUController extends Controller
                         $dataNap['distanceMessage'] = $onu_distance_nap_not_configurated;
                     }
                 } else {
-                    $dataNap['distanceMessage'] = $onu_not_positioned;
+                    $dataNap['distanceMessage'] = $nap_not_positioned;
                 }
                 $naps[$nap->getId()] = $dataNap;
+            } else {
+                $dataNap = [
+                    'id' => $nap->getId(),
+                    'name' => $nap->getName(),
+                    'distance' => -1,
+                    'distanceMessage' => $nap_not_positioned,
+                    'freePort' => $nap->getFreePort(),
+                    'address' => '',
+                    'olt' => $nap->getOlt() == null ? $without_olt : $nap->getOlt()->getName(),
+                    'slot' => $nap->getSlot(),
+                    'link' => $nap->getLink()
+                ];
+                $naps[$nap->getId()] = $dataNap;    
             }
         }
         return $naps;