refactor: fixed the course page

community/www/courses/course.html

@@ -11,22 +11,23 @@
   <div class="course-header">
     <div class="course-type">course</div>
     <h1 id="course-title" data-course="{{course.name}}">{{course.title}}</h1>
+    <div class="course-short-intro">{{ course.short_introduction }}</div>
   </div>
 
   <div class="row">
-    <div class="col-lg-9 col-md-12">
+    <div class="col-lg-8 col-md-12">
       <div  class="course-details">
+        {{ CourseVideo(course) }}
+
         {{ CourseDescription(course) }}
         {{ BatchSection(course) }}
         {{ CourseOutline(course) }}
       </div>
     </div>
-
-    <div class="col-lg-3 col-md-12">
+    <div class="col-lg-4 col-md-12">
       <div class="sidebar">
         {{ InstructorsSection(course.get_instructor()) }}
       </div>
-
       <div class="sidebar">
         {{ MentorsSection(course.get_mentors(), course.is_mentor(frappe.session.user), course.name) }}
       </div>
@@ -35,14 +36,7 @@
 </div>
 {% endblock %}
 
-
-{% macro CourseDescription(course) %}
-  <h2>Course Description</h2>
-
-  <div class="course-description">
-    {{ course.short_introduction }}
-  </div>
-
+{% macro CourseVideo(course) %}
   {% if course.video_link %}
   <div class="preview-video">
     <iframe
@@ -57,6 +51,14 @@
   {% endif %}
 {% endmacro %}
 
+{% macro CourseDescription(course) %}
+  <h2>Course Description</h2>
+
+  <div class="course-description">
+    {{ course.short_introduction }}
+  </div>
+{% endmacro %}
+
 {% macro BatchSection(course) %}
   {% if course.is_mentor(frappe.session.user) %}
     {{ BatchSectionForMentors(course, course.get_batches(mentor=frappe.session.user)) }}
@@ -86,7 +88,7 @@
   <div class="cta">
     <div class="">
       {% if can_manage %}
-        <button >Manage</button>
+        <a href="/courses/{{course.name}}/{{batch.name}}/about" class="btn btn-secondary">Manage</a>
       {% else %}
         <button class="join-batch" data-batch="{{ batch.name | urlencode }}">Join this Batch</button>
       {% endif %}
@@ -136,6 +138,6 @@
   <h2>Course Outline</h2>
 
   {% for chapter in course.get_chapters() %}
-    {{ widgets.ChapterTeaser(chapter=chapter)}}
+    {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter)}}
   {% endfor %}
 {% endmacro %}

community/www/courses/utils.py

@@ -14,12 +14,14 @@ def get_member_with_name(name):
 
 def get_batch(code):
     try:
-        return frappe.db.get_value("LMS Batch", {"code": code}, ["name", "description"], as_dict=True)
+        print("get_batch", code)
+        return frappe.db.get_value("LMS Batch", {"name": code}, ["name", "description"], as_dict=True)
     except frappe.DoesNotExistError:
+        print("Error: notfound")
         return
 
 def is_member_of_batch(batch_code):
-    membership = frappe.get_all("LMS Batch Membership", {"batch": get_batch(batch_code).name, "member": get_member_with_email()})
+    membership = frappe.get_all("LMS Batch Membership", {"batch": batch_code, "member": get_member_with_email()})
     if len(membership):
         return True
     return False
@@ -54,4 +56,4 @@ def get_batch_members(batch):
         if membership.member_type == "Mentor":
             member.is_mentor = True
         members.append(member)
-    return members
+    return members

community/www/macros/common_macro.html

@@ -1,31 +1,31 @@
 {% macro InstructorsSection(instructor) %}
-<h3>Instructor</h3>
-<div class="instructor">
-    <div class="instructor-title">{{instructor.full_name}}</div>
-    <div class="instructor-subtitle">Created {{instructor.get_course_count()}} courses</div>
-</div>
+  <h3>Instructor</h3>
+  <div class="instructor">
+      <div class="instructor-title">{{instructor.full_name}}</div>
+      <div class="instructor-subtitle">Created {{instructor.get_course_count()}} courses</div>
+  </div>
 {% endmacro %}
 
 {% macro MentorsSection(mentors, is_mentor, course_name) %}
-<h3>Mentors</h3>
-{% for m in mentors %}
-<div class="instructor">
-    <div class="instructor-title">{{m.full_name}}</div>
-    <div class="instructor-subtitle">Mentored {{m.get_batch_count()}} batches</div>
-</div>
-{% endfor %}
-{% if not is_mentor %}
-<div id="mentor-request" class="notice">
-    Interested to become a mentor?
+  <h3>Mentors</h3>
+  {% for m in mentors %}
+  <div class="instructor">
+      <div class="instructor-title">{{m.full_name}}</div>
+      <div class="instructor-subtitle">Mentored {{m.get_batch_count()}} batches</div>
+  </div>
+  {% endfor %}
+  {% if not is_mentor %}
+  <div id="mentor-request" class="notice">
+      Interested to become a mentor?
 
-    <div><a id="apply-now" data-course="{{course_name | urlencode}}" href="">Apply Now!</a></div>
-</div>
-<div id="already-applied" class="notice hide">
-  You've applied to become a mentor for this course. Your request is currently under review.
+      <div><a id="apply-now" data-course="{{course_name | urlencode}}" href="">Apply Now!</a></div>
+  </div>
+  <div id="already-applied" class="notice hide">
+    You've applied to become a mentor for this course. Your request is currently under review.
 
-  If you are not any more interested to mentor this course, you can <a id="cancel-request" data-course="{{course_name | urlencode}}" href="">cancel your application</a>.
-</div>
-{% endif %}
+    If you are not any more interested to mentor this course, you can <a id="cancel-request" data-course="{{course_name | urlencode}}" href="">cancel your application</a>.
+  </div>
+  {% endif %}
 {% endmacro %}