feat: redirect the learn page to the current lesson of the user
The current lesson is maintained in the LMS Batch Membership and that is updated everytime a lesson page is visited.
This commit is contained in:
@@ -34,3 +34,21 @@ def submit_solution(exercise, code):
|
|||||||
return
|
return
|
||||||
doc = ex.submit(code)
|
doc = ex.submit(code)
|
||||||
return {"name": doc.name, "creation": doc.creation}
|
return {"name": doc.name, "creation": doc.creation}
|
||||||
|
|
||||||
|
@frappe.whitelist()
|
||||||
|
def save_current_lesson(batch_name, lesson_name):
|
||||||
|
"""Saves the current lesson for a student/mentor.
|
||||||
|
"""
|
||||||
|
name = frappe.get_value(
|
||||||
|
doctype="LMS Batch Membership",
|
||||||
|
filters={
|
||||||
|
"batch": batch_name,
|
||||||
|
"member_email": frappe.session.user
|
||||||
|
},
|
||||||
|
fieldname="name")
|
||||||
|
if not name:
|
||||||
|
return
|
||||||
|
doc = frappe.get_doc("LMS Batch Membership", name)
|
||||||
|
doc.current_lesson = lesson_name
|
||||||
|
doc.save(ignore_permissions=True)
|
||||||
|
return {"current_lesson": doc.current_lesson}
|
||||||
|
|||||||
@@ -69,6 +69,24 @@ class LMSBatch(Document):
|
|||||||
message.is_author = True
|
message.is_author = True
|
||||||
return messages
|
return messages
|
||||||
|
|
||||||
|
def get_membership(self, email):
|
||||||
|
"""Returns the membership document of given user.
|
||||||
|
"""
|
||||||
|
name = frappe.get_value(
|
||||||
|
doctype="LMS Batch Membership",
|
||||||
|
filters={
|
||||||
|
"batch": self.name,
|
||||||
|
"member": email
|
||||||
|
},
|
||||||
|
fieldname="name")
|
||||||
|
return frappe.get_doc("LMS Batch Membership", name)
|
||||||
|
|
||||||
|
def get_current_lesson(self, user):
|
||||||
|
"""Returns the name of the current lesson for the given user.
|
||||||
|
"""
|
||||||
|
membership = self.get_membership(user)
|
||||||
|
return membership and membership.current_lesson
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def save_message(message, batch):
|
def save_message(message, batch):
|
||||||
doc = frappe.get_doc({
|
doc = frappe.get_doc({
|
||||||
|
|||||||
@@ -150,6 +150,13 @@ class LMSCourse(Document):
|
|||||||
"name")
|
"name")
|
||||||
return lesson_name and frappe.get_doc("Lesson", lesson_name)
|
return lesson_name and frappe.get_doc("Lesson", lesson_name)
|
||||||
|
|
||||||
|
def get_lesson_index(self, lesson_name):
|
||||||
|
"""Returns the {chapter_index}.{lesson_index} for the lesson.
|
||||||
|
"""
|
||||||
|
lesson = frappe.get_doc("Lesson", lesson_name)
|
||||||
|
chapter = frappe.get_doc("Chapter", lesson.chapter)
|
||||||
|
return f"{chapter.index_}.{lesson.index_}"
|
||||||
|
|
||||||
def get_outline(self):
|
def get_outline(self):
|
||||||
return CourseOutline(self)
|
return CourseOutline(self)
|
||||||
|
|
||||||
|
|||||||
@@ -84,49 +84,16 @@
|
|||||||
{{ super() }}
|
{{ super() }}
|
||||||
{{ LiveCodeEditorJS() }}
|
{{ LiveCodeEditorJS() }}
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
<!-- <script type="text/javascript">
|
|
||||||
$(function() {
|
$(function() {
|
||||||
var editorLookup = {};
|
var batch_name = "{{ batch.name }}";
|
||||||
|
var lesson_name = "{{ lesson.name }}";
|
||||||
|
|
||||||
$(".canvas-editor").each((i, e) => {
|
frappe.call("community.lms.api.save_current_lesson", {
|
||||||
var data = $(e).data();
|
"batch_name": batch_name,
|
||||||
var editor = new LiveCodeEditor(e, {
|
"lesson_name": lesson_name
|
||||||
runtime: "python-canvas",
|
|
||||||
base_url: "{{ livecode_url }}",
|
|
||||||
codemirror: true,
|
|
||||||
userdata: data,
|
|
||||||
autosave: function(editor, code) {
|
|
||||||
// can't autosave when user is Guest
|
|
||||||
if (frappe.session.user == "Guest") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var data = editor.options.userdata;
|
|
||||||
var code = editor.codemirror.doc.getValue();
|
|
||||||
// console.log("autosaving...")
|
|
||||||
frappe.call("community.lms.api.autosave_section", {
|
|
||||||
section: data.section,
|
|
||||||
code: code
|
|
||||||
}).then((r) => {
|
|
||||||
// TODO: verify
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
editorLookup[data.section] = editor;
|
|
||||||
})
|
|
||||||
|
|
||||||
$(".canvas-editor .reset").each((i, e) => {
|
|
||||||
$(e).on("click", function(event) {
|
|
||||||
var data = $(this).parents(".canvas-editor").data();
|
|
||||||
var section = data.section;
|
|
||||||
frappe.call("community.lms.api.get_section", {
|
|
||||||
name: section
|
|
||||||
}).then(r => {
|
|
||||||
var editor = editorLookup[data.section];
|
|
||||||
editor.codemirror.doc.setValue(r.message.contents);
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
</script> -->
|
</script>
|
||||||
|
|
||||||
{%- endblock %}
|
{%- endblock %}
|
||||||
|
|||||||
@@ -12,13 +12,14 @@ def get_context(context):
|
|||||||
batch_name = context.batch.name
|
batch_name = context.batch.name
|
||||||
|
|
||||||
if not chapter_index or not lesson_index:
|
if not chapter_index or not lesson_index:
|
||||||
frappe.local.flags.redirect_location = f"/courses/{course_name}/{batch_name}/learn/1.1"
|
index_ = get_lesson_index(context.course, context.batch, frappe.session.user) or "1.1"
|
||||||
|
frappe.local.flags.redirect_location = get_learn_url(course_name, batch_name, index_)
|
||||||
raise frappe.Redirect
|
raise frappe.Redirect
|
||||||
|
|
||||||
context.lesson = context.course.get_lesson(chapter_index, lesson_index)
|
context.lesson = context.course.get_lesson(chapter_index, lesson_index)
|
||||||
context.lesson_index = lesson_index
|
context.lesson_index = lesson_index
|
||||||
context.chapter_index = chapter_index
|
context.chapter_index = chapter_index
|
||||||
print(context.lesson)
|
|
||||||
outline = context.course.get_outline()
|
outline = context.course.get_outline()
|
||||||
next_ = outline.get_next(lesson_number)
|
next_ = outline.get_next(lesson_number)
|
||||||
prev_ = outline.get_prev(lesson_number)
|
prev_ = outline.get_prev(lesson_number)
|
||||||
@@ -29,3 +30,9 @@ def get_learn_url(course_name, batch_name, lesson_number):
|
|||||||
if not lesson_number:
|
if not lesson_number:
|
||||||
return
|
return
|
||||||
return f"/courses/{course_name}/{batch_name}/learn/{lesson_number}"
|
return f"/courses/{course_name}/{batch_name}/learn/{lesson_number}"
|
||||||
|
|
||||||
|
def get_lesson_index(course, batch, user):
|
||||||
|
lesson = batch.get_current_lesson(user)
|
||||||
|
return lesson and course.get_lesson_index(lesson)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user