Merge FD3-698

src/FTTHBundle/Admin/ONUAdmin.php

@@ -32,6 +32,7 @@ class ONUAdmin extends WorkflowBaseAdmin
     {
         $datagridMapper
             ->add('clientId')
+            ->add('ip')
             ->add('ponSerialNumber', CallbackFilter::class, array(
                 'callback' => function (ProxyQuery $query, $alias, $field, $data) {
                     if (!$data || !is_array($data) || !array_key_exists('value', $data) || !isset($data['value'])) {
@@ -204,6 +205,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                         )))
                     ->add('olt')
                     ->add('position')
+                    ->add('ip')
                 ->end()
                 ->with('Huawei', ['class' => "col-md-12 {$hidden['Huawei']} olt_mark Huawei"])
                     ->add('servicePorts', CollectionType::class, array(
@@ -235,6 +237,7 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->end()
             ->setHelps(array(
                 'nap' => $this->trans("helps.check_address"),
+                'ip' => $this->trans("helps.ip_static"),
                 'serialNumber' => $this->trans("helps.onu_serial_number"),
                 'ponSerialNumber' => $this->trans("helps.onu_pon_serial_number"),
                 'ponSerialNumberAux' => $this->trans("helps.onu_pon_serial_number_aux"),
@@ -374,7 +377,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('clientId')
                     ->add('ponSerialNumber');
         if ($this->hasParameter('show.onu.activationCode') && $this->getParameter('show.onu.activationCode') == true) {
-            $formMapper->add('activationCode');
+            $showMapper->add('activationCode');
         }
         
         $showMapper->add('profile')
@@ -389,7 +392,9 @@ class ONUAdmin extends WorkflowBaseAdmin
                     ->add('serialNumber')
                     ->add('ponSerialNumberAux')
                     ->add('olt')
-                    ->add('currentState');
+                    ->add('currentState')
+                    ->add('position')
+                    ->add('ip');
         // Consulto en stats la url del detalle de onu
         $onuShowUrl = $this->getStatsShowOnuUrl();
         if ($onuShowUrl != '') {
@@ -458,8 +463,6 @@ class ONUAdmin extends WorkflowBaseAdmin
 
                 $catv = $tr069Data['CatvPower']['_value'] ?? null;
 
-                $ip = $tr069Data['ExternalIPAddress']['_value'] ?? null;
-
                 $showMapper
                     ->tab('TR069')
                         ->with('General')
@@ -652,23 +655,24 @@ class ONUAdmin extends WorkflowBaseAdmin
     }
 
     public function update($object){
-          $em = $this->getConfigurationPool()->getContainer()->get('doctrine.orm.entity_manager');
-          $all = $em->getRepository(\FTTHBundle\Entity\ServicePort::class)->findBy(array("onu" => $object));
-          foreach($all as $sp){
-              if(!$object->getServicePort()->contains($sp)){
-                  $em->remove($sp);
-              }
-          }
-
-          foreach($object->getServicePort() as $sp){
-              $sp->setOnu($object);
-              $em->persist($sp);
-              if(!$sp->getOlt()){
-                  $sp->setOlt($object->getOlt());
-              }
-          }
-          return parent::update($object);
-      }
+        $em = $this->getConfigurationPool()->getContainer()->get('doctrine.orm.entity_manager');
+        $all = $em->getRepository(\FTTHBundle\Entity\ServicePort::class)->findBy(array("onu" => $object));
+        foreach($all as $sp){
+            if(!$object->getServicePort()->contains($sp)){
+                $em->remove($sp);
+            }
+        }
+
+        foreach($object->getServicePort() as $sp){
+            $sp->setOnu($object);
+            $em->persist($sp);
+            if(!$sp->getOlt()){
+                $sp->setOlt($object->getOlt());
+            }
+        }
+        return parent::update($object);
+    }
+
     /**
      * @param Form $form
      * @param Template $template

src/FTTHBundle/Entity/ONUTemplate.php

@@ -148,7 +148,7 @@ class ONUTemplate implements TenancyIdTraitInterface
      */
     public function __toString()
     {
-        return (string)$this->id;
+        return sprintf("ID: %s MODELO: %s PERFIL: %s OLT: %s ", $this->id, $this->model, $this->profile, $this->olt);
     }
 
     /**

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

@@ -316,6 +316,7 @@ helps:
     tr069_disabled: El servicio TR069 se encuentra deshabilitado.
     tr069_onu_no_detected: No se encontró la ONU/ONT en el servicio TR069.
     onuTemplate: Al seleccionar una Plantilla de ONU se recargará la página y el formulario seteará sus valores 
+    ip_static: Ip estática
 error:
     address_not_found: La dirección "%client_address%" no fue encontrada en los servicios de google.
 Distance: Distancia