eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: replaced instances of batch to batch_old

Browse Source
This commit is contained in:
Jannat Patel
2023-08-26 15:28:03 +05:30
parent 12b3d16662
commit 09dbe0fed7
11 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cypress.config.js
View File

@@ -13,6 +13,6 @@ module.exports = defineConfig({
openMode: 0, openMode: 0,
}, },
e2e: { e2e: {
baseUrl: "http://test_site_ui:8000", baseUrl: "http://dd1:8000",
}, },
}); });

6
lms/lms/doctype/lms_batch_old/lms_batch_old.py
View File

@@ -78,9 +78,9 @@ def switch_batch(course_name, email, batch_name):
print(f"{email} is already a member of {batch.title}") print(f"{email} is already a member of {batch.title}")
return 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() membership.save()
# update exercise submissions # 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"): for name in frappe.db.get_all("Exercise Submission", filters=filters, pluck="name"):
doc = frappe.get_doc("Exercise Submission", name) doc = frappe.get_doc("Exercise Submission", name)
print("updating exercise submission", name) print("updating exercise submission", name)
doc.batch = batch_name doc.batch_old = batch_name
doc.save() doc.save()

4
lms/lms/doctype/lms_course/lms_course.py
View File

@@ -130,7 +130,7 @@ class LMSCourse(Document):
if mentor: if mentor:
# TODO: optimize this # TODO: optimize this
memberships = frappe.db.get_all("LMS Enrollment", {"member": mentor}, ["batch"]) 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] return [b for b in batches if b.name in batch_names]
def get_cohorts(self): def get_cohorts(self):
@@ -164,7 +164,7 @@ class LMSCourse(Document):
) )
for membership in all_memberships: for membership in all_memberships:
membership.batch_title = frappe.db.get_value( membership.batch_title = frappe.db.get_value(
"LMS Batch Old", membership.batch, "title" "LMS Batch Old", membership.batch_old, "title"
) )
return all_memberships return all_memberships

2
lms/lms/doctype/lms_enrollment/lms_enrollment.py
View File

@@ -51,7 +51,7 @@ class LMSEnrollment(Document):
member_name = frappe.db.get_value("User", self.member, "full_name") member_name = frappe.db.get_value("User", self.member, "full_name")
frappe.throw( frappe.throw(
_("{0} is already a Student of {1} course through {2} batch").format( _("{0} is already a Student of {1} course through {2} batch").format(
member_name, course, membership.batch member_name, course, membership.batch_old
) )
) )

2
lms/lms/doctype/lms_exercise/lms_exercise.py
View File

@@ -43,7 +43,7 @@ class LMSExercise(Document):
exercise_title=self.title, exercise_title=self.title,
course=self.course, course=self.course,
lesson=self.lesson, lesson=self.lesson,
batch=member.batch, batch=member.batch_old,
solution=code, solution=code,
member=member.name, member=member.name,
) )

4
lms/lms/utils.py
View File

@@ -74,9 +74,9 @@ def get_membership(course, member=None, batch=None):
as_dict=True, as_dict=True,
) )
if membership and membership.batch: if membership and membership.batch_old:
membership.batch_title = frappe.db.get_value( membership.batch_title = frappe.db.get_value(
"LMS Batch Old", membership.batch, "title" "LMS Batch Old", membership.batch_old, "title"
) )
return membership return membership

4
lms/lms/widgets/CourseCard.html
View File

@@ -1,7 +1,7 @@
{% if frappe.session.user != "Guest" %} {% if frappe.session.user != "Guest" %}
{% set membership = frappe.db.get_value("LMS Enrollment", {% set membership = frappe.db.get_value("LMS Enrollment",
{"member": frappe.session.user, "course": course.name}, {"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) %} {% set progress = frappe.utils.cint(membership.progress) %}
{% else %} {% else %}
{% set membership, progress = None, None %} {% set membership, progress = None, None %}
@@ -123,7 +123,7 @@
{% set lesson_index = get_lesson_index(membership.current_lesson) or "1.1" %} {% 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 "" %}
<a class="stretched-link" href="{{ get_lesson_url(course.name, lesson_index) }}{{ query_parameter }}"></a> <a class="stretched-link" href="{{ get_lesson_url(course.name, lesson_index) }}{{ query_parameter }}"></a>

8
lms/www/batch/join.py
View File

@@ -4,8 +4,8 @@ import frappe
def get_context(context): def get_context(context):
context.no_cache = 1 context.no_cache = 1
batch_name = frappe.form_dict["batch"] batch_name = frappe.form_dict["batch"]
context.batch = frappe.get_doc("LMS Batch Old", batch_name) context.batch_old = frappe.get_doc("LMS Batch Old", batch_name)
context.already_a_member = context.batch.is_member(frappe.session.user) context.already_a_member = context.batch_old.is_member(frappe.session.user)
context.batch.course_title = frappe.db.get_value( context.batch_old.course_title = frappe.db.get_value(
"LMS Course", context.batch.course, "title" "LMS Course", context.batch_old.course, "title"
) )

2
lms/www/batch/learn.py
View File

@@ -72,7 +72,7 @@ def get_context(context):
context.page_extensions = get_page_extensions(context) context.page_extensions = get_page_extensions(context)
context.page_context = { context.page_context = {
"course": context.course.name, "course": context.course.name,
"batch": context.batch, "batch": context.batch_old,
"lesson": context.lesson.name if context.lesson.name else "New Lesson", "lesson": context.lesson.name if context.lesson.name else "New Lesson",
"is_member": context.membership is not None, "is_member": context.membership is not None,
} }

2
lms/www/courses/course.py
View File

@@ -85,7 +85,7 @@ def set_course_context(context, course_name):
context.course = course context.course = course
membership = get_membership(course.name, frappe.session.user) membership = get_membership(course.name, frappe.session.user)
context.course.query_parameter = ( 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.membership = membership
context.is_instructor = is_instructor(course.name) context.is_instructor = is_instructor(course.name)

6
lms/www/utils.py
View File

@@ -27,9 +27,11 @@ def get_common_context(context):
membership = get_membership(course.name, frappe.session.user, batch_name) membership = get_membership(course.name, frappe.session.user, batch_name)
context.membership = membership context.membership = membership
context.progress = frappe.utils.cint(membership.progress) if membership else 0 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 = ( 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() context.livecode_url = get_livecode_url()