Bläddra i källkod

Se añade complemento dataTable al repositorio.

Maxi Schvindt 7 år sedan
förälder
incheckning
2349e10e02

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

@@ -137,8 +137,8 @@ class OnuAdmin extends BaseAdmin
             if(isset($urls['url_ftth'])) {
                 $deviceId = $object->getDeviceId();
                 if(is_null($deviceId)) {
-                    if(isset($urls['api_ftth'])) {
-                        $apiOnu = "{$urls['api_ftth']}/api/onus.json"; //http://ftth:8000/api/onus.json
+                    if(isset($urls['url_ftth'])) {
+                        $apiOnu = "{$urls['url_ftth']}/api/onus.json"; //http://ftth.fd3.flowdat.com/api/onus.json
                         $oltDeviceId = $object->getOltDeviceId();
                         $tenancyId = $object->getTenancyId();
                         $ponSerialNumber = $object->getPonSerialNumber();

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
src/StatsBundle/Resources/public/datatables/jquery.dataTables.min.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 164 - 0
src/StatsBundle/Resources/public/datatables/jquery.dataTables.min.js


+ 1 - 1
src/StatsBundle/Resources/public/highcharts/highchartsConfig.js

@@ -30,7 +30,7 @@ Highcharts.setOptions({
     credits: {enabled: false},
     xAxis: {type: 'datetime',dateTimeLabelFormats: {month: '%e. %b',year: '%b'},title: {text: 'Date'}},
     yAxis: {title: {text: null},labels: {align: 'left',x: 5,y: -2},plotLines: [{value: 0,width: 1,color: '#808080'}]},
-    plotOptions: {series: {turboThreshold: 0,lineWidth: 2,states: {hover: {lineWidth: 2}},marker: {enabled: true,lineWidth: 1,radius: 3,symbol: 'square',states: {hover: {enabled: true}}}}},
+    plotOptions: {series: {turboThreshold: 0,lineWidth: 2,states: {hover: {lineWidth: 2}},marker: {enabled: true,lineWidth: 1,radius: 3,symbol: 'square', states: {hover: {enabled: true}}}}},
     series: {type: 'spline',connectNulls: false},
     tooltip: {useHTML: true,borderColor: '#494949',valueDecimals: 2,shared: true,crosshairs: true,xDateFormat: '%A, %b %e, %H:%M'}
 });

+ 2 - 2
src/StatsBundle/Resources/views/Device/cmts_report.html.twig

@@ -2,7 +2,7 @@
 
 {% block stylesheets %}
 {{ parent() }}
-<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="{{ asset('bundles/stats/datatables/jquery.dataTables.min.css') }}">
 <style>
 
 .cpu_card {
@@ -19,7 +19,7 @@
 <script src="{{ asset('bundles/baseadmin/report/hinclude.js') }}"></script>
 <script src="{{ asset('bundles/baseadmin/report/randomColor.js') }}"></script>
 <script src="{{ asset('bundles/baseadmin/report/chart.min.js') }}"></script>
-<script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+<script src="{{ asset('bundles/stats/datatables/jquery.dataTables.min.js') }}"></script>
 {% endblock %}
 
 {% block content %}

+ 2 - 2
src/StatsBundle/Resources/views/Device/olt_report.html.twig

@@ -2,7 +2,7 @@
 
 {% block stylesheets %}
 {{ parent() }}
-<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="{{ asset('bundles/stats/datatables/jquery.dataTables.min.css') }}">
 <style>
 
 .cpu_card {
@@ -19,7 +19,7 @@
 <script src="{{ asset('bundles/baseadmin/report/hinclude.js') }}"></script>
 <script src="{{ asset('bundles/baseadmin/report/randomColor.js') }}"></script>
 <script src="{{ asset('bundles/baseadmin/report/chart.min.js') }}"></script>
-<script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+<script src="{{ asset('bundles/stats/datatables/jquery.dataTables.min.js') }}"></script>
 {% endblock %}
 
 {% block content %}

+ 5 - 1
src/StatsBundle/Resources/views/Stats/olt_ponport.html.twig

@@ -52,7 +52,11 @@ Highcharts.chart('olt_ponport_rx', {
         {% for index, serie in seriesOnus %}
         {name: "{{serie['name']}}",
         data: {{serie['data']|json_encode}},
-        type: 'spline'},
+        type: 'spline',
+        lineWidth: 1,
+        marker: {lineWidth: 1,radius: 2, states: {hover: {enabled: false}}},
+        states: {hover: {lineWidth: 1}},
+        },
         {% endfor %}
     ]
 });