From c37cdbdc5fc95c26ae955cd13c9bfa3c08f61924 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Fri, 2 Sep 2022 17:18:57 +0530 Subject: [PATCH 1/3] chore: added logs --- lms/lms/web_template/courses_enrolled/courses_enrolled.html | 2 +- lms/templates/courses_created.html | 2 +- lms/www/dashboard/index.html | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html index b165aa70..236e8dec 100644 --- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html +++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html @@ -1,5 +1,5 @@ {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %} - +{{ enrolled }} {% if enrolled | length %}
{% for course in enrolled %} diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html index a219ebe1..083317d1 100644 --- a/lms/templates/courses_created.html +++ b/lms/templates/courses_created.html @@ -1,5 +1,5 @@ {% set courses = get_authored_courses(frappe.session.user, only_published=False) %} - +{{ courses }} {% if courses | length %}
{% for course in courses %} diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html index 083cb524..93f303a1 100644 --- a/lms/www/dashboard/index.html +++ b/lms/www/dashboard/index.html @@ -8,6 +8,8 @@ {% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %} {% set show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role() %} +{{ show_creators_section }} +{{ frappe.session.user }}
From 8088a464ad12fb7aa41ab2a78df9def2c5236888 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 5 Sep 2022 09:16:57 +0530 Subject: [PATCH 2/3] fix: dashboard creators section issue --- lms/lms/doctype/lms_course/lms_course.py | 9 ++++----- lms/lms/utils.py | 2 +- lms/overrides/user.py | 18 ++++++++++-------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py index 1d8096a4..0f497eb3 100644 --- a/lms/lms/doctype/lms_course/lms_course.py +++ b/lms/lms/doctype/lms_course/lms_course.py @@ -34,11 +34,10 @@ class LMSCourse(Document): self.send_email_to_interested_users() def send_email_to_interested_users(self): - interested_users = frappe.get_all("LMS Course Interest", - { - "course": self.name - }, - ["name", "user"]) + interested_users = frappe.get_all("LMS Course Interest", { + "course": self.name + }, + ["name", "user"]) subject = self.title + " is available!" args = { "title": self.title, diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 30b201a0..5fd64ca3 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -239,7 +239,7 @@ def get_progress(course, lesson): def render_html(body, youtube, quiz_id): - if "/" in youtube: + if youtube and "/" in youtube: youtube = youtube.split("/")[-1] quiz_id = "{{ Quiz('" + quiz_id + "') }}" if quiz_id else "" diff --git a/lms/overrides/user.py b/lms/overrides/user.py index 324cf83c..00805c7a 100644 --- a/lms/overrides/user.py +++ b/lms/overrides/user.py @@ -128,6 +128,7 @@ def get_enrolled_courses(): in_progress = [] completed = [] memberships = get_course_membership(frappe.session.user, member_type="Student") + for membership in memberships: course = frappe.db.get_value("LMS Course", membership.course, ["name", "upcoming", "title", "image", "enable_certification", "paid_certificate", "price_certificate", "currency", "published"], as_dict=True) @@ -146,6 +147,7 @@ def get_enrolled_courses(): def get_course_membership(member, member_type=None): """ Returns all memberships of the user. """ + filters = { "member": member } @@ -158,20 +160,20 @@ def get_course_membership(member, member_type=None): def get_authored_courses(member, only_published=True): """ Returns the number of courses authored by this user. """ course_details = [] - - filters = { + courses = frappe.get_all("Course Instructor", { "instructor": member - } - if only_published: - filters["published"] = True - courses = frappe.get_all('LMS Course', filters) + }, ["parent"]) for course in courses: - course_details.append(frappe.db.get_value("LMS Course", course, - ["name", "upcoming", "title", "image", "enable_certification", "status"], as_dict=True)) + detail = frappe.db.get_value("LMS Course", course.parent, + ["name", "upcoming", "title", "image", "enable_certification", "status", "published"], as_dict=True) + if only_published and not detail.published: + continue + course_details.append(detail) return course_details + def get_palette(full_name): """ Returns a color unique to each member for Avatar """ From 6a760c3019598d5bfb02a943774ceefbec42e269 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 5 Sep 2022 09:25:00 +0530 Subject: [PATCH 3/3] chore: removed logs --- lms/lms/web_template/courses_enrolled/courses_enrolled.html | 2 +- lms/templates/courses_created.html | 2 +- lms/www/dashboard/index.html | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html index 236e8dec..b165aa70 100644 --- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html +++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html @@ -1,5 +1,5 @@ {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %} -{{ enrolled }} + {% if enrolled | length %}
{% for course in enrolled %} diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html index 083317d1..a219ebe1 100644 --- a/lms/templates/courses_created.html +++ b/lms/templates/courses_created.html @@ -1,5 +1,5 @@ {% set courses = get_authored_courses(frappe.session.user, only_published=False) %} -{{ courses }} + {% if courses | length %}
{% for course in courses %} diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html index 93f303a1..083cb524 100644 --- a/lms/www/dashboard/index.html +++ b/lms/www/dashboard/index.html @@ -8,8 +8,6 @@ {% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %} {% set show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role() %} -{{ show_creators_section }} -{{ frappe.session.user }}