fix: renamed class to batch for live classes

This commit is contained in:
Jannat Patel
2023-09-04 23:18:45 +05:30
parent db408b21d2
commit 07276f5c17
2 changed files with 26 additions and 23 deletions

View File

@@ -17,13 +17,13 @@ from lms.lms.utils import (
def get_context(context): def get_context(context):
context.no_cache = 1 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_moderator = has_course_moderator_role()
context.is_evaluator = has_course_evaluator_role() context.is_evaluator = has_course_evaluator_role()
context.batch_info = frappe.db.get_value( context.batch_info = frappe.db.get_value(
"LMS Batch", "LMS Batch",
class_name, batch_name,
[ [
"name", "name",
"title", "title",
@@ -45,18 +45,18 @@ def get_context(context):
) )
context.reference_doctype = "LMS Batch" context.reference_doctype = "LMS Batch"
context.reference_name = class_name context.reference_name = batch_name
batch_courses = frappe.get_all( batch_courses = frappe.get_all(
"Batch Course", "Batch Course",
{"parent": class_name}, {"parent": batch_name},
["name", "course", "title"], ["name", "course", "title"],
order_by="creation desc", order_by="creation desc",
) )
batch_students = frappe.get_all( batch_students = frappe.get_all(
"Batch Student", "Batch Student",
{"parent": class_name}, {"parent": batch_name},
["name", "student", "student_name", "username"], ["name", "student", "student_name", "username"],
order_by="creation desc", order_by="creation desc",
) )
@@ -67,31 +67,31 @@ def get_context(context):
"LMS Course", fields=["name", "title"], limit_page_length=0 "LMS Course", fields=["name", "title"], limit_page_length=0
) )
context.course_name_list = [course.course for course in context.batch_courses] 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_students = get_class_student_details( context.batch_students = get_class_student_details(
batch_students, batch_courses, context.assessments 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: 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.")) raise frappe.PermissionError(_("You don't have permission to access this page."))
context.live_classes = frappe.get_all( context.live_classes = frappe.get_all(
"LMS Live Class", "LMS Live Class",
{"class_name": class_name, "date": [">=", getdate()]}, {"batch_name": batch_name, "date": [">=", getdate()]},
["title", "description", "time", "date", "start_url", "join_url", "owner"], ["title", "description", "time", "date", "start_url", "join_url", "owner"],
order_by="date", order_by="date",
) )
context.current_student = ( 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_assignments = get_all_assignments(batch_name)
context.all_quizzes = get_all_quizzes(class_name) context.all_quizzes = get_all_quizzes(batch_name)
context.flow = get_scheduled_flow(class_name) context.flow = get_scheduled_flow(batch_name)
def get_all_quizzes(class_name): def get_all_quizzes(batch_name):
filters = {} if has_course_moderator_role() else {"owner": frappe.session.user} filters = {} if has_course_moderator_role() else {"owner": frappe.session.user}
all_quizzes = frappe.get_all("LMS Quiz", filters, ["name", "title"]) all_quizzes = frappe.get_all("LMS Quiz", filters, ["name", "title"])
for quiz in all_quizzes: for quiz in all_quizzes:
@@ -100,13 +100,13 @@ def get_all_quizzes(class_name):
"doctype": "LMS Assessment", "doctype": "LMS Assessment",
"assessment_type": "LMS Quiz", "assessment_type": "LMS Quiz",
"assessment_name": quiz.name, "assessment_name": quiz.name,
"parent": class_name, "parent": batch_name,
} }
) )
return all_quizzes 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} filters = {} if has_course_moderator_role() else {"owner": frappe.session.user}
all_assignments = frappe.get_all("LMS Assignment", filters, ["name", "title"]) all_assignments = frappe.get_all("LMS Assignment", filters, ["name", "title"])
for assignment in all_assignments: for assignment in all_assignments:
@@ -115,7 +115,7 @@ def get_all_assignments(class_name):
"doctype": "LMS Assessment", "doctype": "LMS Assessment",
"assessment_type": "LMS Assignment", "assessment_type": "LMS Assignment",
"assessment_name": assignment.name, "assessment_name": assignment.name,
"parent": class_name, "parent": batch_name,
} }
) )
return all_assignments return all_assignments
@@ -209,18 +209,18 @@ def sort_students(batch_students):
return batch_students return batch_students
def get_scheduled_flow(class_name): def get_scheduled_flow(batch_name):
chapters = [] chapters = []
lessons = frappe.get_all( lessons = frappe.get_all(
"Scheduled Flow", "Scheduled Flow",
{"parent": class_name}, {"parent": batch_name},
["name", "lesson", "date", "start_time", "end_time"], ["name", "lesson", "date", "start_time", "end_time"],
order_by="idx", order_by="idx",
) )
for lesson in lessons: for lesson in lessons:
lesson = get_lesson_details(lesson, class_name) lesson = get_lesson_details(lesson, batch_name)
chapter_exists = [ chapter_exists = [
chapter for chapter in chapters if chapter.chapter == lesson.chapter chapter for chapter in chapters if chapter.chapter == lesson.chapter
] ]
@@ -241,7 +241,7 @@ def get_scheduled_flow(class_name):
return chapters return chapters
def get_lesson_details(lesson, class_name): def get_lesson_details(lesson, batch_name):
lesson.update( lesson.update(
frappe.db.get_value( frappe.db.get_value(
"Course Lesson", "Course Lesson",
@@ -251,19 +251,19 @@ def get_lesson_details(lesson, class_name):
) )
) )
lesson.index = get_lesson_index(lesson.lesson) 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) lesson.icon = get_lesson_icon(lesson.body)
return lesson 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 = frappe._dict()
student_details.courses = frappe._dict() student_details.courses = frappe._dict()
course_list = [course.course for course in batch_courses] course_list = [course.course for course in batch_courses]
get_course_progress(batch_courses, student_details) get_course_progress(batch_courses, student_details)
student_details.name = frappe.session.user 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) student_details.upcoming_evals = get_upcoming_evals(frappe.session.user, course_list)
return student_details return student_details

View File

@@ -48,6 +48,9 @@ const show_course_modal = (e) => {
}, },
}); });
course_modal.show(); course_modal.show();
setTimeout(() => {
$(".modal-body").css("min-height", "300px");
}, 1000);
}; };
const add_course = (values, course_name) => { const add_course = (values, course_name) => {