|
@@ -106,6 +106,7 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
'template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'
|
|
|
))
|
|
|
->add('catv')
|
|
|
+ ->add('voip')
|
|
|
->add('created')
|
|
|
->add('logOLT.status', 'string', array(
|
|
|
'template' => 'FTTHBundle:Type:list_status_field_type.html.twig'))
|
|
@@ -305,6 +306,7 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
],
|
|
|
])
|
|
|
->add('catv')
|
|
|
+ ->add('voip')
|
|
|
->end()
|
|
|
->with('Huawei', ['class' => "col-md-12 {$hidden['Huawei']} olt_mark Huawei"])
|
|
|
->add('servicePorts', CollectionType::class, array(
|
|
@@ -357,7 +359,8 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
'servicePorts' => $this->trans("helps.service_port"),
|
|
|
'mac' => $this->trans("helps.mac"),
|
|
|
'radiusAuth' => $this->trans("helps.radiusAuth"),
|
|
|
- 'catv' => $this->trans("helps.catv")
|
|
|
+ 'catv' => $this->trans("helps.catv"),
|
|
|
+ 'voip' => $this->trans("helps.voip")
|
|
|
));
|
|
|
|
|
|
|
|
@@ -404,6 +407,7 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
$status = $tr069Data['Status']['_value'] ?? null;
|
|
|
|
|
|
$catv = $tr069Data['CatvPower']['_value'] ?? null;
|
|
|
+ $voip = $tr069Data['Voip']['_value'] ?? null;
|
|
|
|
|
|
$ip = $tr069Data['ExternalIPAddress']['_value'] ?? null;
|
|
|
|
|
@@ -426,6 +430,9 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
->with('CATV',['description' => $this->trans('helps.tr069_catv')])
|
|
|
->add('tr069_catv', CheckboxType::class, array('mapped' => false, 'data' => $catv, 'required' => false))
|
|
|
->end()
|
|
|
+ ->with('VOIP',['description' => $this->trans('helps.tr069_voip')])
|
|
|
+ ->add('tr069_voip', CheckboxType::class, array('mapped' => false, 'data' => $voip, 'required' => false))
|
|
|
+ ->end()
|
|
|
->end();
|
|
|
|
|
|
$tr069Data = 1;
|
|
@@ -551,6 +558,7 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
->add('trafficProfileIn')
|
|
|
->add('trafficProfileOut')
|
|
|
->add('catv')
|
|
|
+ ->add('voip')
|
|
|
;
|
|
|
|
|
|
// Consulto en stats la url del detalle de onu
|
|
@@ -646,6 +654,7 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
$status = $tr069Data['Status']['_value'] ?? null;
|
|
|
|
|
|
$catv = $tr069Data['CatvPower']['_value'] ?? null;
|
|
|
+ $voip = $tr069Data['Voip']['_value'] ?? null;
|
|
|
|
|
|
$showMapper
|
|
|
->tab('TR069')
|
|
@@ -666,6 +675,9 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
->with('CATV',['description' => $this->trans('helps.tr069_catv')])
|
|
|
->add('tr069_catv', null, array('template' => 'FTTHBundle:ONU:base_show_boolean.html.twig', 'boolean' => $catv))
|
|
|
->end()
|
|
|
+ ->with('VoIP',['description' => $this->trans('helps.tr069_voip')])
|
|
|
+ ->add('tr069_voip', null, array('template' => 'FTTHBundle:ONU:base_show_boolean.html.twig', 'boolean' => $voip))
|
|
|
+ ->end()
|
|
|
->end();
|
|
|
} else {
|
|
|
$showMapper
|
|
@@ -720,8 +732,9 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
if((boolean) $this->getForm()->get('tr069_exist')->getData()) {
|
|
|
$ssid = ($this->getForm()->get('tr069_ssid')->getData()) ?? null;
|
|
|
$pass = ($this->getForm()->get('tr069_pass')->getData()) ?? null;
|
|
|
- $id = ($this->getForm()->get('tr069_id')->getData()) ?? null;;
|
|
|
+ $id = ($this->getForm()->get('tr069_id')->getData()) ?? null;
|
|
|
$catv = ($this->getForm()->get('tr069_catv')->getData()) ?? null;
|
|
|
+ $voip = ($this->getForm()->get('tr069_voip')->getData()) ?? null;
|
|
|
$broadcast = ($this->getForm()->get('tr069_broadcast')->getData()) ?? null;
|
|
|
$status = ($this->getForm()->get('tr069_status')->getData()) ?? null;
|
|
|
|
|
@@ -732,6 +745,7 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
$tr069 = $this->get($serviceName);
|
|
|
|
|
|
if(!is_null($catv)) $aux = $tr069->setCATV($id, $catv);
|
|
|
+ if(!is_null($voip)) $aux = $tr069->setVoIP($id, $voip);
|
|
|
|
|
|
if($ssid) $aux = $tr069->setWlan($id, $ssid, $pass);
|
|
|
|
|
@@ -798,6 +812,10 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
if($catv = $template->getCatv()) {
|
|
|
$form->add('catv', null, array('data' => $catv));
|
|
|
}
|
|
|
+
|
|
|
+ if($voip = $template->getVoIP()) {
|
|
|
+ $form->add('voip', null, array('data' => $voip));
|
|
|
+ }
|
|
|
|
|
|
if($vlans = $template->getVlans()) {
|
|
|
$form->add('vlans', null, array('data' => $vlans));
|
|
@@ -827,6 +845,7 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
$fields[$this->trans('export.link')] = "link";
|
|
|
$fields[$this->trans('export.position')] = "position";
|
|
|
$fields[$this->trans('export.catv')] = "catv";
|
|
|
+ $fields[$this->trans('export.voip')] = "voip";
|
|
|
$fields[$this->trans('export.activationCode')] = "activationCode";
|
|
|
$fields[$this->trans('export.created')] = "created";
|
|
|
$fields[$this->trans('export.updated')] = "updated";
|