Merged in FD3-141 (pull request #15)

FD3-141

Approved-by: Maximiliano Schvindt <maximiliano@interlink.com.ar>

app/AppKernel.php

@@ -37,7 +37,9 @@ class AppKernel extends Kernel
             new DeviceBundle\DeviceBundle(),
             new OwnerVoterBundle\OwnerVoterBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
-            new MigrationsBundle\MigrationsBundle()
+            new MigrationsBundle\MigrationsBundle(),
+            new MapBundle\MapBundle(),
+            new LeafletBundle\LeafletBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/config/config.yml

@@ -19,6 +19,7 @@ imports:
     - { resource: "bundles/ik/device-bundle/parameters.yml" }
     - { resource: "@DeviceBundle/Resources/config/services.yml" }
     - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
+    - { resource: "@MapBundle/Resources/config/services.yml" }
 
 parameters:
     app_name: ftth

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"
+    

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'

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%'

composer.json

@@ -73,6 +73,20 @@
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
+        },
+        {
+            "type": "vcs",
+            "url":  "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
         }
     ],
     "config": {
@@ -109,7 +123,9 @@
         "ik/owner-voter-bundle": "dev-master",
         "doctrine/doctrine-migrations-bundle": "^1.2",
         "ik/migrations-bundle": "dev-master",
-        "samsonasik/package-versions": "1.1.0"
+        "samsonasik/package-versions": "1.1.0",
+        "ik/leaflet-bundle": "dev-master",
+        "ik/map-bundle": "dev-master"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "38078f3bae2c25fd9046bdcb4c4f29b3",
+    "content-hash": "f305f11f0e3bf25a6a6571f7b70ee4bf",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1460,6 +1460,50 @@
             ],
             "time": "2017-07-05 12:20:18"
         },
+        {
+            "name": "ik/leaflet-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git",
+                "reference": "f7f09658910a9e40caa6c6ad15870c8acb882b1e"
+            },
+            "require": {
+                "ext-curl": "*",
+                "kriswallsmith/buzz": "~0.13"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "LeafletBundle\\": ""
+                }
+            },
+            "description": "The Flowdat3 Leaflet Resource",
+            "time": "2017-08-15 13:46:42"
+        },
+        {
+            "name": "ik/map-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
+                "reference": "8e61c7c8723b332a522cd6b08943b0a1326ad5e2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "MapBundle\\": ""
+                }
+            },
+            "description": "The Flowdat3 Symfony Admin Generator",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "bootstrap",
+                "sonata"
+            ],
+            "time": "2017-08-15 15:34:50"
+        },
         {
             "name": "ik/migrations-bundle",
             "version": "dev-master",
@@ -5927,7 +5971,9 @@
         "ik/extra-data-bundle": 20,
         "ik/device-bundle": 20,
         "ik/owner-voter-bundle": 20,
-        "ik/migrations-bundle": 20
+        "ik/migrations-bundle": 20,
+        "ik/leaflet-bundle": 20,
+        "ik/map-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

src/FTTHBundle/Entity/OLT.php

@@ -11,6 +11,8 @@ use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Workflow\Exception\ExceptionInterface;
 use DeviceBundle\Validator\Constraints as ValidatorAssert;
 use DeviceBundle\Interfaces\DeviceInterface;
+use MapBundle\Entity\Interfaces\LocationInterface;
+use MapBundle\Entity\Traits\LocationTrait;
 
 /**
  * @ORM\Entity
@@ -18,11 +20,13 @@ use DeviceBundle\Interfaces\DeviceInterface;
  * 
  * @ValidatorAssert\Device
  */
-class OLT implements DeviceInterface, TenancyIdTraitInterface
+class OLT implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
 {
 
     use ExtraDataTrait;
     use TenancyIdTrait;
+    use LocationTrait;
+    
     /**
      * @var bigint $id
      *

src/FTTHBundle/Entity/ONU.php

@@ -14,6 +14,8 @@ use Symfony\Component\Workflow\Exception\ExceptionInterface;
 use DeviceBundle\Validator\Constraints as ValidatorAssert;
 use DeviceBundle\Interfaces\DeviceInterface;
 use JMS\Serializer\Annotation as JMS;
+use MapBundle\Entity\Interfaces\LocationInterface;
+use MapBundle\Entity\Traits\LocationTrait;
 
 /**
  * ONU
@@ -25,11 +27,13 @@ use JMS\Serializer\Annotation as JMS;
  *
  * @ValidatorAssert\Device
  */
-class ONU implements DeviceInterface, TenancyIdTraitInterface
+class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
 {
 
     use ExtraDataTrait;
     use TenancyIdTrait;
+    use LocationTrait;
+    
     /**
      * @var int
      *