Merge pull request #1304 from pateljannat/issues-74

fix: misc batch flow changes
This commit is contained in:
Jannat Patel
2025-02-12 13:15:14 +05:30
committed by GitHub
6 changed files with 62 additions and 14 deletions

View File

@@ -1225,3 +1225,16 @@ def get_notifications(filters):
@frappe.whitelist(allow_guest=True)
def is_guest_allowed():
return frappe.get_cached_value("LMS Settings", None, "allow_guest_access")
@frappe.whitelist()
def make_announcement(students, cc, subject, content):
for student in students:
frappe.sendmail(
recipients=student,
cc=cc,
subject=subject,
message=content,
header=[subject, "green"],
retry=3,
)

View File

@@ -325,9 +325,17 @@
{
"link_doctype": "LMS Batch Enrollment",
"link_fieldname": "batch"
},
{
"link_doctype": "LMS Certificate Evaluation",
"link_fieldname": "batch_name"
},
{
"link_doctype": "LMS Certificate",
"link_fieldname": "batch_name"
}
],
"modified": "2025-02-10 12:01:22.476325",
"modified": "2025-02-12 11:59:35.312487",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Batch",

View File

@@ -19,7 +19,8 @@ class LMSBatchEnrollment(Document):
def validate_duplicate_members(self):
if frappe.db.exists(
"LMS Batch Enrollment", {"batch": self.batch, "member": self.member}
"LMS Batch Enrollment",
{"batch": self.batch, "member": self.member, "name": ["!=", self.name]},
):
frappe.throw(_("Member already enrolled in this batch"))
@@ -70,7 +71,7 @@ def send_confirmation_email(doc):
if not doc.confirmation_email_sent and (
outgoing_email_account or frappe.conf.get("mail_login")
):
doc.send_mail()
send_mail(doc)
doc.db_set("confirmation_email_sent", 1)