feat: #28 info page, #27 discussion page initial structure, add batch webform change

community/www/courses/members/index.html

@@ -1,6 +1,8 @@
 {% 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 %}
 {% block head_include %}
 <meta name="description" content="Courses" />
@@ -8,28 +10,29 @@
 {% endblock %}
 
 {% block content %}
-{{ Sidebar(course, batch_code) }}
+{{ Sidebar(course_slug, batch_code) }}
 <div class="container">
-	<div class="border p-3">
-		<h3>{{course.name}}</h3>
-		<div class="text-muted">{{member_count}} members</div>
-	</div>
-
-	<div class="mt-5">
-		{% for member in members %}
-		<div class="d-flex align-items-center">
-			<div>
-				{{ Profile(member.photo, member.full_name, member.abbr, "small") }}
-			</div>
-			<div class="mr-5">
-				{{member.full_name}}
-			</div>
-			{% if member.is_mentor %}
-			<div class="badge badge-success">Mentor</div>
-			{% endif %}
-		</div>
-		<hr>
-		{% endfor %}
-	</div>
+	{{ BatchHearder(course.name, member_count)}}
+	{{ MembersList(members)}}
 </div>
-{% endblock %}
+{% endblock %}
+
+
+{% macro MembersList(members) %}
+<div class="mt-5">
+	{% for member in members %}
+	<div class="d-flex align-items-center">
+		<div>
+			{{ Profile(member.photo, member.full_name, member.abbr, "small") }}
+		</div>
+		<div class="mr-5">
+			{{member.full_name}}
+		</div>
+		{% if member.is_mentor %}
+		<div class="badge badge-success">Mentor</div>
+		{% endif %}
+	</div>
+	<hr>
+	{% endfor %}
+</div>
+{% endmacro %}

community/www/courses/members/index.py

@@ -1,5 +1,5 @@
 import frappe
-from community.www.courses.utils import redirect_if_not_a_member, get_batch, get_member_with_name, get_course
+from community.www.courses.utils import redirect_if_not_a_member, get_batch, get_member_with_name, get_course, get_batch_members
 
 def get_context(context):
     context.no_cache = 1
@@ -8,16 +8,5 @@ def get_context(context):
     context.batch_code = frappe.form_dict["batch"]
     redirect_if_not_a_member(context.course_slug, context.batch_code)
     context.batch = get_batch(context.batch_code)
-    context.members = get_members(context.batch)
-    context.member_count = len(context.members)
-
-def get_members(batch):
-    members = []
-    memberships = frappe.get_all("LMS Batch Membership", {"batch": batch}, ["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
+    context.members = get_batch_members(context.batch.name)
+    context.member_count = len(context.members)