diff --git a/cypress.config.js b/cypress.config.js index d93eac9e..ffbf5130 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -13,6 +13,6 @@ module.exports = defineConfig({ openMode: 0, }, e2e: { - baseUrl: "http://test_site_ui:8000", + baseUrl: "http://dd1:8000", }, }); diff --git a/lms/lms/doctype/lms_batch_old/lms_batch_old.py b/lms/lms/doctype/lms_batch_old/lms_batch_old.py index a6ba95e4..07373d1a 100644 --- a/lms/lms/doctype/lms_batch_old/lms_batch_old.py +++ b/lms/lms/doctype/lms_batch_old/lms_batch_old.py @@ -78,9 +78,9 @@ def switch_batch(course_name, email, batch_name): print(f"{email} is already a member of {batch.title}") return - old_batch = frappe.get_doc("LMS Batch Old", membership.batch) + old_batch = frappe.get_doc("LMS Batch Old", membership.batch_old) - membership.batch = batch_name + membership.batch_old = batch_name membership.save() # update exercise submissions @@ -88,5 +88,5 @@ def switch_batch(course_name, email, batch_name): for name in frappe.db.get_all("Exercise Submission", filters=filters, pluck="name"): doc = frappe.get_doc("Exercise Submission", name) print("updating exercise submission", name) - doc.batch = batch_name + doc.batch_old = batch_name doc.save() diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py index 6fc6b169..0e22f237 100644 --- a/lms/lms/doctype/lms_course/lms_course.py +++ b/lms/lms/doctype/lms_course/lms_course.py @@ -130,7 +130,7 @@ class LMSCourse(Document): if mentor: # TODO: optimize this memberships = frappe.db.get_all("LMS Enrollment", {"member": mentor}, ["batch"]) - batch_names = {m.batch for m in memberships} + batch_names = {m.batch_old for m in memberships} return [b for b in batches if b.name in batch_names] def get_cohorts(self): @@ -164,7 +164,7 @@ class LMSCourse(Document): ) for membership in all_memberships: membership.batch_title = frappe.db.get_value( - "LMS Batch Old", membership.batch, "title" + "LMS Batch Old", membership.batch_old, "title" ) return all_memberships diff --git a/lms/lms/doctype/lms_enrollment/lms_enrollment.py b/lms/lms/doctype/lms_enrollment/lms_enrollment.py index 50f36543..25194f95 100644 --- a/lms/lms/doctype/lms_enrollment/lms_enrollment.py +++ b/lms/lms/doctype/lms_enrollment/lms_enrollment.py @@ -51,7 +51,7 @@ class LMSEnrollment(Document): member_name = frappe.db.get_value("User", self.member, "full_name") frappe.throw( _("{0} is already a Student of {1} course through {2} batch").format( - member_name, course, membership.batch + member_name, course, membership.batch_old ) ) diff --git a/lms/lms/doctype/lms_exercise/lms_exercise.py b/lms/lms/doctype/lms_exercise/lms_exercise.py index 2342e383..e43d5a85 100644 --- a/lms/lms/doctype/lms_exercise/lms_exercise.py +++ b/lms/lms/doctype/lms_exercise/lms_exercise.py @@ -43,7 +43,7 @@ class LMSExercise(Document): exercise_title=self.title, course=self.course, lesson=self.lesson, - batch=member.batch, + batch=member.batch_old, solution=code, member=member.name, ) diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 1040706d..d5c65640 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -74,9 +74,9 @@ def get_membership(course, member=None, batch=None): as_dict=True, ) - if membership and membership.batch: + if membership and membership.batch_old: membership.batch_title = frappe.db.get_value( - "LMS Batch Old", membership.batch, "title" + "LMS Batch Old", membership.batch_old, "title" ) return membership diff --git a/lms/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html index e2289342..1fcf2f93 100644 --- a/lms/lms/widgets/CourseCard.html +++ b/lms/lms/widgets/CourseCard.html @@ -1,7 +1,7 @@ {% if frappe.session.user != "Guest" %} {% set membership = frappe.db.get_value("LMS Enrollment", {"member": frappe.session.user, "course": course.name}, - ["name", "course", "batch", "current_lesson", "member_type", "progress"], as_dict=1) %} + ["name", "course", "batch_old", "current_lesson", "member_type", "progress"], as_dict=1) %} {% set progress = frappe.utils.cint(membership.progress) %} {% else %} {% set membership, progress = None, None %} @@ -123,7 +123,7 @@ {% set lesson_index = get_lesson_index(membership.current_lesson) or "1.1" %} - {% set query_parameter = "?batch=" + membership.batch if membership.batch else "" %} + {% set query_parameter = "?batch=" + membership.batch_old if membership.batch_old else "" %} diff --git a/lms/www/batch/join.py b/lms/www/batch/join.py index 3cc95284..06a59766 100644 --- a/lms/www/batch/join.py +++ b/lms/www/batch/join.py @@ -4,8 +4,8 @@ import frappe def get_context(context): context.no_cache = 1 batch_name = frappe.form_dict["batch"] - context.batch = frappe.get_doc("LMS Batch Old", batch_name) - context.already_a_member = context.batch.is_member(frappe.session.user) - context.batch.course_title = frappe.db.get_value( - "LMS Course", context.batch.course, "title" + context.batch_old = frappe.get_doc("LMS Batch Old", batch_name) + context.already_a_member = context.batch_old.is_member(frappe.session.user) + context.batch_old.course_title = frappe.db.get_value( + "LMS Course", context.batch_old.course, "title" ) diff --git a/lms/www/batch/learn.py b/lms/www/batch/learn.py index fae056f7..4f90125b 100644 --- a/lms/www/batch/learn.py +++ b/lms/www/batch/learn.py @@ -72,7 +72,7 @@ def get_context(context): context.page_extensions = get_page_extensions(context) context.page_context = { "course": context.course.name, - "batch": context.batch, + "batch": context.batch_old, "lesson": context.lesson.name if context.lesson.name else "New Lesson", "is_member": context.membership is not None, } diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py index 6ed9ab4b..2666739a 100644 --- a/lms/www/courses/course.py +++ b/lms/www/courses/course.py @@ -85,7 +85,7 @@ def set_course_context(context, course_name): context.course = course membership = get_membership(course.name, frappe.session.user) context.course.query_parameter = ( - "?batch=" + membership.batch if membership and membership.batch else "" + "?batch=" + membership.batch_old if membership and membership.batch_old else "" ) context.membership = membership context.is_instructor = is_instructor(course.name) diff --git a/lms/www/utils.py b/lms/www/utils.py index a99046bc..a33c8341 100644 --- a/lms/www/utils.py +++ b/lms/www/utils.py @@ -27,9 +27,11 @@ def get_common_context(context): membership = get_membership(course.name, frappe.session.user, batch_name) context.membership = membership context.progress = frappe.utils.cint(membership.progress) if membership else 0 - context.batch = membership.batch if membership and membership.batch else None + context.batch_old = ( + membership.batch_old if membership and membership.batch_old else None + ) context.course.query_parameter = ( - "?batch=" + membership.batch if membership and membership.batch else "" + "?batch=" + membership.batch_old if membership and membership.batch_old else "" ) context.livecode_url = get_livecode_url()