JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Closes #87

selenium-screenshot-testing
Kevin Chung 2016-02-08 17:19:55 -05:00
parent d3e2838828
commit 6640f591de
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CTFd/admin.py
View File

@ -226,14 +226,18 @@ def admin_chals():
json_data = {'game':[]} json_data = {'game':[]}
for x in chals: for x in chals:
solve_count = Solves.query.filter_by(chalid=x[1]).count() solve_count = Solves.query.join(Teams, Solves.teamid == Teams.id).filter(Solves.chalid==x[1], Teams.banned==None).count()
if teams_with_points > 0:
percentage = (float(solve_count) / float(teams_with_points))
else:
percentage = 0.0
json_data['game'].append({ json_data['game'].append({
'id': x[1], 'id': x[1],
'name': x[2], 'name': x[2],
'value': x[3], 'value': x[3],
'description': x[4], 'description': x[4],
'category': x[5], 'category': x[5],
'percentage_solved': (float(solve_count) / float(teams_with_points)) 'percentage_solved': percentage
}) })
db.session.close() db.session.close()