Arreglo para que muestre todas las nap en las onu

composer.lock

@@ -1433,7 +1433,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-11-24 15:24:36"
+            "time": "2017-11-24T15:24:36+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1456,7 +1456,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-12-05 15:22:24"
+            "time": "2017-12-05T15:22:24+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1569,7 +1569,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-16 14:10:01"
+            "time": "2017-11-16T14:10:01+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1619,7 +1619,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2017-10-11T14:15:38+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1642,7 +1642,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/template-bundle",
@@ -1668,7 +1668,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2017-08-02 18:42:10"
+            "time": "2017-08-02T18:42:10+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1689,7 +1689,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-11-29 14:00:21"
+            "time": "2017-11-29T14:00:21+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1727,7 +1727,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-11-09 15:34:00"
+            "time": "2017-11-09T15:34:00+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -3259,7 +3259,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",

src/FTTHBundle/Controller/ONUController.php

@@ -204,42 +204,44 @@ class ONUController extends Controller
             ->from(NAP::class, 'n');
         $napsQuery = $query->getQuery()->execute();
         $geodecode = new GeoDecode();
+        $d = $this->container->hasParameter('onu.distance.nap');
+        if ($d) {
+            $distanceNap = $this->container->getParameter('onu.distance.nap');
+        } else {
+            $distanceNap = null;
+        }
         foreach ($napsQuery as $nap) {
             if ($nap->getExtraData() != null) {
-                $extraData = json_decode($nap->getExtraData(), true);
                 $nap->setContainer($this->container);
+                // Seteamos la dirección - dirección o null
+                $address = $nap->getData('address');
                 $dataNap = [
                     'id' => $nap->getId(),
                     'name' => $nap->getName(),
                     'distance' => -1,
+                    'distanceMessage' => '',
                     'freePort' => $nap->getFreePort(),
-                    'address' => '',
-                    'olt' => ($nap->getOlt() != null ? $nap->getOlt()->getName() : "SIN OLT"),
+                    'address' => $address == null ? '' : $address,
+                    'olt' => ($nap->getOlt() != null ? $nap->getOlt()->getName() : $translator->trans("without_olt", array(), "FTTHBundle")),
                     'slot' => $nap->getSlot(),
                     'link' => $nap->getLink()
                 ];
                 if ($nap->getlat() != null && $nap->getlng() != null) {
                     $distance = $geodecode->distanceGeoPoints($lat, $lng, $nap->getlat(), $nap->getlng(), true);
-                    if ($this->container->hasParameter('onu.distance.nap')) {
-                        if ($this->container->getParameter('onu.distance.nap') >= $distance ||
-                            $napId == $nap->getId()) {
-                            // controlo la distancia y el codigo de nap
-                            $dataNap['distance'] = $distance;
-                        } else {
-                            $dataNap['distance'] = $distance . " [" . $translator->trans("out_of_range", array(), "FTTHBundle") . "]";
+                    $dataNap['distance'] = $distance;
+
+                    // 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['address'] = $extraData['Address'];
-                        $naps[$nap->getId()] = $dataNap;
                     } else {
-                        // si el codigo de napId coincide tengo que cargar la nap
-                        $dataNap['distance'] = $distance . " [" . "Distancia minima no configurada" . "]";
-                        $dataNap['address'] = $extraData['Address'];
-                        $naps[$nap->getId()] = $dataNap;
+                        $dataNap['distanceMessage'] = " [" . $translator->trans("onu_distance_nap_not_configurated", array(), "FTTHBundle") . "]";
                     }
                 } else {
-                    $dataNap['distance'] = "-1" . " [" . "NAP no posicionada" . "]";
-                    $naps[$nap->getId()] = $dataNap;
+                    $dataNap['distanceMessage'] = " [" . $translator->trans("onu_not_positioned", array(), "FTTHBundle") . "]";
                 }
+                $naps[$nap->getId()] = $dataNap;
             }
         }
         return $naps;

src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -205,4 +205,7 @@ msg_init_import: Iniciando importación, espere un momento.
 msg_end_import: FIN :)
 nap.capacity.max: El NAP seleccionado sobrepasó su capacidad de %capacity% ONUs. Tiene %count% ONUs asociadas
 Address: Dirección
-out_of_range: FUERA DE RANGO
+out_of_range: FUERA DE RANGO
+without_olt: SIN OLT
+onu_distance_nap_not_configurated: Requiere configuración de distancia
+onu_not_positioned: ONU no posicionada

src/FTTHBundle/Resources/views/ONU/form.html.twig

@@ -43,7 +43,7 @@
                     $('input[class="search-input"]').val(data.results[0].address);
                     drawMap(extradata.lat, extradata.lng);
                 }
-                calcularDistanciaNap();
+                //calcularDistanciaNap();
             });
         }
 
@@ -59,7 +59,7 @@
                 type: "POST"
             }).done(function (res) {
                 if (res != undefined && res.status == google.maps.GeocoderStatus.OK) {
-                        drawMap(res.results[0].geometry.location.lat, res.results[0].geometry.location.lng);
+                    drawMap(res.results[0].geometry.location.lat, res.results[0].geometry.location.lng);
                 } else {
                     console.log(res.status);
                     alert("{{ 'error.address_not_found'|trans({}, 'FTTHBundle') }}");
@@ -111,12 +111,13 @@
                         obj = JSON.parse(obj);
                         for (var i = 0; i < obj.length; i++) {
                             if (obj[i].distance != -1) {
-                                var tmp = obj[i].name + " ({{ 'Free Port'|trans({}, 'FTTHBundle') }}: " + obj[i].freePort + " - " +
-                                    "{{ 'Distance'|trans({}, 'FTTHBundle') }}: " + obj[i].distance + " KM. - " +
-                                    "{{ 'Address'|trans({}, 'FTTHBundle') }}: " + obj[i].address + " - " +
+                                var tmp = obj[i].name +
+                                    " ({{ 'Free Port'|trans({}, 'FTTHBundle') }}: " + obj[i].freePort + " - " +
                                     "OLT: " + obj[i].olt + " - " +
                                     "Slot: " + obj[i].slot + " - " +
-                                    "Link: " + obj[i].link + ")";
+                                    "Link: " + obj[i].link + " - " +
+                                    "{{ 'Distance'|trans({}, 'FTTHBundle') }}: " + obj[i].distance + " KM. - " +
+                                    "{{ 'Address'|trans({}, 'FTTHBundle') }}: " + obj[i].address + " )";
                                 select.append(
                                     '<option value="' + obj[i].id + '" >' + tmp +
                                     '</option>'
@@ -129,13 +130,15 @@
                         for (var i = 0; i < obj.length; i++) {
                             if (obj[i].distance == -1) {
                                 var tmp = obj[i].name + " ({{ 'Free Port'|trans({}, 'FTTHBundle') }}: " + obj[i].freePort + " - ";
+                                tmp +=
+                                    "OLT: " + obj[i].olt + " - " +
+                                    "Slot: " + obj[i].slot + " - " +
+                                    "Link: " + obj[i].link + " - ";
+                                tmp += "{{ 'Distance'|trans({}, 'FTTHBundle') }}: " + obj[i].distanceMessage;
                                 if (obj[i].address != null && obj[i].address.length > 0) {
-                                    tmp += "{{ 'Address'|trans({}, 'FTTHBundle') }}: " + obj[i].address + " - ";
+                                    tmp += " - {{ 'Address'|trans({}, 'FTTHBundle') }}: " + obj[i].address;
                                 }
-                                tmp += "OLT: " + obj[i].olt + " - " +
-                                    "Slot: " + obj[i].slot + " - " +
-                                    "Link: " + obj[i].link +
-                                    ")";
+                                tmp += ")";
                                 select.append(
                                     '<option value="' + obj[i].id + '" >' + tmp +
                                     '</option>'