Merge branch 'development'
This commit is contained in:
@@ -43,7 +43,7 @@ def _fetch_questions():
|
|||||||
data_path = dataset.get_file()
|
data_path = dataset.get_file()
|
||||||
with open(data_path, 'r') as data_file:
|
with open(data_path, 'r') as data_file:
|
||||||
data = loads(data_file.read())
|
data = loads(data_file.read())
|
||||||
questions = generate_questions(data)
|
questions = generate_questions(dataset:data, randomise:false)
|
||||||
return jsonify({
|
return jsonify({
|
||||||
'time_limit': end_time,
|
'time_limit': end_time,
|
||||||
'questions': questions,
|
'questions': questions,
|
||||||
|
@@ -30,6 +30,7 @@ def _instructions():
|
|||||||
@quiz.route('/start/', methods=['GET', 'POST'])
|
@quiz.route('/start/', methods=['GET', 'POST'])
|
||||||
def _start():
|
def _start():
|
||||||
clubs = [
|
clubs = [
|
||||||
|
'Barrowland Bears Korfball Club',
|
||||||
'Dundee Korfball Club',
|
'Dundee Korfball Club',
|
||||||
'Edinburgh City Korfball Club',
|
'Edinburgh City Korfball Club',
|
||||||
'Edinburgh Mavericks Korfball Club',
|
'Edinburgh Mavericks Korfball Club',
|
||||||
|
Reference in New Issue
Block a user