From 51a6cc035cd5ddec1ca8d23603b5293857b088ea Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 16 Dec 2024 17:14:30 +0530 Subject: [PATCH 1/4] fix: delete quiz and submission before deleting course --- lms/lms/api.py | 5 +++-- lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/lms/api.py b/lms/lms/api.py index 908a1dc0..e6430277 100644 --- a/lms/lms/api.py +++ b/lms/lms/api.py @@ -841,8 +841,6 @@ def delete_course(course): frappe.delete_doc("Lesson Reference", lesson) for lesson in lessons: - frappe.db.delete("LMS Course Progress", {"lesson": lesson}) - topics = frappe.get_all( "Discussion Topic", {"reference_doctype": "Course Lesson", "reference_docname": lesson}, @@ -862,6 +860,9 @@ def delete_course(course): for chapter in chapters: frappe.delete_doc("Course Chapter", chapter) + frappe.db.delete("LMS Course Progress", {"course": course}) + frappe.db.delete("LMS Quiz", {"course": course}) + frappe.db.delete("LMS Quiz Submission", {"course": course}) frappe.db.delete("LMS Enrollment", {"course": course}) frappe.delete_doc("LMS Course", course) diff --git a/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py index 0998c3f6..0618eb2b 100644 --- a/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py +++ b/lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py @@ -17,6 +17,7 @@ class LMSQuizSubmission(Document): self.notify_member() def validate_marks(self): + self.score = 0 for row in self.result: if cint(row.marks) > cint(row.marks_out_of): frappe.throw( From 75c11d3fcc6353aa94875bce27199443717047eb Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 16 Dec 2024 17:21:12 +0530 Subject: [PATCH 2/4] fix: course category was not reflecting on course form --- frontend/src/pages/CourseForm.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/CourseForm.vue b/frontend/src/pages/CourseForm.vue index b4de038f..79b58638 100644 --- a/frontend/src/pages/CourseForm.vue +++ b/frontend/src/pages/CourseForm.vue @@ -133,8 +133,8 @@ @@ -288,6 +288,7 @@ const course = reactive({ video_link: '', course_image: null, tags: '', + category: '', published: false, published_on: '', featured: false, From a81b384f90c6bb956905b53421ff6a1600d29b65 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 16 Dec 2024 17:30:00 +0530 Subject: [PATCH 3/4] fix: mariadb dependency installation --- .github/helper/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh index 574144b8..d5a3929f 100644 --- a/.github/helper/install_dependencies.sh +++ b/.github/helper/install_dependencies.sh @@ -5,7 +5,7 @@ echo "Setting Up System Dependencies..." sudo apt update sudo apt remove mysql-server mysql-client -sudo apt install libcups2-dev redis-server mariadb-client-10.6 +sudo apt-get install libcups2-dev redis-server mariadb-client-10.6 install_wkhtmltopdf() { wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb From 3288fb0f065a330cd971c19c698f88f1162f5716 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 16 Dec 2024 17:56:57 +0530 Subject: [PATCH 4/4] chore: replace mariadb-client-10.6 with mariadb-client for ui tests --- .github/helper/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh index d5a3929f..beb0cd34 100644 --- a/.github/helper/install_dependencies.sh +++ b/.github/helper/install_dependencies.sh @@ -5,7 +5,7 @@ echo "Setting Up System Dependencies..." sudo apt update sudo apt remove mysql-server mysql-client -sudo apt-get install libcups2-dev redis-server mariadb-client-10.6 +sudo apt-get install libcups2-dev redis-server mariadb-client install_wkhtmltopdf() { wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb