Merge pull request #1022 from pateljannat/evaluator_name_issue

fix: evaluator name issue
frappe · Sep 19, 2024 · bc4b17c · bc4b17c
2 parents 3cda563 + 8c454a3
commit bc4b17c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
@@ -13,6 +13,7 @@
 	get_datetime,
 	nowtime,
 	get_time,
+	get_fullname,
 )
 from lms.lms.utils import get_evaluator
 import json
@@ -32,6 +33,7 @@ def after_insert(self):
 	def set_evaluator(self):
 		if not self.evaluator:
 			self.evaluator = get_evaluator(self.course, self.batch_name)
+			self.evaluator_name = get_fullname(self.evaluator)
 
 	def validate_unavailability(self):
 		if self.evaluator:

diff --git a/lms/patches.txt b/lms/patches.txt
@@ -90,4 +90,4 @@ lms.patches.v1_0.set_published_on
 lms.patches.v2_0.fix_progress_percentage
 lms.patches.v2_0.add_discussion_topic_titles
 lms.patches.v2_0.sidebar_settings
-lms.patches.v2_0.delete_certificate_request_notification
+lms.patches.v2_0.delete_certificate_request_notification #18-09-2024
diff --git a/lms/patches/v2_0/delete_certificate_request_notification.py b/lms/patches/v2_0/delete_certificate_request_notification.py
@@ -2,4 +2,10 @@
 
 
 def execute():
-	frappe.db.delete("Notification", "Certificate Request Creation")
+	delete_notification("Certificate Request Creation")
+	delete_notification("Certificate Request Reminder")
+
+
+def delete_notification(notification_name):
+	if frappe.db.exists("Notification", notification_name):
+		frappe.db.delete("Notification", notification_name)