From 8cdaa7877aa58640f3f40db78a7012b3f9207821 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 21 Nov 2023 13:32:12 +0530 Subject: [PATCH 1/3] feat: discussions mention notifications --- lms/hooks.py | 8 +- lms/lms/doctype/lms_batch/lms_batch.py | 1 - lms/lms/utils.py | 91 +++++++++++++++++++++- lms/templates/emails/mention_template.html | 11 +++ 4 files changed, 103 insertions(+), 8 deletions(-) create mode 100644 lms/templates/emails/mention_template.html diff --git a/lms/hooks.py b/lms/hooks.py index dbfd815f..7b819d16 100644 --- a/lms/hooks.py +++ b/lms/hooks.py @@ -97,7 +97,7 @@ override_doctype_class = { # Hook on document methods and events doc_events = { - "Discussion Reply": {"after_insert": "lms.lms.utils.create_notification_log"}, + "Discussion Reply": {"after_insert": "lms.lms.utils.handle_notifications"}, } # Scheduled Tasks @@ -118,9 +118,9 @@ fixtures = ["Custom Field", "Function", "Industry"] # Overriding Methods # ------------------------------ # -# override_whitelisted_methods = { -# "frappe.desk.doctype.event.event.get_events": "lms.event.get_events" -# } +override_whitelisted_methods = { + "frappe.desk.search.get_names_for_mentions": "lms.lms.utils.get_names_for_mentions", +} # # each overriding function accepts a `data` argument; # generated from the base implementation of the doctype dashboard, diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py index cf371f55..9f96d4cd 100644 --- a/lms/lms/doctype/lms_batch/lms_batch.py +++ b/lms/lms/doctype/lms_batch/lms_batch.py @@ -64,7 +64,6 @@ class LMSBatch(Document): def send_confirmation_mail(self): for student in self.students: - if not student.confirmation_email_sent: self.send_mail(student) student.confirmation_email_sent = 1 diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 3ed651e4..a60c5126 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -6,7 +6,14 @@ import razorpay import requests from frappe import _ from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_result -from frappe.desk.doctype.notification_log.notification_log import make_notification_logs +from frappe.desk.doctype.notification_log.notification_log import ( + make_notification_logs, + enqueue_create_notification, + get_title, +) +from frappe.utils import get_fullname +from frappe.desk.search import get_user_groups +from frappe.desk.notifications import extract_mentions from frappe.utils import ( add_months, cint, @@ -603,17 +610,20 @@ def validate_image(path): return path -def create_notification_log(doc, method): +def handle_notifications(doc, method): topic = frappe.db.get_value( "Discussion Topic", doc.topic, ["reference_doctype", "reference_docname", "owner", "title"], as_dict=1, ) - if topic.reference_doctype != "Course Lesson": return + create_notification_log(doc, topic) + notify_mentions(doc, topic) + +def create_notification_log(doc, topic): course = frappe.db.get_value("Course Lesson", topic.reference_docname, "course") instructors = frappe.db.get_all( "Course Instructor", {"parent": course}, pluck="instructor" @@ -640,6 +650,40 @@ def create_notification_log(doc, method): make_notification_logs(notification, users) +def notify_mentions(doc, topic): + mentions = extract_mentions(doc.reply) + print(mentions) + if not mentions: + return + + sender_fullname = get_fullname(doc.owner) + recipients = [ + frappe.db.get_value( + "User", + {"enabled": 1, "name": name}, + "email", + ) + for name in mentions + ] + subject = _("{0} mentioned you in a comment").format(sender_fullname) + template = "mention_template" + + args = { + "sender": sender_fullname, + "content": doc.reply, + "batch_link": "/batches/" + topic.reference_docname, + } + for recipient in recipients: + frappe.sendmail( + recipients=recipient, + subject=subject, + template=template, + args=args, + header=[subject, "green"], + retry=3, + ) + + def get_lesson_count(course): lesson_count = 0 chapters = frappe.get_all("Chapter Reference", {"parent": course}, ["chapter"]) @@ -1092,3 +1136,44 @@ def change_currency(amount, currency, country=None): amount = cint(amount) amount, currency = check_multicurrency(amount, currency, country) return fmt_money(amount, 0, currency) + + +@frappe.whitelist() +def get_names_for_mentions(search_term): + print(search_term) + users_for_mentions = frappe.cache.get_value( + "users_for_mentions", get_users_for_mentions + ) + print(users_for_mentions) + user_groups = frappe.cache.get_value("user_groups", get_user_groups) + + filtered_mentions = [] + for mention_data in users_for_mentions + user_groups: + if search_term.lower() not in mention_data.value.lower(): + continue + + mention_data["link"] = frappe.utils.get_url_to_form( + "User Group" if mention_data.get("is_group") else "User Profile", mention_data["id"] + ) + + filtered_mentions.append(mention_data) + + return sorted(filtered_mentions, key=lambda d: d["value"]) + + +def get_users_for_mentions(): + print("this.is.users") + filters = ( + { + "name": ["not in", ("Administrator", "Guest")], + "allowed_in_mentions": True, + "enabled": True, + }, + ) + print(frappe.utils.get_url()) + print("this.is.url") + return frappe.get_all( + "User", + filters=filters, + fields=["name as id", "full_name as value", "user_type"], + ) diff --git a/lms/templates/emails/mention_template.html b/lms/templates/emails/mention_template.html new file mode 100644 index 00000000..ed0ecc4b --- /dev/null +++ b/lms/templates/emails/mention_template.html @@ -0,0 +1,11 @@ +

+ {{ _("{0} mentioned you in a comment in your batch.").format(sender) }} +

+

+

+ {{ content | markdown }} +
+

+
+ {{ _("Open Batch") }} +
\ No newline at end of file From 81db6c544d904cd273a28f7ab02a53251087e3c1 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 22 Nov 2023 13:04:04 +0530 Subject: [PATCH 2/3] fix: mention email link --- lms/hooks.py | 2 +- lms/lms/utils.py | 47 +++-------------------------------------------- 2 files changed, 4 insertions(+), 45 deletions(-) diff --git a/lms/hooks.py b/lms/hooks.py index 7b819d16..0e2b3adf 100644 --- a/lms/hooks.py +++ b/lms/hooks.py @@ -119,7 +119,7 @@ fixtures = ["Custom Field", "Function", "Industry"] # ------------------------------ # override_whitelisted_methods = { - "frappe.desk.search.get_names_for_mentions": "lms.lms.utils.get_names_for_mentions", + # "frappe.desk.search.get_names_for_mentions": "lms.lms.utils.get_names_for_mentions", } # # each overriding function accepts a `data` argument; diff --git a/lms/lms/utils.py b/lms/lms/utils.py index a60c5126..473066b4 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -617,7 +617,7 @@ def handle_notifications(doc, method): ["reference_doctype", "reference_docname", "owner", "title"], as_dict=1, ) - if topic.reference_doctype != "Course Lesson": + if topic.reference_doctype not in ["Course Lesson", "LMS Batch"]: return create_notification_log(doc, topic) notify_mentions(doc, topic) @@ -652,7 +652,6 @@ def create_notification_log(doc, topic): def notify_mentions(doc, topic): mentions = extract_mentions(doc.reply) - print(mentions) if not mentions: return @@ -671,8 +670,9 @@ def notify_mentions(doc, topic): args = { "sender": sender_fullname, "content": doc.reply, - "batch_link": "/batches/" + topic.reference_docname, + "batch_link": "/batches/" + topic.reference_docname + "#discussions", } + for recipient in recipients: frappe.sendmail( recipients=recipient, @@ -1136,44 +1136,3 @@ def change_currency(amount, currency, country=None): amount = cint(amount) amount, currency = check_multicurrency(amount, currency, country) return fmt_money(amount, 0, currency) - - -@frappe.whitelist() -def get_names_for_mentions(search_term): - print(search_term) - users_for_mentions = frappe.cache.get_value( - "users_for_mentions", get_users_for_mentions - ) - print(users_for_mentions) - user_groups = frappe.cache.get_value("user_groups", get_user_groups) - - filtered_mentions = [] - for mention_data in users_for_mentions + user_groups: - if search_term.lower() not in mention_data.value.lower(): - continue - - mention_data["link"] = frappe.utils.get_url_to_form( - "User Group" if mention_data.get("is_group") else "User Profile", mention_data["id"] - ) - - filtered_mentions.append(mention_data) - - return sorted(filtered_mentions, key=lambda d: d["value"]) - - -def get_users_for_mentions(): - print("this.is.users") - filters = ( - { - "name": ["not in", ("Administrator", "Guest")], - "allowed_in_mentions": True, - "enabled": True, - }, - ) - print(frappe.utils.get_url()) - print("this.is.url") - return frappe.get_all( - "User", - filters=filters, - fields=["name as id", "full_name as value", "user_type"], - ) From 6f40c357b31774d30fc89f44017703730826ba13 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 22 Nov 2023 17:27:42 +0530 Subject: [PATCH 3/3] fix: quiz submission page rendering --- lms/lms/doctype/lms_payment/lms_payment.js | 16 ++++++---- lms/lms/doctype/lms_quiz/lms_quiz.py | 1 + lms/lms/utils.py | 9 +++++- lms/templates/emails/mention_template.html | 2 +- lms/templates/quiz/quiz.html | 3 -- lms/templates/quiz/quiz.js | 3 ++ lms/www/quiz_submission/quiz_submission.py | 34 +++++++++++++++++++++- 7 files changed, 57 insertions(+), 11 deletions(-) diff --git a/lms/lms/doctype/lms_payment/lms_payment.js b/lms/lms/doctype/lms_payment/lms_payment.js index 11d42cab..b2d03500 100644 --- a/lms/lms/doctype/lms_payment/lms_payment.js +++ b/lms/lms/doctype/lms_payment/lms_payment.js @@ -1,8 +1,14 @@ // Copyright (c) 2023, Frappe and contributors // For license information, please see license.txt -// frappe.ui.form.on("LMS Payment", { -// refresh(frm) { - -// }, -// }); +frappe.ui.form.on("LMS Payment", { + onload(frm) { + frm.set_query("member", function (doc) { + return { + filters: { + ignore_user_type: 1, + }, + }; + }); + }, +}); diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py index 709cfe34..bbaaabb7 100644 --- a/lms/lms/doctype/lms_quiz/lms_quiz.py +++ b/lms/lms/doctype/lms_quiz/lms_quiz.py @@ -110,6 +110,7 @@ def quiz_summary(quiz, results): "score_out_of": score_out_of, "submission": submission.name, "pass": percentage == quiz_details.passing_percentage, + "percentage": percentage, } diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 473066b4..70f186fc 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -667,10 +667,17 @@ def notify_mentions(doc, topic): subject = _("{0} mentioned you in a comment").format(sender_fullname) template = "mention_template" + if topic.reference_doctype == "LMS Batch": + link = f"/batches/{topic.reference_docname}#discussions" + if topic.reference_doctype == "Course Lesson": + course = frappe.db.get_value("Course Lesson", topic.reference_docname, "course") + lesson_index = get_lesson_index(topic.reference_docname) + link = get_lesson_url(course, lesson_index) + args = { "sender": sender_fullname, "content": doc.reply, - "batch_link": "/batches/" + topic.reference_docname + "#discussions", + "link": link, } for recipient in recipients: diff --git a/lms/templates/emails/mention_template.html b/lms/templates/emails/mention_template.html index ed0ecc4b..f791df47 100644 --- a/lms/templates/emails/mention_template.html +++ b/lms/templates/emails/mention_template.html @@ -7,5 +7,5 @@

- {{ _("Open Batch") }} + {{ _("Check Discussion") }}
\ No newline at end of file diff --git a/lms/templates/quiz/quiz.html b/lms/templates/quiz/quiz.html index 84caaf50..ccbdc9d1 100644 --- a/lms/templates/quiz/quiz.html +++ b/lms/templates/quiz/quiz.html @@ -10,9 +10,6 @@
  • {{ _("You will have to get {0}% correct answers in order to pass the quiz.").format(quiz.passing_percentage) }}
    • -
  • - {{ _("Without passing the quiz you won't be able to complete the lesson.") }} -
    • {% endif %} {% if quiz.max_attempts %} diff --git a/lms/templates/quiz/quiz.js b/lms/templates/quiz/quiz.js index ed37a030..186ba447 100644 --- a/lms/templates/quiz/quiz.js +++ b/lms/templates/quiz/quiz.js @@ -134,6 +134,9 @@ const quiz_summary = (e = undefined) => { $(".quiz-footer span").addClass("hide"); $("#quiz-form").prepend( `
    + ${__("You got")} ${data.message.percentage}% ${__("correct answers")} +
    +
    ${__("Your score is")} ${data.message.score} ${__("out of")} ${data.message.score_out_of}
    ` diff --git a/lms/www/quiz_submission/quiz_submission.py b/lms/www/quiz_submission/quiz_submission.py index f7d3f35b..6f6292c4 100644 --- a/lms/www/quiz_submission/quiz_submission.py +++ b/lms/www/quiz_submission/quiz_submission.py @@ -13,7 +13,39 @@ def get_context(context): submission = frappe.form_dict["submission"] quiz_name = frappe.form_dict["quiz"] - context.quiz = frappe.get_doc("LMS Quiz", quiz_name) + quiz = frappe.db.get_value( + "LMS Quiz", + quiz_name, + [ + "name", + "title", + "max_attempts", + "show_answers", + "show_submission_history", + "passing_percentage", + ], + as_dict=True, + ) + quiz.questions = [] + fields = ["name", "question", "type", "multiple"] + for num in range(1, 5): + fields.append(f"option_{num}") + fields.append(f"is_correct_{num}") + fields.append(f"explanation_{num}") + fields.append(f"possibility_{num}") + + questions = frappe.get_all( + "LMS Quiz Question", + filters={"parent": quiz.name}, + fields=["question", "marks"], + order_by="idx", + ) + + for question in questions: + details = frappe.db.get_value("LMS Question", question.question, fields, as_dict=1) + details["marks"] = question.marks + quiz.questions.append(details) + context.quiz = quiz if submission == "new-submission": context.submission = frappe._dict()