Bug fixes and correct answer count in results
This commit is contained in:
@@ -216,7 +216,7 @@ async def register_as_admin(sid: str, data: dict):
|
||||
if await redis.get(f"game_session:{game_pin}") is not None:
|
||||
await sio.emit("already_registered_as_admin", room=sid)
|
||||
return
|
||||
GameSession(admin=sid, game_id=game_id, answers=[]).save(game_pin)
|
||||
await GameSession(admin=sid, game_id=game_id, answers=[]).save(game_pin)
|
||||
await sio.emit(
|
||||
"registered_as_admin",
|
||||
{"game_id": game_id, "game": await redis.get(f"game:{game_pin}")},
|
||||
@@ -251,7 +251,7 @@ async def set_question_number(sid: str, data: str):
|
||||
game_data = await PlayGame.get_from_redis(session["game_pin"])
|
||||
game_data.current_question = int(float(data))
|
||||
game_data.question_show = True
|
||||
game_data.save(session["game_pin"])
|
||||
await game_data.save(session["game_pin"])
|
||||
await redis.set(f"game:{session['game_pin']}:current_time", datetime.now().isoformat(), ex=7200)
|
||||
temp_return = game_data.model_dump(include={"questions"})["questions"][int(float(data))]
|
||||
if game_data.questions[int(float(data))].type == QuizQuestionType.SLIDE:
|
||||
@@ -296,7 +296,7 @@ async def submit_answer(sid: str, data: dict):
|
||||
if already_answered:
|
||||
await sio.emit("already_replied", room=sid)
|
||||
return
|
||||
(answer_right, answer) = check_answer(game_data, data)
|
||||
answer_right, answer = check_answer(game_data, data)
|
||||
latency = int(float(session["ping"]))
|
||||
time_q_started = datetime.fromisoformat(await redis.get(f"game:{session['game_pin']}:current_time"))
|
||||
diff = (time_q_started - now).total_seconds() * 1000 # - timedelta(milliseconds=latency)
|
||||
|
||||
@@ -30,7 +30,6 @@ async def check_captcha(captcha_data: str) -> bool:
|
||||
) as resp:
|
||||
resp_data = await resp.model_dump_json()
|
||||
if not resp_data["success"]:
|
||||
print("CAPTCHA FAILED")
|
||||
return
|
||||
except KeyError:
|
||||
return False
|
||||
@@ -60,7 +59,7 @@ def check_answer(game_data: PlayGame, data: SubmitAnswerData) -> (bool, str):
|
||||
q_answers = game_data.questions[q_i].answers
|
||||
q_answer = data.answer
|
||||
if q_type == QuizQuestionType.ABCD:
|
||||
return (check_abcd_question, data.answer)
|
||||
return (check_abcd_question(q_answer, q_answers), data.answer)
|
||||
elif q_type == QuizQuestionType.RANGE:
|
||||
return (
|
||||
check_range_question(q_answer, q_answers),
|
||||
@@ -69,7 +68,7 @@ def check_answer(game_data: PlayGame, data: SubmitAnswerData) -> (bool, str):
|
||||
elif q_type == QuizQuestionType.VOTING:
|
||||
return (False, q_answer)
|
||||
elif q_type == QuizQuestionType.ORDER:
|
||||
return check_order_question(q_answer, q_answers)
|
||||
return check_order_question(data.complex_answer, q_answer, q_answers)
|
||||
elif q_type == QuizQuestionType.TEXT:
|
||||
return (
|
||||
check_text_question(q_answer, q_answers),
|
||||
@@ -105,14 +104,11 @@ def check_order_question(
|
||||
) -> (bool, str):
|
||||
if complex_answer is None:
|
||||
return (False, answer)
|
||||
correct_answers = []
|
||||
for a in answers:
|
||||
correct_answers.append({"answer": a.answer})
|
||||
answer_order = []
|
||||
for a in complex_answer.model_dump():
|
||||
answer_order.append(a["answer"])
|
||||
answer = ", ".join(answer_order)
|
||||
return (correct_answers == complex_answer.model_dump(), answer)
|
||||
correct_answers = [{"answer": a.answer} for a in answers]
|
||||
submitted_answers = [{"answer": a.answer} for a in complex_answer]
|
||||
answer_str = ", ".join(a["answer"] for a in submitted_answers)
|
||||
is_correct = submitted_answers == correct_answers
|
||||
return is_correct, answer_str
|
||||
|
||||
|
||||
def check_text_question(answer: str, answers: list[TextQuizAnswer]) -> bool:
|
||||
|
||||
Reference in New Issue
Block a user