Merged in FD3-390 (pull request #117)

FD3-390

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>

composer.lock

@@ -2016,7 +2016,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git",
-                "reference": "db4aba82a00ac8af06d5445c4473648959798127"
+                "reference": "5fa33e67613667d93dbaa9e878b38420fe3518a5"
             },
             "require": {
                 "ext-curl": "*",
@@ -2029,7 +2029,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2018-03-06T18:03:24+00:00"
+            "time": "2018-12-05T12:04:14+00:00"
         },
         {
             "name": "ik/map-bundle",
@@ -2083,7 +2083,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "596bc7b28ad90ba558da5b3eb5d7f26c583b148d"
+                "reference": "1c60fd91f1bb0fe5125da70908670629d4d341e6"
             },
             "require": {
                 "ext-curl": "*",
@@ -2102,7 +2102,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2018-10-23T15:06:48+00:00"
+            "time": "2018-12-04T13:12:24+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",

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

@@ -20,11 +20,29 @@
         var modificacion = false;
         $(function () {
             // buscar la direccion del cliente y la muestra en el mapa.
-            var objSelectClient = $('input:hidden[id$="clientId"]');
+            var objSelectClient = $('input:hidden[id="{{ admin.uniqid }}_clientId"]');
 
-            if (objSelectClient.val() != "" && parseInt(objSelectClient.val()) > 0) {
+            if (objSelectClient.val() != "" &&
+                !isNaN(objSelectClient.val()) &&
+                parseInt(objSelectClient.val()) > 0) {
                 modificacion = true;
-                callbackClientId(objSelectClient.val());
+                var extradata = $('textarea[id="{{ admin.uniqid }}_extraData"]').val();
+                try {
+                    extradata = JSON.parse(extradata);
+                    if (extradata.lat == undefined || extradata.lng == undefined) {
+                        extradata = null;
+                    }
+                } catch (ignore) {
+                    extradata = null;
+                }
+                if (extradata) {
+                    drawMap(extradata.lat, extradata.lng);
+                    calcularDistanciaNap();
+                    $('input[class="search-input"]').val(extradata.address);
+                } else {
+                    // no hay direcciones cargadas, entonces la busco desde el cliente
+                    callbackClientId(objSelectClient.val());
+                }
             } else {
                 if (_MAP_LATITUDE == 0 && _MAP_LONGITUDE == 0) {
                     setCoordinatesFromConfig(true);
@@ -130,11 +148,10 @@
                     $('input[class="search-input"]').val(data.results[0].address);
                     drawMap(extradata.lat, extradata.lng);
                 }
-                //calcularDistanciaNap();
+                calcularDistanciaNap();
             });
         }
 
-
         /**
          * funcion que busca una direccion y la muestra en el mapa.
          * @param address Contiene la direccion.
@@ -309,7 +326,20 @@
                 }
             }
         }
+
         $('[id="{{ admin.uniqid }}_ponSerialNumber"]').on('blur', checkLengthPonSerialNumber);
+
+        function addAddressToExtraData(){
+            var address = $('input[class="search-input"]').val();
+            var extradata = $('textarea[id="{{ admin.uniqid }}_extraData"]').val();
+            try {
+                extradata = JSON.parse(extradata);
+                extradata.address = address;
+                $('textarea[id="{{ admin.uniqid }}_extraData"]').val(JSON.stringify(extradata));
+            } catch (ignore) {
+            }
+        }
+
     </script>
 
 {% endblock %}