diff --git a/lms/lms/api.py b/lms/lms/api.py index 7ad04441..c7ee80f7 100644 --- a/lms/lms/api.py +++ b/lms/lms/api.py @@ -306,7 +306,9 @@ def get_chart_details(): details.completions = frappe.db.count( "LMS Enrollment", {"progress": ["like", "%100%"]} ) - details.lesson_completions = frappe.db.count("LMS Course Progress") + details.lesson_completions = frappe.db.count( + "LMS Course Progress", {"status": "Complete"} + ) return details @@ -1135,7 +1137,7 @@ def fetch_activity_data(member, start_date): lesson_completions = frappe.get_all( "LMS Course Progress", fields=["creation"], - filters={"member": member, "creation": [">=", start_date]}, + filters={"member": member, "creation": [">=", start_date], "status": "Complete"}, ) quiz_submissions = frappe.get_all( diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py index c26594a2..5a16f983 100644 --- a/lms/lms/doctype/lms_batch/lms_batch.py +++ b/lms/lms/doctype/lms_batch/lms_batch.py @@ -429,7 +429,11 @@ def get_timetable_details(timetable): True if frappe.db.exists( "LMS Course Progress", - {"lesson": entry.reference_docname, "member": frappe.session.user}, + { + "lesson": entry.reference_docname, + "member": frappe.session.user, + "status": "Complete", + }, ) else False ) diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 0f450b41..1736b75b 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -327,7 +327,7 @@ def get_progress(course, lesson, member=None): return frappe.db.exists( "LMS Course Progress", - {"course": course, "member": member, "lesson": lesson}, + {"course": course, "member": member, "lesson": lesson, "status": "Complete"}, ["status"], ) diff --git a/lms/templates/statistics.html b/lms/templates/statistics.html index c33d6d1e..816b1c75 100644 --- a/lms/templates/statistics.html +++ b/lms/templates/statistics.html @@ -31,7 +31,7 @@ {% endif %} {% if lesson_completion %} {% set lesson_completion_count = - frappe.db.count("LMS Course Progress") %} + frappe.db.count("LMS Course Progress", { "status": "Complete" }) %}
{{ _("Lessons Completed") }}