فهرست منبع

Se agrega un chequeo de existencia de mapa para puerto pon y onus. Se
modifica el field rx del listado de ponports para los fiberlink que
solor retornan un valor, no por cada onu.

Maximiliano Schvindt 7 سال پیش
والد
کامیت
eef22a3f67

+ 47 - 37
src/StatsBundle/Controller/StatsController.php

@@ -139,6 +139,11 @@ class StatsController extends Controller
                 $setLatLng = $setZoom = true;
                 $srs = $data['featureType']['nativeBoundingBox'];
             }
+        } else {
+            $translator = $this->get('translator');
+            $flashbag = $this->get('session')->getFlashBag();
+            $flashbag->add("error", $translator->trans("msg_no_exist_map",array(),"StatsBundle"));
+            return $this->redirect($this->generateUrl('admin_stats_onu_list'));
         }
 
         if($setLatLng) {
@@ -340,44 +345,49 @@ class StatsController extends Controller
         $data = $api->getLayerData("deviceServer_1", $layer);
 
         $setLatLng = $setZoom = false;
+        
+        if(!empty($data)) {
+            if(isset($data['featureType']['latLonBoundingBox'])) {
+                $setLatLng = $setZoom = true;
+                $srs = $data['featureType']['latLonBoundingBox'];
+            } elseif(isset($data['featureType']['nativeBoundingBox'])) {
+                $setLatLng = $setZoom = true;
+                $srs = $data['featureType']['nativeBoundingBox'];
+            }
+        } else {
+            $translator = $this->get('translator');
+            $flashbag = $this->get('session')->getFlashBag();
+            $flashbag->add("error", $translator->trans("msg_no_exist_map",array(),"StatsBundle"));
+            return $this->redirect($this->generateUrl('admin_stats_ponport_list'));
+        }
  
-         if(!empty($data)) {
-             if(isset($data['featureType']['latLonBoundingBox'])) {
-                 $setLatLng = $setZoom = true;
-                 $srs = $data['featureType']['latLonBoundingBox'];
-             } elseif(isset($data['featureType']['nativeBoundingBox'])) {
-                 $setLatLng = $setZoom = true;
-                 $srs = $data['featureType']['nativeBoundingBox'];
-             }
-         }
- 
-         if($setLatLng) {
-             $lng = $srs['minx'] + ($srs['maxx'] - $srs['minx']) / 2;
-             $lat = $srs['miny'] + ($srs['maxy'] - $srs['miny']) / 2;
-         }
- 
-         if($setZoom) {
-             $lngDiff = $srs['maxx'] - $srs['minx'];
-             $latDiff = $srs['maxy'] - $srs['miny'];
-             $maxDiff = ($lngDiff > $latDiff) ? $lngDiff : $latDiff;
-             if ($maxDiff < 360 / pow(2, 20)) {
-                 $zoom = 21;
-             } else {
-                 $zoom = (-1*( (log($maxDiff)/log(2)) - (log(360)/log(2)))) + 1;
-                 if ($zoom < 1) $zoom = 1;
-             }
-         }
- 
-         $map = array('lat' => $lat, 'lng' => $lng, 'zoom' => $zoom);
+        if($setLatLng) {
+            $lng = $srs['minx'] + ($srs['maxx'] - $srs['minx']) / 2;
+            $lat = $srs['miny'] + ($srs['maxy'] - $srs['miny']) / 2;
+        }
  
-         return $this->render('StatsBundle:Stats:ponport_map.html.twig', array(
-             'base_template' => $adminPool->getTemplate('layout'),
-             'admin_pool' => $adminPool,
-             'admin' => $adminPool->getAdminByClass("StatsBundle\Entity\PonPort"),
-             'map'   => $map,
-             'layer' => $layer,
-             'ponPort' => $ponPort
-         ));
-     }
+        if($setZoom) {
+            $lngDiff = $srs['maxx'] - $srs['minx'];
+            $latDiff = $srs['maxy'] - $srs['miny'];
+            $maxDiff = ($lngDiff > $latDiff) ? $lngDiff : $latDiff;
+            if ($maxDiff < 360 / pow(2, 20)) {
+                $zoom = 21;
+            } else {
+                $zoom = (-1*( (log($maxDiff)/log(2)) - (log(360)/log(2)))) + 1;
+                if ($zoom < 1) $zoom = 1;
+            }
+        }
+
+        $map = array('lat' => $lat, 'lng' => $lng, 'zoom' => $zoom);
+
+        return $this->render('StatsBundle:Stats:ponport_map.html.twig', array(
+            'base_template' => $adminPool->getTemplate('layout'),
+            'admin_pool' => $adminPool,
+            'admin' => $adminPool->getAdminByClass("StatsBundle\Entity\PonPort"),
+            'map'   => $map,
+            'layer' => $layer,
+            'ponPort' => $ponPort
+        ));
+    }
 
 }

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

@@ -117,4 +117,5 @@ link_action_update_devices: Actualizar dispositivos
 link_action_show_ponport_in_map: Ver en Mapa
 show_ponport: Mostrar PonPort
 link_action_add_onu_in_ftth: Agregar al sistema
-msg_no_registered_in_ftth: La ONU no se encuentra registrada en FTTH. Puede agregarla desde Acciones > Agregar al sistema.
+msg_no_registered_in_ftth: La ONU no se encuentra registrada en FTTH. Puede agregarla desde Acciones > Agregar al sistema.
+msg_no_exist_map: No se encuentra el mapa solicitado.

+ 10 - 3
src/StatsBundle/Resources/views/PonPort/base_list_field_rx.html.twig

@@ -31,9 +31,16 @@
             {% elseif value >= -15 and value < -13 %}
                 {% set style = "rx_ftth_rojo" %}
             {% endif %}
-            <td class="ponport_td_rx_power" title="{{ponPort ~ '/' ~ key}} {{ value|number_format(2, '.', ',')}} dBm">
-                <span class="ponport_td_span_rx_power">{{key}} <span class="{{style}}"> {{ value|number_format(2, '.', ',')}}</span></span>
-            </td>
+            
+            {% if key == 0 %}
+                <td class="ponport_td_rx_power" title="{{ponPort}} {{ value|number_format(2, '.', ',')}} dBm">
+                    <span class="ponport_td_span_rx_power"><span class="{{style}}"> {{ value|number_format(2, '.', ',')}}</span></span>
+                </td>
+            {% else %}
+                <td class="ponport_td_rx_power" title="{{ponPort ~ '/' ~ key}} {{ value|number_format(2, '.', ',')}} dBm">
+                    <span class="ponport_td_span_rx_power">{{key}} <span class="{{style}}"> {{ value|number_format(2, '.', ',')}}</span></span>
+                </td>
+            {% endif %}
         
         {% endfor %}
         </tr></table>