-
-
- {{ _("Title") }}
-
-
- {{ _("Something Short and Concise") }}
-
+
+ {{ _("Title") }}
@@ -86,6 +81,19 @@
+
+
+
+ {{ _("Instructor Notes") }}
+
+
+ {{ _("These notes will only be visible to the Course Creator, Course Evaluaor and Moderator.") }}
+
+
+ {% if lesson.instructor_notes %}
+ {{ lesson.instructor_notes }}
+ {% endif %}
+
@@ -117,9 +125,9 @@
};
{% endif %}
- {{ include_script('controls.bundle.js') }}
+
{% endblock %}
diff --git a/lms/www/batch/edit.js b/lms/www/batch/edit.js
index dd0ae722..d0efee8b 100644
--- a/lms/www/batch/edit.js
+++ b/lms/www/batch/edit.js
@@ -1,7 +1,15 @@
frappe.ready(() => {
- frappe.telemetry.capture("on_lesson_creation_page", "lms");
let self = this;
this.quiz_in_lesson = [];
+
+ frappe.telemetry.capture("on_lesson_creation_page", "lms");
+
+ if ($("#instructor-notes").length) {
+ frappe.require("controls.bundle.js", () => {
+ make_instructor_notes_component();
+ });
+ }
+
if ($("#current-lesson-content").length) {
parse_string_to_lesson();
}
@@ -18,6 +26,27 @@ const setup_editor = () => {
self.editor = new EditorJS({
holder: "lesson-content",
tools: {
+ embed: {
+ class: Embed,
+ config: {
+ services: {
+ youtube: true,
+ vimeo: true,
+ codepen: true,
+ slides: {
+ regex: /https:\/\/docs\.google\.com\/presentation\/d\/e\/([A-Za-z0-9_-]+)\/pub/,
+ embedUrl:
+ "https://docs.google.com/presentation/d/e/<%= remote_id %>/embed",
+ html: "",
+ },
+ pdf: {
+ regex: /(https?:\/\/.*\.pdf)/,
+ embedUrl: "<%= remote_id %>",
+ html: "",
+ },
+ },
+ },
+ },
header: {
class: Header,
inlineToolbar: ["bold", "italic", "link"],
@@ -76,6 +105,15 @@ const parse_string_to_lesson = () => {
file_url: video,
},
});
+ } else if (block.includes("{{ Embed")) {
+ let embed = block.match(/'([^']+)'/)[1];
+ lesson_blocks.push({
+ type: "embed",
+ data: {
+ service: embed.split("|||")[0],
+ embed: embed.split("|||")[1],
+ },
+ });
} else if (block.includes("![]")) {
let image = block.match(/\((.*?)\)/)[1];
lesson_blocks.push({
@@ -131,6 +169,15 @@ const parse_lesson_to_string = (data) => {
"#".repeat(block.data.level) + ` ${block.data.text}\n`;
} else if (block.type == "paragraph") {
lesson_content += `${block.data.text}\n`;
+ } else if (block.type == "embed") {
+ if (block.data.service == "pdf") {
+ if (!block.data.embed.startsWith(window.location.origin)) {
+ frappe.throw(__("Invalid PDF URL"));
+ }
+ }
+ lesson_content += `{{ Embed("${
+ block.data.service
+ }|||${block.data.embed.replace(/&/g, "&")}") }}\n`;
}
});
save(lesson_content);
@@ -149,6 +196,8 @@ const save = (lesson_content) => {
preview: $("#preview").prop("checked") ? 1 : 0,
idx: $("#lesson-title").data("index"),
lesson: lesson ? lesson : "",
+ instructor_notes:
+ this.instructor_notes.get_values().instructor_notes,
},
callback: (data) => {
frappe.show_alert({
@@ -466,3 +515,20 @@ class Upload {
};
}
}
+
+const make_instructor_notes_component = () => {
+ this.instructor_notes = new frappe.ui.FieldGroup({
+ fields: [
+ {
+ fieldname: "instructor_notes",
+ fieldtype: "Text Editor",
+ default: $("#current-instructor-notes").html(),
+ },
+ ],
+ body: $("#instructor-notes").get(0),
+ });
+ this.instructor_notes.make();
+ $("#instructor-notes .form-section:last").removeClass("empty-section");
+ $("#instructor-notes .frappe-control").removeClass("hide-control");
+ $("#instructor-notes .form-column").addClass("p-0");
+};
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index e368d7b2..d2d778ff 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -149,17 +149,28 @@
{% if show_lesson %}
{% if is_instructor and not lesson.include_in_preview %}
-
+
{{ _("This lesson is not available for preview. As you are the Instructor of the course only you can see it.") }}
×
{% endif %}
+ {% if lesson.instructor_notes and (is_moderator or instructor or is_evaluator) %}
+
+
+ {% endif %}
+
{{ render_html(lesson) }}
{% else %}
{% set course_link = "" + _('here') + "" %}
-
+ {{ _("Instructor Notes") }}
+
+
+ {{ lesson.instructor_notes }}
+
+
+
{{ _("There is no preview available for this lesson.
Please join the course to access it.
Click {0} to enroll.").format(course_link) }}
diff --git a/lms/www/batch/learn.py b/lms/www/batch/learn.py
index ebf2eb31..c1fde031 100644
--- a/lms/www/batch/learn.py
+++ b/lms/www/batch/learn.py
@@ -2,7 +2,12 @@ import frappe
from frappe import _
from frappe.utils import cstr, flt
-from lms.lms.utils import get_lesson_url, has_course_moderator_role, is_instructor
+from lms.lms.utils import (
+ get_lesson_url,
+ has_course_moderator_role,
+ is_instructor,
+ has_course_evaluator_role,
+)
from lms.www.utils import (
get_common_context,
redirect_to_lesson,
@@ -37,20 +42,23 @@ def get_context(context):
redirect_to_lesson(context.course, index_)
context.lesson = get_current_lesson_details(lesson_number, context)
- instructor = is_instructor(context.course.name)
+ context.instructor = is_instructor(context.course.name)
+ context.is_moderator = has_course_moderator_role()
+ context.is_evaluator = has_course_evaluator_role()
context.show_lesson = (
context.membership
or (context.lesson and context.lesson.include_in_preview)
- or instructor
- or has_course_moderator_role()
+ or context.instructor
+ or context.is_moderator
+ or context.is_evaluator
)
if not context.lesson:
context.lesson = frappe._dict()
if frappe.form_dict.get("edit"):
- if not instructor and not has_course_moderator_role():
+ if not context.instructor and not context.is_moderator:
raise frappe.PermissionError(_("You do not have permission to access this page."))
context.lesson.edit_mode = True
else:
diff --git a/lms/www/batches/batch.py b/lms/www/batches/batch.py
index f70823cd..05d7b001 100644
--- a/lms/www/batches/batch.py
+++ b/lms/www/batches/batch.py
@@ -40,6 +40,7 @@ def get_context(context):
"amount",
"currency",
"batch_details",
+ "published",
],
as_dict=True,
)
diff --git a/lms/www/batches/batch_details.py b/lms/www/batches/batch_details.py
index d7d59b61..6707da54 100644
--- a/lms/www/batches/batch_details.py
+++ b/lms/www/batches/batch_details.py
@@ -1,4 +1,5 @@
import frappe
+from frappe import _
from lms.lms.utils import has_course_moderator_role, has_course_evaluator_role
from lms.www.utils import is_student
@@ -23,10 +24,17 @@ def get_context(context):
"start_time",
"end_time",
"seat_count",
+ "published",
],
as_dict=1,
)
+ context.is_moderator = has_course_moderator_role()
+ context.is_evaluator = has_course_evaluator_role()
+
+ if not context.is_moderator and not context.batch_info.published:
+ raise frappe.PermissionError(_("You do not have permission to access this page."))
+
context.courses = frappe.get_all(
"Batch Course",
{"parent": batch_name},
@@ -44,6 +52,4 @@ def get_context(context):
context.student_count = frappe.db.count("Batch Student", {"parent": batch_name})
context.seats_left = context.batch_info.seat_count - context.student_count
- context.is_moderator = has_course_moderator_role()
- context.is_evaluator = has_course_evaluator_role()
context.is_student = is_student(batch_name)
diff --git a/lms/www/batches/index.html b/lms/www/batches/index.html
index bf5f998f..21178371 100644
--- a/lms/www/batches/index.html
+++ b/lms/www/batches/index.html
@@ -7,8 +7,8 @@
{{ Header() }}
- {% if past_batches | length or upcoming_batches | length %}
- {{ BatchTabs(past_batches, upcoming_batches, my_batches) }}
+ {% if past_batches | length or upcoming_batches | length or private_batches | length %}
+ {{ BatchTabs(past_batches, upcoming_batches, private_batches, my_batches) }}
{% else %}
{{ EmptyState() }}
{% endif %}
@@ -27,7 +27,7 @@
{% endmacro %}
-{% macro BatchTabs(past_batches, upcoming_batches, my_batches) %}
+{% macro BatchTabs(past_batches, upcoming_batches, private_batches, my_batches) %}