Merge branch 'master' of https://bitbucket.org/ikflowdat/ftth into bug

Conflicts:
	composer.lock

app/config/config_prod.yml

@@ -9,6 +9,7 @@ imports:
 #        query_cache_driver: apc
 
 monolog:
+    channels: ['devicelog', 'webservice']
     handlers:
         main:
             type:         fingers_crossed
@@ -20,3 +21,8 @@ monolog:
             level: debug
         console:
             type:  console
+        amqp:
+            type: service
+            id: monolog.amqp
+            level: debug
+            channels: ['devicelog', 'webservice']

composer.lock

@@ -757,7 +757,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/doctrine/instantiator/doctrine-instantiator-8e884e78f9f0eb1329e445619e04456e64d8051d-zip-681b88.zip",
                 "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": "62a7b8d59ce1dc5627bd2aed2882f18ff1138219"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3,<8.0-DEV"
@@ -1433,7 +1433,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-11-24T15:24:36+00:00"
+            "time": "2017-11-24 15:24:36"
         },
         {
             "name": "ik/auth-bundle",
@@ -1456,7 +1456,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-12-05T15:22:24+00:00"
+            "time": "2017-12-05 15:22:24"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1479,7 +1479,11 @@
                 "bootstrap",
                 "sonata"
             ],
+<<<<<<< HEAD
             "time": "2017-12-19T11:28:24+00:00"
+=======
+            "time": "2017-12-12 15:42:32"
+>>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "ik/device-bundle",
@@ -1502,7 +1506,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-12-13T13:30:22+00:00"
+            "time": "2017-12-13 13:30:22"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1525,7 +1529,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-12-11T15:48:57+00:00"
+            "time": "2017-12-11 15:48:57"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1546,7 +1550,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-12-12T17:52:51+00:00"
+            "time": "2017-12-12 17:52:51"
         },
         {
             "name": "ik/map-bundle",
@@ -1569,7 +1573,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-16T14:10:01+00:00"
+            "time": "2017-11-16 14:10:01"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1592,7 +1596,11 @@
                 "bundle",
                 "migrations"
             ],
+<<<<<<< HEAD
             "time": "2017-12-15T14:11:27+00:00"
+=======
+            "time": "2017-12-06 17:56:15"
+>>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1619,7 +1627,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11T14:15:38+00:00"
+            "time": "2017-10-11 14:15:38"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1642,7 +1650,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12T15:49:24+00:00"
+            "time": "2017-06-12 15:49:24"
         },
         {
             "name": "ik/template-bundle",
@@ -1668,7 +1676,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2017-08-02T18:42:10+00:00"
+            "time": "2017-08-02 18:42:10"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1689,7 +1697,11 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
+<<<<<<< HEAD
             "time": "2017-12-18T13:14:57+00:00"
+=======
+            "time": "2017-12-18 13:14:57"
+>>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "ik/workflow-bundle",
@@ -1727,7 +1739,11 @@
                 "bundle",
                 "workflow"
             ],
+<<<<<<< HEAD
             "time": "2017-12-21T11:43:15+00:00"
+=======
+            "time": "2017-11-09 15:34:00"
+>>>>>>> 1d8d862147f6c24c6bbfe0e05d072ab91a07fefc
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -2005,7 +2021,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/jms/serializer-bundle/jms-serializer-bundle-85ee039a2b7f89d77c403e33cee7b43a875c31e5-zip-e99b92.zip",
                 "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5",
-                "shasum": "8ceb3e6f31ad9b250fe9070661ee2d4b4d52c0f2"
+                "shasum": ""
             },
             "require": {
                 "jms/serializer": "^1.7",
@@ -2921,7 +2937,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/sensio/distribution-bundle/sensio-distribution-bundle-eb6266b3b472e4002538610b28a0a04bcf94891a-zip-b89371.zip",
                 "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a",
-                "shasum": "c880207d73e5af5719bf65852f2890e55cb488d6"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9",
@@ -3259,7 +3275,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04T12:16:04+00:00"
+            "time": "2017-10-04 12:16:04"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -4617,7 +4633,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18T12:29:38+00:00"
+            "time": "2016-04-18 12:29:38"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -5140,7 +5156,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/phpunit/php-file-iterator/phpunit-php-file-iterator-3cc8f69b3028d0f96a9078e6295d86e9bf019be5-zip-184bc9.zip",
                 "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": "d3ce5a919fe743126f331988b9a0f7b8302b999a"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5187,7 +5203,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/phpunit/php-text-template/phpunit-php-text-template-31f8b717e51d9a2afca6c9f046f5d69fc27c8686-zip-c6bcbd.zip",
                 "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": "4122b00281fc98e1733bd9ca446002393c452f84"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5228,7 +5244,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/phpunit/php-timer/phpunit-php-timer-3dcf38ca72b158baf0bc245e9184d3fdffa9c46f-zip-c27592.zip",
                 "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": "f67f992aca05457e1e21f619250770b09092ff7b"
+                "shasum": ""
             },
             "require": {
                 "php": "^5.3.3 || ^7.0"
@@ -5469,7 +5485,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/sebastian/code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-4419fcdb5eabb9caa61a27c7a1db532a6b55dd18-zip-2b8d33.zip",
                 "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": "8470a6b3ca913a110aa2580255552a06e995710c"
+                "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0"
@@ -5943,7 +5959,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/sebastian/resource-operations/sebastian-resource-operations-ce990bb21759f94aeafd30209e8cfcdfa8bc3f52-zip-4a3a08.zip",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.6.0"
@@ -5985,7 +6001,7 @@
                 "type": "zip",
                 "url": "https://satis.infra.flowdat.com/dist/sebastian/version/sebastian-version-99732be0ddb3361e16ad77b68ba41efc8e979019-zip-0eee83.zip",
                 "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": "dff8de471afebba9fc6837bb8c886ddc7ebe41bb"
+                "shasum": ""
             },
             "require": {
                 "php": ">=5.6"

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;

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

@@ -208,4 +208,4 @@ Address: Dirección
 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
+nap_not_positioned: NAP no posicionada