fix: quiz progress and youtube video integration

community/lms/widgets/BatchTabs.html

@@ -2,16 +2,17 @@
   <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
+  {% set all_memberships = course.get_all_memberships(frappe.session.user) %}
+  {% if membership and membership.batch and all_memberships | length > 1 %}
+  <a class="pull-right dropdown-item border rounded" style="width: 10rem;" href="#" id="navbarDropdown" role="button"
+    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    {{ membership.batch_title }}
   </a>
   <div class="dropdown-menu" aria-labelledby="navbarDropdown">
     {% 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>
+    <a class="dropdown-item switch-batch"
+      href="/courses/{{ course.name }}/home?batch={{ data.batch }}">{{ data.batch_title }}</a>
     {% endif %}
     {% endfor %}
   </div>
@@ -28,7 +29,8 @@
     <a class="nav-link" id="home" href="/courses/{{course.name}}/home{{ course.query_parameter }}">Home</a>
   </li>
   <li class="nav-item">
-    {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and membership.current_lesson else '1.1' %}
+    {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and 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>

community/lms/widgets/ChapterTeaser.html

@@ -7,9 +7,17 @@
     <div class="chapter-lessons">
       {% 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)) }}{{course.query_parameter}}" {% else %} href="" class="no-preview"
-          {% endif %} data-course="{{ course.name }}">{{ lesson.title }}</a>
+        {% if show_link or lesson.include_in_preview %}
+        <a class="" href="{{ course.get_learn_url(course.get_lesson_index(lesson.name)) }}{{course.query_parameter}}"
+          data-course="{{ course.name }}">{{ lesson.title }}</a>
+        {% else %}
+        <div class="no-preview" title="This lesson is not available for preview">
+          <span style="color: #2490ef;">
+            {{ lesson.title }}
+          </span>
+          <i class="fa fa-lock ml-2"></i>
+        </div>
+        {% endif %}
         {% 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>
         {% endif %}
@@ -18,36 +26,3 @@
     </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 = () => {
-      if ($(".upcoming").length > 0) {
-        $('html,body').animate({ scrollTop: $(".upcoming").offset().top }, 300);
-      }
-      frappe.hide_msgprint();
-    }
-  })
-</script>

community/lms/widgets/Quiz.html

@@ -1,67 +0,0 @@
-<h3 id="title">{{ quiz.title }}</h3>
-<form id="quiz-form">
-  {% for question in quiz.questions %}
-  <div class="question mb-5" data-question="{{ question.question }}"
-    data-multi="{{ question.multiple_correct_answers}}">
-    <p> {{ loop.index }}. {{ question.question }}</p>
-    {% set options = question.options.split(",") %}
-    {% for option in options %}
-    <div class="checkbox">
-      <input {% if question.multiple_correct_answers %} type="checkbox" {% else %} type="radio"
-        name="{{ question.question | urlencode }}" {% endif %} class="option" value="{{ option }}">
-      <span class="label-area">{{ option }}</span>
-    </div>
-    {% endfor %}
-  </div>
-  {% endfor %}
-  <button class="btn btn-secondary hide mb-5" id="try-again">Try Again</button>
-  <button class="btn btn-primary" id="submit">Submit</button>
-  <h4 class="success-message"></h4>
-  <h5 class="score text-muted"></h5>
-</form>
-<script>
-  frappe.ready(() => {
-    $("#submit").click((e) => {
-      e.preventDefault();
-      var result = [];
-      $('.question').each((i, element) => {
-        var options = $(element).find(".option");
-        var answers = [];
-        options.filter((i, op) => $(op).prop("checked")).each((i, elem) => answers.push(elem.value));
-        result.push({
-          "question": element.dataset.question,
-          "answer": answers
-        });
-      });
-      frappe.call({
-        method: "community.lms.doctype.lms_quiz.lms_quiz.submit",
-        args: {
-          quiz: $("#title").text(),
-          result: result
-        },
-        callback: (data) => {
-          $("#submit").addClass("hide");
-          $("#try-again").removeClass("hide");
-          $(":input[type='checkbox']").prop("disabled", true);
-          $(":input[type='radio']").prop("disabled", true);
-          if (data.message == result.length) {
-            $(".success-message").text("Congratulations, you cleared the quiz!");
-          }
-          else {
-            $(".success-message").text("Some of your answers weren't correct. You can give it another shot.");
-          }
-          $(".score").text(`Score: ${data.message}/${result.length}`);
-        }
-      })
-    })
-
-    $("#try-again").click((e) => {
-      e.preventDefault();
-      $("#quiz-form").trigger("reset");
-      $(".success-message").text("");
-      $(".score").text("");
-      $("#submit").removeClass("hide");
-      $("#try-again").addClass("hide");
-    })
-  })
-</script>