feat: learning modes

community/lms/api.py

@@ -29,13 +29,13 @@ def submit_solution(exercise, code):
     return {"name": doc.name, "creation": doc.creation}
 
 @frappe.whitelist()
-def save_current_lesson(batch_name, lesson_name):
+def save_current_lesson(course_name, lesson_name):
     """Saves the current lesson for a student/mentor.
     """
     name = frappe.get_value(
         doctype="LMS Batch Membership",
         filters={
-            "batch": batch_name,
+            "course": course_name,
             "member": frappe.session.user
         },
         fieldname="name")

community/lms/doctype/lesson/lesson.py

@@ -55,11 +55,11 @@ class Lesson(Document):
         return
 
 @frappe.whitelist()
-def save_progress(lesson, batch):
+def save_progress(lesson, course):
     if not frappe.db.exists("LMS Batch Membership",
             {
                 "member": frappe.session.user,
-                "batch": batch
+                "course": course
             }):
         return
     if frappe.db.exists("LMS Course Progress",

community/lms/doctype/lms_batch/lms_batch.py

@@ -21,14 +21,6 @@ class LMSBatch(Document):
     def after_insert(self):
         create_membership(batch=self.name, member_type="Mentor")
 
-    def get_mentors(self):
-        memberships = frappe.get_all(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member_type": "Mentor"},
-                    ["member"])
-        member_names = [m['member'] for m in memberships]
-        return find_all("User", name=["IN", member_names])
-
     def is_member(self, email, member_type=None):
         """Checks if a person is part of a batch.
 
@@ -43,16 +35,6 @@ class LMSBatch(Document):
             filters['member_type'] = member_type
         return frappe.db.exists("LMS Batch Membership", filters)
 
-    def get_students(self):
-        """Returns (email, full_name, username) of all the students of this batch as a list of dict.
-        """
-        memberships = frappe.get_all(
-                    "LMS Batch Membership",
-                    {"batch": self.name, "member_type": "Student"},
-                    ["member"])
-        member_names = [m['member'] for m in memberships]
-        return find_all("User", name=["IN", member_names])
-
     def get_messages(self):
         messages =  frappe.get_all("LMS Message", {"batch": self.name}, ["*"], order_by="creation")
         for message in messages:

community/lms/doctype/lms_batch_membership/lms_batch_membership.py

@@ -44,10 +44,11 @@ class LMSBatchMembership(Document):
                 frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
 
 @frappe.whitelist()
-def create_membership(batch, member=None, member_type="Student", role="Member"):
+def create_membership(course, batch=None, member=None, member_type="Student", role="Member"):
     frappe.get_doc({
         "doctype": "LMS Batch Membership",
         "batch": batch,
+        "course": course,
         "role": role,
         "member_type": member_type,
         "member": member or frappe.session.user

community/lms/doctype/lms_course/lms_course.py

@@ -82,8 +82,8 @@ class LMSCourse(Document):
         """
         if not email:
             return False
-        return frappe.db.exists({
+        return frappe.db.count("LMS Course Mentor Mapping",
-            "doctype": "LMS Course Mentor Mapping",
+            {
                 "course": self.name,
                 "mentor": email
             })
@@ -192,13 +192,11 @@ class LMSCourse(Document):
             return
         return f"/courses/{self.name}/learn/{lesson_number}"
 
-    def get_current_batch(self, member):
+    def get_current_membership(self, member):
-        current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, pluck="batch")
+        current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, ["name", "batch"])
-        print(current_membership, member, self.name, frappe.session.user)
         if len(current_membership):
             return current_membership[0]
-        print(frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch"))
+        return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, ["name","batch"], as_dict=True)
-        return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch")
 
     def get_all_memberships(self, member=frappe.session.user):
         print(member, frappe.session.user)
@@ -208,6 +206,38 @@ class LMSCourse(Document):
             membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
         return all_memberships
 
+    def get_mentors(self, batch):
+        filters = {
+            "course": self.name,
+            "member_type": "Mentor"
+        }
+        if batch:
+            filters["batch"] = batch
+
+        print(filters)
+        memberships = frappe.get_all(
+                    "LMS Batch Membership",
+                    filters,
+                    ["member"])
+        member_names = [m['member'] for m in memberships]
+        return find_all("User", name=["IN", member_names])
+
+    def get_students(self, batch):
+        """Returns (email, full_name, username) of all the students of this batch as a list of dict.
+        """
+        filters = {
+            "course": self.name,
+            "member_type": "Student"
+        }
+        if batch:
+            filters["batch"] = batch
+        memberships = frappe.get_all(
+                    "LMS Batch Membership",
+                    filters,
+                    ["member"])
+        member_names = [m['member'] for m in memberships]
+        return find_all("User", name=["IN", member_names])
+
     def get_outline(self):
         return CourseOutline(self)
 

community/lms/widgets/BatchTabs.html

@@ -17,13 +17,13 @@
   </div>
   {% endif %}
 </div>
-{% if not batch %}
+{% if not membership %}
 {% set display_class = "hide" %}
 {% else %}
 {% set display_class = "" %}
 {% endif %}
 <ul class="nav nav-tabs mt-4">
-  <li class="nav-item {{ display_class }}">
+  <li class="nav-item">
     <a class="nav-link" id="home" href="/courses/{{course.name}}/home">Home</a>
   </li>
   <li class="nav-item">
@@ -35,9 +35,9 @@
   <li class="nav-item {{ display_class }}">
     <a class="nav-link" id="members" href="/courses/{{course.name}}/members">Members</a>
   </li>
-  <li class="nav-item {{ display_class }}">
+  <!-- <li class="nav-item {{ display_class }}">
     <a class="nav-link" id="discussion" href="/courses/{{course.name}}/discuss">Discussion</a>
-  </li>
+  </li> -->
   <!-- <li class="nav-item">
     <a class="nav-link" id="about" href="/courses/{{course.name}}/about">About</a>
   </li> -->

community/lms/widgets/RenderBatch.html

@@ -7,7 +7,7 @@
     <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() %}
+    {% for m in course.get_mentors(batch.name) %}
     <div>
       {{ widgets.Avatar(member=m, avatar_class="avatar-medium" ) }}
       <span class="instructor-title">{{m.full_name}}</span>
@@ -21,7 +21,7 @@
       <a href="" class="btn btn-primary manage-batch" data-batch="{{ batch.name | urlencode }}"
         data-course="{{ course.name | urlencode }}">Manage</a>
       {% elif can_join %}
-      <button class="join-batch btn btn-primary" data-batch="{{ batch.name | urlencode }}"
+      <button class="join-batch btn btn-secondary" data-batch="{{ batch.name | urlencode }}"
         data-course="{{ course.name | urlencode }}">Join this Batch</button>
       {% endif %}
     </div>

community/public/css/style.css

@@ -23,6 +23,7 @@
   --cta-color: var(--c4);
   --send-message: var(--c7);
   --received-message: var(--c8);
+	--control-bg: var(--gray-100);
 }
 
 body {

community/www/batch/discuss.html

@@ -11,7 +11,7 @@
 {% block content %}
 
 <div class="container">
-  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  {{ widgets.BatchTabs(course=course, membership=membership) }}
   <div class="messages-container mt-5">
     {{ widgets.BatchHeader(batch_name=batch.title, member_count=member_count)}}
     <ol class="messages">

community/www/batch/discuss.py

@@ -4,5 +4,5 @@ from . import utils
 def get_context(context):
     utils.get_common_context(context)
     context.messages = context.batch.get_messages()
-    if not context.batch:
+    if not context.membership:
         utils.redirect_to_lesson(context.course)

community/www/batch/home.html

@@ -8,15 +8,13 @@
 {% endblock %}
 
 {% block content %}
-{% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/join?batch=" + batch.name %}
 <div class="container mt-5">
-  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  {{ widgets.BatchTabs(course=course, membership=membership) }}
-  <!-- <div>
-    <h1 class="mt-5">{{ batch.title }}</h1>
-  </div> -->
   <div class="course-details mt-5">
     {{ widgets.CourseOutline(course=course, batch=batch, show_link=True, show_progress=True) }}
   </div>
+
+  {% if batch %}
   <div class="w-25">
     <h3>Batch Schedule</h3>
     {{ widgets.RenderBatch(course=course, batch=batch) }}
@@ -28,8 +26,9 @@
     {{ frappe.utils.md_to_html(batch.description) }}
   </div>
   {% endif %}
-
+  {% endif %}
   {% if course.is_mentor(frappe.session.user) %}
+  {% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/join?batch=" + batch.name %}
   <div class="">
     <h3> Invite Members </h3>
     <a href="" class="" id="invite-link" data-link="{{ invite_link }}">Get Batch Invitation

community/www/batch/home.py

@@ -3,5 +3,3 @@ from . import utils
 
 def get_context(context):
     utils.get_common_context(context)
-    if not context.batch:
-        utils.redirect_to_lesson(context.course)

community/www/batch/learn.html

@@ -22,17 +22,18 @@
 {% block content %}
 
 <div class="container">
-  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  {{ widgets.BatchTabs(course=course, membership=membership) }}
   <div class="lesson-page">
 
-    <h2 class="title {% if course.is_mentor(frappe.session.user) %} is_mentor {% endif %}" data-name="{{ lesson.name }}" {% if batch %} data-batch="{{ batch.name }}" {% endif %}>{{ lesson.title }}</h2>
+    <h2 class="title {% if course.is_mentor(frappe.session.user) %} is_mentor {% endif %}" data-name="{{ lesson.name }}"
+      {% if batch %} data-batch="{{ batch.name }}" {% endif %}>{{ lesson.title }}</h2>
 
-    {% if batch or lesson.include_in_preview %}
+    {% if membership or lesson.include_in_preview %}
     {{ lesson.render_html() }}
     {% else %}
     <div class="no-preview-message">
-      <span>This lesson is not available for Preview. Please join a batch to access the complete course.</span>
+      <span>This lesson is not available for Preview. Please join the course to access this lesson.</span>
-      <a href="/courses/{{ course.name }}">Checkout Upcoming Batches</a>
+      <a href="/courses/{{ course.name }}">Checkout Course Details.</a>
     </div>
     {% endif %}
 
@@ -63,5 +64,24 @@
 {% for ext in page_extensions %}
 {{ ext.render_footer() }}
 {% endfor %}
-
+<script>
+  var membership = {{ membership }};
+  var is_mentor = {{ course.is_mentor(frappe.session.user) }};
+  console.log(is_mentor)
+  if (membership && !is_mentor) {
+    frappe.call({
+      method: "community.lms.doctype.lesson.lesson.save_progress",
+      args: {
+        lesson: "{{ lesson.name }}",
+        course: "{{ course.name }}"
+      }
+    })
+  }
+  if (membership) {
+    frappe.call("community.lms.api.save_current_lesson", {
+      "course_name": "{{ course.name }}",
+      "lesson_name": "{{ lesson.name }}"
+    })
+  }
+</script>
 {%- endblock %}

community/www/batch/learn.js

@@ -1,5 +1,5 @@
 frappe.ready(() => {
-  if ($(".title").attr("data-batch") && !$(".title").hasClass("is_mentor")) {
+  /* if ($(".title").attr("data-batch") && !$(".title").hasClass("is_mentor")) {
     frappe.call({
       method: "community.lms.doctype.lesson.lesson.save_progress",
       args: {
@@ -13,5 +13,5 @@ frappe.ready(() => {
       "batch_name": $(".title").attr("data-batch"),
       "lesson_name": $(".title").attr("data-name")
     })
-  }
+  } */
 })

community/www/batch/members.html

@@ -10,7 +10,7 @@
 {% block content %}
 
 <div class="container">
-  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  {{ widgets.BatchTabs(course=course, membership=membership) }}
   {{ MembersList(members)}}
 </div>
 {% endblock %}

community/www/batch/members.py

@@ -3,5 +3,5 @@ from . import utils
 
 def get_context(context):
     utils.get_common_context(context)
-    if not context.batch:
+    if not context.membership:
         utils.redirect_to_lesson(context.course)

community/www/batch/utils.py

@@ -11,11 +11,16 @@ def get_common_context(context):
         context.template = "www/404.html"
         return
 
-    batch_name = course.get_current_batch(frappe.session.user)
+    membership = course.get_current_membership(frappe.session.user)
-    batch = course.get_batch(batch_name)
+
+    if membership:
+        context.membership = membership
+        batch = course.get_batch(membership.batch)
+
+        if batch:
             context.batch = batch
-    if batch_name:
+
-        context.members = batch.get_mentors() + batch.get_students()
+        context.members = course.get_mentors(membership.batch) + course.get_students(membership.batch)
         context.member_count = len(context.members)
 
 

community/www/courses/course.html

@@ -12,7 +12,12 @@
     <div class="mb-5">
       <a class="anchor_style" href="/courses">Courses</a> / <span class="text-muted">{{ course.title }}</span>
     </div>
+    <div class="d-flex justify-content-between align-items-end">
       <h2 id="course-title" data-course="{{course.name}}">{{course.title}}</h2>
+      <div>
+        <button class="btn btn-primary join-batch" data-course="{{ course.name | urlencode }}"> Join the Course</button>
+      </div>
+    </div>
     <div class="course-short-intro">{{ course.short_introduction }}</div>
   </div>
 

community/www/courses/course.js

@@ -57,11 +57,13 @@ frappe.ready(() => {
       window.location.href = `/login?redirect-to=/courses/${course}`;
       return;
     }
-    batch = decodeURIComponent($(e.currentTarget).attr("data-batch"))
+    var batch = $(e.currentTarget).attr("data-batch");
+    batch = batch ? decodeURIComponent(batch) : "";
     frappe.call({
       "method": "community.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
       "args": {
-        "batch": batch
+        "batch": batch ? batch : "",
+        "course": course
       },
       "callback": (data) => {
         if (data.message == "OK") {