Browse Source

Baseadmin-bundle actualizado. Se agregan colores a los valores de
estadísticas de ONUs.

Maximiliano Schvindt 7 years ago
parent
commit
646c5b98bc

+ 2 - 2
composer.lock

@@ -1262,7 +1262,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "a62ae709daf7f900018c3f56f1e39c36bfbd5e61"
+                "reference": "5b2777db360a34f54f1fe59125e0f7a0b3d0ff7b"
             },
             "type": "library",
             "autoload": {
@@ -1277,7 +1277,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-03 18:52:52"
+            "time": "2017-08-09 17:31:17"
         },
         {
             "name": "ik/device-bundle",

+ 5 - 5
src/StatsBundle/Admin/OnuAdmin.php

@@ -40,11 +40,11 @@ class OnuAdmin extends BaseAdmin
             ->add('ponSerialNumber')
             ->add('ponPort')
             ->add('status')
-            ->add('txPower')
-            ->add('rxPower')
-            ->add('voltage')
-            ->add('temperature')
-            ->add('uptime')
+            ->add('txPower', 'string', array('template' => 'StatsBundle:Onu:base_list_field_tx.html.twig'))
+            ->add('rxPower', 'string', array('template' => 'StatsBundle:Onu:base_list_field_rx.html.twig'))
+            ->add('voltage', 'string', array('template' => 'StatsBundle:Onu:base_list_field_voltage.html.twig'))
+            ->add('temperature', 'string', array('template' => 'StatsBundle:Onu:base_list_field_temperature.html.twig'))
+            ->add('uptime', 'string', array('template' => 'StatsBundle:Onu:base_list_field_uptime.html.twig'))
             ->add('updated')
             ->add('_action', null, array(
                 'actions' => array('show' => array())

+ 3 - 1
src/StatsBundle/Resources/translations/StatsBundle.es.yml

@@ -82,4 +82,6 @@ Device: Dispositivo
 
 link_action_update_devices: Actualizar dispositivos
 
-Statistics: Estadísticas
+Statistics: Estadísticas
+macroFields:
+    notavailable: 'NULL'

+ 27 - 0
src/StatsBundle/Resources/views/Onu/base_list_field_rx.html.twig

@@ -0,0 +1,27 @@
+{% extends 'SonataAdminBundle:CRUD:base_list_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 %}

+ 9 - 0
src/StatsBundle/Resources/views/Onu/base_list_field_temperature.html.twig

@@ -0,0 +1,9 @@
+{% extends 'SonataAdminBundle:CRUD:base_list_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 %}

+ 25 - 0
src/StatsBundle/Resources/views/Onu/base_list_field_tx.html.twig

@@ -0,0 +1,25 @@
+{% extends 'SonataAdminBundle:CRUD:base_list_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 %}

+ 9 - 0
src/StatsBundle/Resources/views/Onu/base_list_field_uptime.html.twig

@@ -0,0 +1,9 @@
+{% extends 'SonataAdminBundle:CRUD:base_list_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 %}

+ 9 - 0
src/StatsBundle/Resources/views/Onu/base_list_field_voltage.html.twig

@@ -0,0 +1,9 @@
+{% extends 'SonataAdminBundle:CRUD:base_list_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 %}