Explorar o código

Merge branch 'FD3-302'

Luciano Andrade %!s(int64=7) %!d(string=hai) anos
pai
achega
8aa39b720e
Modificáronse 2 ficheiros con 731 adicións e 1026 borrados
  1. 663 999
      composer.lock
  2. 68 27
      src/FTTHBundle/Resources/views/ONU/form.html.twig

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 663 - 999
composer.lock


+ 68 - 27
src/FTTHBundle/Resources/views/ONU/form.html.twig

@@ -4,42 +4,83 @@
 {% block formactions %}
     {{ parent() }}
     <script type="text/javascript">
+        //        $(document).ready(function () {
+        //            var objSelectClient = $('input:hidden[id$="clientId"]');
+        //            objSelectClient.on("change", function () { //bind() for older jquery version
+        //                alert("2");
+        //                fcChange();
+        //            }); //could be change() or trigger('change')
+        //
+        //        });
         $(function () {
             // buscar la direccion del cliente y la muestra en el mapa.
-            var objSelectClient = $('select[id$="clientId"]');
-            objSelectClient.change(function () {
-                $.ajax({
-                    url: '{{ path('ajax_client_data') }}',
-                    dataType: 'json',
-                    delay: 250,
-                    data: {
-                        q: $(this).val()
-                    }
-                }).done(function (data) {
-                    console.log(data);
-                    var extradata = null;
-                    if (data.results[0].location) {
-                        extradata = JSON.parse(data.results[0].location.extraData);
-                        if (extradata.lat == undefined || extradata.lng == undefined) {
-                            extradata = null;
-                        }
-                    }
-                    if (extradata === null) {
-                        googleSearchDirectionAndShowMaps(data.results[0].address);
-                    } else {
-                        $('input[class="search-input"]').val(data.results[0].address);
-                        drawMap(extradata.lat, extradata.lng);
-                    }
-                });
-            });
+            var objSelectClient = $('input:hidden[id$="clientId"]');
+//            objSelectClient.on("change", function () { //bind() for older jquery version
+//                fcChange();
+//            }).triggerHandler('change'); //could be change() or trigger('change')
+
+            {#function callbackClientId() {#}
+            {#//            objSelectClient.change(function () {#}
+            {#alert("1");#}
+            {#$.ajax({#}
+            {#url: '{{ path('ajax_client_data') }}',#}
+            {#dataType: 'json',#}
+            {#delay: 250,#}
+            {#data: {#}
+            {#q: $(this).val()#}
+            {#}#}
+            {#}).done(function (data) {#}
+            {#console.log(data);#}
+            {#var extradata = null;#}
+            {#if (data.results[0].location) {#}
+            {#extradata = JSON.parse(data.results[0].location.extraData);#}
+            {#if (extradata.lat == undefined || extradata.lng == undefined) {#}
+            {#extradata = null;#}
+            {#}#}
+            {#}#}
+            {#if (extradata === null) {#}
+            {#googleSearchDirectionAndShowMaps(data.results[0].address);#}
+            {#} else {#}
+            {#$('input[class="search-input"]').val(data.results[0].address);#}
+            {#drawMap(extradata.lat, extradata.lng);#}
+            {#}#}
+            {#});#}
+            {#//            });#}
+//            }
 
             if (objSelectClient.val() != "" && parseInt(objSelectClient.val()) > 0) {
                 calcularDistanciaNap();
             } else {
-                drawMap(-32.030232, -61.220883); // galvez
+                drawMap(-32.030232, -61.220883); // galvez
             }
         });
 
+        function callbackClientId(clientId) {
+            $.ajax({
+                url: '{{ path('ajax_client_data') }}',
+                dataType: 'json',
+                delay: 250,
+                data: {
+                    q: clientId
+                }
+            }).done(function (data) {
+                var extradata = null;
+                if (data.results[0].location) {
+                    extradata = JSON.parse(data.results[0].location.extraData);
+                    if (extradata.lat == undefined || extradata.lng == undefined) {
+                        extradata = null;
+                    }
+                }
+                if (extradata === null) {
+                    googleSearchDirectionAndShowMaps(data.results[0].address);
+                } else {
+                    $('input[class="search-input"]').val(data.results[0].address);
+                    drawMap(extradata.lat, extradata.lng);
+                }
+            });
+        }
+
+
         /**
          * funcion que busca una direccion y la muestra en el mapa.
          * @param address Contiene la direccion.