fix: show system timezone in certificate request
This commit is contained in:
@@ -202,7 +202,7 @@ const openEvalCall = (evl) => {
|
||||
|
||||
const evaluationCourses = computed(() => {
|
||||
return props.courses.filter((course) => {
|
||||
return course.evaluator != ''
|
||||
return course.evaluator && course.evaluator != ''
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ from frappe.utils import (
|
||||
format_time,
|
||||
get_datetime,
|
||||
get_fullname,
|
||||
get_system_timezone,
|
||||
get_time,
|
||||
getdate,
|
||||
nowtime,
|
||||
@@ -118,16 +119,7 @@ class LMSCertificateRequest(Document):
|
||||
def validate_timezone(self):
|
||||
if self.timezone:
|
||||
return
|
||||
if self.batch_name:
|
||||
timezone = frappe.db.get_value("LMS Batch", self.batch_name, "timezone")
|
||||
if timezone:
|
||||
self.timezone = timezone
|
||||
return
|
||||
if self.course:
|
||||
timezone = frappe.db.get_value("LMS Course", self.course, "timezone")
|
||||
if timezone:
|
||||
self.timezone = timezone
|
||||
return
|
||||
self.timezone = get_system_timezone()
|
||||
|
||||
def send_notification(self):
|
||||
outgoing_email_account = frappe.get_cached_value(
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<p> {{ _("Hey {0}").format(member_name) }} </p>
|
||||
<br>
|
||||
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(course, date, start_time, timezone) }}</p>
|
||||
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} ({3} time).').format(course, date, start_time, timezone) }}</p>
|
||||
<br>
|
||||
<p> {{ _("Your evaluator is {0}").format(evaluator) }} </p>
|
||||
<br>
|
||||
|
||||
Reference in New Issue
Block a user