- {{ _("Schedule") }}
+ {{ _("Timetable") }}
- {% for chapter in flow %}
-
-
+
+
- 
-
-
-
-
- {{ chapter.chapter_title }}
-
-
+ {% for legend in legends %}
+
+
+
{% endmacro %}
@@ -595,4 +551,6 @@
frappe.boot.single_types = []
let courses = {{ course_list | json }};
+
+
{% endblock %}
\ No newline at end of file
diff --git a/lms/www/batches/batch.js b/lms/www/batches/batch.js
index 1fdefaa3..8dfc84a9 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();
@@ -606,3 +624,144 @@ 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;
+ console.log(options);
+ 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) {
+ return `
+
+
{% endfor %}
{{ legend.title }}
+
+
`;
+ },
+ },
+ };
+};
+
+const create_events = (calendar, events, calendar_id) => {
+ let calendar_events = [];
+
+ events.forEach((event, idx) => {
+ 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: get_background_color(event.reference_doctype),
+ 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,
+ },
+ });
+ });
+
+ calendar.createEvents(calendar_events);
+};
+
+const add_links_to_events = (calendar, events) => {
+ calendar.on("clickEvent", ({ event }) => {
+ const el = document.getElementById("clicked-event");
+ 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) => {
+ if (doctype == "Course Lesson") return "var(--blue-400)";
+ if (doctype == "LMS Quiz") return "var(--green-400)";
+ if (doctype == "LMS Assignment") return "var(--orange-400)";
+ if (doctype == "LMS Live Class") return "var(--purple-400)";
+};
diff --git a/lms/www/batches/batch.py b/lms/www/batches/batch.py
index 05d7b001..00aac227 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, get_datetime
from lms.www.utils import get_assessments, is_student
from lms.lms.utils import (
has_course_moderator_role,
@@ -89,7 +89,13 @@ def get_context(context):
)
context.all_assignments = get_all_assignments(batch_name)
context.all_quizzes = get_all_quizzes(batch_name)
- context.flow = get_scheduled_flow(batch_name)
+ context.show_timetable = frappe.db.count(
+ "LMS Batch Timetable",
+ {
+ "parent": batch_name,
+ },
+ )
+ context.legends = get_legends()
def get_all_quizzes(batch_name):
@@ -210,38 +216,6 @@ def sort_students(batch_students):
return batch_students
-def get_scheduled_flow(batch_name):
- chapters = []
-
- lessons = frappe.get_all(
- "Scheduled Flow",
- {"parent": batch_name},
- ["name", "lesson", "date", "start_time", "end_time"],
- order_by="idx",
- )
-
- for lesson in lessons:
- lesson = get_lesson_details(lesson, batch_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, batch_name):
lesson.update(
frappe.db.get_value(
@@ -277,3 +251,24 @@ 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():
+ return [
+ {
+ "title": "Lesson",
+ "color": "var(--blue-400)",
+ },
+ {
+ "title": "Quiz",
+ "color": "var(--green-400)",
+ },
+ {
+ "title": "Assignment",
+ "color": "var(--orange-400)",
+ },
+ {
+ "title": "Live Class",
+ "color": "var(--purple-400)",
+ },
+ ]
diff --git a/lms/www/batches/batch_details.html b/lms/www/batches/batch_details.html
index 5ed9fe76..b1967306 100644
--- a/lms/www/batches/batch_details.html
+++ b/lms/www/batches/batch_details.html
@@ -136,9 +136,9 @@
{% endif %}
${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 %}