From 049c374ece7583df00f16de07266439e94db8c03 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 20 Oct 2021 16:12:41 +0530
Subject: [PATCH] fix: convert progress to int for comparision

---
 community/lms/doctype/course_lesson/course_lesson.py      | 2 +-
 .../lms_batch_membership/lms_batch_membership.json        | 8 ++++----
 community/lms/widgets/CourseCard.html                     | 2 +-
 community/overrides/user.py                               | 1 +
 community/www/courses/course.html                         | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/community/lms/doctype/course_lesson/course_lesson.py b/community/lms/doctype/course_lesson/course_lesson.py
index d2251669..8fbfb0e9 100644
--- a/community/lms/doctype/course_lesson/course_lesson.py
+++ b/community/lms/doctype/course_lesson/course_lesson.py
@@ -96,5 +96,5 @@ def save_progress(lesson, course, status):
 
     course_details = frappe.get_doc("LMS Course", course)
     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
diff --git a/community/lms/doctype/lms_batch_membership/lms_batch_membership.json b/community/lms/doctype/lms_batch_membership/lms_batch_membership.json
index 18e660b8..69720d29 100644
--- a/community/lms/doctype/lms_batch_membership/lms_batch_membership.json
+++ b/community/lms/doctype/lms_batch_membership/lms_batch_membership.json
@@ -66,6 +66,7 @@
    "fieldname": "course",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Course",
    "options": "LMS Course"
   },
@@ -91,8 +92,8 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "migration_hash": "10fbeeba76887ba1dc94e7ac19ea637d",
- "modified": "2021-10-20 10:08:04.071690",
+ "migration_hash": "fe10c462acf5e727d864305d7ce90e73",
+ "modified": "2021-10-20 15:10:33.767419",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",
@@ -113,6 +114,5 @@
  ],
  "quick_entry": 1,
  "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/community/lms/widgets/CourseCard.html b/community/lms/widgets/CourseCard.html
index b709ce90..33783870 100644
--- a/community/lms/widgets/CourseCard.html
+++ b/community/lms/widgets/CourseCard.html
@@ -1,5 +1,5 @@
 {% 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="course-image {% if not course.image %}default-image{% endif %}"
diff --git a/community/overrides/user.py b/community/overrides/user.py
index e9a65082..eb8f5a17 100644
--- a/community/overrides/user.py
+++ b/community/overrides/user.py
@@ -132,6 +132,7 @@ class CustomUser(User):
         completed = []
         memberships = self.get_course_membership("Student")
         for membership in memberships:
+            course = frappe.get_doc("LMS Course", membership.course)
             progress = cint(membership.progress)
             if progress < 100:
                 in_progress.append(course)
diff --git a/community/www/courses/course.html b/community/www/courses/course.html
index 48448c69..da83b44e 100644
--- a/community/www/courses/course.html
+++ b/community/www/courses/course.html
@@ -111,7 +111,7 @@
       </div>
       {{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, dimension_class="member-card-large") }}
     </div>
-    {% set progress = membership.progress %}
+    {% set progress = frappe.utils.cint(membership.progress) %}
     {% if progress %}
     <div class="course-progress-section">
       <div class="course-home-headings">