diff --git a/community/lms/doctype/course_lesson/course_lesson.py b/community/lms/doctype/course_lesson/course_lesson.py index 25427c87..d2251669 100644 --- a/community/lms/doctype/course_lesson/course_lesson.py +++ b/community/lms/doctype/course_lesson/course_lesson.py @@ -65,11 +65,12 @@ class CourseLesson(Document): @frappe.whitelist() def save_progress(lesson, course, status): - if not frappe.db.exists("LMS Batch Membership", - { - "member": frappe.session.user, - "course": course - }): + membership = frappe.db.exists("LMS Batch Membership", + { + "member": frappe.session.user, + "course": course + }) + if not membership: return if frappe.db.exists("LMS Course Progress", @@ -92,5 +93,8 @@ def save_progress(lesson, course, status): "lesson": lesson, "status": status, }).save(ignore_permissions=True) + course_details = frappe.get_doc("LMS Course", course) - return course_details.get_course_progress() + progress = course_details.get_course_progress() + frappe.db.set_value("LMS Batch Memebership", membership, "progress", progress) + return progress diff --git a/community/lms/doctype/lms_batch_membership/lms_batch_membership.json b/community/lms/doctype/lms_batch_membership/lms_batch_membership.json index 7a6a8497..18e660b8 100644 --- a/community/lms/doctype/lms_batch_membership/lms_batch_membership.json +++ b/community/lms/doctype/lms_batch_membership/lms_batch_membership.json @@ -5,15 +5,16 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ - "batch", + "course", "member", "member_name", "member_username", "column_break_3", - "course", + "batch", "member_type", - "role", - "current_lesson" + "progress", + "current_lesson", + "role" ], "fields": [ { @@ -80,11 +81,18 @@ "fieldtype": "Data", "label": "Memeber Username", "read_only": 1 + }, + { + "fieldname": "progress", + "fieldtype": "Data", + "label": "Progress", + "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-09-29 15:27:58.765399", + "migration_hash": "10fbeeba76887ba1dc94e7ac19ea637d", + "modified": "2021-10-20 10:08:04.071690", "modified_by": "Administrator", "module": "LMS", "name": "LMS Batch Membership", diff --git a/community/lms/doctype/lms_course/lms_course.py b/community/lms/doctype/lms_course/lms_course.py index feebe8f3..3c559211 100644 --- a/community/lms/doctype/lms_course/lms_course.py +++ b/community/lms/doctype/lms_course/lms_course.py @@ -251,7 +251,7 @@ class LMSCourse(Document): membership = frappe.db.get_value("LMS Batch Membership", filters, - ["name", "batch", "current_lesson", "member_type"], + ["name", "batch", "current_lesson", "member_type", "progress"], as_dict=True) if membership and membership.batch: diff --git a/community/lms/report/course_progress_summary/course_progress_summary.py b/community/lms/report/course_progress_summary/course_progress_summary.py index efda989f..a54249e4 100644 --- a/community/lms/report/course_progress_summary/course_progress_summary.py +++ b/community/lms/report/course_progress_summary/course_progress_summary.py @@ -2,7 +2,7 @@ # License: MIT. See LICENSE import frappe -from frappe.utils import rounded +from frappe.utils import cint from frappe import _ def execute(filters=None): @@ -23,21 +23,16 @@ def get_data(filters=None): memberships = frappe.get_all( "LMS Batch Membership", query_filter, - ["name", "course", "member", "member_name"], + ["name", "course", "member", "member_name", "progress"], order_by="course") - current_course = memberships[0].course for membership in memberships: - if current_course != membership.course: - current_course = membership.course - - course_details = frappe.get_doc("LMS Course", current_course) summary.append(frappe._dict({ - "course": course_details.name, - "course_name": course_details.title, + "course": membership.name, + "course_name": frappe.db.get_value("LMS Course", membership.course, "title"), "member": membership.member, "member_name": membership.member_name, - "progress": rounded(course_details.get_course_progress(membership.member)) + "progress": cint(membership.progress) })) return summary diff --git a/community/lms/widgets/CourseCard.html b/community/lms/widgets/CourseCard.html index 38736ab0..b709ce90 100644 --- a/community/lms/widgets/CourseCard.html +++ b/community/lms/widgets/CourseCard.html @@ -1,5 +1,5 @@ {% set membership = course.get_membership(frappe.session.user) %} -{% set progress = course.get_course_progress() %} +{% set progress = membership.progress %}