diff --git a/frontend/src/pages/CourseForm.vue b/frontend/src/pages/CourseForm.vue index 59bbac64..fd469122 100644 --- a/frontend/src/pages/CourseForm.vue +++ b/frontend/src/pages/CourseForm.vue @@ -446,7 +446,7 @@ const submitCourse = () => { } const deleteCourse = createResource({ - url: "lms.lms.api.delete_course", + url: 'lms.lms.api.delete_course', makeParams(values) { return { course: props.courseName, @@ -461,7 +461,9 @@ const deleteCourse = createResource({ const trashCourse = () => { $dialog({ title: __('Delete Course'), - message: __('Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?'), + message: __( + 'Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?' + ), actions: [ { label: __('Delete'), diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue index 2b396972..7dd53bbb 100644 --- a/frontend/src/pages/Quizzes.vue +++ b/frontend/src/pages/Quizzes.vue @@ -47,7 +47,10 @@ -
+
{{ __('No quizzes found') }} diff --git a/lms/install.py b/lms/install.py index d2267649..a0225486 100644 --- a/lms/install.py +++ b/lms/install.py @@ -2,6 +2,7 @@ import frappe from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to from lms.lms.api import give_dicussions_permission + def after_install(): add_pages_to_nav() create_batch_source() diff --git a/lms/lms/api.py b/lms/lms/api.py index 7a223bc6..0633015a 100644 --- a/lms/lms/api.py +++ b/lms/lms/api.py @@ -811,25 +811,22 @@ def get_announcements(batch): order_by="communication_date desc", ) + @frappe.whitelist() def delete_course(course): - chapters = frappe.get_all("Course Chapter", { - "course": course - }, pluck="name") + chapters = frappe.get_all("Course Chapter", {"course": course}, pluck="name") - chapter_references = frappe.get_all("Chapter Reference", { - "parent": course - }, pluck="name") + chapter_references = frappe.get_all( + "Chapter Reference", {"parent": course}, pluck="name" + ) for chapter in chapters: - lessons = frappe.get_all("Course Lesson", { - "chapter": chapter - }, pluck="name") + lessons = frappe.get_all("Course Lesson", {"chapter": chapter}, pluck="name") - lesson_references = frappe.get_all("Lesson Reference", { - "parent": chapter - }, pluck="name") + lesson_references = frappe.get_all( + "Lesson Reference", {"parent": chapter}, pluck="name" + ) for lesson in lesson_references: frappe.delete_doc("Lesson Reference", lesson) @@ -837,18 +834,17 @@ def delete_course(course): for lesson in lessons: frappe.db.delete("LMS Course Progress", {"lesson": lesson}) - topics = frappe.get_all("Discussion Topic", { - "reference_doctype": "Course Lesson", - "reference_docname": lesson - }, pluck="name") + topics = frappe.get_all( + "Discussion Topic", + {"reference_doctype": "Course Lesson", "reference_docname": lesson}, + pluck="name", + ) for topic in topics: - frappe.db.delete("Discussion Reply", { - "topic": topic - }) + frappe.db.delete("Discussion Reply", {"topic": topic}) frappe.db.delete("Discussion Topic", topic) - + frappe.delete_doc("Course Lesson", lesson) for chapter in chapter_references: @@ -862,19 +858,19 @@ def delete_course(course): def give_dicussions_permission(): - doctypes = ["Discussion Topic", "Discussion Reply"] - roles = ["LMS Student", "Course Creator", "Moderator", "Batch Evaluator"] - for doctype in doctypes: - for role in roles: - if not frappe.db.exists("Custom DocPerm", {"parent": doctype, "role": role}): - frappe.get_doc( - { - "doctype": "Custom DocPerm", - "parent": doctype, - "role": role, - "read": 1, - "write": 1, - "create": 1, - "delete": 1, - } - ).save(ignore_permissions=True) \ No newline at end of file + doctypes = ["Discussion Topic", "Discussion Reply"] + roles = ["LMS Student", "Course Creator", "Moderator", "Batch Evaluator"] + for doctype in doctypes: + for role in roles: + if not frappe.db.exists("Custom DocPerm", {"parent": doctype, "role": role}): + frappe.get_doc( + { + "doctype": "Custom DocPerm", + "parent": doctype, + "role": role, + "read": 1, + "write": 1, + "create": 1, + "delete": 1, + } + ).save(ignore_permissions=True) diff --git a/lms/lms/doctype/course_chapter/course_chapter.py b/lms/lms/doctype/course_chapter/course_chapter.py index 93cab89d..e8947a29 100644 --- a/lms/lms/doctype/course_chapter/course_chapter.py +++ b/lms/lms/doctype/course_chapter/course_chapter.py @@ -8,9 +8,7 @@ from lms.lms.api import update_course_statistics class CourseChapter(Document): - def on_update(self): - print("on_update") self.recalculate_course_progress() update_course_statistics() @@ -19,15 +17,9 @@ class CourseChapter(Document): current_lessons = self.lessons if previous_lessons != current_lessons: - enrolled_members = frappe.get_all("LMS Enrollment", { - "course": self.course - }, ["member", "name"]) - print("enrolled_members", enrolled_members) + enrolled_members = frappe.get_all( + "LMS Enrollment", {"course": self.course}, ["member", "name"] + ) for enrollment in enrolled_members: - print(self.course, enrollment.member) new_progress = get_course_progress(self.course, enrollment.member) - print("new_progress", new_progress) frappe.db.set_value("LMS Enrollment", enrollment.name, "progress", new_progress) - - - diff --git a/lms/patches/v2_0/add_course_statistics.py b/lms/patches/v2_0/add_course_statistics.py index ed723ecc..31b8dbfe 100644 --- a/lms/patches/v2_0/add_course_statistics.py +++ b/lms/patches/v2_0/add_course_statistics.py @@ -1,5 +1,6 @@ import frappe from lms.lms.api import update_course_statistics + def execute(): update_course_statistics() diff --git a/lms/patches/v2_0/give_discussions_permissions.py b/lms/patches/v2_0/give_discussions_permissions.py index b7c3aa2b..57cc46ca 100644 --- a/lms/patches/v2_0/give_discussions_permissions.py +++ b/lms/patches/v2_0/give_discussions_permissions.py @@ -1,5 +1,6 @@ import frappe from lms.lms.api import give_dicussions_permission + def execute(): give_dicussions_permission()