Forráskód Böngészése

Se actualiza vendors y se actualizan las gráficas, van a mostrar puntitos si filtramos un período de 6 horas, caso contrario no los muestra para que la gráfica se vea mejor.

Maxi Schvindt 7 éve
szülő
commit
fdc19c87b9

+ 4 - 4
composer.lock

@@ -1580,7 +1580,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/RedisBundle.git",
-                "reference": "a0a70b12771119874e2819f320711c2c5a649234"
+                "reference": "ec6e2cfcd148357264fab528aaca8641736605d3"
             },
             "require": {
                 "predis/predis": "^1.1"
@@ -1596,7 +1596,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2018-02-19T13:37:40+00:00"
+            "time": "2018-07-05T17:19:01+00:00"
         },
         {
             "name": "ik/stats/base-stats-bundle",
@@ -1625,7 +1625,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/CmtsBundle.git",
-                "reference": "2264f8c689c2b0fdb988f0131c6f5e2d37b5a24d"
+                "reference": "04b20eeec954678ac6a0aca87780caf98a040504"
             },
             "type": "library",
             "autoload": {
@@ -1638,7 +1638,7 @@
                 "CMTS",
                 "Flowdat 3"
             ],
-            "time": "2018-07-05T15:12:46+00:00"
+            "time": "2018-07-05T16:08:41+00:00"
         },
         {
             "name": "ik/stats/fiberhome-bundle",

+ 14 - 6
src/StatsBundle/Resources/views/Stats/show_cmts.html.twig

@@ -98,6 +98,7 @@ table.dataTable thead tr th, table.dataTable tbody tr td {
                                 </div>
                                 <div class="col-sm-6">
                                     {% include '@Stats/Stats/picker.html.twig' %}
+                                    <br />
                                     <div id="cmts_consumption"></div>
                                 </div>
                             </div>
@@ -163,6 +164,13 @@ $('#flap_list').click( function(e) {
     loadFlapList();
 }); 
 
+var from = {{from}};
+var to = {{to}};
+var markerEnable = false;
+if((to - from) <= 21600) {
+    markerEnable = true;
+}
+
 
 Highcharts.chart('cmts_consumption', {
     chart: {type: 'spline'},
@@ -171,7 +179,7 @@ Highcharts.chart('cmts_consumption', {
     xAxis: {type: 'datetime',dateTimeLabelFormats: {month: '%e. %b',year: '%b'},title: {text: 'Date'}},
     yAxis: {labels: {formatter: consumptionAxisLabel,align: 'left'},min: 0},
     tooltip: {formatter: consumptionTooltip},
-    plotOptions: {series: {dataLabels: {enabled: false, color: '#666666', formatter: bandwidthDataLabel}}},
+    plotOptions: {series: {marker: {enabled: markerEnable}, dataLabels: {enabled: false, color: '#666666', formatter: bandwidthDataLabel}}},
     series: [{
         name: "OUT Consumption",
         data: {{series['out_consumption']['data']|json_encode}},
@@ -190,7 +198,7 @@ Highcharts.chart('cmts_bandwidth', {
     xAxis: {type: 'datetime',dateTimeLabelFormats: {month: '%e. %b',year: '%b'},title: {text: 'Date'}},
     yAxis: {labels: {formatter: bandwidthAxisLabel,align: 'left'},min: 0},
     tooltip: {formatter: bandwidthTooltip},
-    plotOptions: {series: {dataLabels: {enabled: false, color: '#666666', formatter: bandwidthDataLabel}}},
+    plotOptions: {series: {marker: {enabled: markerEnable}, dataLabels: {enabled: false, color: '#666666', formatter: bandwidthDataLabel}}},
     series: [{
         name: "OUT Bandwidth",
         data: {{series['out_bandwidth']['data']|json_encode}},
@@ -232,7 +240,7 @@ Highcharts.chart('cmts_cm', {
     xAxis: {type: 'datetime',dateTimeLabelFormats: {month: '%e. %b',year: '%b'},title: {text: 'Date'}},
     yAxis: {min: 0,stackLabels: {enabled: false,style: {fontWeight: 'bold',color: (Highcharts.theme && Highcharts.theme.textColor) || 'gray'}}},
     tooltip: {valueSuffix: ' cm',valueDecimals: 0},
-    plotOptions: {area: {stacking: 'normal', dataLabels: {enabled: false, color: '#666666'}}},
+    plotOptions: {series: {marker: {enabled: false}}, area: {stacking: 'normal', dataLabels: {enabled: false, color: '#666666'}}},
     series: [{
         name: 'Online',
         data: {{series['on']['data']|json_encode}},
@@ -251,7 +259,7 @@ Highcharts.chart('interface_utilization', {
     xAxis: {type: 'datetime',dateTimeLabelFormats: {month: '%e. %b',year: '%b'},title: {text: 'Date'}},
     yAxis: {labels: {align: 'left'},min: 0, max: 100},
     tooltip: {valueSuffix: ' %',valueDecimals: 2},
-    plotOptions: {spline: {marker: {enabled: true}}},
+    plotOptions: {series: {marker: {enabled: markerEnable}}, spline: {marker: {enabled: false}}},
     series: [
         {% for index in utilizations %}
         {
@@ -269,7 +277,7 @@ Highcharts.chart('interface_snr', {
     xAxis: {type: 'datetime',dateTimeLabelFormats: {month: '%e. %b',year: '%b'},title: {text: 'Date'}},
     yAxis: {labels: {align: 'left'}},
     tooltip: {valueSuffix: ' dB',valueDecimals: 2},
-    plotOptions: {spline: {marker: {enabled: true}}},
+    plotOptions: {series: {marker: {enabled: markerEnable}}, spline: {marker: {enabled: false}}},
     series: [
         {% for index in snrs %}
         {
@@ -287,7 +295,7 @@ Highcharts.chart('interface_cer', {
     xAxis: {type: 'datetime',dateTimeLabelFormats: {month: '%e. %b',year: '%b'},title: {text: 'Date'}},
     yAxis: {labels: {align: 'left'}},
     tooltip: {valueSuffix: ' %',valueDecimals: 6},
-    plotOptions: {spline: {marker: {enabled: true}}},
+    plotOptions: {series: {marker: {enabled: markerEnable}}, spline: {marker: {enabled: false}}},
     series: [
         {% for index in cers %}
         {