From 2fbe5dacb20d19b2b75338d2d6bc9721b20783a6 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 24 Mar 2023 18:06:42 +0530
Subject: [PATCH] feat: user input quiz portal form

---
 lms/lms/doctype/lms_quiz/lms_quiz.py | 16 ++-----
 lms/public/css/style.css             | 27 +++++++++---
 lms/templates/quiz.html              |  8 ++--
 lms/www/batch/learn.js               | 31 ++++++++++---
 lms/www/batch/quiz.html              | 21 +++++++++
 lms/www/batch/quiz.js                | 65 +++++++++++++++++++---------
 lms/www/batch/quiz.py                |  3 +-
 7 files changed, 123 insertions(+), 48 deletions(-)

diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py
index bc158433..f9b4326a 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -148,17 +148,7 @@ def save_quiz(quiz_title, questions, quiz):
 				}
 			)
 
-		question_doc.update({"question": row["question"], "multiple": row["multiple"]})
-
-		for num in range(1, 5):
-			question_doc.update(
-				{
-					"option_" + cstr(num): row["option_" + cstr(num)],
-					"explanation_" + cstr(num): row["explanation_" + cstr(num)],
-					"is_correct_" + cstr(num): row["is_correct_" + cstr(num)],
-				}
-			)
-
+		question_doc.update(row)
 		question_doc.save(ignore_permissions=True)
 
 	return doc.name
@@ -197,6 +187,8 @@ def check_input_answers(question, answer):
 		"LMS Quiz Question", question, fields, as_dict=1
 	)
 	for num in range(1, 5):
-		if question_details[f"possibility_{num}"] == answer:
+		current_possibility = question_details[f"possibility_{num}"]
+		if current_possibility and current_possibility.lower() == answer.lower():
 			return 1
+
 	return 0
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index d8e6b3aa..26f3cbd2 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -90,6 +90,7 @@ input[type=checkbox] {
 	padding: 2rem 0 5rem;
 	padding-top: 3rem;
 	background-color: var(--bg-color);
+	font-size: var(--text-base);
 }
 
 .common-card-style {
@@ -425,7 +426,6 @@ input[type=checkbox] {
 
 .lesson-links {
 	display: flex;
-	align-items: center;
 	padding: 0.5rem;
 	color: var(--gray-900);
 	font-size: var(--text-base);
@@ -544,10 +544,10 @@ input[type=checkbox] {
 }
 
 .quiz-footer {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top: 5rem;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-top: 2rem;
 }
 
 .question {
@@ -1366,7 +1366,7 @@ pre {
 .question-header {
   display: flex;
   align-items: center;
-  margin-bottom: 2rem;
+  margin-bottom: 1rem;
 }
 
 .question-number {
@@ -2027,3 +2027,18 @@ select {
     grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
     grid-gap: 1.5rem;
 }
+
+.answer-indicator {
+	border-radius: var(--border-radius-md);
+	padding: 0.2rem 0.5rem;
+	width: fit-content;
+	margin-top: 0.5rem;
+}
+
+.answer-indicator.success {
+	background-color: var(--dark-green-50);
+}
+
+.answer-indicator.failure {
+	background-color: var(--red-50);
+}
\ No newline at end of file
diff --git a/lms/templates/quiz.html b/lms/templates/quiz.html
index a21ac009..c9752953 100644
--- a/lms/templates/quiz.html
+++ b/lms/templates/quiz.html
@@ -104,19 +104,19 @@
 			{% endif %}
 
 
-			<button class="button pull-right is-default" id="check" disabled>
+			<button class="btn btn-secondary btn-sm pull-right" id="check" disabled>
 				{{ _("Check") }}
 			</button>
-			<div class="button is-secondary hide" id="next">
+			<div class="btn btn-secondary btn-sm hide" id="next">
 				{{ _("Next Question") }}
 			</div>
-			<div class="button is-secondary is-default hide" id="summary">
+			<div class="btn btn-secondary btn-sm hide" id="summary">
 				{{ _("Submit") }}
 			</div>
 			<small id="submission-message" class="font-weight-bold hide">
 				{{ _("Please join the course to submit the Quiz.") }}
 			</small>
-			<div class="button is-secondary hide" id="try-again">
+			<div class="btn btn-secondary btn-sm hide" id="try-again">
 				{{ _("Try Again") }}
 			</div>
 		</div>
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index c70f07eb..1b7b776a 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -35,6 +35,7 @@ frappe.ready(() => {
 	});
 
 	$("#summary").click((e) => {
+		add_to_local_storage();
 		quiz_summary(e);
 	});
 
@@ -247,7 +248,7 @@ const parse_options = () => {
 };
 
 const is_answer_correct = (type, element) => {
-	let answer = type == "Choices" ? decodeURIComponent($(element).val()) : "";
+	let answer = decodeURIComponent($(element).val());
 
 	frappe.call({
 		async: false,
@@ -260,7 +261,7 @@ const is_answer_correct = (type, element) => {
 		callback: (data) => {
 			type == "Choices"
 				? parse_choices(element, data.message)
-				: parse_possible_answers(e);
+				: parse_possible_answers(element, data.message);
 		},
 	});
 };
@@ -278,9 +279,27 @@ const parse_choices = (element, correct) => {
 	}
 };
 
-const parse_possible_answers = () => {
+const parse_possible_answers = (element, correct) => {
 	self.answer.push(decodeURIComponent($(element).val()));
-	correct ? self.is_correct.push(1) : self.is_correct.push(0);
+	if (correct) {
+		self.is_correct.push(1);
+		show_indicator("success", element);
+	} else {
+		self.is_correct.push(0);
+		show_indicator("failure", element);
+	}
+};
+
+const show_indicator = (class_name, element) => {
+	let label = class_name == "success" ? "Correct" : "Incorrect";
+	let icon =
+		class_name == "success" ? "#icon-solid-success" : "#icon-solid-error";
+	$(`<div class="answer-indicator ${class_name}">
+			<svg class="icon icon-md">
+				<use href=${icon}>
+			</svg>
+			<span style="font-weight: 500">${__(label)}</span>
+		</div>`).insertAfter(element);
 };
 
 const add_icon = (element, icon) => {
@@ -292,7 +311,6 @@ const add_icon = (element, icon) => {
             ${label}
         </div>
     `);
-	//$(element).parent().empty().html(`<div class="option-text"><img class="mr-3" src="/assets/lms/icons/${icon}.svg"> ${label}</div>`);
 };
 
 const add_to_local_storage = () => {
@@ -308,6 +326,9 @@ const add_to_local_storage = () => {
 
 	quiz_stored ? quiz_stored.push(quiz_obj) : (quiz_stored = [quiz_obj]);
 	localStorage.setItem(quiz_name, JSON.stringify(quiz_stored));
+
+	self.answer = [];
+	self.is_correct = [];
 };
 
 const create_certificate = (e) => {
diff --git a/lms/www/batch/quiz.html b/lms/www/batch/quiz.html
index 12309243..9eacd460 100644
--- a/lms/www/batch/quiz.html
+++ b/lms/www/batch/quiz.html
@@ -37,8 +37,16 @@
         <div contenteditable="true" data-placeholder="{{ _('Question') }}" data-question="{{ question.name }}"
         class="question mb-4">{% if question.question %} {{ question.question }} {% endif %}</div>
 
+        <select type="text" value="{{ question.type }}" class="input-with-feedback form-control ellipsis type" maxlength="140" data-fieldtype="Select" data-fieldname="type" placeholder="" data-doctype="LMS Quiz Question">
+            {% for option in ["Choices", "User Input"] %}
+            <option value="{{ option }}" {% if question.type == option %} selected {% endif %} > {{ _(option) }} </option>
+            {% endfor %}
+        </select>
+
         {% for i in range(1,5) %}
         {% set num = frappe.utils.cstr(i) %}
+
+        {% if question.type == "Choices" %}
         {% set option = question["option_" + num] %}
         {% set explanation = question["explanation_" + num] %}
 
@@ -57,6 +65,19 @@
                 </div>
             </div>
         </div>
+
+        {% else %}
+        {% set possible_answer = question["possibility_" + num] %}
+
+        <div class="mt-4">
+            <label class=""> {{ _("Possible Answer") }} {{ num }} </label>
+            <div class="control-input-wrapper">
+                <div class="control-input">
+                    <div contenteditable="true" class="input-with-feedback form-control bold possibility-{{ num }}" style="height: 100px;" spellcheck="false">{% if possible_answer %}{{possible_answer}}{% endif %}</div>
+                </div>
+            </div>
+        </div>
+        {% endif %}
         {% endfor %}
     </div>
     {% endfor %}
diff --git a/lms/www/batch/quiz.js b/lms/www/batch/quiz.js
index 9df71c49..e2065612 100644
--- a/lms/www/batch/quiz.js
+++ b/lms/www/batch/quiz.js
@@ -93,36 +93,41 @@ const get_questions = () => {
 
 		let details = {};
 		let correct_options = 0;
+		let possibilities = 0;
+
 		details["question"] = $(el).find(".question").text();
 		details["question_name"] =
 			$(el).find(".question").data("question") || "";
+		details["type"] = $(el).find(".type").val();
 
 		Array.from({ length: 4 }, (x, i) => {
 			let num = i + 1;
 
-			details[`option_${num}`] = $(el)
-				.find(`.option-${num} .option-input:first`)
-				.text();
-			details[`explanation_${num}`] = $(el)
-				.find(`.option-${num} .option-input:last`)
-				.text();
+			if (details.type == "Choices") {
+				details[`option_${num}`] = $(el)
+					.find(`.option-${num} .option-input:first`)
+					.text();
+				details[`explanation_${num}`] = $(el)
+					.find(`.option-${num} .option-input:last`)
+					.text();
 
-			let is_correct = $(el)
-				.find(`.option-${num} .option-checkbox`)
-				.find("input")
-				.prop("checked");
-			if (is_correct) correct_options += 1;
+				let is_correct = $(el)
+					.find(`.option-${num} .option-checkbox`)
+					.find("input")
+					.prop("checked");
+				if (is_correct) correct_options += 1;
 
-			details[`is_correct_${num}`] = is_correct;
+				details[`is_correct_${num}`] = is_correct;
+			} else {
+				let possible_answer = $(el)
+					.find(`.possibility-${num}`)
+					.text()
+					.trim();
+				if (possible_answer) possibilities += 1;
+				details[`possibility_${num}`] = possible_answer;
+			}
 		});
-
-		if (!details["option_1"] || !details["option_2"])
-			frappe.throw(__("Each question must have at least two options."));
-
-		if (!correct_options)
-			frappe.throw(
-				__("Each question must have at least one correct option.")
-			);
+		validate_mandatory(details, correct_options, possibilities);
 
 		details["multiple"] = correct_options > 1 ? 1 : 0;
 		questions.push(details);
@@ -131,6 +136,26 @@ const get_questions = () => {
 	return questions;
 };
 
+const validate_mandatory = (details, correct_options, possibilities) => {
+	if (details["type"] == "Choices") {
+		if (!details["option_1"] || !details["option_2"])
+			frappe.throw(__("Each question must have at least two options."));
+
+		if (!correct_options)
+			frappe.throw(
+				__(
+					"Question with choices must have at least one correct option."
+				)
+			);
+	} else if (!possibilities) {
+		frappe.throw(
+			__(
+				"Question with user input must have at least one possible answer."
+			)
+		);
+	}
+};
+
 const scroll_to_question_container = () => {
 	$([document.documentElement, document.body]).animate(
 		{
diff --git a/lms/www/batch/quiz.py b/lms/www/batch/quiz.py
index 7db15054..5d687fea 100644
--- a/lms/www/batch/quiz.py
+++ b/lms/www/batch/quiz.py
@@ -9,11 +9,12 @@ def get_context(context):
 		context.quiz = frappe._dict()
 		context.quiz.edit_mode = 1
 	else:
-		fields_arr = ["name", "question"]
+		fields_arr = ["name", "question", "type"]
 		for num in range(1, 5):
 			fields_arr.append("option_" + cstr(num))
 			fields_arr.append("is_correct_" + cstr(num))
 			fields_arr.append("explanation_" + cstr(num))
+			fields_arr.append("possibility_" + cstr(num))
 
 		context.quiz = frappe.db.get_value("LMS Quiz", quizname, ["title", "name"], as_dict=1)
 		context.quiz.questions = frappe.get_all(