eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Jannat Patel
2023-06-13 18:58:44 +05:30
parent 6f1026434d db35e3e425
commit 43128d7ea3
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
View File

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

2
lms/www/batch/quiz.html
View File

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

6
lms/www/batch/quiz.js
View File

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