MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: [contrib] improvement on the handling of lots of contributions at the same time

pull/43/merge
Sami Mokaddem 2018-09-24 12:23:04 +02:00
parent cf70fef0ac
commit f22a9db067
2 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static/css/ranking.css
View File

@ -66,6 +66,11 @@
color: black;
}
.higlightRowInTable {
background-color: #dff0d8 !important;
color: black;
}
.centerInBtn {
float: left;
text-align: center;

71
static/js/contrib.js
View File

@ -9,6 +9,8 @@ var sec_before_reload = refresh_speed;
var plotLineChart;
var source_awards;
var source_lastContrib;
var last_added_contrib;
var timeout_last_added_contrib;
/* CONFIG */
var maxRank = 16;
@ -336,39 +338,39 @@ function addLastFromJson(datatable, url) {
}
function addLastContributor(datatable, data, update) {
var date = new Date(data.epoch*1000);
date.toString = function() {return this.toTimeString().slice(0,-15) +' '+ this.toLocaleDateString(); };
var to_add = [
date,
data.pnts,
getMonthlyRankIcon(data.rank),
getOrgRankIcon(data.orgRank, 60),
createHonorImg(data.honorBadge, 20),
createImg(data.logo_path, 32),
createOrgLink(data.org),
];
if (update == undefined || update == false) {
datatable.row.add(to_add);
datatable.draw();
} else if(update == true) {
var row_added = false;
datatable.rows().every( function() {
if($(this.data()[6])[0].text == data.org) {
var node = $(datatable.row( this ).node());
datatable.row( this ).data( to_add );
if(next_effect <= new Date()) {
node.effect("slide", 500);
next_effect.setSeconds((new Date()).getSeconds() + 5);
}
row_added = true;
}
var org = data.org;
if (org == last_added_contrib) {
let node = $('#lastTable > tbody tr:eq(0)');
node.addClass('higlightRowInTable');
update_timeout_last_added_contrib();
} else {
last_added_contrib = org;
var date = new Date(data.epoch*1000);
date.toString = function() {return this.toTimeString().slice(0,-15) +' '+ this.toLocaleDateString(); };
var to_add = [
date,
data.pnts,
getMonthlyRankIcon(data.rank),
getOrgRankIcon(data.orgRank, 60),
createHonorImg(data.honorBadge, 20),
createImg(data.logo_path, 32),
createOrgLink(data.org),
];
if (update === undefined || update === false) {
datatable.row.add(to_add);
datatable.draw();
});
if (!row_added) {
var node = $(datatable.row.add(to_add).draw().node());
node.effect("slide", 700);
} else if(update == true) {
datatable.rows().every( function() {
if($(this.data()[6])[0].text == data.org) {
var node = $(datatable.row( this ).node());
datatable.row( this ).data( to_add );
node.effect("slide", 500);
}
datatable.draw();
});
}
}
}
function addAwards(datatableAwards, json, playAnim) {
@ -549,6 +551,15 @@ function updateProgressHeader(org) {
updateOvertakePnts();
}
function update_timeout_last_added_contrib() {
clearTimeout(timeout_last_added_contrib);
timeout_last_added_contrib = setTimeout(function() {
let node = $('#lastTable > tbody tr:eq(0)');
node.removeClass('higlightRowInTable');
last_added_contrib = null;
}, 5000);
}
function showOnlyOrg() {
datatableCateg.search( $('#orgText').text() ).draw();
}