diff --git a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.js b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.js index de578610..d6aec59c 100644 --- a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.js +++ b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.js @@ -1,7 +1,7 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see license.txt -frappe.ui.form.on("Lesson Assignment", { +frappe.ui.form.on("LMS Assignment Submission", { // refresh: function(frm) { // } }); diff --git a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json index 36957671..4a991c2a 100644 --- a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json +++ b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json @@ -88,10 +88,10 @@ "index_web_pages_for_search": 1, "links": [], "make_attachments_public": 1, - "modified": "2023-03-27 13:24:18.696868", + "modified": "2023-03-27 13:24:18.696869", "modified_by": "Administrator", "module": "LMS", - "name": "Lesson Assignment", + "name": "LMS Assignment Submission", "owner": "Administrator", "permissions": [ { diff --git a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py index e9c62f11..6e98a1f9 100644 --- a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py +++ b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py @@ -12,7 +12,7 @@ class LessonAssignment(Document): def validate_duplicates(self): if frappe.db.exists( - "Lesson Assignment", + "LMS Assignment Submission", {"lesson": self.lesson, "member": self.member, "name": ["!=", self.name]}, ): lesson_title = frappe.db.get_value("Course Lesson", self.lesson, "title") @@ -26,13 +26,13 @@ class LessonAssignment(Document): @frappe.whitelist() def upload_assignment(assignment, lesson): args = { - "doctype": "Lesson Assignment", + "doctype": "LMS Assignment Submission", "lesson": lesson, "member": frappe.session.user, } if frappe.db.exists(args): del args["doctype"] - frappe.db.set_value("Lesson Assignment", args, "assignment", assignment) + frappe.db.set_value("LMS Assignment Submission", args, "assignment", assignment) else: args.update({"assignment": assignment}) lesson_work = frappe.get_doc(args) @@ -42,7 +42,7 @@ def upload_assignment(assignment, lesson): @frappe.whitelist() def get_assignment(lesson): assignment = frappe.db.get_value( - "Lesson Assignment", + "LMS Assignment Submission", {"lesson": lesson, "member": frappe.session.user}, ["lesson", "member", "assignment", "comments", "status"], as_dict=True, @@ -55,7 +55,7 @@ def get_assignment(lesson): @frappe.whitelist() def grade_assignment(name, result, comments): - doc = frappe.get_doc("Lesson Assignment", name) + doc = frappe.get_doc("LMS Assignment Submission", name) doc.status = result doc.comments = comments doc.save(ignore_permissions=True) diff --git a/lms/lms/notification/assignment_submission_notification/assignment_submission_notification.json b/lms/lms/notification/assignment_submission_notification/assignment_submission_notification.json index c57ee791..03a91be8 100644 --- a/lms/lms/notification/assignment_submission_notification/assignment_submission_notification.json +++ b/lms/lms/notification/assignment_submission_notification/assignment_submission_notification.json @@ -1,11 +1,11 @@ { "attach_print": 0, "channel": "Email", - "creation": "2023-03-27 16:34:03.505645", + "creation": "2023-03-27 16:34:03.505647", "days_in_advance": 0, "docstatus": 0, "doctype": "Notification", - "document_type": "Lesson Assignment", + "document_type": "LMS Assignment Submission", "enabled": 1, "event": "New", "idx": 0, diff --git a/lms/www/assignments/assignment.js b/lms/www/assignments/assignment.js index 418e7567..8c16136e 100644 --- a/lms/www/assignments/assignment.js +++ b/lms/www/assignments/assignment.js @@ -36,7 +36,7 @@ const save_assignment = (e) => { message: __("Please grade the assignment."), }); frappe.call({ - method: "lms.lms.doctype.lesson_assignment.lesson_assignment.grade_assignment", + method: "lms.lms.doctype.lms_assignment_submission.lms_assignment_submission.grade_assignment", args: { name: $(e.currentTarget).data("assignment"), result: this.result, diff --git a/lms/www/assignments/assignment.py b/lms/www/assignments/assignment.py index 33823012..ab9c8233 100644 --- a/lms/www/assignments/assignment.py +++ b/lms/www/assignments/assignment.py @@ -8,7 +8,7 @@ def get_context(context): assignment = frappe.form_dict["assignment"] context.assignment = frappe.db.get_value( - "Lesson Assignment", + "LMS Assignment Submission", assignment, [ "assignment", diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js index d70825e1..abbb9ce1 100644 --- a/lms/www/batch/learn.js +++ b/lms/www/batch/learn.js @@ -374,7 +374,7 @@ const upload_file = (file, target) => { const create_lesson_work = (file, target) => { frappe.call({ - method: "lms.lms.doctype.lesson_assignment.lesson_assignment.upload_assignment", + method: "lms.lms.doctype.lms_assignment_submission.lms_assignment_submission.upload_assignment", args: { assignment: file.file_url, lesson: $(".title").attr("data-lesson"), @@ -435,7 +435,7 @@ const clear_work = (e) => { const fetch_assignments = () => { if ($(".attach-file").length <= 0) return; frappe.call({ - method: "lms.lms.doctype.lesson_assignment.lesson_assignment.get_assignment", + method: "lms.lms.doctype.lms_assignment_submission.lms_assignment_submission.get_assignment", args: { lesson: $(".title").attr("data-lesson"), }, diff --git a/lms/www/classes/progress.html b/lms/www/classes/progress.html index 07fc6b40..b515a240 100644 --- a/lms/www/classes/progress.html +++ b/lms/www/classes/progress.html @@ -121,8 +121,8 @@ {% macro Assignment(course, student, is_moderator) %} {% for assignment in course.assignments %} {% set filters = { "member": student.name, "course": course.course, "lesson": assignment.name } %} - {% set has_submitted = frappe.db.exists("Lesson Assignment", filters) %} - {% set submission = frappe.db.get_value("Lesson Assignment", filters, ["assignment", "creation", "status"], as_dict=True) %} + {% set has_submitted = frappe.db.exists("LMS Assignment Submission", filters) %} + {% set submission = frappe.db.get_value("LMS Assignment Submission", filters, ["assignment", "creation", "status"], as_dict=True) %} {% set status = submission.status %} {% set color = "green" if status == "Pass" else "red" if status == "Fail" else "orange" %} {% set can_see_details = has_submitted and (is_moderator or frappe.session.user == student.name) %}