fix: dashboard function parameters

This commit is contained in:
Jannat Patel
2022-09-05 10:34:40 +05:30
parent 25d9b08dd5
commit 2819e55a61
4 changed files with 7 additions and 24 deletions

View File

@@ -127,7 +127,7 @@ class CustomUser(User):
def get_enrolled_courses(): def get_enrolled_courses():
in_progress = [] in_progress = []
completed = [] completed = []
memberships = get_course_membership(frappe.session.user, member_type="Student") memberships = get_course_membership(None, member_type="Student")
for membership in memberships: for membership in memberships:
course = frappe.db.get_value("LMS Course", membership.course, ["name", "upcoming", "title", "image", course = frappe.db.get_value("LMS Course", membership.course, ["name", "upcoming", "title", "image",
@@ -145,11 +145,11 @@ def get_enrolled_courses():
"completed": completed "completed": completed
} }
def get_course_membership(member, member_type=None): def get_course_membership(member=None, member_type=None):
""" Returns all memberships of the user. """ """ Returns all memberships of the user. """
filters = { filters = {
"member": member "member": member or frappe.session.user
} }
if member_type: if member_type:
filters["member_type"] = member_type filters["member_type"] = member_type
@@ -157,11 +157,11 @@ def get_course_membership(member, member_type=None):
return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"]) return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"])
def get_authored_courses(member, only_published=True): def get_authored_courses(member=None, only_published=True):
""" Returns the number of courses authored by this user. """ """ Returns the number of courses authored by this user. """
course_details = [] course_details = []
courses = frappe.get_all("Course Instructor", { courses = frappe.get_all("Course Instructor", {
"instructor": member "instructor": member or frappe.session.user
}, ["parent"]) }, ["parent"])
for course in courses: for course in courses:

View File

@@ -1,4 +1,4 @@
{% set courses = get_authored_courses(frappe.session.user, only_published=False) %} {% set courses = get_authored_courses(None, only_published=False) %}
{% if courses | length %} {% if courses | length %}
<div class="cards-parent"> <div class="cards-parent">

View File

@@ -227,23 +227,6 @@
{% endmacro %} {% endmacro %}
{% macro CourseCreator(course) %}
<div class="course-home-headings"> {{ _("Course Creators") }} </div>
<div class="common-card-style course-creators-card">
{% set instructors = get_instructors(course.name) %}
{% for instructor in instructors %}
<div class="d-flex align-items-center">
{{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
<div class="ml-4">
<div class="course-creator-name"> {{ instructor.full_name }} </div>
<div class="course-meta"> {{ get_authored_courses(instructor.name) | length }} {{ _("Courses Created") }} </div>
</div>
</div>
{% endfor %}
</div>
{% endmacro %}
<!-- Related Courses Section --> <!-- Related Courses Section -->
{% macro RelatedCourses(course) %} {% macro RelatedCourses(course) %}
{% if course.related_courses | length %} {% if course.related_courses | length %}

View File

@@ -33,7 +33,7 @@
<!-- Banner --> <!-- Banner -->
{% macro ProfileBanner(member) %} {% macro ProfileBanner(member) %}
{% set cover_image = member.cover_image if member.cover_image else "/assets/lms/images/profile-banner.png" %} {% set cover_image = member.cover_image if member.cover_image else "/assets/lms/images/profile-banner.png" %}
{% set enrollment = get_course_membership(frappe.session.user, member_type="Student") | length %} {% set enrollment = get_course_membership(None, member_type="Student") | length %}
{% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %} {% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}
<div class="container"> <div class="container">