refactor: patches to fix data, profile dashboard, lms mentor mapping page fixes

community/www/batch/discuss.js

@@ -30,4 +30,4 @@ frappe.ready(() => {
 			$(".msger-input").val("");
 		}
 	})
-})
+})

community/www/batch/discuss.py

@@ -1,9 +1,6 @@
 import frappe
 from . import utils
-from community.lms.doctype.lms_batch.lms_batch import get_messages
 
 def get_context(context):
     utils.get_common_context(context)
-
-    context.members = utils.get_batch_members(context.batch.name)
-    context.member_count = len(context.members)
+    context.messages = context.batch.get_messages()

community/www/batch/members.html

@@ -1,6 +1,5 @@
 {% extends "templates/base.html" %}
 {% from "www/macros/sidebar.html" import Sidebar %}
-{% from "www/macros/profile.html" import Profile %}
 {% from "www/macros/common_macro.html" import BatchHearder %}
 
 {% block title %}Members{% endblock %}
@@ -14,27 +13,27 @@
 {{ Sidebar(course, batch) }}
 
 <div class="container">
-	{{ BatchHearder(course.title, member_count)}}
-	{{ MembersList(members)}}
+  {{ BatchHearder(course.title, member_count)}}
+  {{ MembersList(members)}}
 </div>
 {% endblock %}
 
 
 {% macro MembersList(members) %}
 <div class="mt-5">
-	{% for member in members %}
-	<div class="d-flex align-items-center">
-		<div>
-      {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }} <a href="/{{member.username}}">{{ member.full_name }}</a>
-		</div>
-		<div class="mr-5">
-			{{member.full_name}}
-		</div>
-		{% if member.is_mentor %}
-		<div class="badge badge-success">Mentor</div>
-		{% endif %}
-	</div>
-	<hr>
-	{% endfor %}
+  {% for member in members %}
+  <div class="d-flex align-items-center">
+    <div>
+      {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }}
+    </div>
+    <div class="ml-5 mr-5">
+      <a href="/{{member.username}}">{{ member.full_name }}</a>
+    </div>
+    {% if course.is_mentor(member.name) %}
+    <div class="badge badge-success">Mentor</div>
+    {% endif %}
+  </div>
+  <hr>
+  {% endfor %}
 </div>
 {% endmacro %}

community/www/batch/members.py

@@ -3,6 +3,3 @@ from . import utils
 
 def get_context(context):
     utils.get_common_context(context)
-
-    context.members = utils.get_batch_members(context.batch.name)
-    context.member_count = len(context.members)

community/www/batch/utils.py

@@ -19,25 +19,10 @@ def get_common_context(context):
 
     context.course = course
     context.batch = batch
+    context.members = batch.get_mentors() + batch.get_students()
+    context.member_count = len(context.members)
     context.livecode_url = get_livecode_url()
 
 def get_livecode_url():
     return frappe.db.get_single_value("LMS Settings", "livecode_url")
 
-def get_batch_members(batch_name):
-    members = []
-    memberships = frappe.get_all("LMS Batch Membership", {"batch": batch_name}, ["member", "member_type"])
-
-    for membership in memberships:
-        member = get_member_with_name(membership.member)
-        if membership.member_type == "Mentor":
-            member.is_mentor = True
-        members.append(member)
-    return members
-
-def get_member_with_name(name):
-    try:
-        return frappe.get_doc("Community Member", name)
-    except frappe.DoesNotExistError:
-        return
-