Przeglądaj źródła

Merged in demo (pull request #2)

Demo
Luciano Andrade 8 lat temu
rodzic
commit
9de9c44271

+ 1 - 0
app/config/bundles/ik/webservice-bundle/parameters.yml.dist

@@ -4,6 +4,7 @@ parameters:
     url_mapas: 'http://127.0.0.1/mapas/app_dev.php' # url app Base
 
     client: '%url_base%/api/clients.json'
+    onu: '%url_ftth%/api/onus.json'
 
     sidebar_menu: # urls para el sidebar menu 
         Base: '%url_base%'

+ 1 - 0
app/config/bundles/ik/webservice-bundle/parameters.yml.docker

@@ -5,6 +5,7 @@ parameters:
     url_mapas: 'http://%env(HOST_MAPAS)%'
 
     client: '%url_base%/api/clients.json'
+    onu: '%url_ftth%/api/onus.json'
 
     remote_client_create_url: '%url_base%/admin/client/client/create'
 

+ 7 - 0
src/StatsBundle/Controller/StatsController.php

@@ -82,8 +82,15 @@ class StatsController extends Controller
     {
         $grafana_url = $this->getParameter('grafana_url');
 
+        $onus = $this->get('webservice')->getData('onu', array(
+            'id' => $request->get('id')
+        ));
+
         $urls = array();
         $serialNumber = 'fhtt000753b0';
+        if (isset($onus[0]) && isset($onus[0]['ponSerialNumber'])) {
+            $serialNumber = $onus[0]['ponSerialNumber'];
+        }
         $panelIds = array(1, 2, 3, 4, 5);
         foreach ($panelIds as $panelId) {
             $urls[] = "onu?orgId=1&var-serialnumber={$serialNumber}&panelId={$panelId}";

+ 1 - 1
src/StatsBundle/Resources/views/StatsDevice/show.html.twig

@@ -5,6 +5,6 @@
     {% if object.deviceType == constant('DeviceBundle\\Utils\\DeviceTypes::FTTH_OLT') %}
     {{ render(controller('StatsBundle:Stats:getStatsGraph')) }}
     {% else %}
-    {{ render(controller('StatsBundle:Stats:getONUStatsGraph')) }}
+    {{ render(controller('StatsBundle:Stats:getONUStatsGraph', { 'id':object.deviceId })) }}
     {% endif %}
 {% endblock %}