Merge branch 'master' into '103-verschiedene-lernmodi'
# Conflicts: # django/templates/play/game/question_host.html
This commit is contained in:
@@ -243,6 +243,7 @@ def question(request, join_code):
|
||||
return render(request, 'play/game/question_host.html', {
|
||||
'quiz_game': quiz_game,
|
||||
'question_data': question_data,
|
||||
'current_question':current_question,
|
||||
'host_id': quiz_game.host_id,
|
||||
'start_time': int(quiz_game.question_start_time.timestamp() * 1000),
|
||||
'question_index': quiz_game.current_question_index,
|
||||
@@ -265,6 +266,7 @@ def question(request, join_code):
|
||||
return render(request, 'play/game/question_participant.html', {
|
||||
'quiz_game': quiz_game,
|
||||
'question_data': question_data,
|
||||
'current_question':current_question,
|
||||
'participant': participant,
|
||||
'start_time': int(quiz_game.question_start_time.timestamp() * 1000),
|
||||
'question_index': quiz_game.current_question_index,
|
||||
|
||||
Reference in New Issue
Block a user