Browse Source

Se agrego la ubicación a la entidad ONU

Guillermo Espinoza 7 years ago
parent
commit
48944a824a

+ 4 - 0
app/config/routing.yml

@@ -61,3 +61,7 @@ base_admin_alert:
 admin_tenancy_change_tenancy_global_ajax:
     path: changeTenancyAjaxAction
     defaults: { _controller: BaseAdminBundle:RedirectionAjax:changeTenancyAjax }
+
+map:
+    resource: "@MapBundle/Resources/config/routing.yml"
+    

+ 1 - 0
app/config/url_webservice.yml.dist

@@ -14,3 +14,4 @@ parameters:
     remote_client_create_url: '%url_base%/admin/client/client/create'
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
+    remote_get_map_url: '%url_mapas%/api/maps.json'

+ 1 - 0
app/config/url_webservice.yml.docker

@@ -8,6 +8,7 @@ parameters:
     remote_client_create_url: '%url_base%/admin/client/client/create'
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
+    remote_get_map_url: '%url_mapas%/api/maps.json'
     sidebar_menu:
         Base: '%url_base%'
         Mapas: '%url_mapas%'

+ 8 - 8
composer.lock

@@ -1420,7 +1420,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "f41487cb33cde26a8af8cef1e23ccb5c286fdb57"
+                "reference": "f6b8fdcefdf517a0a28f4c8abd79940228e6ac7c"
             },
             "type": "library",
             "autoload": {
@@ -1435,7 +1435,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-08-14 17:12:36"
+            "time": "2017-08-15 13:45:08"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1466,7 +1466,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
-                "reference": "3a15f63a11a3d7fb92bc1ab1ca6ae8685591ef11"
+                "reference": "f7f09658910a9e40caa6c6ad15870c8acb882b1e"
             },
             "require": {
                 "ext-curl": "*",
@@ -1479,7 +1479,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-08-11 17:58:22"
+            "time": "2017-08-15 13:46:42"
         },
         {
             "name": "ik/map-bundle",
@@ -1487,7 +1487,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
-                "reference": "24973d05c04a36c3ac12bfdea4df2b10aec8dd1e"
+                "reference": "a585b4384e731ba2206636ce8f6317bbde40bfa1"
             },
             "type": "library",
             "autoload": {
@@ -1502,7 +1502,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-10 15:16:44"
+            "time": "2017-08-15 13:44:19"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1609,7 +1609,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "0f3977e0e2db4c2f16436379083483bc9c9ef149"
+                "reference": "b52ce2ca48888b55efae468773b25f2119348c5e"
             },
             "require": {
                 "ext-curl": "*",
@@ -1622,7 +1622,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-08-14 14:08:43"
+            "time": "2017-08-15 13:48:13"
         },
         {
             "name": "ik/workflow-bundle",