Entity NAP

src/FTTHBundle/Admin/NodeAdmin.php

@@ -8,7 +8,7 @@ use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-class NodeAdmin extends BaseAdmin
+class NAPAdmin extends BaseAdmin
 {
     /**
      * @param DatagridMapper $datagridMapper
@@ -27,6 +27,8 @@ class NodeAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
+            ->add('parent')
+            ->add('onus')
             ->add('_action', null, array(
                 'actions' => array(
                     'show' => array(),
@@ -44,6 +46,7 @@ class NodeAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
+            ->add('parent')
         ;
     }
 
@@ -54,6 +57,8 @@ class NodeAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
+            ->add('parent')
+            ->add('onus')
         ;
     }
 }

src/FTTHBundle/Admin/ONUAdmin.php

@@ -20,7 +20,7 @@ class ONUAdmin extends BaseAdmin
             ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')
             ->add('model')
             ->add('serialNumber')
             ->add('mac')
@@ -34,13 +34,13 @@ class ONUAdmin extends BaseAdmin
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-	        ->add('clientId')
+            ->add('clientId')
             ->add('ip')
             ->add('mac')
             ->add('serialNumber')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')
             ->add('model')
             ->add('olt')
             ->add('workflow')
@@ -62,10 +62,10 @@ class ONUAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-	        ->add('clientId')
+            ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')    
             ->add('model')
             ->add('serialNumber')
             ->add('mac')
@@ -81,10 +81,10 @@ class ONUAdmin extends BaseAdmin
     {
         $showMapper
             ->add('id')
-	        ->add('clientId')
+            ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
-            ->add('node')
+            ->add('nap')
             ->add('model')
             ->add('serialNumber')
             ->add('mac')

src/FTTHBundle/Entity/Node.php

@@ -9,11 +9,11 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table
  * @ORM\Entity
  */
-class Node
+class NAP
 {
 
     use ONUTrait;
-    
+
     /**
      * @var int
      *
@@ -30,12 +30,18 @@ class Node
      * @Assert\NotNull
      */
     private $name;
-    
+
     /**
-     * @ORM\OneToMany(targetEntity="ONU", mappedBy="node")
+     * @ORM\ManyToOne(targetEntity="NAP")
+     */
+    protected $parent;
+        
+    /**
+     * @ORM\OneToMany(targetEntity="ONU", mappedBy="nap")
      */
     protected $onus;
-    
+
+     
     /**
      * @return string
      */
@@ -74,4 +80,24 @@ class Node
         return $this->name;
     }
 
+    /**
+     * @return NAP
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @param NAP $parent
+     * 
+     * @return $this
+     */
+    public function setParent($parent = null)
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
 }

src/FTTHBundle/Entity/ONU.php

@@ -102,11 +102,11 @@ class ONU
      * @ORM\JoinColumn(name="model_id", referencedColumnName="id", onDelete="SET NULL")
      */
     protected $model;
-    
+        
     /**
-     * @ORM\ManyToOne(targetEntity="Node", inversedBy="onus", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="NAP", inversedBy="onus", fetch="EXTRA_LAZY")
      */
-    protected $node;
+    protected $nap;
     
     /**
      * @ORM\ManyToOne(targetEntity="Profile", inversedBy="onus", fetch="EXTRA_LAZY")
@@ -390,22 +390,23 @@ class ONU
         
         return $this;
     }
-
+    
     /**
-     * @return Node
+     * @return NAP
      */
-    public function getNode()
+    public function getNap()
     {
-        return $this->node;
+        return $this->nap;
     }
 
     /**
-     * @param Node $node
+     * @param NAP $nap
+     * 
      * @return $this
      */
-    public function setNode($node)
+    public function setNap($nap)
     {
-        $this->node = $node;
+        $this->nap = $nap;
         
         return $this;
     }

src/FTTHBundle/Resources/config/services.yml

@@ -31,14 +31,6 @@ services:
         calls:    
             - [setTranslationDomain, [FTTHBundle]]
 
-    ftth.admin.node:
-        class: FTTHBundle\Admin\NodeAdmin
-        arguments: [~, FTTHBundle\Entity\Node, SonataAdminBundle:CRUD]
-        tags:
-            - { name: sonata.admin, manager_type: orm, group: FTTH, label: Node, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
-            - [setTranslationDomain, [FTTHBundle]]
-
     ftth.admin.profile:
         class: FTTHBundle\Admin\ProfileAdmin
         arguments: [~, FTTHBundle\Entity\Profile, SonataAdminBundle:CRUD]
@@ -46,3 +38,11 @@ services:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: Profile, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
         calls:    
             - [setTranslationDomain, [FTTHBundle]]
+
+    ftth.admin.nap:
+        class: FTTHBundle\Admin\NAPAdmin
+        arguments: [~, FTTHBundle\Entity\NAP, SonataAdminBundle:CRUD]
+        tags:
+            - { name: sonata.admin, manager_type: orm, group: FTTH, label: NAP, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:    
+            - [setTranslationDomain, [FTTHBundle]]

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

@@ -3,8 +3,9 @@ ONU: ONU
 OLT: OLT
 OLTModel: Modelo OLT
 ONUModel: Modelo ONU
-Node: Nodo
+NAP: NAP
 Profile: Perfil
+
 filter:
     label_id: Id
     label_ip: Ip
@@ -27,13 +28,14 @@ filter:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_nap: NAP
+    
 breadcrumb:
     link_o_n_u_list: Listado ONU
     link_o_n_u_create: Crear ONU
@@ -47,12 +49,13 @@ breadcrumb:
     link_o_n_u_model_list: Listado Modelo ONU
     link_o_n_u_model_create: Crear Modelo ONU
     link_o_n_u_model_delete: Eliminar Modelo ONU
-    link_node_list: Listado Nodos
-    link_node_create: Crear Nodo
-    link_node_delete: Eliminar Nodo
+    link_n_a_p_list: Listado NAP
+    link_n_a_p_create: Crear NAP
+    link_n_a_p_delete: Eliminar NAP
     link_profile_list: Listado Perfiles
     link_profile_create: Crear Perfil
     link_profile_delete: Eliminar Perfil
+    
 form:
     label_id: Id
     label_ip: Ip
@@ -75,13 +78,15 @@ form:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_parent: Padre
+    label_nap: NAP
+    
 list:
     label_id: Id
     label_ip: Ip
@@ -104,13 +109,16 @@ list:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_parent: Padre
+    label_nap: NAP
+    label_onus: ONUs
+    
 show:
     label_id: Id
     label_ip: Ip
@@ -133,13 +141,16 @@ show:
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
     label_model: Modelo
-    label_node: Nodo
     label_profile: Perfil
     label_upload: Upload
     label_download: Download
     label_workflow: Workflow
     label_log: Log
     label_model_workflow: Workflow
+    label_parent: Padre
+    label_nap: NAP
+    label_onus: ONUs
+    
 Incorrect State: Estado erróneo
 Undefined State: Estado no definido
 Undefined Workflow: Workflow no definido