Arreglos

src/FTTHBundle/Controller/ONUController.php

@@ -80,7 +80,7 @@ class ONUController extends Controller
 
     }
 
-    /*
+    /**
      * Queda pendiente enviar un comando para actualizar masivamente los devices
      * /admin/ftth/onu/onu_save?_=1508847664462&limit=100&mapId=3&offset=0&clientId=1
      */
@@ -157,12 +157,9 @@ class ONUController extends Controller
             Response::HTTP_OK,
             array('content-type' => 'application/json')
         );
-
         return $response;
-
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
@@ -210,6 +207,11 @@ class ONUController extends Controller
         } else {
             $distanceNap = null;
         }
+        // mensajes de errores
+        $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") . "]";
         foreach ($napsQuery as $nap) {
             if ($nap->getExtraData() != null) {
                 $nap->setContainer($this->container);
@@ -222,7 +224,7 @@ class ONUController extends Controller
                     'distanceMessage' => '',
                     'freePort' => $nap->getFreePort(),
                     'address' => $address == null ? '' : $address,
-                    'olt' => ($nap->getOlt() != null ? $nap->getOlt()->getName() : $translator->trans("without_olt", array(), "FTTHBundle")),
+                    'olt' => $nap->getOlt() == null ? $without_olt : $nap->getOlt()->getName(),
                     'slot' => $nap->getSlot(),
                     'link' => $nap->getLink()
                 ];
@@ -233,13 +235,13 @@ class ONUController extends Controller
                     // Si tenemos distancia de referencia y se encuentra en rango, seteamos y continuamos
                     if ($distanceNap != null) {
                         if ($distanceNap < $distance) {
-                            $dataNap['distanceMessage'] = " [" . $translator->trans("out_of_range", array(), "FTTHBundle") . "]";
+                            $dataNap['distanceMessage'] = $out_of_range;
                         }
                     } else {
-                        $dataNap['distanceMessage'] = " [" . $translator->trans("onu_distance_nap_not_configurated", array(), "FTTHBundle") . "]";
+                        $dataNap['distanceMessage'] = $onu_distance_nap_not_configurated;
                     }
                 } else {
-                    $dataNap['distanceMessage'] = " [" . $translator->trans("onu_not_positioned", array(), "FTTHBundle") . "]";
+                    $dataNap['distanceMessage'] = $onu_not_positioned;
                 }
                 $naps[$nap->getId()] = $dataNap;
             }
@@ -249,8 +251,9 @@ class ONUController extends Controller
 
     /**
      * Ordena por las distancias, poniendo los -1 al final.
-     * @param $a
-     * @param $b
+     * @param float $a
+     * @param float $b
+     * @return int Retorna -1 en  caso de que $a < $b y 1 en caso contrario.
      */
     public function orderDistances($a, $b)
     {
@@ -261,6 +264,5 @@ class ONUController extends Controller
             return 0;
         }
         return ($a < $b) ? -1 : 1;
-        //return (float)$a["distance"] - (float)$b["distance"];
     }
 }