fix: conflicts

2021-10-24 12:03:06 +05:30
parent f5af07086b
commit 050cfa494c
23 changed files with 478 additions and 154 deletions
--- a/school/www/courses/course.html
+++ b/school/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 = course.get_course_progress() %}
+    {% set progress = frappe.utils.cint(membership.progress) %}
    {% if progress %}
    <div class="course-progress-section">
      <div class="course-home-headings">