diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue index 8f876e0f..46c9d1e3 100644 --- a/frontend/src/components/Modals/Settings.vue +++ b/frontend/src/components/Modals/Settings.vue @@ -315,12 +315,6 @@ const tabsStructure = computed(() => { doctype: 'Email Template', type: 'Link', }, - { - label: 'Assignment Submission Template', - name: 'assignment_submission_template', - doctype: 'Email Template', - type: 'Link', - }, ], }, { 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 dcb7f71d..ff64617a 100644 --- a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py +++ b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py @@ -4,8 +4,7 @@ import frappe from frappe import _ from frappe.model.document import Document -from frappe.utils import validate_url, validate_email_address -from frappe.email.doctype.email_template.email_template import get_email_template +from frappe.utils import validate_url from frappe.desk.doctype.notification_log.notification_log import make_notification_logs @@ -15,14 +14,6 @@ class LMSAssignmentSubmission(Document): self.validate_url() self.validate_status() - def after_insert(self): - if not frappe.flags.in_test: - outgoing_email_account = frappe.get_cached_value( - "Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name" - ) - if outgoing_email_account or frappe.conf.get("mail_login"): - self.send_mail() - def validate_duplicates(self): if frappe.db.exists( "LMS Assignment Submission", @@ -39,38 +30,6 @@ class LMSAssignmentSubmission(Document): if self.type == "URL" and not validate_url(self.answer): frappe.throw(_("Please enter a valid URL.")) - def send_mail(self): - subject = _("New Assignment Submission") - template = "assignment_submission" - custom_template = frappe.db.get_single_value( - "LMS Settings", "assignment_submission_template" - ) - - args = { - "member_name": self.member_name, - "assignment_name": self.assignment, - "assignment_title": self.assignment_title, - "submission_name": self.name, - } - - moderators = frappe.get_all("Has Role", {"role": "Moderator"}, pluck="parent") - for moderator in moderators: - if not validate_email_address(moderator): - moderators.remove(moderator) - - if custom_template: - email_template = get_email_template(custom_template, args) - subject = email_template.get("subject") - content = email_template.get("message") - frappe.sendmail( - recipients=moderators, - subject=subject, - template=template if not custom_template else None, - content=content if custom_template else None, - args=args, - header=[subject, "green"], - ) - def validate_status(self): if not self.is_new(): doc_before_save = self.get_doc_before_save() diff --git a/lms/lms/doctype/lms_settings/lms_settings.json b/lms/lms/doctype/lms_settings/lms_settings.json index c263bf5e..95b87930 100644 --- a/lms/lms/doctype/lms_settings/lms_settings.json +++ b/lms/lms/doctype/lms_settings/lms_settings.json @@ -58,7 +58,6 @@ "certification_template", "batch_confirmation_template", "column_break_uwsp", - "assignment_submission_template", "payment_reminder_template", "seo_tab", "meta_description" @@ -238,12 +237,6 @@ "fieldtype": "Tab Break", "label": "Email Templates" }, - { - "fieldname": "assignment_submission_template", - "fieldtype": "Link", - "label": "Assignment Submission Template", - "options": "Email Template" - }, { "fieldname": "column_break_uwsp", "fieldtype": "Column Break" @@ -383,7 +376,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-04-10 16:17:00.658698", + "modified": "2025-04-17 21:58:30.365876", "modified_by": "sayali@frappe.io", "module": "LMS", "name": "LMS Settings",