Merge remote-tracking branch 'remotes/origin/master' into HEAD

app/config/config.yml

@@ -15,7 +15,7 @@ imports:
     - { resource: "@BaseOAuthClientBundle/Resources/config/hwioauthbundle/config.yml" }
     - { resource: "@TemplateBundle/Resources/config/services.yml" }
     - { resource: '@BaseAdminBundle/Resources/config/services.yml' }
-
+    - { resource: "@ExtraDataBundle/Resources/config/services.yml" }
 
 parameters:
     app_name: ftth

composer.lock

@@ -1285,7 +1285,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "a232d28e8740ad58574155672917b822a43c1c7d"
+                "reference": "2501685b7529d1c01060edb5c1525581a40e7bbc"
             },
             "type": "library",
             "autoload": {
@@ -1300,7 +1300,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-04-21 18:41:49"
+            "time": "2017-04-24 18:04:14"
         },
         {
             "name": "ik/oauthclient-bundle",

src/FTTHBundle/Admin/NAPAdmin.php

@@ -7,16 +7,18 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 
 class NAPAdmin extends BaseAdmin
 {
+
     /**
      * @param DatagridMapper $datagridMapper
      */
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
-            ->add('name')
+                ->add('name')
         ;
     }
 
@@ -26,16 +28,17 @@ class NAPAdmin extends BaseAdmin
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-            ->add('name')
-            ->add('parent')
-            ->add('onus')
-            ->add('_action', null, array(
-                'actions' => array(
-                    'show' => array(),
-                    'edit' => array(),
-                    'delete' => array(),
-                )
-            ))
+                ->add('name')
+                ->add('parent')
+                ->add('onus')
+                ->add('extraData')
+                ->add('_action', null, array(
+                    'actions' => array(
+                        'show' => array(),
+                        'edit' => array(),
+                        'delete' => array(),
+                    )
+                ))
         ;
     }
 
@@ -45,8 +48,9 @@ class NAPAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-            ->add('name')
-            ->add('parent')
+                ->add('name')
+                ->add('parent')
+                ->add('extraData')
         ;
     }
 
@@ -56,9 +60,11 @@ class NAPAdmin extends BaseAdmin
     protected function configureShowFields(ShowMapper $showMapper)
     {
         $showMapper
-            ->add('name')
-            ->add('parent')
-            ->add('onus')
+                ->add('name')
+                ->add('parent')
+                ->add('onus')
+                ->add('extraData')
         ;
     }
+
 }

src/FTTHBundle/Admin/OLTModelAdmin.php

@@ -29,6 +29,7 @@ class OLTModelAdmin extends BaseAdmin
         $listMapper
             ->add('name')
             ->add('props')
+            ->add('extraData')
             ->add('_action', null, array(
                 'actions' => array(
                     'show' => array(),
@@ -47,6 +48,7 @@ class OLTModelAdmin extends BaseAdmin
         $formMapper
             ->add('name')
             ->add('props')
+            ->add('extraData')
         ;
     }
 
@@ -58,6 +60,7 @@ class OLTModelAdmin extends BaseAdmin
         $showMapper
             ->add('name')
             ->add('props')
+            ->add('extraData')
         ;
     }
 }

src/FTTHBundle/Admin/ONUModelAdmin.php

@@ -27,6 +27,7 @@ class ONUModelAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
+            ->add('extraData')
             ->add('_action', null, array(
                 'actions' => array(
                     'show' => array(),
@@ -44,6 +45,7 @@ class ONUModelAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
+            ->add('extraData')
         ;
     }
 
@@ -54,6 +56,7 @@ class ONUModelAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
+            ->add('extraData')
         ;
     }
 }

src/FTTHBundle/Admin/ProfileAdmin.php

@@ -31,6 +31,7 @@ class ProfileAdmin extends AbstractAdmin
             ->add('name')
             ->add('upload')
             ->add('download')
+            ->add('extraData')
             ->add('_action', null, array(
                 'actions' => array(
                     'show' => array(),
@@ -50,6 +51,7 @@ class ProfileAdmin extends AbstractAdmin
             ->add('name')
             ->add('upload')
             ->add('download')
+            ->add('extraData')
         ;
     }
 
@@ -62,6 +64,7 @@ class ProfileAdmin extends AbstractAdmin
             ->add('name')
             ->add('upload')
             ->add('download')
+            ->add('extraData')
         ;
     }
 }

src/FTTHBundle/Entity/NAP.php

@@ -3,6 +3,7 @@
 namespace FTTHBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use ExtraDataBundle\Entity\Traits\ExtraDataWithParentTrait;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -12,6 +13,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 class NAP
 {
 
+    use ExtraDataWithParentTrait;
     use ONUTrait;
 
     /**
@@ -27,6 +29,7 @@ class NAP
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * 
      * @Assert\NotNull
      */
     private $name;

src/FTTHBundle/Entity/OLT.php

@@ -3,6 +3,7 @@
 namespace FTTHBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Workflow\Exception\ExceptionInterface;
@@ -14,6 +15,8 @@ use Symfony\Component\Workflow\Exception\ExceptionInterface;
 class OLT
 {
 
+    use ExtraDataTrait;
+    
     /**
      * @var bigint $id
      *

src/FTTHBundle/Entity/OLTModel.php

@@ -3,6 +3,7 @@
 namespace FTTHBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -12,6 +13,8 @@ use Symfony\Component\Validator\Constraints as Assert;
 class OLTModel
 {
 
+    use ExtraDataTrait;
+    
     /**
      * @var int
      *

src/FTTHBundle/Entity/ONUModel.php

@@ -3,6 +3,7 @@
 namespace FTTHBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -12,6 +13,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 class ONUModel
 {
     
+    use ExtraDataTrait;
     use ONUTrait;
     
     /**

src/FTTHBundle/Entity/Profile.php

@@ -3,6 +3,7 @@
 namespace FTTHBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -11,7 +12,8 @@ use Symfony\Component\Validator\Constraints as Assert;
  */
 class Profile
 {
-    
+ 
+    use ExtraDataTrait;
     use ONUTrait;
 
     /**

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

@@ -87,6 +87,8 @@ form:
     label_props: Propiedades
     label_parent: Padre
     label_nap: NAP
+    label_extra_data: Extra Data
+
 list:
     label_id: Id
     label_ip: Ip
@@ -119,6 +121,8 @@ list:
     label_parent: Padre
     label_nap: NAP
     label_onus: ONUs
+    label_extra_data: Extra Data
+
 show:
     label_id: Id
     label_ip: Ip
@@ -151,6 +155,8 @@ show:
     label_parent: Padre
     label_nap: NAP
     label_onus: ONUs
+    label_extra_data: Extra Data
+
 Incorrect State: Estado erróneo
 Undefined State: Estado no definido
 Undefined Workflow: Workflow no definido