fix: batch switch with query parameters

community/lms/widgets/BatchTabs.html

@@ -4,14 +4,14 @@
     {{ 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"
+  <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>
+    {% for data in all_memberships %}
+    {% if data.batch != membership.batch %}
+    <a class="dropdown-item switch-batch" href="/courses/{{ course.name }}/home?batch={{ data.batch }}">{{ data.batch_title }}</a>
     {% endif %}
     {% endfor %}
   </div>
@@ -22,18 +22,21 @@
 {% else %}
 {% set display_class = "" %}
 {% endif %}
+
 <ul class="nav nav-tabs mt-4">
   <li class="nav-item">
-    <a class="nav-link" id="home" href="/courses/{{course.name}}/home">Home</a>
+    <a class="nav-link" id="home" href="/courses/{{course.name}}/home{{ course.query_parameter }}">Home</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" id="learn" href="/courses/{{course.name}}/learn">Lessons</a>
+    {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership.current_lesson else '1.1' %}
+    <a class="nav-link" id="learn"
+      href="{{ course.get_learn_url(lesson_index) }}{{ course.query_parameter }}">Lessons</a>
   </li>
   <!-- <li class="nav-item">
     <a class="nav-link" id="schedule" href="/courses/{{course.name}}/schedule">Schedule</a>
   </li> -->
   <li class="nav-item {{ display_class }}">
-    <a class="nav-link" id="members" href="/courses/{{course.name}}/members">Members</a>
+    <a class="nav-link" id="members" href="/courses/{{course.name}}/members{{ course.query_parameter }}">Members</a>
   </li>
   <!-- <li class="nav-item {{ display_class }}">
     <a class="nav-link" id="discussion" href="/courses/{{course.name}}/discuss">Discussion</a>
@@ -41,37 +44,22 @@
   <!-- <li class="nav-item">
     <a class="nav-link" id="about" href="/courses/{{course.name}}/about">About</a>
   </li> -->
-  {% if batch and batch.is_member(frappe.session.user, member_type="Mentor") %}
+  {% if membership.batch and course.is_mentor(frappe.session.user) %}
   <li class="nav-item">
-    <a class="nav-link" id="progress" href="/courses/{{course.name}}/progress">Progress</a>
+    <a class="nav-link" id="progress" href="/courses/{{course.name}}/progress{{ course.query_parameter }}">Progress</a>
   </li>
   {% endif %}
 </ul>
+{% block script %}
 <script>
   frappe.ready(() => {
-    var selector = document.querySelector(`a[href="${decodeURIComponent(window.location.pathname)}"]`)
+    var selector = document.querySelector(`a[href="${decodeURIComponent(window.location.pathname)}{{ course.query_parameter }}"]`)
     if (selector) {
       selector.classList.add('active');
     }
     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,
-          member: frappe.session.user
-        },
-        callback: (data) => {
-          window.location.reload();
-        }
-      })
-    })
   })
 </script>
+{% endblock %}

community/lms/widgets/ChapterTeaser.html

@@ -8,7 +8,7 @@
       {% for lesson in chapter.get_lessons() %}
       <div class="lesson-teaser">
         <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"
+          href="{{ course.get_learn_url(course.get_lesson_index(lesson.name)) }}{{course.query_parameter}}" {% 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() %}
         <span class="ml-5 badge p-2 {{ lesson.get_slugified_class() }}"> {{ lesson.get_progress() }}</span>

community/lms/widgets/RenderBatch.html

@@ -18,7 +18,7 @@
   <div class="cta">
     <div class="">
       {% if can_manage %}
-      <a href="" class="btn btn-primary manage-batch" data-batch="{{ batch.name | urlencode }}"
+      <a href="/courses/{{ course.name }}/home?batch={{ batch.name }}" 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-secondary" data-batch="{{ batch.name | urlencode }}"