chore: resolved conflicts

lms/lms/doctype/lms_quiz_question/lms_quiz_question.json

@@ -39,31 +39,31 @@
  "fields": [
   {
    "fieldname": "question",
-   "fieldtype": "Text",
+   "fieldtype": "Text Editor",
    "in_list_view": 1,
    "label": "Question",
    "reqd": 1
   },
   {
    "fieldname": "option_1",
-   "fieldtype": "Data",
+   "fieldtype": "Small Text",
    "label": "Option 1",
    "mandatory_depends_on": "eval: doc.type == 'Choices'"
   },
   {
    "fieldname": "option_2",
-   "fieldtype": "Data",
+   "fieldtype": "Small Text",
    "label": "Option 2",
    "mandatory_depends_on": "eval: doc.type == 'Choices'"
   },
   {
    "fieldname": "option_3",
-   "fieldtype": "Data",
+   "fieldtype": "Small Text",
    "label": "Option 3"
   },
   {
    "fieldname": "option_4",
-   "fieldtype": "Data",
+   "fieldtype": "Small Text",
    "label": "Option 4"
   },
   {
@@ -206,7 +206,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-03-17 18:22:20.324536",
+ "modified": "2023-06-09 17:09:53.740179",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz Question",

lms/www/batch/quiz.html

@@ -98,8 +98,6 @@
         </span>
         {{ question.question.split("\n")[0] }}
     </div>
-
-
 </div>
 {% endmacro %}
 

lms/www/batch/quiz.js

@@ -150,7 +150,13 @@ const save_quiz = (values) => {
 			quiz: $("#quiz-form").data("name") || "",
 		},
 		callback: (data) => {
-			window.location.href = `/quizzes/${data.message}`;
+			frappe.show_alert({
+				message: __("Saved"),
+				indicator: "green",
+			});
+			setTimeout(() => {
+				window.location.href = `/quizzes/${data.message}`;
+			}, 2000);
 		},
 	});
 };