feat: access for course creation

lms/www/batch/learn.html

@@ -185,7 +185,9 @@
 
 <div class="mt-4">
     <button class="btn btn-primary btn-sm btn-lesson pull-right ml-2"> {{ _("Save") }} </button>
+    {% if lesson.name %}
     <button class="btn btn-secondary btn-sm pull-right btn-back ml-2"> {{ _("Back to Lesson") }} </button>
+    {% endif %}
     <a class="btn btn-secondary btn-sm pull-right" href="/quizzes"> {{ _("Create a Quiz") }} </a>
 
     <div class="attachments-parent">

lms/www/batch/learn.js

@@ -1,6 +1,6 @@
 frappe.ready(() => {
 
-    localStorage.removeItem($("#quiz-title").text());
+    localStorage.removeItem($("#quiz-title").data("name"));
 
     fetch_assignments();
 
@@ -200,8 +200,9 @@ const move_to_next_lesson = (status, e) => {
 
 const quiz_summary = (e=undefined) => {
     e && e.preventDefault();
-    let quiz_name = $("#quiz-title").text();
+    let quiz_name = $("#quiz-title").data("name");
     let total_questions = $(".question").length;
+
     frappe.call({
         method: "lms.lms.doctype.lms_quiz.lms_quiz.quiz_summary",
         args: {
@@ -230,7 +231,6 @@ const check_answer = (e=undefined) => {
     e && e.preventDefault();
     clearInterval(self.timer);
     $(".timer").addClass("hide");
-    let quiz_name = $("#quiz-title").text();
     let total_questions = $(".question").length;
     let current_index = $(".active-question").attr("data-qt-index");
 
@@ -249,7 +249,7 @@ const check_answer = (e=undefined) => {
         $("#next").removeClass("hide");
     }
     let [answer, is_correct] = parse_options();
-    add_to_local_storage(quiz_name, current_index, answer, is_correct);
+    add_to_local_storage(current_index, answer, is_correct);
 };
 
 
@@ -285,13 +285,16 @@ const add_icon = (element, icon) => {
 };
 
 
-const add_to_local_storage = (quiz_name, current_index, answer, is_correct) => {
+const add_to_local_storage = (current_index, answer, is_correct) => {
+    let quiz_name = $("#quiz-title").data("name")
     let quiz_stored = JSON.parse(localStorage.getItem(quiz_name));
+
     let quiz_obj = {
         "question_index": current_index,
         "answer": answer.join(),
         "is_correct": is_correct
     }
+
     quiz_stored ? quiz_stored.push(quiz_obj) : quiz_stored = [quiz_obj]
     localStorage.setItem(quiz_name, JSON.stringify(quiz_stored))
 };

lms/www/batch/learn.py

@@ -24,16 +24,17 @@ def get_context(context):
 
     context.lesson = get_current_lesson_details(lesson_number, context)
     if not context.lesson:
-        context.lessom = frappe._dict()
+        context.lesson = frappe._dict()
 
     if frappe.form_dict.get("edit"):
         if not is_instructor(context.course.name):
             redirect_to_courses_list()
         context.lesson.edit_mode = True
+    else:
+        neighbours = get_neighbours(lesson_number, context.lessons)
+        context.next_url = get_url(neighbours["next"], context.course)
+        context.prev_url = get_url(neighbours["prev"], context.course)
 
-    neighbours = get_neighbours(lesson_number, context.lessons)
-    context.next_url = get_url(neighbours["next"], context.course)
-    context.prev_url = get_url(neighbours["prev"], context.course)
     meta_info = context.lesson.title + " - " + context.course.title if context.lesson.title else "New Lesson"
     context.metatags = {
         "title": meta_info,
@@ -52,8 +53,13 @@ def get_context(context):
 
 def get_current_lesson_details(lesson_number, context):
     details_list = list(filter(lambda x: cstr(x.number) == lesson_number, context.lessons))
+
     if not len(details_list):
-        redirect_to_lesson(context.course)
+        if frappe.form_dict.get("edit"):
+            return None
+        else:
+            redirect_to_lesson(context.course)
+
     lesson_info = details_list[0]
     lesson_info.body = lesson_info.body.replace("\"", "'")
     return lesson_info

lms/www/courses/course.html

@@ -188,10 +188,13 @@ data-placeholder="Description">{% if course.description %}{{ frappe.utils.md_to_
 {% if course.edit_mode %}
 <div class="my-4">
     <button class="btn btn-primary btn-md btn-save-course">
-        {{ _("Save Course Details") }} </button>
+        {{ _("Save Course Details") }}
+    </button>
+    {% if course.name %}
     <a class="btn btn-secondary btn-md btn-exit-edit ml-2" href="/courses/{{ course.name }}">
         {{ _("Back to Course") }}
     </a>
+    {% endif %}
 </div>
 {% endif %}
 {% endmacro %}

lms/www/courses/index.html

@@ -15,11 +15,7 @@
     </div>
 
     {% else %}
-
-    <div class="course-search-header">
-        {% include "lms/templates/search_course/search_course.html" %}
-        <a class="btn btn-secondary btn-md ml-2" href="/courses/new-course"> {{ _("Create a Course") }} </a>
-    </div>
+    {% include "lms/templates/search_course/search_course.html" %}
 
     <div class="course-list">
       {% set courses = live_courses %}

lms/www/dashboard/index.html

@@ -2,48 +2,48 @@
 {% block title %}{{ _("Dashboard")}}
 {% endblock %}
 
+
 {% block content %}
 {% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
+{% set show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role() %}
+
 <div class="common-page-style dashboard">
-  <div class="container">
-    {% if portal_course_creation %}
-    <a class="button is-default button-links pull-right hide" id="create-course-link" href="/courses/new-course">
-        <svg class="icon icon-sm mr-1"><use href="#icon-add"></use></svg>
-        {{ _("New Course")}}
-    </a>
-    {% endif %}
-    <ul class="nav" id="courses-tab">
-      <li class="nav-item">
-        <a class="nav-link active" data-toggle="tab" href="#courses-enrolled"> {{ _("Courses Enrolled") }} </a>
-      </li>
-      {% if portal_course_creation %}
-      <li class="nav-item">
-        <a class="nav-link" data-toggle="tab" href="#courses-created">{{ _("Courses Created") }}
+    <div class="container">
+
+        {% if show_creators_section %}
+        <a class="btn btn-secondary btn-md pull-right" id="create-course-link" href="/courses/new-course">
+            {{ _("Create a Course")}}
         </a>
-      </li>
-      {% endif %}
-    </ul>
-    <div class="border-bottom mb-4"></div>
-    <div class="tab-content">
-      <div class="tab-pane active" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
-        {% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %}
-      </div>
-      {% if portal_course_creation %}
-      <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
-        {% include "lms/templates/courses_created.html" %}
-      </div>
-      {% endif %}
+        {% endif %}
+
+        <ul class="nav" id="courses-tab">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="tab" href="#courses-enrolled"> {{ _("Courses Enrolled") }} </a>
+            </li>
+            {% if show_creators_section %}
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#courses-created">{{ _("Courses Created") }}
+                </a>
+            </li>
+            {% endif %}
+        </ul>
+
+        <div class="border-bottom mb-4"></div>
+
+        <div class="tab-content">
+            <div class="tab-pane active" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
+                {% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %}
+            </div>
+            {% if show_creators_section %}
+            <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
+                {% include "lms/templates/courses_created.html" %}
+            </div>
+            {% endif %}
+        </div>
+
     </div>
-  </div>
 </div>
+
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-<script>
-    frappe.ready(() => {
-        $('#courses-tab a[data-toggle="tab"]').on('shown.bs.tab', (e) => {
-            let link = $("#create-course-link");
-            $(e.currentTarget).attr("href") == "#courses-created" ? link.removeClass("hide") : link.addClass("hide");
-        });
-    })
-</script>
 {% endblock %}