From ed7db2d7c5b4e847d3b9ac95c84b1e265f23209a Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 30 Jul 2024 14:17:17 +0530 Subject: [PATCH] fix: eval request issues --- frappe-ui | 2 +- .../doctype/lms_certificate_request/lms_certificate_request.py | 3 ++- .../certificate_request_creation.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe-ui b/frappe-ui index aa44431c..a349ab07 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit aa44431c185b1e4563f2ebf6af380c7743d2cd4c +Subproject commit a349ab070a73a3d22ead6a33374c9fe44f6ecf57 diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py index ef5f9bae..7646dfbf 100644 --- a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py +++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py @@ -73,12 +73,13 @@ class LMSCertificateRequest(Document): for req in existing_requests: if ( + req.name != self.name && ( req.date == getdate(self.date) or getdate() < getdate(req.date) or ( getdate() == getdate(req.date) and getdate(self.start_time) < getdate(req.start_time) - ) + )) ): course_title = frappe.db.get_value("LMS Course", req.course, "title") frappe.throw( diff --git a/lms/lms/notification/certificate_request_creation/certificate_request_creation.html b/lms/lms/notification/certificate_request_creation/certificate_request_creation.html index 1db1fa13..34e041a1 100644 --- a/lms/lms/notification/certificate_request_creation/certificate_request_creation.html +++ b/lms/lms/notification/certificate_request_creation/certificate_request_creation.html @@ -5,5 +5,5 @@

{{ _("Hey {0}").format(doc.member_name) }}

{{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), timezone) }}

-

{{ _("Your evaluator is {0}").format(evaluator_name) }} +

{{ _("Your evaluator is {0}").format(evaluator_name) }}

{{ _("Please prepare well and be on time for the evaluations.") }}