eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: eval request issues

Browse Source
This commit is contained in:
Jannat Patel
2024-07-30 14:17:17 +05:30
parent 98a56f9117
commit ed7db2d7c5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frappe-ui

Submodule frappe-ui updated: aa44431c18...a349ab070a

3
lms/lms/doctype/lms_certificate_request/lms_certificate_request.py
View File

@@ -73,12 +73,13 @@ class LMSCertificateRequest(Document):
for req in existing_requests: for req in existing_requests:
if ( if (
req.name != self.name && (
req.date == getdate(self.date) req.date == getdate(self.date)
or getdate() < getdate(req.date) or getdate() < getdate(req.date)
or ( or (
getdate() == getdate(req.date) getdate() == getdate(req.date)
and getdate(self.start_time) < getdate(req.start_time) and getdate(self.start_time) < getdate(req.start_time)
) ))
): ):
course_title = frappe.db.get_value("LMS Course", req.course, "title") course_title = frappe.db.get_value("LMS Course", req.course, "title")
frappe.throw( frappe.throw(

2
lms/lms/notification/certificate_request_creation/certificate_request_creation.html
View File

@@ -5,5 +5,5 @@
<p> {{ _("Hey {0}").format(doc.member_name) }} </p> <p> {{ _("Hey {0}").format(doc.member_name) }} </p>
<p> {{ _('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) }}</p> <p> {{ _('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) }}</p>
<p> {{ _("Your evaluator is {0}").format(evaluator_name) }} <p> {{ _("Your evaluator is {0}").format(evaluator_name) }} </p>
<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p> <p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>