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

Added PB showing pnts # of pnts to get for the next lvl

pull/3/head
Sami Mokaddem 2017-11-02 14:44:27 +01:00
parent 3bfa5185dc
commit cb674a770d
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server.py
View File

@ -108,7 +108,7 @@ def getRemainingPoints(points):
prev = 0 prev = 0
for i in [cfg.getint('CONTRIB' ,'rankMultiplier')**x for x in range(1,17)]: for i in [cfg.getint('CONTRIB' ,'rankMultiplier')**x for x in range(1,17)]:
if prev <= points < i: if prev <= points < i:
return i-points return { 'remainingPts': i-points, 'stepPts': prev }
prev = i prev = i
return 0 return 0
@ -274,7 +274,8 @@ def getOrgRank():
org = '' org = ''
points = random.randint(1,2**16) points = random.randint(1,2**16)
#FIXME put 0 if org has no points #FIXME put 0 if org has no points
data = {'org': org, 'points': points, 'rank': getRankLevel(points), 'remainingPts': getRemainingPoints(points)} remainingPts = getRemainingPoints(points)
data = {'org': org, 'points': points, 'rank': getRankLevel(points), 'remainingPts': remainingPts['remainingPts'], 'stepPts': remainingPts['stepPts']}
return jsonify(data) return jsonify(data)
@app.route("/_getTopCoord") @app.route("/_getTopCoord")

30
static/js/contrib.js
View File

@ -101,7 +101,29 @@ function getRankIcon(rank, size, header) {
} }
return img.outerHTML; return img.outerHTML;
} }
function generateRankingSheet(rank) { function generateRankingSheet(rank, stepPnt, pnt, Rpnt) {
var Cpnt = pnt - stepPnt;
var Tpnt = Cpnt + Rpnt;
var gdiv = document.createElement('div');
//progressBar
var div = document.createElement('div');
div.classList.add('progress');
var pb_length = 187;
div.style.width = pb_length+'px'; //HARDCODED...
div.style.marginBottom = '0px';
var div1 = document.createElement('div')
div1.classList.add('progress-bar')
div1.style.width = 100*(Cpnt)/Tpnt+'%';
div1.innerHTML = pnt;
div.appendChild(div1);
var div1 = document.createElement('div')
div1.classList.add('progress-bar', 'progress-bar-warning')
div1.style.width = 100*(Rpnt)/Tpnt+'%'
div1.innerHTML = Rpnt;
div.appendChild(div1);
gdiv.appendChild(div);
// table
var table = document.createElement('table'); var table = document.createElement('table');
table.classList.add('table', 'table-striped'); table.classList.add('table', 'table-striped');
table.style.marginBottom = '0px'; table.style.marginBottom = '0px';
@ -135,7 +157,8 @@ function generateRankingSheet(rank) {
} }
table.appendChild(thead); table.appendChild(thead);
table.appendChild(tbody); table.appendChild(tbody);
return table.outerHTML; gdiv.appendChild(table);
return gdiv.outerHTML;
} }
function addToTableFromJson(datatable, url) { function addToTableFromJson(datatable, url) {
@ -158,13 +181,12 @@ function addToTableFromJson(datatable, url) {
function updateProgressHeader(org) { function updateProgressHeader(org) {
// get Org rank // get Org rank
$.getJSON( url_getOrgRank+'?org='+org, function( data ) { $.getJSON( url_getOrgRank+'?org='+org, function( data ) {
console.log(data);
datatableTop.draw(); datatableTop.draw();
var rank = Math.floor(data.rank); var rank = Math.floor(data.rank);
$('#btnCurrRank').show(); $('#btnCurrRank').show();
$('#orgText').text(data.org); $('#orgText').text(data.org);
var popoverRank = $('#btnCurrRank').data('bs.popover'); var popoverRank = $('#btnCurrRank').data('bs.popover');
popoverRank.options.content = generateRankingSheet(rank); popoverRank.options.content = generateRankingSheet(rank, data.stepPts, data.points, data.remainingPts);
$('#orgRankDiv').html(getRankIcon(rank, 40, true)); $('#orgRankDiv').html(getRankIcon(rank, 40, true));
$('#orgNextRankDiv').html(getRankIcon(rank+1, 40, true)); $('#orgNextRankDiv').html(getRankIcon(rank+1, 40, true));
$('#progressBarDiv').width((data.rank - rank)*150); //150 is empty bar width $('#progressBarDiv').width((data.rank - rank)*150); //150 is empty bar width