refactor: refactored the about page

community/www/courses/about/index.html

@@ -12,16 +12,13 @@
 {{ Sidebar(course_slug, batch_code) }}
 <div class="container">
 	{{ CourseBasicDetail(course)}}
-	{{ InstructorsSection(instructor) }}
-	{% if batch.description %}
-		{{ BatchDetails(batch.description) }}
-	{% endif %}
-	{{ MentorsSection(mentors, True, course.name) }}
+	{{ InstructorsSection(course.get_instructor()) }}
+	{{ BatchDetails(batch)}}
 </div>
 {% endblock %}
 
 {% macro CourseBasicDetail(course) %}
-<h2>{{course.name}}</h2>
+<h2>{{course.title}}</h2>
 <div class="course-description">
 	{{course.short_introduction}}
 </div>
@@ -36,11 +33,25 @@
 <div>{{frappe.utils.md_to_html(course.description)}}</div>
 {% endmacro %}
 
-{% macro BatchDetails(description) %}
-<div class="mt-5">
-	<h3>About the Batch</h3>
-	<div>
-		{{ frappe.utils.md_to_html(description) }}
-	</div>
+{% macro BatchDetails(batch) %}
+<h2>About the Batch</h2>
+
+<div class="batch">
+  <div class="batch-details">
+  <div>Session every {{batch.sessions_on}}</div>
+  <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
+    {{frappe.utils.format_time(batch.end_time, "short")}}</div>
+  <div>Starting {{frappe.utils.format_date(batch.start_date, "medium")}}</div>
+  <div class="course-type" style="color: #888; padding: 10px 0px;">mentors</div>
+
+  {% for m in batch.get_mentors() %}
+    <div>
+      {% if m.photo_url %}
+      <img class="profile-photo" src="{{m.photo_url}}">
+      {% endif %}
+      <span class="instructor-title">{{m.full_name}}</span>
+    </div>
+  {% endfor %}
+  </div>
 </div>
 {% endmacro %}

community/www/courses/about/index.py

@@ -1,21 +1,21 @@
 import frappe
-from community.www.courses.utils import redirect_if_not_a_member, get_course, get_instructor, get_batch
+from community.lms.models import Course
 
 def get_context(context):
     context.no_cache = 1
-    context.course_slug = frappe.form_dict["course"]
-    context.course = get_course(context.course_slug)
-    context.batch_code = frappe.form_dict["batch"]
-    redirect_if_not_a_member(context.course_slug, context.batch_code)
 
-    context.instructor = get_instructor(context.course.owner)
-    context.batch = get_batch(context.batch_code)
-    context.mentors = get_mentors(context.batch.name)
+    course_name = frappe.form_dict["course"]
+    batch_name = frappe.form_dict["batch"]
 
-def get_mentors(batch):
-    mentors = []
-    memberships = frappe.get_all("LMS Batch Membership", {"batch": batch, "member_type": "Mentor"}, ["member"])
-    for membership in memberships:
-        member = frappe.get_doc("Community Member", membership.member)
-        mentors.append(member)
-    return mentors
+    course = Course.find(course_name)
+    if not course:
+        context.template = "www/404.html"
+        return
+
+    batch = course.get_batch(batch_name)
+    if not batch:
+        frappe.local.flags.redirect_location = "/courses/" + course_name
+        raise frappe.Redirect
+
+    context.course = course
+    context.batch = batch