FD3-674 se actualiza el form de ONU, donde se muestran algunos campos mas si es Modelo de OLT ZTE v4

app/DoctrineMigrations/src/oltmodel.yml

@@ -1,61 +1,61 @@
 insertorupdate:
     oltmodel:
         -
-          id: 1
-          name: "FiberHome-AN5516-01"
-          props: "NULL"
-          mark: "FiberHome"
-          library: "OIDSBase"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/fiberhome/telnet.py\",\r\n\"model\": \"FiberHome-AN5516-01\"\r\n}"
-          tenancy_id: 1
-        -
-          id: 2
-          name: "Huawei MA5608T"
-          props: "NULL"
-          mark: "Huawei"
-          library: "OIDSHuaweiV1"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/huawei/telnet.py\",\r\n\"model\": \"Huawei-MA5608T\",\r\n\"auto-create-service-ports\" : true\r\n}"
-          tenancy_id: 1
-        -
-          id: 3
-          name: "ZTE C320"
-          props: "NULL"
-          mark: "ZTE"
-          library: "OIDSBase"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320\"\r\n}"
-          tenancy_id: 1
-        -
-          id: 4
-          name: "Fiberlink"
-          mark: "FiberLink"
-          library: "OIDSFiberLinkV1"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/fiberlink/telnet.py\",\r\n\"model\": \"Fiberlink\"\r\n}"
-          tenancy_id: 1
-        -
-          id: 5
-          name: "ZTE C320 V2"
-          mark: "ZTE"
-          library: "OIDSBase"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V2\"\r\n}"
-          tenancy_id: 1
-        -
-          id: 6
-          name: "Furukawa"
-          mark: "Furukawa"
-          library: "OIDSBase"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/furukawa/telnet.py\",\r\n\"model\": \"Furukawa\"\r\n}"
-          tenancy_id: 1
-        -
-          id: 7
-          name: "ZTE C320 V3"
-          mark: "ZTE"
-          library: "OIDSBase"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V3\"\r\n}"
-          tenancy_id: 1
-        -
-          id: 8
-          name: "ZTE C320 V4"
-          mark: "ZTE"
-          library: "OIDSZTEV1"
-          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V4\"\r\n}"
-          tenancy_id: 2
+            id: 1
+            name: "FiberHome-AN5516-01"
+            props: "NULL"
+            mark: "FiberHome"
+            library: "OIDSBase"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/fiberhome/telnet.py\",\r\n\"model\": \"FiberHome-AN5516-01\"\r\n}"
+            tenancy_id: 1
+        -
+            id: 2
+            name: "Fiberlink"
+            mark: "FiberLink"
+            library: "OIDSFiberLinkV1"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/fiberlink/telnet.py\",\r\n\"model\": \"Fiberlink\"\r\n}"
+            tenancy_id: 1
+        -
+            id: 3
+            name: "Huawei MA5608T"
+            props: "NULL"
+            mark: "Huawei"
+            library: "OIDSHuaweiV1"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/huawei/telnet.py\",\r\n\"model\": \"Huawei-MA5608T\",\r\n\"auto-create-service-ports\" : true\r\n}"
+            tenancy_id: 1
+        -
+            id: 4
+            name: "ZTE C320"
+            props: "NULL"
+            mark: "ZTE"
+            library: "OIDSBase"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320\"\r\n}"
+            tenancy_id: 1
+        -
+            id: 5
+            name: "ZTE C320 V2"
+            mark: "ZTE"
+            library: "OIDSBase"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V2\"\r\n}"
+            tenancy_id: 1
+        -
+            id: 6
+            name: "ZTE C320 V3"
+            mark: "ZTE"
+            library: "OIDSBase"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V3\"\r\n}"
+            tenancy_id: 1
+        -
+            id: 7
+            name: "ZTE C320 V4"
+            mark: "ZTE"
+            library: "OIDSZTEV1"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V4\"\r\n}"
+            tenancy_id: 2
+        -
+            id: 8
+            name: "Furukawa"
+            mark: "Furukawa"
+            library: "OIDSBase"
+            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/furukawa/telnet.py\",\r\n\"model\": \"Furukawa\"\r\n}"
+            tenancy_id: 1

src/FTTHBundle/Admin/ONUAdmin.php

@@ -106,7 +106,19 @@ class ONUAdmin extends WorkflowBaseAdmin
         $template = $em->getRepository('FTTHBundle:ONUTemplate')->findOneBy(array('base'=>true));
         $subject = $this->getSubject();
 
-        foreach ($marks as $m) {$hidden[$m] = 'hidden';}
+        foreach ($marks as $m) {
+            $hidden[$m] = 'hidden';
+        }
+
+        // Por defecto se esconden los campos en ZTE v4
+        $optionsZTEV4 = [
+            'label_attr' => [
+                'class' => 'zte_v4 hidden',
+            ],
+            'attr' => [
+                'class' => 'zte_v4 hidden',
+            ],
+        ];
 
         if ($subject->getId() || $template) {
             if($subject->getOlt()) {
@@ -118,8 +130,16 @@ class ONUAdmin extends WorkflowBaseAdmin
             }
 
             if ($olt && $olt->getModel()) {
-                $mark = $olt->getModel()->getMark();
+                $oltModel = $olt->getModel();
+                $mark = $oltModel->getMark();
                 $hidden[$mark] = '';
+
+                // Chequeo si el modelo de OLT es ZTE v4
+                $name = $oltModel->getName();
+                if (strpos($name, 'ZTE') !== false && strpos($name, 'V4') !== false) {
+                    $optionsZTEV4['label_attr']['class'] = 'zte_v4';
+                    $optionsZTEV4['attr']['class'] = 'zte_v4';
+                }
             }
         }
 
@@ -170,8 +190,8 @@ class ONUAdmin extends WorkflowBaseAdmin
                 ->end()
                 ->with('ZTE', ['class' => "col-md-12 {$hidden['ZTE']} olt_mark ZTE"])
                     ->add('vlan')
-                    ->add('vlanProfile')
-                    ->add('onuProfile')
+                    ->add('vlanProfile', null, $optionsZTEV4)
+                    ->add('onuProfile', null, $optionsZTEV4)
                     ->add('trafficProfileIn')
                     ->add('trafficProfileOut')
                     ->add('tcontprofile')

src/FTTHBundle/Controller/OLTModelController.php

@@ -27,12 +27,14 @@ class OLTModelController extends Controller
         $em = $this->getDoctrine();
         $id = $request->get('id');
         $mark = 'ERROR';
+        $name = '';
         $olt = $em->getRepository('FTTHBundle:OLT')->find($id);
         if ($olt && $olt->getModel()) {
             $mark = $olt->getModel()->getMark();
+            $name = $olt->getModel()->getName();
         }
 
-        return new JsonResponse(compact('mark'));
+        return new JsonResponse(compact('mark', 'name'));
     }
 
 }

src/FTTHBundle/Resources/views/ONU/form.html.twig

@@ -13,13 +13,13 @@
             border: 1px solid #CCCCCC;
         }
     </style>
-    
+
     <script type="text/javascript">
         var modificacion = false;
         $(function () {
             // buscar la direccion del cliente y la muestra en el mapa.
             var objSelectClient = $('input:hidden[id$="clientId"]');
-            
+
             if (objSelectClient.val() != "" && parseInt(objSelectClient.val()) > 0) {
                 modificacion = true;
                 callbackClientId(objSelectClient.val());
@@ -60,6 +60,12 @@
                 success: function (result) {
                     $('.olt_mark').addClass('hidden');
                     $('.'+result.mark).removeClass('hidden');
+
+                    $('.zte_v4').addClass('hidden');
+                    // El modelo de OLT es ZTE V4, entonces muestro los campos
+                    if (result.name.includes('ZTE') && result.name.includes('V4')) {
+                        $('.zte_v4').removeClass('hidden');
+                    }
                 }
             });
         });