Merge

app/DoctrineMigrations/Version20171205180407.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use MigrationsBundle\Migrations\MigrationsBase;
+
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171205180407 extends MigrationsBase
+{
+    public function up(Schema $schema)
+    {
+        $this->executeYaml(__DIR__ . "/Actions20171205180407/", "inicio.yml");
+        $this->showResult();
+    }
+}

app/config/parameters.yml.dist

@@ -35,8 +35,9 @@ parameters:
     db_session_user: root
     db_session_password: null
 
-    # RabbitMQ routing key
-    env(AMQP_KEY) : ""
+    # RabbitMQ routing key 
+    env(HOST_AMQP): amqp
+    env(AMQP_KEY): ftth
 
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'

app/config/parameters.yml.docker

@@ -32,7 +32,10 @@ parameters:
     db_session_name: fd_session
     db_session_user: root
     db_session_password: 235r2342gtfsw
-    env(AMQP_KEY) : ""
+    
+    # RabbitMQ routing key 
+    env(HOST_AMQP): amqp
+    env(AMQP_KEY): ftth
 
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'

composer.lock

@@ -16,7 +16,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/d2e29143917186502edbd5c5ac3536241a18ddda",
+                "url": "https://satis.infra.flowdat.com/dist/behat/transliterator/behat-transliterator-d2e29143917186502edbd5c5ac3536241a18ddda-zip-13fce1.zip",
                 "reference": "d2e29143917186502edbd5c5ac3536241a18ddda",
                 "shasum": "975c44ed94e058e628592b89145466fa2e556934"
             },
@@ -56,7 +56,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cocur/slugify/zipball/05f00fa75f1c53edfcf4d0425e7e62e95b8888dd",
+                "url": "https://satis.infra.flowdat.com/dist/cocur/slugify/cocur-slugify-05f00fa75f1c53edfcf4d0425e7e62e95b8888dd-zip-da2623.zip",
                 "reference": "05f00fa75f1c53edfcf4d0425e7e62e95b8888dd",
                 "shasum": "fe3e6691b45242f9f9c47bc5c7c175b741bd918e"
             },
@@ -119,7 +119,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/fae359b3efd908e407a0105ff8956b5c94ddca8e",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/annotations/doctrine-annotations-fae359b3efd908e407a0105ff8956b5c94ddca8e-zip-627787.zip",
                 "reference": "fae359b3efd908e407a0105ff8956b5c94ddca8e",
                 "shasum": "666b80ae2677f10f4bdb4310bcc5a558d848cceb"
             },
@@ -186,7 +186,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/cache/doctrine-cache-8c434000f420ade76a07c64cbe08ca47e5c101ca-zip-45d536.zip",
                 "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca",
                 "shasum": "072297e455a3d21f3f2534abc8876802929d7398"
             },
@@ -256,7 +256,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/collections/doctrine-collections-b99c5c46c87126201899afe88ec490a25eedd6a2-zip-1be3b8.zip",
                 "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2",
                 "shasum": "fee2dd75f4681e7f5fda7445fac30416ad4a29d9"
             },
@@ -324,7 +324,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/common/doctrine-common-cd8daf2501e10c63dced7b8b9b905844316ae9d3-zip-ba3873.zip",
                 "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3",
                 "shasum": "476804c261f9e3a85cc60798de4773ceb04b0e38"
             },
@@ -397,7 +397,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/71140662c0a954602e81271667b6e03d9f53ea34",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/dbal/doctrine-dbal-71140662c0a954602e81271667b6e03d9f53ea34-zip-16495f.zip",
                 "reference": "71140662c0a954602e81271667b6e03d9f53ea34",
                 "shasum": "79c74d6b82fb610683a474e3472ff0a1c519842e"
             },
@@ -468,7 +468,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/doctrine-bundle/doctrine-doctrine-bundle-a5b3ba908ba68f3e14e42762a7b940fde65ed7da-zip-5c5502.zip",
                 "reference": "a5b3ba908ba68f3e14e42762a7b940fde65ed7da",
                 "shasum": "3ada65d9f4f64ef1b9e31b31f241094733f22e4e"
             },
@@ -546,7 +546,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/34fce1cd7bc74634fc119f8bf985a137087927d2",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/doctrine-cache-bundle/doctrine-doctrine-cache-bundle-34fce1cd7bc74634fc119f8bf985a137087927d2-zip-7fe7fe.zip",
                 "reference": "34fce1cd7bc74634fc119f8bf985a137087927d2",
                 "shasum": "63a033a7f74693cb7246a0c3b81e344befcfa600"
             },
@@ -630,7 +630,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/0b89ee55bceb53c60bc4ba32924ac5053e377abb",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/doctrine-migrations-bundle/doctrine-doctrine-migrations-bundle-0b89ee55bceb53c60bc4ba32924ac5053e377abb-zip-e4f6d6.zip",
                 "reference": "0b89ee55bceb53c60bc4ba32924ac5053e377abb",
                 "shasum": "8a9290abfd4986ab33c934e4ad107aa2dd3b39be"
             },
@@ -691,7 +691,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/54b8333d2a5682afdc690060c1cf384ba9f47f08",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/inflector/doctrine-inflector-54b8333d2a5682afdc690060c1cf384ba9f47f08-zip-9fd2eb.zip",
                 "reference": "54b8333d2a5682afdc690060c1cf384ba9f47f08",
                 "shasum": "7567c388ccf5ae771f26b49afc6d8667fe9ca16e"
             },
@@ -809,7 +809,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/lexer/doctrine-lexer-2f708a85bb3aab5d99dab8be435abd73e0b18acb-zip-7336a0.zip",
                 "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb",
                 "shasum": "27771df83a75e189adc2e746313004421befc244"
             },
@@ -861,7 +861,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/migrations/zipball/57e50714fcb34235cf055edc409e169b8d7af690",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/migrations/doctrine-migrations-57e50714fcb34235cf055edc409e169b8d7af690-zip-ef538b.zip",
                 "reference": "57e50714fcb34235cf055edc409e169b8d7af690",
                 "shasum": "0151aad67f4e530706d770312f5406e8e7915c8f"
             },
@@ -929,7 +929,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/464b5fdbfbbeb4a65465ac173c4c5d90960f41ff",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/orm/doctrine-orm-464b5fdbfbbeb4a65465ac173c4c5d90960f41ff-zip-8d6d53.zip",
                 "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff",
                 "shasum": "9e5f30e47bcf6b8b6b302432fa44774ba2c2772d"
             },
@@ -1107,7 +1107,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/a96e829fc3f503675bebea2d0d8e170213ab210a",
+                "url": "https://satis.infra.flowdat.com/dist/friendsofsymfony/rest-bundle/friendsofsymfony-rest-bundle-a96e829fc3f503675bebea2d0d8e170213ab210a-zip-929fcc.zip",
                 "reference": "a96e829fc3f503675bebea2d0d8e170213ab210a",
                 "shasum": "e4a93489aa9e985bcaa6dbc4081019cbe56f6c75"
             },
@@ -1464,7 +1464,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "fc13213d31df24dd6a975969c0ff53cbb9ce5c87"
+                "reference": "63444b34bcb0d5f97eb72265c3e04c3e744e84b3"
             },
             "type": "library",
             "autoload": {
@@ -1479,7 +1479,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-12-12 15:42:32"
+            "time": "2017-12-26 15:41:06"
         },
         {
             "name": "ik/device-bundle",
@@ -1487,7 +1487,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "549e289e09ef991900025be4994e0641efa955ef"
+                "reference": "44b9f6833db9d9611e9065615888ddbe96993537"
             },
             "type": "library",
             "autoload": {
@@ -1502,7 +1502,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-12-13 13:30:22"
+            "time": "2017-12-26 12:26:50"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1510,7 +1510,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "285c7a279256fc613a0a8e65c6163d5b60361365"
+                "reference": "fdfa90821ff77946aa8a6781da6ac561f52e2b76"
             },
             "type": "library",
             "autoload": {
@@ -1525,7 +1525,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-12-11 15:48:57"
+            "time": "2017-12-27 13:01:33"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1577,7 +1577,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
-                "reference": "1fb5025b4a8030528d2194a666fc172b62fc34ba"
+                "reference": "db2d82800bca471cff76677b53aef5ec0ce6f374"
             },
             "type": "library",
             "autoload": {
@@ -1592,7 +1592,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-12-06 17:56:15"
+            "time": "2017-12-21 12:10:32"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1697,7 +1697,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "dc130dd1b6bd8f609ade3b324798c70e20c5a977"
+                "reference": "360f6a217c6ebdbc7d39b608d5cc63f28dbde47e"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1727,7 +1727,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-11-09 15:34:00"
+            "time": "2017-12-21 16:04:13"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1840,7 +1840,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/84088bc4f6e2387ec8b549bffc1e037107572f5a",
+                "url": "https://satis.infra.flowdat.com/dist/jms/metadata/jms-metadata-84088bc4f6e2387ec8b549bffc1e037107572f5a-zip-226f9d.zip",
                 "reference": "84088bc4f6e2387ec8b549bffc1e037107572f5a",
                 "shasum": "e0db3958e238ba3a77976af7a4622b16cbfba7e5"
             },
@@ -2074,7 +2074,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/c6ad49933babd06a27b2f962a3469601ec9038b8",
+                "url": "https://satis.infra.flowdat.com/dist/knplabs/knp-menu/knplabs-knp-menu-c6ad49933babd06a27b2f962a3469601ec9038b8-zip-b6dfda.zip",
                 "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8",
                 "shasum": "aaa50e396025e04d19405b9547a449dd4765a97b"
             },
@@ -2139,7 +2139,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/90aff8e39274d1225dfa3bb7b1dd4e47b7312dca",
+                "url": "https://satis.infra.flowdat.com/dist/knplabs/knp-menu-bundle/knplabs-knp-menu-bundle-90aff8e39274d1225dfa3bb7b1dd4e47b7312dca-zip-0b529b.zip",
                 "reference": "90aff8e39274d1225dfa3bb7b1dd4e47b7312dca",
                 "shasum": "9df3decc6263f893d4af2ce76ecdc1891d599bbd"
             },
@@ -2196,7 +2196,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/Buzz/zipball/487760b05d6269a4c2c374364325326cfa65b12c",
+                "url": "https://satis.infra.flowdat.com/dist/kriswallsmith/buzz/kriswallsmith-buzz-487760b05d6269a4c2c374364325326cfa65b12c-zip-0eadfe.zip",
                 "reference": "487760b05d6269a4c2c374364325326cfa65b12c",
                 "shasum": "738ce41bcae934ac6346eeee49339886f2305779"
             },
@@ -2244,7 +2244,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
+                "url": "https://satis.infra.flowdat.com/dist/monolog/monolog/monolog-monolog-bad29cb8d18ab0315e6c477751418a82c850d558-zip-96ac6d.zip",
                 "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
                 "shasum": "81358a7f80cccda122aa1f6f718a87e89fcbbfc0"
             },
@@ -2322,7 +2322,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nelmio/NelmioCorsBundle/zipball/fa14a81737c605bf4766054cdcb72a16a433d537",
+                "url": "https://satis.infra.flowdat.com/dist/nelmio/cors-bundle/nelmio-cors-bundle-fa14a81737c605bf4766054cdcb72a16a433d537-zip-751954.zip",
                 "reference": "fa14a81737c605bf4766054cdcb72a16a433d537",
                 "shasum": "7cc39cd6e6db8edcccb0ff54161894e9e0ba03f1"
             },
@@ -2379,7 +2379,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a1d9f267eb8b8ad560e54e397a5ed1e3b78097d1",
+                "url": "https://satis.infra.flowdat.com/dist/paragonie/random_compat/paragonie-random_compat-a1d9f267eb8b8ad560e54e397a5ed1e3b78097d1-zip-8ff3a6.zip",
                 "reference": "a1d9f267eb8b8ad560e54e397a5ed1e3b78097d1",
                 "shasum": "7417d6bf8e5edde37b6dfe477c0ff4919e540a2e"
             },
@@ -2421,7 +2421,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/8a6e89ad46130eb365b7f57d313f2a795f5e3269",
+                "url": "https://satis.infra.flowdat.com/dist/php-amqplib/php-amqplib/php-amqplib-php-amqplib-8a6e89ad46130eb365b7f57d313f2a795f5e3269-zip-5b5f38.zip",
                 "reference": "8a6e89ad46130eb365b7f57d313f2a795f5e3269",
                 "shasum": "b6eb8dacb145e8c09feba7864f6a051051a26c6a"
             },
@@ -2475,7 +2475,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-amqplib/RabbitMqBundle/zipball/0bb11edec0abdf6dc28eac0144c0a673dddba28f",
+                "url": "https://satis.infra.flowdat.com/dist/php-amqplib/rabbitmq-bundle/php-amqplib-rabbitmq-bundle-0bb11edec0abdf6dc28eac0144c0a673dddba28f-zip-ade703.zip",
                 "reference": "0bb11edec0abdf6dc28eac0144c0a673dddba28f",
                 "shasum": "747f4458ab338285c7dc45f43a9052c19d5db782"
             },
@@ -2540,7 +2540,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/360a888f246773e660fce0d175cf62e41f50dd22",
+                "url": "https://satis.infra.flowdat.com/dist/phpcollection/phpcollection/phpcollection-phpcollection-360a888f246773e660fce0d175cf62e41f50dd22-zip-271c3f.zip",
                 "reference": "360a888f246773e660fce0d175cf62e41f50dd22",
                 "shasum": "6a4f75f5417e301fa4420ebc86078e76254c1e9b"
             },
@@ -2590,7 +2590,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/617bd84bf0d918da79b06ac6765b5390b83b1321",
+                "url": "https://satis.infra.flowdat.com/dist/phpoption/phpoption/phpoption-phpoption-617bd84bf0d918da79b06ac6765b5390b83b1321-zip-ec7839.zip",
                 "reference": "617bd84bf0d918da79b06ac6765b5390b83b1321",
                 "shasum": "52d1c84913be818a51afed7d32fdc2256fac8dd1"
             },
@@ -2639,7 +2639,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/9e66031f41fbbdda45ee11e93c45d480ccba3eb3",
+                "url": "https://satis.infra.flowdat.com/dist/psr/cache/psr-cache-9e66031f41fbbdda45ee11e93c45d480ccba3eb3-zip-1d6c8b.zip",
                 "reference": "9e66031f41fbbdda45ee11e93c45d480ccba3eb3",
                 "shasum": "3d3864556293679b360904cb67838ebe6d26b33f"
             },
@@ -2783,7 +2783,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "url": "https://satis.infra.flowdat.com/dist/psr/log/psr-log-fe0936ee26643249e916849d48e3a51d5f5e278b-zip-e71523.zip",
                 "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
                 "shasum": "3796e091488045d72c8d0cef6e8b4a6b766c85c7"
             },
@@ -3026,7 +3026,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/f5f60fc84fdef91333c67f29b00a271cfbcf1ccb",
+                "url": "https://satis.infra.flowdat.com/dist/sensio/generator-bundle/sensio-generator-bundle-f5f60fc84fdef91333c67f29b00a271cfbcf1ccb-zip-cf47b2.zip",
                 "reference": "f5f60fc84fdef91333c67f29b00a271cfbcf1ccb",
                 "shasum": "6a1b539e6a1a7edeadd1510eed8c9a8a6294e713"
             },
@@ -3078,7 +3078,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93",
+                "url": "https://satis.infra.flowdat.com/dist/sensiolabs/security-checker/sensiolabs-security-checker-21696b0daa731064c23cfb694c60a2584a7b6e93-zip-59973b.zip",
                 "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93",
                 "shasum": "93c7c86bab2ebebccadea1d63d92790ef9ddffd6"
             },
@@ -3122,7 +3122,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/simplethings/EntityAuditBundle/zipball/bcdd118356ef451da2f6986fbeab68184e084bf0",
+                "url": "https://satis.infra.flowdat.com/dist/simplethings/entity-audit-bundle/simplethings-entity-audit-bundle-bcdd118356ef451da2f6986fbeab68184e084bf0-zip-0b3dc2.zip",
                 "reference": "bcdd118356ef451da2f6986fbeab68184e084bf0",
                 "shasum": "75ece7213b4145a5eabd685aec346b8f517c3cd3"
             },
@@ -3271,7 +3271,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/987b9e9bbbdaeed339c1fcf97a4645aba1e6b403",
+                "url": "https://satis.infra.flowdat.com/dist/sonata-project/block-bundle/sonata-project-block-bundle-987b9e9bbbdaeed339c1fcf97a4645aba1e6b403-zip-f8223f.zip",
                 "reference": "987b9e9bbbdaeed339c1fcf97a4645aba1e6b403",
                 "shasum": "5d326359a01bb1c872b7cb09af333e5dfe6709b5"
             },
@@ -3343,7 +3343,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/cache/zipball/882f41583d10e6320fcc5376964b934790add59f",
+                "url": "https://satis.infra.flowdat.com/dist/sonata-project/cache/sonata-project-cache-882f41583d10e6320fcc5376964b934790add59f-zip-e7fcb2.zip",
                 "reference": "882f41583d10e6320fcc5376964b934790add59f",
                 "shasum": "aa21e2f2b45881dfad8560eb10250966cba720bd"
             },
@@ -3402,7 +3402,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/a1b837101262af856c45b22e8f0887553edf0fb0",
+                "url": "https://satis.infra.flowdat.com/dist/sonata-project/core-bundle/sonata-project-core-bundle-a1b837101262af856c45b22e8f0887553edf0fb0-zip-094660.zip",
                 "reference": "a1b837101262af856c45b22e8f0887553edf0fb0",
                 "shasum": "b4eab0224ddcb695619ccfd100c5e2e042a5bd65"
             },
@@ -3538,7 +3538,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataDoctrineORMAdminBundle/zipball/5a6819928f947cb7e5a8d288ad83f8131bab4875",
+                "url": "https://satis.infra.flowdat.com/dist/sonata-project/doctrine-orm-admin-bundle/sonata-project-doctrine-orm-admin-bundle-5a6819928f947cb7e5a8d288ad83f8131bab4875-zip-f14cc6.zip",
                 "reference": "5a6819928f947cb7e5a8d288ad83f8131bab4875",
                 "shasum": "0c40ac0fe870f15d2a78d7657a0f81ca81e9dcaf"
             },
@@ -3747,7 +3747,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/e2915242824e32e28be3fc699c453c1d16fd6de1",
+                "url": "https://satis.infra.flowdat.com/dist/swiftmailer/swiftmailer/swiftmailer-swiftmailer-e2915242824e32e28be3fc699c453c1d16fd6de1-zip-24e5a7.zip",
                 "reference": "e2915242824e32e28be3fc699c453c1d16fd6de1",
                 "shasum": "c7c962262f18a0a92333289c5cc60241ad97e5e9"
             },
@@ -3798,7 +3798,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/monolog-bundle/symfony-monolog-bundle-6f96c7dbb6b2ef70b307a1a6f897153cbca3da47-zip-b9767d.zip",
                 "reference": "6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
                 "shasum": "9bfbf89227cb6c537f05ae2097653339435f30e6"
             },
@@ -3858,7 +3858,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/polyfill-apcu/symfony-polyfill-apcu-d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c-zip-ce3dd0.zip",
                 "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c",
                 "shasum": "82a361acbbe28dad4d360f33b88255dc2daec70a"
             },
@@ -3914,7 +3914,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2deb44160e1c886241c06602b12b98779f728177",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/polyfill-intl-icu/symfony-polyfill-intl-icu-2deb44160e1c886241c06602b12b98779f728177-zip-5c7a77.zip",
                 "reference": "2deb44160e1c886241c06602b12b98779f728177",
                 "shasum": "d2a77632c399083f4e243b8787bea67de58b6333"
             },
@@ -3969,7 +3969,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/polyfill-mbstring/symfony-polyfill-mbstring-0b6a8940385311a24e060ec1fe35680e17c74497-zip-af83ff.zip",
                 "reference": "0b6a8940385311a24e060ec1fe35680e17c74497",
                 "shasum": "3c32d4cef3c9212bbbed0dc3720339a82462620e"
             },
@@ -4025,7 +4025,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/polyfill-php56/symfony-polyfill-php56-a6bd4770a6967517e6610529e14afaa3111094a3-zip-2ddb9f.zip",
                 "reference": "a6bd4770a6967517e6610529e14afaa3111094a3",
                 "shasum": "a6d04b302d0186cd13c8ead1aa79093f30cad609"
             },
@@ -4081,7 +4081,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/7f7f3c9c2b9f17722e0cd64fdb4f957330c53146",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/polyfill-php70/symfony-polyfill-php70-7f7f3c9c2b9f17722e0cd64fdb4f957330c53146-zip-451ee3.zip",
                 "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146",
                 "shasum": "db1bbff956265a40f1030b6a0e9814db5d26c872"
             },
@@ -4140,7 +4140,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/polyfill-util/symfony-polyfill-util-4271c55cbc0a77b2641f861b978123e46b3da969-zip-601b3f.zip",
                 "reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
                 "shasum": "d0d1c1363cc4275e8fc3a9f473b077ecff06d6b2"
             },
@@ -4253,7 +4253,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/swiftmailer-bundle/symfony-swiftmailer-bundle-de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51-zip-fa7389.zip",
                 "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
                 "shasum": "b28c179d3c5d4ed8bbdf5cd37caa99918763b487"
             },
@@ -4629,7 +4629,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/willdurand/JsonpCallbackValidator/zipball/58c0a6c76718794856f7049cf066fdda4e984c49",
+                "url": "https://satis.infra.flowdat.com/dist/willdurand/jsonp-callback-validator/willdurand-jsonp-callback-validator-58c0a6c76718794856f7049cf066fdda4e984c49-zip-e50bc6.zip",
                 "reference": "58c0a6c76718794856f7049cf066fdda4e984c49",
                 "shasum": "f96de007ab9df23a7c110fca2404a592d5d57c3b"
             },
@@ -4669,7 +4669,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/1757fc48a77a85df6f7659a16b4522bf8da14e99",
+                "url": "https://satis.infra.flowdat.com/dist/willdurand/negotiation/willdurand-negotiation-1757fc48a77a85df6f7659a16b4522bf8da14e99-zip-7ea9c2.zip",
                 "reference": "1757fc48a77a85df6f7659a16b4522bf8da14e99",
                 "shasum": "1b48cece24cef7085c707ead21e0ee2505ca8422"
             },
@@ -4721,7 +4721,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+                "url": "https://satis.infra.flowdat.com/dist/myclabs/deep-copy/myclabs-deep-copy-8e6e04167378abf1ddb4d3522d8755c5fd90d102-zip-b7d758.zip",
                 "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
                 "shasum": "37b52563a4ae05716e8477fc781cb03e50599a8f"
             },
@@ -4865,7 +4865,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "url": "https://satis.infra.flowdat.com/dist/phpdocumentor/reflection-common/phpdocumentor-reflection-common-144c307535e82c8fdcaacbcfc1d6d8eeb896687c-zip-c3be2d.zip",
                 "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
                 "shasum": "4539a1a703f4610530726a583389f6e85bf38a07"
             },
@@ -4919,7 +4919,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
+                "url": "https://satis.infra.flowdat.com/dist/phpdocumentor/reflection-docblock/phpdocumentor-reflection-docblock-9270140b940ff02e58ec577c237274e92cd40cdd-zip-550863.zip",
                 "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
                 "shasum": "41a73317deaa7f38e3f3eb5ef8e7f7bcb56fc24b"
             },
@@ -4964,7 +4964,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "url": "https://satis.infra.flowdat.com/dist/phpdocumentor/type-resolver/phpdocumentor-type-resolver-b39c7a5b194f9ed7bd0dd345c751007a41862443-zip-e34c86.zip",
                 "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
                 "shasum": "cc04f21b6dd88f21740d739392df15e6cdc117b8"
             },
@@ -5011,7 +5011,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "url": "https://satis.infra.flowdat.com/dist/phpspec/prophecy/phpspec-prophecy-93d39f1f7f9326d746203c7c056f300f7f126073-zip-f944ab.zip",
                 "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
                 "shasum": "f79466e27f8deee75a60d0b4fd98db55eacf9cc3"
             },
@@ -5324,9 +5324,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1bcaca096998de32c29535fdd2dea0c475e8f61",
+                "url": "https://satis.infra.flowdat.com/dist/phpunit/phpunit/phpunit-phpunit-a1bcaca096998de32c29535fdd2dea0c475e8f61-zip-db856b.zip",
                 "reference": "a1bcaca096998de32c29535fdd2dea0c475e8f61",
-                "shasum": ""
+                "shasum": "0b6c77f2626c591c008cc3391cc6ec55283bdb6e"
             },
             "require": {
                 "ext-dom": "*",
@@ -6128,7 +6128,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/3371442b05531d8490d0b51b90b55e61948b0f10",
+                "url": "https://satis.infra.flowdat.com/dist/webmozart/assert/webmozart-assert-3371442b05531d8490d0b51b90b55e61948b0f10-zip-885f0e.zip",
                 "reference": "3371442b05531d8490d0b51b90b55e61948b0f10",
                 "shasum": "2443035dc1c75ecba04a2d14cf21a639f86dc1da"
             },

src/FTTHBundle/Admin/NAPAdmin.php

@@ -22,6 +22,7 @@ class NAPAdmin extends BaseAdmin
             ->add('olt')
             ->add('slot')
             ->add('link')
+            ->add('address')
                 ;
     }
 
@@ -36,6 +37,7 @@ class NAPAdmin extends BaseAdmin
             ->add('olt')
             ->add('slot')
             ->add('link')
+            ->add('address')
             ->add('onus')
             ->add('extraData')
             ->add('_action', null, array(
@@ -53,12 +55,24 @@ class NAPAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-            ->add('name')
-            ->add('parent')
-            ->add('olt')
-            ->add('slot')
-            ->add('link')
-            ->add('extraData');
+        ->tab('default')
+        ->with('')
+        ->add('name')
+        ->add('parent')
+        ->add('olt')
+        ->add('slot')
+        ->add('link')
+        ->add('address', 'text', [
+            'required' => false,
+        ])
+        ->end()
+        ->end()
+        ->tab('Avanzado')
+        ->with('Config')
+        ->add('extraData')
+        ->end()
+        ->end()
+            ;
     }
 
     /**
@@ -72,6 +86,7 @@ class NAPAdmin extends BaseAdmin
             ->add('olt')
             ->add('slot')
             ->add('link')
+            ->add('address')
             ->add('onus')
             ->add('extraData');
     }

src/FTTHBundle/Admin/ONUAdmin.php

@@ -41,7 +41,7 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->add('ip')
             ->add('mac')
             ->add('serialNumber')
-            ->add('ponSerialNumber')
+            ->add('ponSerialNumber', 'string', array('template' => 'FTTHBundle:ONU:base_list_field_pon_serial_number.html.twig'))
             ->add('profile')
             ->add('nap')
             ->add('model')

src/FTTHBundle/Controller/ONUController.php

@@ -147,6 +147,7 @@ class ONUController extends Controller
 
             $em->persist($location);
 
+            $object->setUpdated(new \DateTime());
             $return[] = "LOCATION (id {$location->getId()}) {$action} - ONU (id {$object->getId()}) {$onu['text']} - " . json_encode($mapLocation);
         }
 

src/FTTHBundle/Entity/NAP.php

@@ -92,6 +92,13 @@ class NAP implements TenancyIdTraitInterface, LocationInterface
      */
     protected $link = 0;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $address;
+
 
     /**
      * @return string
@@ -275,4 +282,24 @@ class NAP implements TenancyIdTraitInterface, LocationInterface
 	    return $this->lng;
     }
 
+    /**
+    * @return string
+    */
+    public function getAddress()
+    {
+        return $this->address;
+    }
+
+    /**
+    * @param string $address
+    *
+    * @return Nap
+    */
+    public function setAddress($address)
+    {
+        $this->address = $address;
+
+        return $this;
+    }
+
 }

src/FTTHBundle/Entity/OLT.php

@@ -43,15 +43,16 @@ class OLT implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
     /**
      * @var string $name
      *
-     * @ORM\Column(type="string", length=255, nullable=true, unique=false)
+     * @ORM\Column(type="string", length=255)
+
+     * @Assert\NotNull
      */
     protected $name;
 
     /**
      * @var string $ip
      *
-     * @ORM\Column(type="string", length=50, nullable=false, unique=true)
-     * @Assert\NotNull
+     * @ORM\Column(type="string", length=50, nullable=true, unique=true)
      */
     protected $ip;
 

src/FTTHBundle/Entity/ONU.php

@@ -72,7 +72,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
     /**
      * @var string
      *
-     * @ORM\Column(type="string", length=12, nullable=false, unique=true)
+     * @ORM\Column(type="string", length=16, nullable=false, unique=true)
      */
     private $ponSerialNumber;
 
@@ -267,7 +267,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
      */
     public function setPonSerialNumber($ponSerialNumber)
     {
-        $this->ponSerialNumber = $ponSerialNumber;
+        $this->ponSerialNumber = strtolower($ponSerialNumber);
 
         return $this;
     }
@@ -279,7 +279,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
      */
     public function getPonSerialNumber()
     {
-        return $this->ponSerialNumber;
+        return strtolower($this->ponSerialNumber);
     }
 
     /**

src/FTTHBundle/EventListener/NAPAddressSubscriber.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace FTTHBundle\EventListener;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use FTTHBundle\Entity\NAP;
+
+class NAPAddressSubscriber implements EventSubscriber
+{
+
+    /**
+     * @return array
+     */
+    public function getSubscribedEvents()
+    {
+        return array(
+            'prePersist',
+            'preUpdate',
+        );
+    }
+
+    /**
+     * @param LifecycleEventArgs $args
+     */
+    public function prePersist(LifecycleEventArgs $args)
+    {
+        $this->execute($args);
+    }
+
+    /**
+     * @param LifecycleEventArgs $args
+     */
+    public function preUpdate(LifecycleEventArgs $args)
+    {
+        $this->execute($args, 'preUpdate');
+    }
+
+    /**
+     * @param LifecycleEventArgs $args
+     * @param string $eventName
+     */
+    public function execute(LifecycleEventArgs $args, $eventName = 'prePersist')
+    {
+        $entity = $args->getEntity();
+        if ($entity instanceof NAP) {
+            $address = $entity->getAddress();
+            $address ? $entity->__set('address', $address)
+                     : $entity->__unset('address');
+
+            if ($eventName == 'preUpdate') {
+                $uow = $args->getEntityManager()->getUnitOfWork();
+                $meta = $args->getEntityManager()->getClassMetadata(get_class($entity));
+                $uow->recomputeSingleEntityChangeSet($meta, $entity);
+            }
+        }
+    }
+
+}

src/FTTHBundle/Resources/config/services.yml

@@ -36,7 +36,7 @@ services:
         arguments: [~, FTTHBundle\Entity\ONUModel, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: ONUModel, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
+        calls:
             - [setTranslationDomain, [FTTHBundle]]
 
     ftth.admin.olt_model:
@@ -44,7 +44,7 @@ services:
         arguments: [~, FTTHBundle\Entity\OLTModel, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: OLTModel, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
+        calls:
             - [setTranslationDomain, [FTTHBundle]]
 
     ftth.onu.subscriber:
@@ -71,3 +71,8 @@ services:
         class: FTTHBundle\EventListener\ONUSoftDeleteListener
         tags:
             - { name: doctrine.event_listener, event: prePersist }
+
+    ftth.nap.subscriber:
+        class: FTTHBundle\EventListener\NAPAddressSubscriber
+        tags:
+            - { name: doctrine.event_subscriber, connection: default }

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

@@ -43,6 +43,7 @@ filter:
     label_library: Librería
     label_slot: Slot
     label_link: Link
+    label_address: Dirección
     
 breadcrumb:
     link_o_n_u_list: Listado ONU
@@ -106,6 +107,7 @@ form:
     label_slot: Slot
     label_link: Link
     label_enable: Enable
+    label_address: Dirección
 
 list:
     label_id: Id
@@ -144,6 +146,7 @@ list:
     label_slot: Slot
     label_link: Link
     label_enable: Enable
+    label_address: Dirección
 
 show:
     label_id: Id
@@ -182,6 +185,7 @@ show:
     label_slot: Slot
     label_link: Link
     label_enable: Enable
+    label_address: Dirección
     
 helps:
     check_address: Verifique la dirección para el cálculo de distancias.
@@ -208,4 +212,4 @@ Address: Dirección
 out_of_range: FUERA DE RANGO
 without_olt: SIN OLT
 onu_distance_nap_not_configurated: Requiere configuración de distancia
-nap_not_positioned: NAP no posicionada
+nap_not_positioned: NAP no posicionada

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

@@ -0,0 +1,7 @@
+{% extends 'SonataAdminBundle:CRUD:base_list_field.html.twig' %}
+
+{% block field %}
+
+    {{ object.getPonSerialNumber()|upper }}
+
+{% endblock %}

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

@@ -12,7 +12,11 @@
                 modificacion = true;
                 callbackClientId(objSelectClient.val());
             } else {
-                drawMap(-32.030232, -61.220883); // galvez
+                if (_MAP_LATITUDE == 0 && _MAP_LONGITUDE == 0) {
+                    setCoordinatesFromConfig(true);
+                } else {
+                    drawMap(_MAP_LATITUDE, _MAP_LONGITUDE);
+                }
                 $("div[id*='_nap']").find(".select2-chosen").html("");
                 $("select[id*='_nap']").val(0);
             }