fix: import chart lib from website bundle

This commit is contained in:
Jannat Patel
2022-10-17 19:47:11 +05:30
parent 7d029c5305
commit 3c1449c898
6 changed files with 9 additions and 14 deletions

View File

@@ -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;
};

View File

@@ -1,2 +1,3 @@
import "./profile.js"
import "./common_functions.js"
import "../../../../frappe/frappe/public/js/frappe/ui/chart.js"

View File

@@ -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 %}

View File

@@ -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" %}

View File

@@ -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>

View File

@@ -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,