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

fix: removed unused field and code

Browse Source
This commit is contained in:
Jannat Patel
2022-10-31 17:17:46 +05:30
parent d74db85b82
commit 7b5fe82de9
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/lms/doctype/course_lesson/course_lesson.json
View File

@@ -13,7 +13,6 @@
"column_break_4", "column_break_4",
"title", "title",
"include_in_preview", "include_in_preview",
"included_in_course",
"index_label", "index_label",
"section_break_6", "section_break_6",
"youtube", "youtube",
@@ -111,14 +110,6 @@
"fieldtype": "Data", "fieldtype": "Data",
"label": "YouTube Video URL" "label": "YouTube Video URL"
}, },
{
"default": "0",
"fieldname": "included_in_course",
"fieldtype": "Check",
"hidden": 1,
"label": "Included in Course",
"read_only": 1
},
{ {
"fieldname": "section_break_16", "fieldname": "section_break_16",
"fieldtype": "Section Break", "fieldtype": "Section Break",
@@ -144,7 +135,7 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2022-10-28 12:36:01.978640", "modified": "2022-10-28 12:36:01.978641",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "Course Lesson", "name": "Course Lesson",
@@ -182,4 +173,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }

42
lms/lms/doctype/course_lesson/course_lesson.py
View File

@@ -9,20 +9,24 @@ from frappe.model.document import Document
from ...md import find_macros from ...md import find_macros
from lms.lms.utils import get_course_progress, get_lesson_url from lms.lms.utils import get_course_progress, get_lesson_url
class CourseLesson(Document): class CourseLesson(Document):
def validate(self): def validate(self):
self.check_and_create_folder() #self.check_and_create_folder()
self.validate_quiz_id() self.validate_quiz_id()
def validate_quiz_id(self): def validate_quiz_id(self):
if self.quiz_id and not frappe.db.exists("LMS Quiz", self.quiz_id): if self.quiz_id and not frappe.db.exists("LMS Quiz", self.quiz_id):
frappe.throw(_("Invalid Quiz ID")) frappe.throw(_("Invalid Quiz ID"))
def on_update(self): def on_update(self):
dynamic_documents = ["Exercise", "Quiz"] dynamic_documents = ["Exercise", "Quiz"]
for section in dynamic_documents: for section in dynamic_documents:
self.update_lesson_name_in_document(section) self.update_lesson_name_in_document(section)
def update_lesson_name_in_document(self, section): def update_lesson_name_in_document(self, section):
doctype_map= { doctype_map= {
"Exercise": "Exercise", "Exercise": "Exercise",
@@ -39,6 +43,7 @@ class CourseLesson(Document):
index += 1 index += 1
self.update_orphan_documents(doctype_map[section], documents) self.update_orphan_documents(doctype_map[section], documents)
def update_orphan_documents(self, doctype, documents): def update_orphan_documents(self, doctype, documents):
"""Updates the documents that were previously part of this lesson, """Updates the documents that were previously part of this lesson,
but not any more. but not any more.
@@ -53,6 +58,7 @@ class CourseLesson(Document):
ex.index_label = "" ex.index_label = ""
ex.save() ex.save()
def check_and_create_folder(self): def check_and_create_folder(self):
args = { args = {
"doctype": "File", "doctype": "File",
@@ -63,6 +69,7 @@ class CourseLesson(Document):
folder = frappe.get_doc(args) folder = frappe.get_doc(args)
folder.save(ignore_permissions=True) folder.save(ignore_permissions=True)
def get_exercises(self): def get_exercises(self):
if not self.body: if not self.body:
return [] return []
@@ -79,28 +86,26 @@ class CourseLesson(Document):
return ("").join([ s for s in self.get_progress().lower().split() ]) return ("").join([ s for s in self.get_progress().lower().split() ])
return return
@frappe.whitelist() @frappe.whitelist()
def save_progress(lesson, course, status): def save_progress(lesson, course, status):
membership = frappe.db.exists("LMS Batch Membership", membership = frappe.db.exists("LMS Batch Membership", {
{ "member": frappe.session.user,
"member": frappe.session.user, "course": course
"course": course })
})
if not membership: if not membership:
return return
if frappe.db.exists("LMS Course Progress", if frappe.db.exists("LMS Course Progress", {
{ "lesson": lesson,
"lesson": lesson, "owner": frappe.session.user,
"owner": frappe.session.user, "course": course
"course": course }):
}): doc = frappe.get_doc("LMS Course Progress", {
doc = frappe.get_doc("LMS Course Progress", "lesson": lesson,
{ "owner": frappe.session.user,
"lesson": lesson, "course": course
"owner": frappe.session.user, })
"course": course
})
doc.status = status doc.status = status
doc.save(ignore_permissions=True) doc.save(ignore_permissions=True)
else: else:
@@ -114,6 +119,7 @@ def save_progress(lesson, course, status):
frappe.db.set_value("LMS Batch Membership", membership, "progress", progress) frappe.db.set_value("LMS Batch Membership", membership, "progress", progress)
return progress return progress
@frappe.whitelist() @frappe.whitelist()
def get_lesson_info(chapter): def get_lesson_info(chapter):
return frappe.db.get_value("Course Chapter", chapter, "course") return frappe.db.get_value("Course Chapter", chapter, "course")

1
lms/lms/doctype/lesson_assignment/lesson_assignment.py
View File

@@ -40,7 +40,6 @@ def get_assignment(lesson):
"member": frappe.session.user "member": frappe.session.user
}, ["lesson", "member", "assignment"], }, ["lesson", "member", "assignment"],
as_dict=True) as_dict=True)
print(assignment)
assignment.file_name = frappe.db.get_value("File", {"file_url": assignment.assignment}, "file_name") assignment.file_name = frappe.db.get_value("File", {"file_url": assignment.assignment}, "file_name")
return assignment return assignment