Merged in FD3-257 (pull request #33)

FD3-257

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

app/config/parameters.yml.dist

@@ -20,7 +20,7 @@ parameters:
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
     # Url para logout en repositorio base
-    url_logout: 'http://127.0.0.1/base/app_dev.php/logout'
+    url_logout: 'http://%env(HOST_MAPAS)%/logout'
 
     # RabbitMQ parameters
     rabbit_mq.host:     127.0.0.1

composer.json

@@ -115,7 +115,7 @@
     "config": {
         "secure-http": false,
         "optimize-autoloader": true,
-	"sort-packages": true
+        "sort-packages": true
     },
     "require": {
         "php": ">=5.5.9",
@@ -133,7 +133,7 @@
         "ik/map-bundle": "dev-master",
         "ik/migrations-bundle": "dev-master",
         "ik/oauthclient-bundle": "dev-master",
-        "ik/webservice-bundle": "dev-master",
+        "ik/webservice-bundle": "dev-FD3-257",
         "hwi/oauth-bundle": "^0.5.3",
         "ik/owner-voter-bundle": "dev-master",
         "ik/template-bundle": "dev-master",
@@ -141,7 +141,7 @@
         "incenteev/composer-parameter-handler": "^2.0",
         "jms/serializer": "^1.9.0",
         "jms/serializer-bundle": "^1.5.0",
-	"jdorn/sql-formatter": "^1.2.17",
+        "jdorn/sql-formatter": "^1.2.17",
         "php-amqplib/rabbitmq-bundle": "^1.12",
         "samsonasik/package-versions": "1.1.0",
         "sensio/distribution-bundle": "^5.0.21",

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": "49c90dc355b5613a1df168bfdfa84aaa",
+    "content-hash": "8e7f4d9492913bbd4ad16441d8ec4683",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -757,7 +757,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
                 "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
+                "shasum": "62a7b8d59ce1dc5627bd2aed2882f18ff1138219"
             },
             "require": {
                 "php": ">=5.3,<8.0-DEV"
@@ -1386,7 +1386,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-06-27 13:16:34"
+            "time": "2017-06-27T13:16:34+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1409,7 +1409,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-09-22 13:27:29"
+            "time": "2017-09-22T13:27:29+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-18 15:40:04"
+            "time": "2017-10-18T15:40:04+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-20 14:49:48"
+            "time": "2017-10-20T14:49:48+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1478,7 +1478,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-09-26 14:16:42"
+            "time": "2017-09-26T14:16:42+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1499,7 +1499,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-10-18 17:36:55"
+            "time": "2017-10-18T17:36:55+00:00"
         },
         {
             "name": "ik/map-bundle",
@@ -1522,7 +1522,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-12 13:55:36"
+            "time": "2017-10-12T13:55:36+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1545,7 +1545,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-08-31 11:49:28"
+            "time": "2017-08-31T11:49:28+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1572,7 +1572,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2017-10-11T14:15:38+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1595,7 +1595,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/template-bundle",
@@ -1621,15 +1621,15 @@
                 "bundle",
                 "template"
             ],
-            "time": "2017-08-02 18:42:10"
+            "time": "2017-08-02T18:42:10+00:00"
         },
         {
             "name": "ik/webservice-bundle",
-            "version": "dev-master",
+            "version": "dev-FD3-257",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "05b18020331bf97da5efa3879591ab64a0acb9e9"
+                "reference": "9bf7cb7e643e4d4a2c42d16e08ff1b319c0110c4"
             },
             "require": {
                 "ext-curl": "*",
@@ -1642,7 +1642,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-10-20 18:30:26"
+            "time": "2017-10-23T15:02:50+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1650,7 +1650,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "f858f2e66035253436a15971abe92927ea8e6a6f"
+                "reference": "e1a027927aa7c67bbed5e10d9c594034f368d31f"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1680,7 +1680,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-10-20 12:56:11"
+            "time": "2017-10-20T18:13:35+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1958,7 +1958,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/85ee039a2b7f89d77c403e33cee7b43a875c31e5",
                 "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5",
-                "shasum": ""
+                "shasum": "8ceb3e6f31ad9b250fe9070661ee2d4b4d52c0f2"
             },
             "require": {
                 "jms/serializer": "^1.7",
@@ -2874,7 +2874,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/eb6266b3b472e4002538610b28a0a04bcf94891a",
                 "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a",
-                "shasum": ""
+                "shasum": "c880207d73e5af5719bf65852f2890e55cb488d6"
             },
             "require": {
                 "php": ">=5.3.9",
@@ -3212,7 +3212,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -3357,7 +3357,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/a1b837101262af856c45b22e8f0887553edf0fb0",
                 "reference": "a1b837101262af856c45b22e8f0887553edf0fb0",
-                "shasum": ""
+                "shasum": "b4eab0224ddcb695619ccfd100c5e2e042a5bd65"
             },
             "require": {
                 "cocur/slugify": "^1.4 || ^2.0",
@@ -3753,7 +3753,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
                 "reference": "6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
-                "shasum": ""
+                "shasum": "9bfbf89227cb6c537f05ae2097653339435f30e6"
             },
             "require": {
                 "monolog/monolog": "~1.22",
@@ -4570,7 +4570,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -4676,7 +4676,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
                 "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
-                "shasum": ""
+                "shasum": "37b52563a4ae05716e8477fc781cb03e50599a8f"
             },
             "require": {
                 "php": ">=5.4.0"
@@ -4820,7 +4820,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
                 "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
+                "shasum": "4539a1a703f4610530726a583389f6e85bf38a07"
             },
             "require": {
                 "php": ">=5.5"
@@ -4966,7 +4966,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
                 "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
-                "shasum": ""
+                "shasum": "f79466e27f8deee75a60d0b4fd98db55eacf9cc3"
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
@@ -5093,7 +5093,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
                 "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": ""
+                "shasum": "d3ce5a919fe743126f331988b9a0f7b8302b999a"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5140,7 +5140,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
                 "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
+                "shasum": "4122b00281fc98e1733bd9ca446002393c452f84"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5181,7 +5181,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
                 "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
+                "shasum": "f67f992aca05457e1e21f619250770b09092ff7b"
             },
             "require": {
                 "php": "^5.3.3 || ^7.0"
@@ -5422,7 +5422,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
                 "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
+                "shasum": "8470a6b3ca913a110aa2580255552a06e995710c"
             },
             "require": {
                 "php": "^5.6 || ^7.0"
@@ -5896,7 +5896,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
+                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
             },
             "require": {
                 "php": ">=5.6.0"
@@ -5938,7 +5938,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
                 "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
+                "shasum": "dff8de471afebba9fc6837bb8c886ddc7ebe41bb"
             },
             "require": {
                 "php": ">=5.6"

src/FTTHBundle/Admin/ONUAdmin.php

@@ -6,6 +6,7 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
+use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
 use WorkflowBundle\Admin\WorkflowBaseAdmin;
 
 class ONUAdmin extends WorkflowBaseAdmin
@@ -17,7 +18,10 @@ class ONUAdmin extends WorkflowBaseAdmin
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
-            ->add('clientId')
+            ->add('clientId', CallbackFilter::class,
+                array(
+                    'callback' => array($this, 'getClientFilter'),
+                    'field_type' => 'text'))
             ->add('ponSerialNumber')
             ->add('profile')
             ->add('nap')
@@ -119,4 +123,21 @@ class ONUAdmin extends WorkflowBaseAdmin
         $this->setTemplate('create', 'FTTHBundle:ONU:form.html.twig');
         $this->setTemplate('edit', 'FTTHBundle:ONU:form.html.twig');
     }
+
+    /**
+     * Filtra las ONU por el filtro de clientes.
+     * @param $queryBuilder
+     * @param $alias
+     * @param $field
+     * @param $value
+     * @return bool
+     */
+    public function getClientFilter($queryBuilder, $alias, $field, $value)
+    {
+        $resp = false;
+        if ($value['value']) {
+            $resp = $this->get('webservice')->getClientFilter($queryBuilder, $alias, $field, $value);
+        }
+        return $resp;
+    }
 }