This commit is contained in:
Kevin Chung
2015-10-10 21:11:21 -04:00
parent f59e497d04
commit 1d8748d5c4
3 changed files with 4 additions and 5 deletions

View File

@@ -1,7 +1,6 @@
import os import os
##### SERVER SETTINGS ##### ##### SERVER SETTINGS #####
SECRET_KEY = os.urandom(64) SECRET_KEY = os.urandom(64)
#SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://root:password@localhost/ctfd'
SQLALCHEMY_DATABASE_URI = 'sqlite:///ctfd.db' SQLALCHEMY_DATABASE_URI = 'sqlite:///ctfd.db'
SESSION_TYPE = "filesystem" SESSION_TYPE = "filesystem"
SESSION_FILE_DIR = "/tmp/flask_session" SESSION_FILE_DIR = "/tmp/flask_session"

View File

@@ -20,9 +20,9 @@ def scores():
quickest = db.func.max(Solves.date).label('quickest') quickest = db.func.max(Solves.date).label('quickest')
teams = db.session.query(Solves.teamid, Teams.name, score).join(Teams).join(Challenges).filter(Teams.banned == None).group_by(Solves.teamid).order_by(score.desc(), quickest) teams = db.session.query(Solves.teamid, Teams.name, score).join(Teams).join(Challenges).filter(Teams.banned == None).group_by(Solves.teamid).order_by(score.desc(), quickest)
db.session.close() db.session.close()
json = {'teams':[]} json = {'standings':[]}
for i, x in enumerate(teams): for i, x in enumerate(teams):
json['teams'].append({'place':i+1, 'id':x.teamid, 'name':x.name,'score':int(x.score)}) json['standings'].append({'pos':i+1, 'id':x.teamid, 'name':x.name,'score':int(x.score)})
return jsonify(json) return jsonify(json)

View File

@@ -27,8 +27,8 @@ function updatescores () {
$.get('/scores', function( data ) { $.get('/scores', function( data ) {
teams = $.parseJSON(JSON.stringify(data)); teams = $.parseJSON(JSON.stringify(data));
$('#scoreboard > tbody').empty() $('#scoreboard > tbody').empty()
for (var i = 0; i < teams['teams'].length; i++) { for (var i = 0; i < teams['standings'].length; i++) {
row = "<tr><td>{0}</td><td><a href='/team/{1}'>{2}</a></td><td>{3}</td></tr>".format(i+1, teams['teams'][i].id, htmlentities(teams['teams'][i].name), teams['teams'][i].score) row = "<tr><td>{0}</td><td><a href='/team/{1}'>{2}</a></td><td>{3}</td></tr>".format(i+1, teams['standings'][i].id, htmlentities(teams['standings'][i].name), teams['standings'][i].score)
$('#scoreboard > tbody').append(row) $('#scoreboard > tbody').append(row)
}; };
}); });