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

ui: Restrained number of orgs in fame and prevented datatable to go over 

the visible screen
pull/15/head
Sami Mokaddem 2017-12-01 16:02:28 +01:00
parent e4d933a55b
commit d8b7734b08
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contributor_helper.py
View File

@ -458,7 +458,7 @@ class Contributor_helper:
dic['epoch'] = epoch dic['epoch'] = epoch
return dic return dic
def getTopContributorFromRedis(self, date): def getTopContributorFromRedis(self, date, maxNum=100):
orgDicoPnts = {} orgDicoPnts = {}
for curDate in util.getMonthSpan(date): for curDate in util.getMonthSpan(date):
topNum = 0 # all topNum = 0 # all
@ -480,7 +480,7 @@ class Contributor_helper:
data.append(dic) data.append(dic)
data.sort(key=lambda x: x['pnts'], reverse=True) data.sort(key=lambda x: x['pnts'], reverse=True)
return data return data[:maxNum]
def getTop5OvertimeFromRedis(self): def getTop5OvertimeFromRedis(self):
data = [] data = []

8
server.py
View File

@ -312,7 +312,7 @@ def eventStreamAwards():
yield 'data: {}\n\n'.format(json.dumps(to_return)) yield 'data: {}\n\n'.format(json.dumps(to_return))
@app.route("/_getTopContributor") @app.route("/_getTopContributor")
def getTopContributor(suppliedDate=None): def getTopContributor(suppliedDate=None, maxNum=100):
if suppliedDate is None: if suppliedDate is None:
try: try:
date = datetime.datetime.fromtimestamp(float(request.args.get('date'))) date = datetime.datetime.fromtimestamp(float(request.args.get('date')))
@ -321,7 +321,7 @@ def getTopContributor(suppliedDate=None):
else: else:
date = suppliedDate date = suppliedDate
data = contributor_helper.getTopContributorFromRedis(date) data = contributor_helper.getTopContributorFromRedis(date, maxNum=maxNum)
return jsonify(data) return jsonify(data)
@app.route("/_getFameContributor") @app.route("/_getFameContributor")
@ -332,7 +332,7 @@ def getFameContributor():
today = datetime.datetime.now() today = datetime.datetime.now()
# get previous month # get previous month
date = (datetime.datetime(today.year, today.month, 1) - datetime.timedelta(days=1)) date = (datetime.datetime(today.year, today.month, 1) - datetime.timedelta(days=1))
return getTopContributor(suppliedDate=date) return getTopContributor(suppliedDate=date, maxNum=10)
@app.route("/_getFameQualContributor") @app.route("/_getFameQualContributor")
def getFameQualContributor(): def getFameQualContributor():
@ -342,7 +342,7 @@ def getFameQualContributor():
today = datetime.datetime.now() today = datetime.datetime.now()
# get previous month # get previous month
date = (datetime.datetime(today.year, today.month, 1) - datetime.timedelta(days=1)) date = (datetime.datetime(today.year, today.month, 1) - datetime.timedelta(days=1))
return getTopContributor(suppliedDate=date) return getTopContributor(suppliedDate=date, maxNum=10)
@app.route("/_getTop5Overtime") @app.route("/_getTop5Overtime")
def getTop5Overtime(): def getTop5Overtime():

9
static/js/contrib.js
View File

@ -79,8 +79,9 @@ optionDatatable_last.columnDefs = [
{ className: "centerCellPicOrgLogo verticalAlign", "targets": [ 5 ] }, { className: "centerCellPicOrgLogo verticalAlign", "targets": [ 5 ] },
{ className: "verticalAlign", "targets": [ 6 ] } { className: "verticalAlign", "targets": [ 6 ] }
] ]
var optionDatatable_fame = jQuery.extend({}, optionDatatable_light) var optionDatatable_fameQuant = jQuery.extend({}, optionDatatable_light)
optionDatatable_fame.scrollY = '45vh'; var optionDatatable_fameQual = jQuery.extend({}, optionDatatable_light)
optionDatatable_fameQual.scrollY = '40vh';
var optionDatatable_Categ = { var optionDatatable_Categ = {
responsive: true, responsive: true,
@ -590,8 +591,8 @@ $(document).ready(function() {
}); });
datatableTop = $('#topContribTable').DataTable(optionDatatable_top); datatableTop = $('#topContribTable').DataTable(optionDatatable_top);
datatableFameQuant = $('#fameTableQuantity').DataTable(optionDatatable_fame); datatableFameQuant = $('#fameTableQuantity').DataTable(optionDatatable_fameQuant);
datatableFameQual = $('#fameTableQuality').DataTable(optionDatatable_fame); datatableFameQual = $('#fameTableQuality').DataTable(optionDatatable_fameQual);
datatableCateg = $('#categTable').DataTable(optionDatatable_Categ); datatableCateg = $('#categTable').DataTable(optionDatatable_Categ);
datatableLast = $('#lastTable').DataTable(optionDatatable_last); datatableLast = $('#lastTable').DataTable(optionDatatable_last);
datatableAwards = $('#awardTable').DataTable(optionDatatable_awards); datatableAwards = $('#awardTable').DataTable(optionDatatable_awards);