fix: conflicts

school/www/batch/learn.html

@@ -99,7 +99,7 @@
       <img class="ml-2" src="/assets/school/icons/side-arrow-white.svg">
     </a>
     {% elif course.enable_certification %}
-    <div class="button is-primary {% if course.get_course_progress() != 100 %} hide {% endif %}" id="certification">
+    <div class="button is-primary {% if membership.progress != 100 %} hide {% endif %}" id="certification">
       Get Certificate
     </div>
     {% endif %}

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">

school/www/profiles/profile.html

@@ -130,9 +130,8 @@
     Courses Mentored
   </div>
   <div class="cards-parent">
-    {% for mentorship in member.get_mentored_courses() %}
-    {% set course_details = frappe.get_doc("LMS Course", mentorship.course) %}
-    {{ widgets.CourseCard(course=course_details, read_only=read_only) }}
+    {% for course in member.get_mentored_courses() %}
+    {{ widgets.CourseCard(course=course, read_only=read_only) }}
     {% endfor %}
   </div>
 </div>