From a5d000f70271330ef4d3f3779b19305522848640 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 21 Feb 2024 17:02:18 +0530 Subject: [PATCH] fix: quix show correct answers --- lms/lms/doctype/lms_quiz/lms_quiz.py | 2 ++ lms/templates/quiz/quiz.js | 4 +++- lms/www/batches/batch.js | 11 ++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py index 80f0ab463..9dc10fa82 100644 --- a/lms/lms/doctype/lms_quiz/lms_quiz.py +++ b/lms/lms/doctype/lms_quiz/lms_quiz.py @@ -270,6 +270,8 @@ def check_choice_answers(question, answers): for num in range(1, 5): if question_details[f"option_{num}"] in answers: is_correct.append(question_details[f"is_correct_{num}"]) + elif question_details[f"is_correct_{num}"]: + is_correct.append(2) else: is_correct.append(0) diff --git a/lms/templates/quiz/quiz.js b/lms/templates/quiz/quiz.js index d7b891b65..810bac4db 100644 --- a/lms/templates/quiz/quiz.js +++ b/lms/templates/quiz/quiz.js @@ -239,7 +239,9 @@ const parse_choices = (element, is_correct) => { ? add_icon(elem, "check") : add_icon(elem, "wrong"); } else { - add_icon(elem, "minus-circle"); + if (this.show_answers && is_correct[i] == 2) + add_icon(elem, "minus-circle-green"); + else add_icon(elem, "minus-circle"); } }); }; diff --git a/lms/www/batches/batch.js b/lms/www/batches/batch.js index 3ac054d29..6e27ca109 100644 --- a/lms/www/batches/batch.js +++ b/lms/www/batches/batch.js @@ -711,9 +711,14 @@ const get_calendar_options = (element, calendar_id) => { event.start.d.d )} - ${frappe.datetime.get_time(event.end.d.d)}"> -
${frappe.datetime.get_time(event.start.d.d)} - - ${frappe.datetime.get_time(event.end.d.d)}
-
${event.title}
+
+ ${event.title} + + ${frappe.datetime.get_time(event.start.d.d)} - ${frappe.datetime.get_time( + event.end.d.d + )} + +
`; }, },