third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-04-20 02:27:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix monitor updates when drilldowned

Browse Source
This commit is contained in:
AnthorNet 2015-06-12 07:26:07 +02:00
parent b92c4d54b2
commit 4defeee554
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
contrib/monitor/js/eddn.js
View File

@ -55,6 +55,7 @@ secondsToDurationString = function(seconds) {
var drillDownSoftware = false;
var currentDrillDown = false;
var softwaresTotal = {};
var softwaresVersion = {};
@ -124,9 +125,15 @@ var doUpdateSoftwares = function()
)
.append(
$('<td>').addClass('stat total').html('<strong>' + formatNumber(hits) + '</strong>')
).hide()
)
);
if(!drillDownSoftware)
newTr.hide();
else
if(softwareSplit[0] != currentDrillDown)
newTr.hide();
if(!softwaresVersion[softwareSplit[0]])
softwaresVersion[softwareSplit[0]] = {};
if(!softwaresVersion[softwareSplit[0]][software])
@ -144,15 +151,19 @@ var doUpdateSoftwares = function()
if(!drillDownSoftware)
{
currentDrillDown = currentSoftware;
$('#softwares .table thead th:eq(0)').html('<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>')
.css('cursor','pointer')
.on('click', function(){
currentDrillDown = false;
chart.showDrillUpButton();
$('#softwares .table thead th:eq(0)').html('');
$('#softwares .table thead th:eq(1)').html('');
$('#softwares .table tbody tr[data-type=parent]').show();
$('#softwares .table tbody tr[data-type=drilldown]').hide();
drillDownSoftware = !drillDownSoftware;
doUpdateSoftwares();
chart.drillUp();
});
$('#softwares .table thead th:eq(1)').html(currentSoftware);
@ -209,16 +220,27 @@ var doUpdateSoftwares = function()
)
);
if(!chart.get('software-' + makeSlug(values.name)))
if(!drillDownSoftware)
{
series.addPoint({id: 'software-' + makeSlug(values.name), name: values.name, y: parseInt(values.total), drilldown: true}, false);
if(!chart.get('software-' + makeSlug(values.name)))
{
series.addPoint({id: 'software-' + makeSlug(values.name), name: values.name, y: parseInt(values.total), drilldown: true}, false);
}
else
chart.get('software-' + makeSlug(values.name)).update(parseInt(values.total), false);
newTr.find('.square').css('background', chart.get('software-' + makeSlug(values.name)).color);
}
else
chart.get('software-' + makeSlug(values.name)).update(parseInt(values.total), false);
newTr.find('.square').css('background', chart.get('software-' + makeSlug(values.name)).color);
if(drillDownSoftware)
newTr.hide();
});
if(drillDownSoftware)
$('#softwares .table tbody tr[data-type=drilldown][data-parent="' + currentDrillDown + '"]').each(function(){
$(this).find('.square').css('background', chart.get('software-' + makeSlug($(this).attr('data-name'))).color);
});
chart.redraw();
$('#softwares').find(".stat").removeClass("warning").each(function() {