fix: ui, preview, progress, batches

community/lms/widgets/BatchTabs.html

@@ -2,9 +2,28 @@
   <a class="anchor_style" href="/courses">Courses</a> /{% if course.is_mentor(frappe.session.user) %} <a
     class="anchor_style" href="/courses/{{ course.name }}"> {{ course.title }}</a> {% else %} <span class="text-muted">
     {{ course.title }}</span> {% endif %}
+  {% set all_memberships = course.get_all_memberships() %}
+  {% if all_memberships | length > 1 %}
+    <a class="nav-link pull-right" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true"
+    aria-expanded="false">
+    Switch Batch
+  </a>
+  <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+    {% for membership in all_memberships %}
+    {% if not membership.is_current %}
+    <a class="dropdown-item switch-batch" href="#" data-batch="{{ membership.batch | urlencode }}" data-course="{{ course.name | urlencode }}">{{ membership.batch_title }}</a>
+    {% endif %}
+    {% endfor %}
+  </div>
+  {% endif %}
 </div>
+{% if not batch %}
+{% set display_class = "hide" %}
+{% else %}
+{% set display_class = "" %}
+{% endif %}
 <ul class="nav nav-tabs mt-4">
-  <li class="nav-item">
+  <li class="nav-item {{ display_class }}">
     <a class="nav-link" id="home" href="/courses/{{course.name}}/home">Home</a>
   </li>
   <li class="nav-item">
@@ -13,16 +32,16 @@
   <!-- <li class="nav-item">
     <a class="nav-link" id="schedule" href="/courses/{{course.name}}/schedule">Schedule</a>
   </li> -->
-  <li class="nav-item">
+  <li class="nav-item {{ display_class }}">
     <a class="nav-link" id="members" href="/courses/{{course.name}}/members">Members</a>
   </li>
-  <li class="nav-item">
+  <li class="nav-item {{ display_class }}">
     <a class="nav-link" id="discussion" href="/courses/{{course.name}}/discuss">Discussion</a>
   </li>
   <!-- <li class="nav-item">
     <a class="nav-link" id="about" href="/courses/{{course.name}}/about">About</a>
   </li> -->
-  {% if batch.is_member(frappe.session.user, member_type="Mentor") %}
+  {% if batch and batch.is_member(frappe.session.user, member_type="Mentor") %}
   <li class="nav-item">
     <a class="nav-link" id="progress" href="/courses/{{course.name}}/progress">Progress</a>
   </li>
@@ -37,5 +56,21 @@
     else {
       $("#learn").addClass('active')
     }
+
+    $(".switch-batch").click((e) => {
+      e.preventDefault();
+      var batch = decodeURIComponent($(e.currentTarget).attr("data-batch"));
+      var course = decodeURIComponent($(e.currentTarget).attr("data-course"));
+      frappe.call({
+        method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership",
+        args: {
+          batch: batch,
+          course: course
+        },
+        callback: (data) => {
+          window.location.reload();
+        }
+      })
+    })
   })
 </script>

community/lms/widgets/ChapterTeaser.html

@@ -7,12 +7,46 @@
     <div class="chapter-lessons">
       {% for lesson in chapter.get_lessons() %}
       <div class="lesson-teaser">
-        <a {% if show_link %} href="{{ batch.get_learn_url(course.get_lesson_index(lesson.name)) }}" {% endif %}>{{ lesson.title }}</a>
+        <a {% if show_link or lesson.include_in_preview %}
+          href="{{ course.get_learn_url(course.get_lesson_index(lesson.name)) }}" {% else %} href="" class="no-preview"
+          {% endif %} data-course="{{ course.name }}">{{ lesson.title }}</a>
         {% if show_progress and not course.is_mentor(frappe.session.user) and lesson.get_progress() %}
-        <a class="ml-5 badge p-1 {{ lesson.get_slugified_class() }}"> <img class="progress-image" src="/assets/community/images/Vector.png"> {{ lesson.get_progress() }}</a>
+        <a class="ml-5 badge p-1 {{ lesson.get_slugified_class() }}"> <img class="progress-image"
+            src="/assets/community/images/Vector.png"> {{ lesson.get_progress() }}</a>
         {% endif %}
       </div>
       {% endfor %}
     </div>
   </div>
 </div>
+
+<script>
+  frappe.ready(() => {
+    var d;
+    $(".no-preview").click((e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      e.stopImmediatePropagation();
+      var message = __("Please enroll for this course to access the lesson.");
+      var label = __("Checkout Upcoming Batches");
+      var action = "checkout_upcoming_batches";
+      d = frappe.msgprint({
+        title: __("This lesson is not available for preview!"),
+        message: message,
+        primary_action: {
+          "label": label,
+          "client_action": action,
+        }
+      });
+    })
+
+    window.redirect_to_login = () => {
+      window.location.href = `/login?redirect-to=/courses/${$(".no-preview").attr("data-course")}`
+    }
+
+    window.checkout_upcoming_batches = () => {
+      $('html,body').animate({scrollTop: $(".upcoming").offset().top}, 300);
+      frappe.hide_msgprint();
+    }
+  })
+</script>

community/lms/widgets/RenderBatch.html

@@ -1,6 +1,6 @@
 <div class="batch">
   <div class="batch-details">
-    <div>Session every {{batch.sessions_on}}</div>
+    <div class="sesion-details">Session every {{batch.sessions_on}}</div>
     <div>{{frappe.utils.format_time(batch.start_time, "short")}} -
       {{frappe.utils.format_time(batch.end_time, "short")}}
     </div>
@@ -18,7 +18,8 @@
   <div class="cta">
     <div class="">
       {% if can_manage %}
-      <a href="/courses/{{course.name}}/{{batch.name}}/home" class="btn btn-primary">Manage</a>
+      <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 }}"
         data-course="{{ course.name | urlencode }}">Join this Batch</button>