From 3c1449c89890020262e5fe36070281eb1be7b320 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 17 Oct 2022 19:47:11 +0530
Subject: [PATCH] fix: import chart lib from website bundle

---
 lms/public/js/common_functions.js  | 9 ++-------
 lms/public/js/website.bundle.js    | 1 +
 lms/templates/courses_created.html | 4 ++--
 lms/www/batch/learn.html           | 3 +--
 lms/www/courses/course.html        | 4 ++--
 lms/www/courses/index.js           | 2 +-
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js
index 88fa7aec..c8815f85 100644
--- a/lms/public/js/common_functions.js
+++ b/lms/public/js/common_functions.js
@@ -1,6 +1,6 @@
 frappe.ready(() => {
 
-    setup_vue_and_file_size();
+    setup_file_size();
 
     $(".join-batch").click((e) => {
         join_course(e);
@@ -21,12 +21,7 @@ frappe.ready(() => {
 });
 
 
-const setup_vue_and_file_size = () => {
-    frappe.require("/assets/frappe/node_modules/vue/dist/vue.js", () => {
-        Vue.prototype.__ = window.__;
-        Vue.prototype.frappe = window.frappe;
-    });
-
+const setup_file_size = () => {
     frappe.provide("frappe.form.formatters");
     frappe.form.formatters.FileSize = file_size;
 };
diff --git a/lms/public/js/website.bundle.js b/lms/public/js/website.bundle.js
index 628957f6..d32bbaa5 100644
--- a/lms/public/js/website.bundle.js
+++ b/lms/public/js/website.bundle.js
@@ -1,2 +1,3 @@
 import "./profile.js"
 import "./common_functions.js"
+import "../../../../frappe/frappe/public/js/frappe/ui/chart.js"
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index 1bcc0d4a..2711bc02 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -1,4 +1,4 @@
-{% set courses = get_authored_courses(user or None, only_published or False) %}
+{% set courses = courses_created if courses_created else get_authored_courses(user or None, only_published or False) %}
 
 {% if courses | length %}
 <div class="cards-parent">
@@ -12,7 +12,7 @@
     <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
     <div class="empty-state-text">
         <div class="empty-state-heading">{{ _("No courses created") }}</div>
-        <div class="course-meta">{{ _("Help others learn something new.") }}</div>
+        <div class="course-meta">{{ _("Help others learn something new by creating a course.") }}</div>
     </div>
 </div>
 {% endif %}
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index 1dd123d3..c3249a85 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -255,8 +255,7 @@
         "reference_doctype": "Course Lesson",
         "reference_docname": lesson.name
     }) %}
-    {% set is_instructor = frappe.session.user == course.instructor %}
-    {% set condition = is_instructor if is_instructor else membership %}
+    {% set condition = is_instructor(course.name) or membership %}
     {% set doctype, docname = _("Course Lesson"), lesson.name %}
     {% set title = "Questions" if topics_count else "" %}
     {% set cta_title = "Ask a Question" %}
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index 0cc4c4e1..1af64182 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -293,12 +293,12 @@
     membership.current_lesson else "1.1" if first_lesson_exists(course.name) else None %}
 
     {% if show_start_learing_cta(course, membership) %}
-    <div class="btn btn-primary wide-button join-batch mb-2" data-course="{{ course.name | urlencode }}">
+    <div class="btn btn-primary wide-button join-batch" data-course="{{ course.name | urlencode }}">
         {{ _("Start Learning") }}
     </div>
 
     {% elif is_instructor(course.name) and not course.published and course.status != "Under Review" %}
-    <div class="btn btn-primary wide-button mb-2" id="submit-for-review" data-course="{{ course.name | urlencode }}">
+    <div class="btn btn-primary wide-button" id="submit-for-review" data-course="{{ course.name | urlencode }}">
         {{ _("Submit for Review") }}
     </div>
 
diff --git a/lms/www/courses/index.js b/lms/www/courses/index.js
index d265d68b..7fccbce9 100644
--- a/lms/www/courses/index.js
+++ b/lms/www/courses/index.js
@@ -26,7 +26,7 @@ const generate_graph = (chart_name) => {
 
 
 const render_chart = (data, chart_name) => {
-    let dom_element = chart_name == "Course Enrollments" ? "#course-enrollments" : "#new-signups"
+    let dom_element = chart_name == "Course Enrollments" ? "#course-enrollments" : "#new-signups";
     const chart = new frappe.Chart(dom_element, {
         title: chart_name,
         data: data,