{{ _("You've successfully submitted the assignment. Once the moderator grades your submission, you'll find the details here. Feel free to make edits to your submission if needed.") }}
@@ -73,7 +74,7 @@
{{ assignment.question }}
+
{{ Header() }}
{% if assignments | length %}
{{ AssignmentList(assignments) }}
@@ -32,7 +32,33 @@
{% macro AssignmentList(assignments) %}
-
{% endmacro %}
diff --git a/lms/www/assignments/index.py b/lms/www/assignments/index.py
index 528b92f8..f8d9e3a4 100644
--- a/lms/www/assignments/index.py
+++ b/lms/www/assignments/index.py
@@ -1,10 +1,17 @@
import frappe
+from lms.lms.utils import has_course_moderator_role
def get_context(context):
context.no_cache = 1
+
+ filters = {"owner": frappe.session.user}
+
+ if has_course_moderator_role():
+ filters = {}
+
context.assignments = frappe.get_all(
"LMS Assignment",
- {"owner": frappe.session.user},
+ filters,
["title", "name", "type", "question"],
)
diff --git a/lms/www/batch/edit.html b/lms/www/batch/edit.html
index 6fa88e22..312e060f 100644
--- a/lms/www/batch/edit.html
+++ b/lms/www/batch/edit.html
@@ -66,13 +66,8 @@
{% macro CreateLesson() %}
-
+
+
+
+
+ {% for assignment in assignments %}
+
+
+
+
+
+ {{ _("Title") }}
+
+
+ {{ _("Type") }}
+
+
+
+ {% endfor %}
+
+
+ {{ assignment.title }}
+
+
+
+ {{ assignment.type }}
+
+
-
-
-
{% endmacro %}
{%- block script %}
{{ super() }}
- {% if is_moderator %}
-
- {% endif %}
- {{ include_script('controls.bundle.js') }}
-
+
+
{% endblock %}
diff --git a/lms/www/batch/edit.js b/lms/www/batch/edit.js
index dd0ae722..13010356 100644
--- a/lms/www/batch/edit.js
+++ b/lms/www/batch/edit.js
@@ -1,92 +1,161 @@
frappe.ready(() => {
- frappe.telemetry.capture("on_lesson_creation_page", "lms");
let self = this;
- this.quiz_in_lesson = [];
+ frappe.require("controls.bundle.js");
+ frappe.telemetry.capture("on_lesson_creation_page", "lms");
+
if ($("#current-lesson-content").length) {
- parse_string_to_lesson();
+ parse_string_to_lesson("lesson");
}
- setup_editor();
- fetch_quiz_list();
+ if ($("#current-instructor-notes").length) {
+ parse_string_to_lesson("notes");
+ }
+
+ setup_editor_for_lesson_content();
+ setup_editor_for_instructor_notes();
$("#save-lesson").click((e) => {
save_lesson(e);
});
});
-const setup_editor = () => {
+const setup_editor_for_lesson_content = () => {
self.editor = new EditorJS({
holder: "lesson-content",
- tools: {
- header: {
- class: Header,
- inlineToolbar: ["bold", "italic", "link"],
- config: {
- levels: [4, 5, 6],
- defaultLevel: 5,
- },
- icon: ``,
- },
- paragraph: {
- class: Paragraph,
- inlineToolbar: true,
- config: {
- preserveBlank: true,
- },
- },
- youtube: YouTubeVideo,
- quiz: Quiz,
- upload: Upload,
- },
+ tools: get_tools(),
data: {
- blocks: self.blocks ? self.blocks : [],
+ blocks: self.lesson_blocks || [],
},
});
};
-const parse_string_to_lesson = () => {
- let lesson_content = $("#current-lesson-content").html();
- let lesson_blocks = [];
+const setup_editor_for_instructor_notes = () => {
+ self.instructor_notes_editor = new EditorJS({
+ holder: "instructor-notes",
+ tools: get_tools(),
+ data: {
+ blocks: self.notes_blocks || [],
+ },
+ });
+};
- lesson_content.split("\n").forEach((block) => {
+const get_tools = () => {
+ return {
+ 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: "",
+ },
+ },
+ },
+ },
+ header: {
+ class: Header,
+ inlineToolbar: ["bold", "italic", "link"],
+ config: {
+ levels: [4, 5, 6],
+ defaultLevel: 5,
+ },
+ icon: ``,
+ },
+ paragraph: {
+ class: Paragraph,
+ inlineToolbar: true,
+ config: {
+ preserveBlank: true,
+ },
+ },
+ youtube: YouTubeVideo,
+ quiz: Quiz,
+ upload: Upload,
+ };
+};
+
+const parse_string_to_lesson = (type) => {
+ let content;
+ let blocks = [];
+
+ if (type == "lesson") {
+ content = $("#current-lesson-content").html();
+ } else if (type == "notes") {
+ content = $("#current-instructor-notes").html();
+ }
+
+ content.split("\n").forEach((block) => {
if (block.includes("{{ YouTubeVideo")) {
- let youtube_id = block.match(/'([^']+)'/)[1];
- lesson_blocks.push({
+ let youtube_id = block.match(/\(["']([^"']+?)["']\)/)[1];
+ blocks.push({
type: "youtube",
data: {
youtube: youtube_id,
},
});
} else if (block.includes("{{ Quiz")) {
- let quiz = block.match(/'([^']+)'/)[1];
- this.quiz_in_lesson.push(quiz);
- lesson_blocks.push({
+ let quiz = block.match(/\(["']([^"']+?)["']\)/)[1];
+ blocks.push({
type: "quiz",
data: {
- quiz: [quiz],
+ quiz: quiz,
},
});
} else if (block.includes("{{ Video")) {
- let video = block.match(/'([^']+)'/)[1];
- lesson_blocks.push({
+ let video = block.match(/\(["']([^"']+?)["']\)/)[1];
+ blocks.push({
type: "upload",
data: {
file_url: video,
+ file_type: "video",
+ },
+ });
+ } else if (block.includes("{{ Audio")) {
+ let audio = block.match(/\(["']([^"']+?)["']\)/)[1];
+ blocks.push({
+ type: "upload",
+ data: {
+ file_url: audio,
+ file_type: "audio",
+ },
+ });
+ } else if (block.includes("{{ PDF")) {
+ let pdf = block.match(/\(["']([^"']+?)["']\)/)[1];
+ blocks.push({
+ type: "upload",
+ data: {
+ file_url: pdf,
+ file_type: "pdf",
+ },
+ });
+ } else if (block.includes("{{ Embed")) {
+ let embed = block.match(/\(["']([^"']+?)["']\)/)[1];
+ 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({
+ blocks.push({
type: "upload",
data: {
file_url: image,
+ file_type: "image",
},
});
} else if (block.includes("#")) {
let level = (block.match(/#/g) || []).length;
- lesson_blocks.push({
+ blocks.push({
type: "header",
data: {
text: block.replace(/#/g, "").trim(),
@@ -94,7 +163,7 @@ const parse_string_to_lesson = () => {
},
});
} else {
- lesson_blocks.push({
+ blocks.push({
type: "paragraph",
data: {
text: block,
@@ -103,52 +172,73 @@ const parse_string_to_lesson = () => {
}
});
- this.blocks = lesson_blocks;
+ if (type == "lesson") {
+ this.lesson_blocks = blocks;
+ } else if (type == "notes") {
+ this.notes_blocks = blocks;
+ }
};
const save_lesson = (e) => {
self.editor.save().then((outputData) => {
- parse_lesson_to_string(outputData);
+ parse_content_to_string(outputData, "lesson");
+
+ self.instructor_notes_editor.save().then((outputData) => {
+ parse_content_to_string(outputData, "notes");
+ save();
+ });
});
};
-const parse_lesson_to_string = (data) => {
+const parse_content_to_string = (data, type) => {
let lesson_content = "";
data.blocks.forEach((block) => {
if (block.type == "youtube") {
lesson_content += `{{ YouTubeVideo("${block.data.youtube}") }}\n`;
} else if (block.type == "quiz") {
- block.data.quiz.forEach((quiz) => {
- lesson_content += `{{ Quiz("${quiz}") }}\n`;
- });
+ lesson_content += `{{ Quiz("${block.data.quiz}") }}\n`;
} else if (block.type == "upload") {
let url = block.data.file_url;
- lesson_content += block.data.is_video
- ? `{{ Video("${url}") }}\n`
- : ``;
+ if (block.data.file_type == "video") {
+ lesson_content += `{{ Video("${url}") }}\n`;
+ } else if (block.data.file_type == "audio") {
+ lesson_content += `{{ Audio("${url}") }}\n`;
+ } else if (block.data.file_type == "pdf") {
+ lesson_content += `{{ PDF("${url}") }}\n`;
+ } else {
+ lesson_content += ``;
+ }
} else if (block.type == "header") {
lesson_content +=
"#".repeat(block.data.level) + ` ${block.data.text}\n`;
} else if (block.type == "paragraph") {
lesson_content += `${block.data.text}\n`;
+ } else if (block.type == "embed") {
+ lesson_content += `{{ Embed("${
+ block.data.service
+ }|||${block.data.embed.replace(/&/g, "&")}") }}\n`;
}
});
- save(lesson_content);
+ if (type == "lesson") {
+ this.lesson_content_data = lesson_content;
+ } else if (type == "notes") {
+ this.instructor_notes_data = lesson_content;
+ }
};
-const save = (lesson_content) => {
- validate_mandatory(lesson_content);
+const save = () => {
+ validate_mandatory(this.lesson_content_data);
let lesson = $("#lesson-title").data("lesson");
-
frappe.call({
method: "lms.lms.doctype.lms_course.lms_course.save_lesson",
args: {
title: $("#lesson-title").val(),
- body: lesson_content,
+ body: this.lesson_content_data,
chapter: $("#lesson-title").data("chapter"),
preview: $("#preview").prop("checked") ? 1 : 0,
idx: $("#lesson-title").data("index"),
lesson: lesson ? lesson : "",
+ instructor_notes: this.instructor_notes_data,
},
callback: (data) => {
frappe.show_alert({
@@ -184,19 +274,26 @@ const validate_mandatory = (lesson_content) => {
}
};
-const fetch_quiz_list = () => {
- frappe.call({
- method: "lms.lms.doctype.lms_quiz.lms_quiz.get_user_quizzes",
- callback: (r) => {
- self.quiz_list = r.message;
- },
- });
-};
-
-const is_video = (url) => {
+const get_file_type = (url) => {
let video_types = ["mov", "mp4", "mkv"];
let video_extension = url.split(".").pop();
- return video_types.indexOf(video_extension) >= 0;
+
+ if (video_types.indexOf(video_extension) >= 0) {
+ return "video";
+ }
+
+ let audio_types = ["mp3", "wav", "ogg"];
+ let audio_extension = url.split(".").pop();
+
+ if (audio_types.indexOf(audio_extension) >= 0) {
+ return "audio";
+ }
+
+ if (url.split(".").pop() == "pdf") {
+ return "pdf";
+ }
+
+ return "image";
};
class YouTubeVideo {
@@ -290,57 +387,10 @@ class Quiz {
this.data = data;
}
- get_fields() {
- let fields = [
- {
- fieldname: "start_section",
- fieldtype: "Section Break",
- label: __(
- "To create a new quiz, click on the button below. Once you have created the new quiz you can come back to this lesson and add it from here."
- ),
- },
- {
- fieldname: "create_quiz",
- fieldtype: "Button",
- label: __("Create Quiz"),
- click: () => {
- window.location.href = "/quizzes";
- },
- },
- {
- fieldname: "quiz_information",
- fieldtype: "HTML",
- options: __("OR"),
- },
- {
- fieldname: "quiz_list_section",
- fieldtype: "Section Break",
- label: __("Select a exisitng quiz to add to this lesson."),
- },
- ];
- let break_index = Math.ceil(self.quiz_list.length / 2) + 4;
-
- self.quiz_list.forEach((quiz) => {
- fields.push({
- fieldname: quiz.name,
- fieldtype: "Check",
- label: quiz.title,
- default: self.quiz_in_lesson.includes(quiz.name) ? 1 : 0,
- read_only: self.quiz_in_lesson.includes(quiz.name) ? 1 : 0,
- });
- });
-
- fields.splice(break_index, 0, {
- fieldname: "column_break",
- fieldtype: "Column Break",
- });
- return fields;
- }
-
render() {
this.wrapper = document.createElement("div");
if (this.data && this.data.quiz) {
- $(this.wrapper).html(this.render_quiz());
+ $(this.wrapper).html(this.render_quiz(this.data.quiz));
} else {
this.render_quiz_dialog();
}
@@ -349,16 +399,24 @@ class Quiz {
render_quiz_dialog() {
let me = this;
- let fields = this.get_fields();
let quizdialog = new frappe.ui.Dialog({
title: __("Manage Quiz"),
- fields: fields,
+ fields: [
+ {
+ fieldname: "quiz",
+ fieldtype: "Link",
+ label: __("Quiz"),
+ options: "LMS Quiz",
+ only_select: 1,
+ },
+ ],
primary_action_label: __("Insert"),
primary_action(values) {
- me.analyze_quiz_list(values);
+ me.quiz = values.quiz;
quizdialog.hide();
+ $(me.wrapper).html(me.render_quiz(me.quiz));
},
- secondary_action_label: __("Create New Quiz"),
+ secondary_action_label: __("Create New"),
secondary_action: () => {
window.location.href = `/quizzes`;
},
@@ -370,38 +428,19 @@ class Quiz {
}, 1000);
}
- analyze_quiz_list(values) {
- /* If quiz is selected and is not already in the lesson then render it.*/
-
- this.quiz_to_render = [];
- Object.keys(values).forEach((key) => {
- if (values[key] === 1 && !self.quiz_in_lesson.includes(key)) {
- self.quiz_in_lesson.push(key);
- this.quiz_to_render.push(key);
- }
- });
-
- $(this.wrapper).html(this.render_quiz());
- }
-
- render_quiz() {
- let html = ``;
- let quiz_list = this.data.quiz || this.quiz_to_render;
- quiz_list.forEach((quiz) => {
- html += `
-
{% if batch_info.custom_component %}
- {{ batch_info.custom_component }}
+
{% endmacro %}
@@ -87,8 +88,7 @@
- {{ _("Title") }}
-
-
- {{ _("Something Short and Concise") }}
-
+
+ {{ _("Title") }}
@@ -80,46 +75,60 @@
-
+
+
+
+
+
+
+ {{ _("Instructor Notes") }}
+
+
+ {{ _("These notes will only be visible to the Course Creator, Course Evaluaor and Moderator.") }}
+
+
+
+
+ {% if lesson.instructor_notes %}
+ {{ lesson.instructor_notes }}
+ {% endif %}
+
{{ _("Content") }}
-
+
-
+
+
{{ _("Add your lesson content here") }}
+
+
+
{% if lesson.body %}
- {{ lesson.body }}
+ {{ lesson.body }}
{% endif %}
- Quiz: ${quiz}
-
`;
- });
- return html;
+ render_quiz(quiz) {
+ return `
+ Quiz: ${quiz}
+ `;
}
validate(savedData) {
- return !savedData.quiz || !savedData.quiz.length ? false : true;
+ return !savedData.quiz || !savedData.quiz.trim() ? false : true;
}
save(block_content) {
return {
- quiz: this.data.quiz || this.quiz_to_render,
+ quiz: this.data.quiz || this.quiz,
};
}
}
@@ -435,7 +474,7 @@ class Upload {
folder: "Home/Attachments",
make_attachments_public: true,
restrictions: {
- allowed_file_types: ["image/*", "video/*"],
+ allowed_file_types: ["image/*", "video/*", "audio/*", ".pdf"],
},
on_success: (file_doc) => {
self.file_url = file_doc.file_url;
@@ -445,11 +484,19 @@ class Upload {
}
render_upload(url) {
- this.is_video = is_video(url);
- if (this.is_video) {
- return `
+ {{ batch_info.custom_component }}
+
{% endif %}
- {% if is_student %}
+ {% if settings.show_dashboard and is_student %}
{% endblock %}
@@ -136,9 +137,9 @@
{% endif %}
{{ Dashboard(batch_info, batch_courses, current_student) }}
{% endif %}
+ {% if settings.show_courses %}
{{ CoursesSection(batch_info, batch_courses) }}
+ {% endif %}
- {% if flow | length %}
-
- {{ ScheduleSection(flow) }}
+ {% if show_timetable %}
+
@@ -205,17 +246,19 @@
{% set assessments = current_student.assessments %}
{% set student = current_student %}
-{% if student.name == frappe.session.user %}
-
-{% endif %}
+
+ {{ Timetable() }}
{% endif %}
{% if is_moderator %}
-
- {{ StudentsSection(batch_info, batch_students) }}
-
+ {% if settings.show_students %}
+
+ {{ StudentsSection(batch_info, batch_students) }}
+
+ {% endif %}
-
- {{ AssessmentsSection(batch_info) }}
-
+ {% if settings.show_assessments %}
+
+ {{ AssessmentsSection(batch_info) }}
+
+ {% endif %}
+
+ {% if settings.show_emails %}
+
+ {{ EmailsSection() }}
+
+ {% endif %}
{% endif %}
{% if batch_students | length and (is_moderator or is_student or is_evaluator) %}
-
- {{ Discussions(batch_info) }}
-
+ {% if settings.show_discussions %}
+
+ {{ Discussions(batch_info) }}
+
+ {% endif %}
-
- {{ LiveClassSection(batch_info, live_classes) }}
-
+ {% if settings.show_live_class %}
+
+ {{ LiveClassSection(batch_info, live_classes) }}
+
+ {% endif %}
+ {% endif %}
+
+ {% if custom_tabs_content %}
+ {% include custom_tabs_content %}
{% endif %}
+ {% if student.name == frappe.session.user %}
+
+ {% endif %}
-
-
-
+ {{ BatchDetailsRaw() }}
- {% include "lms/templates/upcoming_evals.html" %}
-
-
- {% include "lms/templates/assessments.html" %}
+
{% endmacro %}
@@ -361,6 +404,41 @@
{% endmacro %}
+
+{% macro EmailsSection() %}
+
+ {% include "lms/templates/upcoming_evals.html" %}
+
+
+ {% include "lms/templates/assessments.html" %}
+
+
+
+
+ {% for email in batch_emails %}
+
+{% endmacro %}
+
+
{% macro AssessmentList(assessments) %}
{% if assessments | length %}
+
+ {% endfor %}
+
+
+
+ {% set member = frappe.db.get_value("User", email.sender, ["full_name", "username", "name", "user_image"], as_dict=1) %}
+ {{ widgets.Avatar(member=member, avatar_class="avatar-small") }}
+
+
+ {{ member.full_name }}
+
+
+
+
+
+
+
+ {{ email.content }}
+
+
@@ -424,7 +502,7 @@
{{ CreateLiveClass(batch_info) }}
{{ LiveClassList(batch_info, live_classes) }}
-
+
{% endmacro %}
@@ -513,86 +591,56 @@
{% endmacro %}
-{% macro ScheduleSection(flow) %}
+{% macro Timetable() %}
- {{ _("Schedule") }}
+ {{ _("Timetable") }}
- {% for chapter in flow %}
-
-
+
+
- 
-
-
-
-
- {{ chapter.chapter_title }}
-
-
+ {% for legend in legends %}
+
+
+
{% endmacro %}
{%- block script %}
{{ super() }}
+ {% if batch_info.custom_script %}
+
+ {% endif %}
+
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/lms/www/batches/batch.js b/lms/www/batches/batch.js
index 1fdefaa3..111c1307 100644
--- a/lms/www/batches/batch.js
+++ b/lms/www/batches/batch.js
@@ -2,6 +2,24 @@ frappe.ready(() => {
let self = this;
frappe.require("controls.bundle.js");
+ if ($("#calendar").length) {
+ setup_timetable();
+ }
+
+ if ($("#calendar").length) {
+ $(document).on("click", "#prev-week", (e) => {
+ this.calendar_ && this.calendar_.prev();
+ set_calendar_range(this.calendar_, this.events);
+ });
+ }
+
+ if ($("#calendar").length) {
+ $(document).on("click", "#next-week", (e) => {
+ this.calendar_ && this.calendar_.next();
+ set_calendar_range(this.calendar_, this.events);
+ });
+ }
+
if ($("#live-class-form").length) {
setTimeout(() => {
make_live_class_form();
@@ -45,6 +63,10 @@ frappe.ready(() => {
$(document).on("click", ".slot", (e) => {
mark_active_slot(e);
});
+
+ $(".btn-email").click((e) => {
+ email_to_students();
+ });
});
const create_live_class = (e) => {
@@ -495,6 +517,10 @@ const open_evaluation_form = (e) => {
},
filter_description: " ",
only_select: 1,
+ change: () => {
+ this.eval_form.set_value("date", "");
+ $("[data-fieldname='slots']").html("");
+ },
},
{
fieldtype: "Date",
@@ -505,7 +531,7 @@ const open_evaluation_form = (e) => {
frappe.datetime.add_days(frappe.datetime.get_today(), 1)
),
change: () => {
- get_slots();
+ if (this.eval_form.get_value("date")) get_slots();
},
},
{
@@ -530,7 +556,7 @@ const get_slots = () => {
args: {
course: this.eval_form.get_value("course"),
date: this.eval_form.get_value("date"),
- batch_name: $(".class-details").data("batch"),
+ batch: $(".class-details").data("batch"),
},
callback: (r) => {
if (r.message) {
@@ -606,3 +632,246 @@ const submit_evaluation_form = (values) => {
},
});
};
+
+const setup_timetable = () => {
+ let self = this;
+ frappe.call({
+ method: "lms.lms.doctype.lms_batch.lms_batch.get_batch_timetable",
+ args: {
+ batch: $(".class-details").data("batch"),
+ },
+ callback: (r) => {
+ if (r.message.length) {
+ setup_calendar(r.message);
+ self.events = r.message;
+ }
+ },
+ });
+};
+
+const setup_calendar = (events) => {
+ const element = $("#calendar");
+ const Calendar = tui.Calendar;
+ const calendar_id = "calendar1";
+ const container = element[0];
+ const options = get_calendar_options(element, calendar_id);
+ const calendar = new Calendar(container, options);
+ this.calendar_ = calendar;
+
+ create_events(calendar, events);
+ add_links_to_events(calendar, events);
+ scroll_to_date(calendar, events);
+ set_calendar_range(calendar, events);
+};
+
+const get_calendar_options = (element, calendar_id) => {
+ const start_time = element.data("start");
+ const end_time = element.data("end");
+
+ return {
+ defaultView: "week",
+ usageStatistics: false,
+ week: {
+ narrowWeekend: true,
+ hourStart: parseInt(start_time.split(":")[0]) - 1,
+ /* hourEnd: parseInt(end_time.split(":")[0]) + 1, */
+ },
+ month: {
+ narrowWeekend: true,
+ },
+ taskView: false,
+ isReadOnly: true,
+ calendars: [
+ {
+ id: calendar_id,
+ name: "Timetable",
+ backgroundColor: "var(--fg-color)",
+ },
+ ],
+ template: {
+ time: function (event) {
+ let hide = event.raw.completed ? "" : "hide";
+ return `
+
+
{% endfor %}
{{ legend.label }}
+
+ 
+
`;
+ },
+ },
+ };
+};
+
+const create_events = (calendar, events, calendar_id) => {
+ let calendar_events = [];
+ events.forEach((event, idx) => {
+ let clr = get_background_color(event.reference_doctype);
+ calendar_events.push({
+ id: `event${idx}`,
+ calendarId: calendar_id,
+ title: event.title,
+ start: `${event.date}T${event.start_time}`,
+ end: `${event.date}T${event.end_time}`,
+ isAllday: event.start_time ? false : true,
+ borderColor: clr,
+ backgroundColor: "var(--fg-color)",
+ customStyle: {
+ borderRadius: "var(--border-radius-md)",
+ boxShadow: "var(--shadow-base)",
+ borderWidth: "8px",
+ padding: "0.25rem 0.5rem 0.5rem",
+ },
+ raw: {
+ url: event.url,
+ milestone: event.milestone,
+ name: event.name,
+ idx: event.idx,
+ parent: event.parent,
+ completed: event.completed,
+ },
+ });
+ });
+
+ calendar.createEvents(calendar_events);
+};
+
+const add_links_to_events = (calendar) => {
+ calendar.on("clickEvent", ({ event }) => {
+ let event_date = event.start.d.d;
+ event_date = moment(event_date).format("YYYY-MM-DD");
+
+ let current_date = moment().format("YYYY-MM-DD");
+
+ if (!moment(event_date).isSameOrBefore(current_date) && !allow_future)
+ return;
+
+ if (event.raw.milestone) {
+ frappe.call({
+ method: "lms.lms.doctype.lms_batch.lms_batch.is_milestone_complete",
+ args: {
+ idx: event.raw.idx,
+ batch: event.raw.parent,
+ },
+ callback: (data) => {
+ if (data.message) window.open(event.raw.url, "_blank");
+ else
+ frappe.show_alert({
+ message:
+ "Please complete all previous activities to proceed.",
+ indicator: "red",
+ });
+ },
+ });
+ } else window.open(event.raw.url, "_blank");
+ });
+};
+
+const scroll_to_date = (calendar, events) => {
+ if (
+ new Date() < new Date(events[0].date) ||
+ new Date() > new Date(events.slice(-1).date)
+ ) {
+ calendar.setDate(new Date(events[0].date));
+ }
+};
+
+const set_calendar_range = (calendar, events) => {
+ let week_start = moment(calendar.getDateRangeStart().d.d);
+ let week_end = moment(calendar.getDateRangeEnd().d.d);
+
+ $(".calendar-range").text(
+ `${moment(week_start).format("DD MMMM YYYY")} - ${moment(
+ week_end
+ ).format("DD MMMM YYYY")}`
+ );
+
+ if (week_start.diff(moment(events[0].date), "days") <= 0)
+ $("#prev-week").hide();
+ else $("#prev-week").show();
+
+ if (week_end.diff(moment(events.slice(-1)[0].date), "days") > 0)
+ $("#next-week").hide();
+ else $("#next-week").show();
+};
+
+const get_background_color = (doctype) => {
+ const match = legends.filter((legend) => {
+ return legend.reference_doctype == doctype;
+ });
+ if (match.length) return match[0].color;
+};
+
+const email_to_students = () => {
+ this.email_dialog = new frappe.ui.Dialog({
+ title: __("Email to Students"),
+ fields: [
+ {
+ fieldtype: "Data",
+ fieldname: "subject",
+ label: __("Subject"),
+ reqd: 1,
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "reply_to",
+ label: __("Reply To"),
+ reqd: 0,
+ },
+ {
+ fieldtype: "Text Editor",
+ fieldname: "message",
+ label: __("Message"),
+ reqd: 1,
+ max_height: 100,
+ min_lines: 5,
+ },
+ ],
+ primary_action: (values) => {
+ send_email(values);
+ },
+ });
+ this.email_dialog.show();
+};
+
+const send_email = (values) => {
+ frappe.call({
+ method: "frappe.client.get_list",
+ args: {
+ doctype: "Batch Student",
+ parent: "LMS Batch",
+ fields: ["student"],
+ filters: {
+ parent: $(".class-details").data("batch"),
+ },
+ },
+ callback: (data) => {
+ send_email_to_students(data.message, values);
+ },
+ });
+};
+
+const send_email_to_students = (students, values) => {
+ students = students.map((row) => row.student);
+ frappe.call({
+ method: "frappe.core.doctype.communication.email.make",
+ args: {
+ recipients: students.join(", "),
+ cc: values.reply_to,
+ subject: values.subject,
+ content: values.message,
+ doctype: "LMS Batch",
+ name: $(".class-details").data("batch"),
+ send_email: 1,
+ },
+ callback: (r) => {
+ this.email_dialog.hide();
+ frappe.show_alert({
+ message: __("Email sent successfully"),
+ indicator: "green",
+ });
+ setTimeout(() => {
+ window.location.reload();
+ }, 2000);
+ },
+ });
+};
diff --git a/lms/www/batches/batch.py b/lms/www/batches/batch.py
index 83fac64a..ab339e15 100644
--- a/lms/www/batches/batch.py
+++ b/lms/www/batches/batch.py
@@ -1,6 +1,6 @@
from frappe import _
import frappe
-from frappe.utils import getdate, cint
+from frappe.utils import getdate
from lms.www.utils import get_assessments, is_student
from lms.lms.utils import (
has_course_moderator_role,
@@ -17,13 +17,13 @@ from lms.lms.utils import (
def get_context(context):
context.no_cache = 1
- class_name = frappe.form_dict["batchname"]
+ batch_name = frappe.form_dict["batchname"]
context.is_moderator = has_course_moderator_role()
context.is_evaluator = has_course_evaluator_role()
context.batch_info = frappe.db.get_value(
"LMS Batch",
- class_name,
+ batch_name,
[
"name",
"title",
@@ -32,6 +32,7 @@ def get_context(context):
"description",
"medium",
"custom_component",
+ "custom_script",
"seat_count",
"start_time",
"end_time",
@@ -40,25 +41,27 @@ def get_context(context):
"amount",
"currency",
"batch_details",
+ "published",
+ "allow_future",
],
as_dict=True,
)
context.reference_doctype = "LMS Batch"
- context.reference_name = class_name
+ context.reference_name = batch_name
batch_courses = frappe.get_all(
"Batch Course",
- {"parent": class_name},
+ {"parent": batch_name},
["name", "course", "title"],
- order_by="creation desc",
+ order_by="idx",
)
batch_students = frappe.get_all(
"Batch Student",
- {"parent": class_name},
+ {"parent": batch_name},
["name", "student", "student_name", "username"],
- order_by="creation desc",
+ order_by="idx",
)
context.batch_courses = get_class_course_details(batch_courses)
@@ -67,31 +70,51 @@ def get_context(context):
"LMS Course", fields=["name", "title"], limit_page_length=0
)
context.course_name_list = [course.course for course in context.batch_courses]
- context.assessments = get_assessments(class_name)
+ context.assessments = get_assessments(batch_name)
+ context.batch_emails = frappe.get_all(
+ "Communication",
+ filters={"reference_doctype": "LMS Batch", "reference_name": batch_name},
+ fields=["subject", "content", "recipients", "cc", "communication_date", "sender"],
+ order_by="communication_date desc",
+ )
+
context.batch_students = get_class_student_details(
batch_students, batch_courses, context.assessments
)
- context.is_student = is_student(class_name)
+ context.is_student = is_student(batch_name)
if not context.is_student and not context.is_moderator and not context.is_evaluator:
raise frappe.PermissionError(_("You don't have permission to access this page."))
context.live_classes = frappe.get_all(
"LMS Live Class",
- {"class_name": class_name, "date": [">=", getdate()]},
+ {"batch_name": batch_name, "date": [">=", getdate()]},
["title", "description", "time", "date", "start_url", "join_url", "owner"],
order_by="date",
)
context.current_student = (
- get_current_student_details(batch_courses, class_name) if context.is_student else None
+ get_current_student_details(batch_courses, batch_name) if context.is_student else None
)
- context.all_assignments = get_all_assignments(class_name)
- context.all_quizzes = get_all_quizzes(class_name)
- context.flow = get_scheduled_flow(class_name)
+ context.all_assignments = get_all_assignments(batch_name)
+ context.all_quizzes = get_all_quizzes(batch_name)
+ context.show_timetable = frappe.db.count(
+ "LMS Batch Timetable",
+ {
+ "parent": batch_name,
+ },
+ )
+ context.legends = get_legends(batch_name)
+ context.settings = frappe.get_single("LMS Settings")
+
+ custom_tabs = frappe.get_hooks("lms_batch_tabs")
+ if custom_tabs:
+ context.custom_tabs_header = custom_tabs.get("header_html")[0]
+ context.custom_tabs_content = custom_tabs.get("content_html")[0]
+ context.update(frappe.get_attr(custom_tabs.get("context")[0])())
-def get_all_quizzes(class_name):
+def get_all_quizzes(batch_name):
filters = {} if has_course_moderator_role() else {"owner": frappe.session.user}
all_quizzes = frappe.get_all("LMS Quiz", filters, ["name", "title"])
for quiz in all_quizzes:
@@ -100,13 +123,13 @@ def get_all_quizzes(class_name):
"doctype": "LMS Assessment",
"assessment_type": "LMS Quiz",
"assessment_name": quiz.name,
- "parent": class_name,
+ "parent": batch_name,
}
)
return all_quizzes
-def get_all_assignments(class_name):
+def get_all_assignments(batch_name):
filters = {} if has_course_moderator_role() else {"owner": frappe.session.user}
all_assignments = frappe.get_all("LMS Assignment", filters, ["name", "title"])
for assignment in all_assignments:
@@ -115,7 +138,7 @@ def get_all_assignments(class_name):
"doctype": "LMS Assessment",
"assessment_type": "LMS Assignment",
"assessment_name": assignment.name,
- "parent": class_name,
+ "parent": batch_name,
}
)
return all_assignments
@@ -209,39 +232,7 @@ def sort_students(batch_students):
return batch_students
-def get_scheduled_flow(class_name):
- chapters = []
-
- lessons = frappe.get_all(
- "Scheduled Flow",
- {"parent": class_name},
- ["name", "lesson", "date", "start_time", "end_time"],
- order_by="idx",
- )
-
- for lesson in lessons:
- lesson = get_lesson_details(lesson, class_name)
- chapter_exists = [
- chapter for chapter in chapters if chapter.chapter == lesson.chapter
- ]
-
- if len(chapter_exists) == 0:
- chapters.append(
- frappe._dict(
- {
- "chapter": lesson.chapter,
- "chapter_title": frappe.db.get_value("Course Chapter", lesson.chapter, "title"),
- "lessons": [lesson],
- }
- )
- )
- else:
- chapter_exists[0]["lessons"].append(lesson)
-
- return chapters
-
-
-def get_lesson_details(lesson, class_name):
+def get_lesson_details(lesson, batch_name):
lesson.update(
frappe.db.get_value(
"Course Lesson",
@@ -251,19 +242,19 @@ def get_lesson_details(lesson, class_name):
)
)
lesson.index = get_lesson_index(lesson.lesson)
- lesson.url = get_lesson_url(lesson.course, lesson.index) + "?class=" + class_name
+ lesson.url = get_lesson_url(lesson.course, lesson.index) + "?class=" + batch_name
lesson.icon = get_lesson_icon(lesson.body)
return lesson
-def get_current_student_details(batch_courses, class_name):
+def get_current_student_details(batch_courses, batch_name):
student_details = frappe._dict()
student_details.courses = frappe._dict()
course_list = [course.course for course in batch_courses]
get_course_progress(batch_courses, student_details)
student_details.name = frappe.session.user
- student_details.assessments = get_assessments(class_name, frappe.session.user)
+ student_details.assessments = get_assessments(batch_name, frappe.session.user)
student_details.upcoming_evals = get_upcoming_evals(frappe.session.user, course_list)
return student_details
@@ -276,3 +267,11 @@ def get_course_progress(batch_courses, student_details):
student_details.courses[course.course] = membership.progress
else:
student_details.courses[course.course] = 0
+
+
+def get_legends(batch):
+ return frappe.get_all(
+ "LMS Timetable Legend",
+ filters={"parenttype": "LMS Batch", "parent": batch},
+ fields=["reference_doctype", "color", "label"],
+ )
diff --git a/lms/www/batches/batch_details.html b/lms/www/batches/batch_details.html
index 1787a2da..9fd5c93e 100644
--- a/lms/www/batches/batch_details.html
+++ b/lms/www/batches/batch_details.html
@@ -14,6 +14,7 @@
{{ CourseList(courses) }}
+ ${frappe.datetime.get_time(event.start.d.d)} -
+ ${frappe.datetime.get_time(event.end.d.d)}
+ ${event.title}
+
- {% if is_moderator or is_evaluator or is_student %}
+ {% if is_moderator or is_evaluator %}
- {{ _("Checkout Batch") }}
+ {{ _("Manage Batch") }}
{% elif batch_info.paid_batch %}
