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

fix: convert progress to int for comparision

Browse Source
This commit is contained in:
Jannat Patel
2021-10-20 16:12:41 +05:30
parent 66e8ac9cae
commit 049c374ece
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
community/lms/doctype/course_lesson/course_lesson.py
View File

@@ -96,5 +96,5 @@ def save_progress(lesson, course, status):
course_details = frappe.get_doc("LMS Course", course) course_details = frappe.get_doc("LMS Course", course)
progress = course_details.get_course_progress() progress = course_details.get_course_progress()
frappe.db.set_value("LMS Batch Memebership", membership, "progress", progress) frappe.db.set_value("LMS Batch Membership", membership, "progress", progress)
return progress return progress

8
community/lms/doctype/lms_batch_membership/lms_batch_membership.json
View File

@@ -66,6 +66,7 @@
"fieldname": "course", "fieldname": "course",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1,
"label": "Course", "label": "Course",
"options": "LMS Course" "options": "LMS Course"
}, },
@@ -91,8 +92,8 @@
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"migration_hash": "10fbeeba76887ba1dc94e7ac19ea637d", "migration_hash": "fe10c462acf5e727d864305d7ce90e73",
"modified": "2021-10-20 10:08:04.071690", "modified": "2021-10-20 15:10:33.767419",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "LMS Batch Membership", "name": "LMS Batch Membership",
@@ -113,6 +114,5 @@
], ],
"quick_entry": 1, "quick_entry": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC"
"track_changes": 1
} }

2
community/lms/widgets/CourseCard.html
View File

@@ -1,5 +1,5 @@
{% set membership = course.get_membership(frappe.session.user) %} {% set membership = course.get_membership(frappe.session.user) %}
{% set progress = membership.progress %} {% set progress = frappe.utils.cint(membership.progress) %}
<div class="common-card-style course-card"> <div class="common-card-style course-card">
<div class="course-image {% if not course.image %}default-image{% endif %}" <div class="course-image {% if not course.image %}default-image{% endif %}"

1
community/overrides/user.py
View File

@@ -132,6 +132,7 @@ class CustomUser(User):
completed = [] completed = []
memberships = self.get_course_membership("Student") memberships = self.get_course_membership("Student")
for membership in memberships: for membership in memberships:
course = frappe.get_doc("LMS Course", membership.course)
progress = cint(membership.progress) progress = cint(membership.progress)
if progress < 100: if progress < 100:
in_progress.append(course) in_progress.append(course)

2
community/www/courses/course.html
View File

@@ -111,7 +111,7 @@
</div> </div>
{{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, dimension_class="member-card-large") }} {{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, dimension_class="member-card-large") }}
</div> </div>
{% set progress = membership.progress %} {% set progress = frappe.utils.cint(membership.progress) %}
{% if progress %} {% if progress %}
<div class="course-progress-section"> <div class="course-progress-section">
<div class="course-home-headings"> <div class="course-home-headings">