Przeglądaj źródła

FD3-514 se agregaron campos wifi, catv y routingMode en ONUModel

Espinoza Guillermo 7 lat temu
rodzic
commit
f765aa2320

+ 16 - 0
src/FTTHBundle/Admin/ONUModelAdmin.php

@@ -7,6 +7,7 @@ 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\ChoiceType;
 
 class ONUModelAdmin extends BaseAdmin
 {
@@ -26,6 +27,9 @@ class ONUModelAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
+            ->add('routingMode')
+            ->add('catv')
+            ->add('wifi')
             ->add('extraData')
             ->add('_action', null, array(
                 'actions' => array(
@@ -43,6 +47,15 @@ class ONUModelAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
+            ->add('routingMode', ChoiceType::class, [
+                'required' => false,
+                'choices' => [
+                    'router' => 'router',
+                    'bridge' => 'bridge',
+                ],
+            ])
+            ->add('catv')
+            ->add('wifi')
             ->add('extraData');
     }
 
@@ -53,6 +66,9 @@ class ONUModelAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
+            ->add('routingMode')
+            ->add('catv')
+            ->add('wifi')
             ->add('extraData');
     }
 

+ 86 - 6
src/FTTHBundle/Entity/ONUModel.php

@@ -15,7 +15,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  */
 class ONUModel implements TenancyIdTraitInterface
 {
-    
+
     use ExtraDataTrait;
     use ONUTrait;
     use TenancyIdTrait;
@@ -35,16 +35,37 @@ class ONUModel implements TenancyIdTraitInterface
      * @ORM\Column(type="string", length=255)
      * @Assert\NotNull
      */
-    private $name;    
+    private $name;
 
     /**
      * @ORM\OneToMany(targetEntity="ONU", mappedBy="model")
-     * 
+     *
      * @JMS\MaxDepth(2)
      */
     protected $onus;
 
-    
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    private $routingMode;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(type="boolean", length=255, nullable=true)
+     */
+    private $catv;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(type="boolean", length=255, nullable=true)
+     */
+    private $wifi;
+
+
     /**
      * @return string
      */
@@ -52,7 +73,7 @@ class ONUModel implements TenancyIdTraitInterface
     {
         return (string) $this->name;
     }
-    
+
     /**
      * Get id
      *
@@ -83,5 +104,64 @@ class ONUModel implements TenancyIdTraitInterface
         return $this->name;
     }
 
-}
+    /**
+     * @return string
+     */
+    public function getRoutingMode()
+    {
+        return $this->routingMode;
+    }
 
+    /**
+     * @param string $routingMode
+     *
+     * @return ONUModel
+     */
+    public function setRoutingMode($routingMode)
+    {
+        $this->routingMode = $routingMode;
+
+        return $this;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getCatv()
+    {
+        return $this->catv;
+    }
+
+    /**
+     * @param boolean $catv
+     *
+     * @return ONUModel
+     */
+    public function setCatv($catv)
+    {
+        $this->catv = $catv;
+
+        return $this;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getWifi()
+    {
+        return $this->wifi;
+    }
+
+    /**
+     * @param boolean $wifi
+     *
+     * @return ONUModel
+     */
+    public function setWifi($wifi)
+    {
+        $this->wifi = $wifi;
+
+        return $this;
+    }
+
+}

+ 11 - 1
src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -70,7 +70,7 @@ breadcrumb:
     link_profile_list: Listado Perfiles
     link_profile_create: Crear Perfil
     link_profile_delete: Eliminar Perfil
-    
+
 form:
     label_id: Id
     label_ip: Ip
@@ -132,6 +132,9 @@ form:
     label_backups: Habilitar Backup
     label_files: Archivos
     label_capacity: Capacidad
+    label_routing_mode: Modalidad de ruteo
+    label_catv: CATV
+    label_wifi: Wifi
 
 list:
     label_id: Id
@@ -179,6 +182,9 @@ list:
     label_backups: Habilitar Backup
     label_files: Archivos
     label_capacity: Capacidad
+    label_routing_mode: Modalidad de ruteo
+    label_catv: CATV
+    label_wifi: Wifi
 
 show:
     label_id: Id
@@ -235,6 +241,10 @@ show:
     label_backups: Habilitar Backup
     label_files: Archivos
     label_capacity: Capacidad
+    label_routing_mode: Modalidad de ruteo
+    label_catv: CATV
+    label_wifi: Wifi
+    
 helps:
     check_address: Verifique la dirección para el cálculo de distancias.
     onu_serial_number: Serial Number de la ONU conformado por 16 caracteres, si es vacío lo calculamos desde el Identificador.