Se mejora la vista de la ONU en el Stats.

src/StatsBundle/Admin/OnuAdmin.php

@@ -92,11 +92,11 @@ class OnuAdmin extends BaseAdmin
             ->add('ponSerialNumber')
             ->add('ponPort')
             ->add('status')
-            ->add('txPower')
-            ->add('rxPower')
-            ->add('voltage')
-            ->add('temperature')
-            ->add('updated')
+            ->add('txPower', 'string', array('template' => 'StatsBundle:Onu:base_show_field_tx.html.twig'))
+            ->add('rxPower', 'string', array('template' => 'StatsBundle:Onu:base_show_field_rx.html.twig'))
+            ->add('voltage', 'string', array('template' => 'StatsBundle:Onu:base_show_field_voltage.html.twig'))
+            ->add('temperature', 'string', array('template' => 'StatsBundle:Onu:base_show_field_temperature.html.twig'))
+            ->add('updated', 'string', array('template' => 'StatsBundle:Onu:base_show_field_uptime.html.twig'))
         ;
     }
 

src/StatsBundle/Resources/translations/StatsBundle.es.yml

@@ -48,6 +48,16 @@ show:
     label_device_server: Servidor
     label_short_type: Tipo
     label_tenancy_id: Tenencia
+    label_olt_device_id: Id
+    label_pon_serial_number: Pon Serial Number
+    label_pon_port: PonPort
+    label_status: Online
+    label_rx_power: RX Power
+    label_tx_power: TX Power
+    label_voltage: Voltage
+    label_temperature: Temperatura
+    label_uptime: Uptime
+    label_updated: Actualizado
 
 list:
     label_name: Nombre
@@ -87,4 +97,5 @@ macroFields:
     notavailable: 'NULL'
 List: Listados
 ONU: ONU
-link_action_show_onu_in_map: Ver en Mapa
+link_action_show_onu_in_map: Ver en Mapa
+Mapa ONUs: Mapa ONUs

src/StatsBundle/Resources/views/Onu/base_show_field_rx.html.twig

@@ -0,0 +1,27 @@
+{% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
+
+{% block field %}
+    {% if object.getRxPower() is null %}
+        <span class="text_column_stats">{{ 'macroFields.notavailable'|trans({},'StatsBundle') }}</span>
+    {% else %}
+       
+        {% set value = object.getRxPower() %}
+        {% set style = "rx_ftth_bordo" %}
+        {% if value < -30 %}
+            {% set style = "rx_ftth_bordo" %}
+        {% elseif value >= -30 and value < -28 %}
+            {% set style = "rx_ftth_rojo" %}
+        {% elseif value >= -28 and value < -26 %}
+            {% set style = "rx_ftth_amarillo" %}
+        {% elseif value >= -26 and value < -20 %}
+            {% set style = "rx_ftth_verde" %}
+        {% elseif value >= -20 and value < -15 %}
+            {% set style = "rx_ftth_amarillo" %}
+        {% elseif value >= -15 and value < -13 %}
+            {% set style = "rx_ftth_rojo" %}
+        {% endif %}
+        
+        <span class="{{style}}">{{ value|number_format(2, '.', ',')}}</span> <span class="text_column_stats">dBm</span>
+        
+    {% endif %}
+{% endblock %}

src/StatsBundle/Resources/views/Onu/base_show_field_temperature.html.twig

@@ -0,0 +1,9 @@
+{% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
+
+{% block field %}
+    {% if object.getTemperature() is null %}
+        <span class="text_column_stats">{{ 'macroFields.notavailable'|trans({},'StatsBundle') }}</span>
+    {% else %}
+       {{ object.getTemperature()|number_format(2, '.', ',')}} <span class="text_column_stats">ºC</span>
+    {% endif %}
+{% endblock %}

src/StatsBundle/Resources/views/Onu/base_show_field_tx.html.twig

@@ -0,0 +1,25 @@
+{% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
+
+{% block field %}
+    {% if object.getTxPower() is null %}
+        <span class="text_column_stats">{{ 'macroFields.notavailable'|trans({},'StatsBundle') }}</span>
+    {% else %}
+       
+        {% set value = object.getTxPower() %}
+        {% set style = "tx_ftth_bordo" %}
+        {% if value < 1 %}
+            {% set style = "tx_ftth_rojo" %}
+        {% elseif value >= 1 and value < 1.5 %}
+            {% set style = "tx_ftth_amarillo" %}
+        {% elseif value >= 1.5 and value < 3.5 %}
+            {% set style = "tx_ftth_verde" %}
+        {% elseif value >= 3.5 and value < 4.5 %}
+            {% set style = "tx_ftth_amarillo" %}
+        {% elseif value >= 4.5 and value < 5 %}
+            {% set style = "tx_ftth_rojo" %}
+        {% endif %}
+        
+        <span class="{{style}}">{{ value|number_format(2, '.', ',')}}</span> <span class="text_column_stats">dBm</span>
+        
+    {% endif %}
+{% endblock %}

src/StatsBundle/Resources/views/Onu/base_show_field_uptime.html.twig

@@ -0,0 +1,9 @@
+{% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
+
+{% block field %}
+    {% if object.getUptime() is null %}
+        <span class="text_column_stats">{{ 'macroFields.notavailable'|trans({},'StatsBundle') }}</span>
+    {% else %}
+       {{ object.getUptime() }}
+    {% endif %}
+{% endblock %}

src/StatsBundle/Resources/views/Onu/base_show_field_voltage.html.twig

@@ -0,0 +1,9 @@
+{% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
+
+{% block field %}
+    {% if object.getVoltage() is null %}
+        <span class="text_column_stats">{{ 'macroFields.notavailable'|trans({},'StatsBundle') }}</span>
+    {% else %}
+       {{ object.getVoltage()|number_format(2, '.', ',')}} <span class="text_column_stats">V</span>
+    {% endif %}
+{% endblock %}

src/StatsBundle/Resources/views/Stats/onu_map.html.twig

@@ -5,93 +5,50 @@
 
 <style>
 
-.vakata-context {
-    z-index: 10000;
-}
-
-.content-header,.content {
-    padding-top: 0px;
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-bottom: 0px;
-}
-
-.no_checkbox>i.jstree-checkbox
-{
-    display:none
-}
-
-.toolbar {
-    margin: 4px;
-}
-
-.statusBar {
-    display: block;
-    color: white;
-    margin-left: 10px;
-    /*margin-top: -10px;*/
-}
-
-.modal-xl { width: 90%; }
-
-.modal {
-  text-align: center;
-}
-
-@media screen and (min-width: 768px) {
-  .modal:before {
-    display: inline-block;
-    vertical-align: middle;
-    content: " ";
-    height: 100%;
-  }
-}
-
-.modal-dialog {
-  display: inline-block;
-  text-align: left;
-  vertical-align: middle;
-}
-
-#objectTree {
-    padding-top: 20px;
-    height: calc(100vh - 120px);
-    overflow-y: scroll;
-    overflow-x: hidden;
-}
-
-#objectTree.jstree-proton .jstree-anchor{
-    color: lightGray;
-}
-
 #map {
     width: 100%;
     height: calc(100vh - 157px);
-    border-top: 2px;
+    border-top: 0px;
     border-bottom: 0px;
     border-left: 0px;
     border-right: 0px;
-    border-style: solid;
-    border-color: gray;
+    border-style: none;
+    border-color: none;
     z-index: 0;
     cursor:default;
 }
-
-footer {
-    z-index: 1100;
-}
+footer {z-index: 1100;}
+.container-fluid {padding-left: 0px; padding-right: 0px;}
 
 </style>
 {% endblock %}
 
 {% block actions %}
-{% endblock %}
+ {% endblock %}
 
 {% block tab_menu %}
-{#{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': sonata_admin.adminPool.getTemplate('tab_menu_template')}, 'twig') }}#}
+<ol class="nav navbar-top-links breadcrumb">
+    <li>
+        <a href="{{url('sonata_admin_dashboard')}}"><i class="fa fa-home"></i></a>
+    </li>
+    <li class="active"><span>{{ 'Mapa ONUs'|trans({}, 'StatsBundle') }}</span></li>
+</ol>
+{% endblock %}
+
+{% block title %}
+{% endblock %}
+
+{% block navbar_title %}
 {% endblock %}
 
 {% block list_filters_actions %}
+<ul class="nav navbar-nav navbar-right">
+    <li>
+        <a class="sonata-action-element" href="{{url('admin_stats_onu_list')}}"><i class="fa fa-list" aria-hidden="true"></i>
+        {{ 'link_action_list'|trans({}, 'SonataAdminBundle') }}
+        </a>
+    </li>
+</ul>
 {% endblock %}
 
 {% block list_filters %}
@@ -109,7 +66,7 @@ footer {
 
 {% block content %}
 
-<div id='wrapper'>
+<div id='wrapper' class="box box-primary">
     <div id='page-content-wrapper'>
         <div class="cms-block cms-block-element" >
             <div id="map"></div>