From ab98884f777187bb1c104ba09a3ce5c3c01245ca Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 10 Feb 2025 16:15:28 +0530 Subject: [PATCH] refactor: replaced Batch Student child table with LMS Batch Enrollment doctype --- frappe-ui | 2 +- frontend/src/components/BatchStudents.vue | 2 +- .../src/components/Modals/StudentModal.vue | 8 +- frontend/src/pages/Batch.vue | 3 +- frontend/src/pages/Courses.vue | 3 +- frontend/vite.config.js | 3 + frontend/yarn.lock | 1018 +++++++------ lms/lms/api.py | 2 +- .../doctype/batch_student/batch_student.json | 2 +- lms/lms/doctype/lms_batch/lms_batch.json | 16 +- lms/lms/doctype/lms_batch/lms_batch.py | 86 +- .../doctype/lms_batch_enrollment/__init__.py | 0 .../lms_batch_enrollment.js | 8 + .../lms_batch_enrollment.json | 121 ++ .../lms_batch_enrollment.py | 99 ++ .../test_lms_batch_enrollment.py | 30 + .../doctype/lms_live_class/lms_live_class.py | 3 +- lms/lms/utils.py | 40 +- lms/patches.txt | 3 +- .../v2_0/migrate_batch_student_data.py | 17 + yarn.lock | 1336 +++++++++++++++++ 21 files changed, 2253 insertions(+), 549 deletions(-) create mode 100644 lms/lms/doctype/lms_batch_enrollment/__init__.py create mode 100644 lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.js create mode 100644 lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json create mode 100644 lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py create mode 100644 lms/lms/doctype/lms_batch_enrollment/test_lms_batch_enrollment.py create mode 100644 lms/patches/v2_0/migrate_batch_student_data.py create mode 100644 yarn.lock diff --git a/frappe-ui b/frappe-ui index 8cd9b06a..1c97498f 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 8cd9b06a5ed50dc181d9672b2fe84c1594b52b48 +Subproject commit 1c97498fb2bf4b64c82a96dac0fdb61ae77e59dc diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue index 23bf4c85..18a1ed92 100644 --- a/frontend/src/components/BatchStudents.vue +++ b/frontend/src/components/BatchStudents.vue @@ -285,7 +285,7 @@ const deleteStudents = createResource({ url: 'lms.lms.api.delete_documents', makeParams(values) { return { - doctype: 'Batch Student', + doctype: 'LMS Batch Enrollment', documents: values.students, } }, diff --git a/frontend/src/components/Modals/StudentModal.vue b/frontend/src/components/Modals/StudentModal.vue index a6bab400..242d0f87 100644 --- a/frontend/src/components/Modals/StudentModal.vue +++ b/frontend/src/components/Modals/StudentModal.vue @@ -46,11 +46,9 @@ const studentResource = createResource({ makeParams(values) { return { doc: { - doctype: 'Batch Student', - parent: props.batch, - parenttype: 'LMS Batch', - parentfield: 'students', - student: student.value, + doctype: 'LMS Batch Enrollment', + batch: props.batch, + member: student.value, }, } }, diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue index 5632ebee..400dcc48 100644 --- a/frontend/src/pages/Batch.vue +++ b/frontend/src/pages/Batch.vue @@ -25,6 +25,7 @@
@@ -54,7 +55,7 @@
-