eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Jannat Patel
2023-08-26 16:00:44 +05:30
parent 0487b2c987 e2c1f6aa2d
commit 9376b0b010
60 changed files with 406 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/www/courses/course.py
View File

@@ -85,7 +85,7 @@ def set_course_context(context, course_name):
context.course = course
membership = get_membership(course.name, frappe.session.user)
context.course.query_parameter = (
"?batch=" + membership.batch if membership and membership.batch else ""
"?batch=" + membership.batch_old if membership and membership.batch_old else ""
)
context.membership = membership
context.is_instructor = is_instructor(course.name)

2
lms/www/courses/index.py
View File

@@ -56,7 +56,7 @@ def get_courses():
live_courses, upcoming_courses = [], []
for course in courses:
course.enrollment_count = frappe.db.count(
"LMS Batch Membership", {"course": course.name, "member_type": "Student"}
"LMS Enrollment", {"course": course.name, "member_type": "Student"}
)
course.avg_rating = get_average_rating(course.name) or 0
if course.upcoming: