Merged in FD3-619 (pull request #91)

FD3-619 Se agrega campo comentarios y se quita campo mac en ONU

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

src/FTTHBundle/Admin/ONUAdmin.php

@@ -50,7 +50,6 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->add('profile')
             ->add('nap')
             ->add('model')
-            ->add('mac')
             ->add('olt');
     }
 
@@ -64,7 +63,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                 'template' => 'FTTHBundle:ONU:base_list_field_client.html.twig'
             ))
             ->add('ip')
-            ->add('mac')
             ->add('serialNumber', 'string', array(
                 'template' => 'FTTHBundle:ONU:base_list_field_upper.html.twig'
             ))
@@ -85,6 +83,7 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->add('currentState', 'string', array(
                 'template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'
             ))
+            ->add('catv')
             ->add('created')
             ->add('_action', 'with-workflow-action', array(
                 'actions' => array(
@@ -143,6 +142,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('profile')
                     ->add('nap')
                     ->add('model')
+                    ->add('comments')
                 ->end()
             ->end()
             ->tab('Avanzado')
@@ -155,7 +155,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                         'attr' => array(
                             'style' => 'text-transform: uppercase;'
                         )))
-                    ->add('mac')
                     ->add('olt')
                     ->add('position')
                 ->end()
@@ -335,6 +334,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('profile')
                     ->add('nap')
                     ->add('model')
+                    ->add('comments')
                     ->add('created')
                 ->end()
             ->end()
@@ -342,7 +342,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                 ->with('ONU')
                     ->add('serialNumber')
                     ->add('ponSerialNumberAux')
-                    ->add('mac')
                     ->add('olt')
                     ->add('currentState')
                 ->end()

src/FTTHBundle/Entity/ONU.php

@@ -231,6 +231,11 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
      */
     protected $catv = true;
     
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    protected $comments;
+
     /**
      * @ORM\Column(type="string", nullable=true)
      */
@@ -921,6 +926,26 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
         return $this;
     }
     
+    /**
+     * @return string
+     */
+    public function getComments()
+    {
+        return $this->comments;
+    }
+    
+    /**
+     * @param string $comments
+     *
+     * @return ONU
+     */
+    public function setComments($comments)
+    {
+        $this->comments = $comments;
+        
+        return $this;
+    }
+
     /**
      * @return string
      */

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

@@ -52,6 +52,7 @@ filter:
     label_files: Archivos
     label_capacity: Capacidad
     label_value: Valor
+    label_comments: Comentarios
 
 breadcrumb:
     link_t_cont_profile_list: Listado Perfiles tcon
@@ -151,8 +152,9 @@ form:
     label_tcontprofile: Perfil tcont
     label_used_by_default: Default
     label_vlans: VLans
+    label_comments: Comentarios
     label_activation_code: Código Activación
-    
+
 list:
     label_id: Id
     label_ip: Ip
@@ -211,6 +213,7 @@ list:
     label_tcontprofile: Perfil tcont
     label_vlans: VLans
     label_base: Base
+    label_comments: Comentarios
     label_activation_code: Código Activación
 
 show:
@@ -273,6 +276,7 @@ show:
     label_wifi: Wifi
     label_value: Valor
     label_used_by_default: Default
+    label_comments: Comentarios
     label_activation_code: Código Activación
 
 helps: