Merged in FD3-601 (pull request #88)

FD3-601 campo activationCode en ONU. Se oculta por defecto

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

app/config/parameters.yml.dist

@@ -61,3 +61,5 @@ parameters:
 
 
     backups: '%kernel.project_dir%/web/backups-config/ftth/'
+    
+    show.onu.activationCode: false

app/config/parameters.yml.docker

@@ -54,3 +54,5 @@ parameters:
     tr069_selenium_host: selenium
 
     backups: '%kernel.project_dir%/web/backups-config/ftth/'
+    
+    show.onu.activationCode: false

src/FTTHBundle/Admin/ONUAdmin.php

@@ -38,7 +38,9 @@ class ONUAdmin extends WorkflowBaseAdmin
 
                     $alias = $query->getRootAlias();
                     $query
-                        ->andWhere("{$alias}.serialNumber LIKE :id OR {$alias}.ponSerialNumber LIKE :id OR {$alias}.ponSerialNumberAux LIKE :id")
+                        ->andWhere("{$alias}.serialNumber LIKE :id OR 
+                                    {$alias}.ponSerialNumber LIKE :id OR 
+                                    {$alias}.ponSerialNumberAux LIKE :id")
                         ->setParameter('id', "%{$data['value']}%");
                 },), null, [
                     'attr' => [
@@ -58,18 +60,31 @@ class ONUAdmin extends WorkflowBaseAdmin
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-            ->add('client', 'string', array('template' => 'FTTHBundle:ONU:base_list_field_client.html.twig'))
+            ->add('client', 'string', array(
+                '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'))
-            ->add('ponSerialNumber', 'string', array('template' => 'FTTHBundle:ONU:base_list_field_upper.html.twig'))
+            ->add('serialNumber', 'string', array(
+                'template' => 'FTTHBundle:ONU:base_list_field_upper.html.twig'
+            ))
+            ->add('ponSerialNumber', 'string', array(
+                'template' => 'FTTHBundle:ONU:base_list_field_upper.html.twig'
+            ))
+            ;
+        if ($this->hasParameter('show.onu.activationCode') && $this->getParameter('show.onu.activationCode') == true) {
+            $listMapper->add('activationCode');
+        }
+        $listMapper
             ->add('profile')
             ->add('nap')
             ->add('position')
             ->add('service_port')
             ->add('model')
             ->add('olt')
-            ->add('currentState', 'string', array('template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'))
+            ->add('currentState', 'string', array(
+                'template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'
+            ))
             ->add('created')
             ->add('_action', 'with-workflow-action', array(
                 'actions' => array(
@@ -113,12 +128,18 @@ class ONUAdmin extends WorkflowBaseAdmin
             $flashbag->add("warning", $translator->trans("msg_use_template_onu_in_create_onu_ftth",array(),"FTTHBundle"));
         }
 
-
         $formMapper
             ->tab('default')
                 ->with('')
                     ->add('clientId')
-                    ->add('ponSerialNumber', null, array('attr' => array('style' => 'text-transform: uppercase;')))
+                    ->add('ponSerialNumber', null, array(
+                        'attr' => array(
+                            'style' => 'text-transform: uppercase;'
+                        )));
+        if ($this->hasParameter('show.onu.activationCode') && $this->getParameter('show.onu.activationCode') == true) {
+            $formMapper->add('activationCode');
+        }
+        $formMapper                 
                     ->add('profile')
                     ->add('nap')
                     ->add('model')
@@ -126,8 +147,14 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->end()
             ->tab('Avanzado')
                 ->with('ONU')
-                    ->add('serialNumber', null, array('attr' => array('style' => 'text-transform: uppercase;')))
-                    ->add('ponSerialNumberAux', null, array('attr' => array('style' => 'text-transform: uppercase;')))
+                    ->add('serialNumber', null, array(
+                        'attr' => array(
+                            'style' => 'text-transform: uppercase;'
+                        )))
+                    ->add('ponSerialNumberAux', null, array(
+                        'attr' => array(
+                            'style' => 'text-transform: uppercase;'
+                        )))
                     ->add('mac')
                     ->add('olt')
                     ->add('position')
@@ -300,7 +327,11 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->tab('default')
                 ->with('')
                     ->add('clientId')
-                    ->add('ponSerialNumber')
+                    ->add('ponSerialNumber');
+        if ($this->hasParameter('show.onu.activationCode') && $this->getParameter('show.onu.activationCode') == true) {
+            $formMapper->add('activationCode');
+        }
+        $showMapper
                     ->add('profile')
                     ->add('nap')
                     ->add('model')

src/FTTHBundle/Entity/ONU.php

@@ -208,6 +208,11 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
      * @ORM\Column(type="boolean", nullable=true, options={"default": true})
      */
     protected $catv = true;
+    
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    protected $activationCode;
 
 
     /**
@@ -857,4 +862,24 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
         return $this;
     }
     
+    /**
+     * @return string
+     */
+    public function getActivationCode()
+    {
+        return $this->activationCode;
+    }
+    
+    /**
+     * @param string $activationCode
+     *
+     * @return ONU
+     */
+    public function setActivationCode($activationCode = null)
+    {
+        $this->activationCode = $activationCode;
+        
+        return $this;
+    }
+    
 }

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

@@ -149,7 +149,8 @@ form:
     label_tcontprofile: Perfil tcont
     label_used_by_default: Default
     label_vlans: VLans
-
+    label_activation_code: Código Activación
+    
 list:
     label_id: Id
     label_ip: Ip
@@ -206,6 +207,7 @@ list:
     label_tcontprofile: Perfil tcont
     label_vlans: VLans
     label_base: Base
+    label_activation_code: Código Activación
 
 show:
     label_id: Id
@@ -267,6 +269,7 @@ show:
     label_wifi: Wifi
     label_value: Valor
     label_used_by_default: Default
+    label_activation_code: Código Activación
 
 helps:
     check_address: Verifique la dirección para el cálculo de distancias.