Merge pull request #945 from pateljannat/issues-26
fix: eval request issues
This commit is contained in:
Submodule frappe-ui updated: aa44431c18...a349ab070a
@@ -72,7 +72,7 @@ class LMSCertificateRequest(Document):
|
|||||||
)
|
)
|
||||||
|
|
||||||
for req in existing_requests:
|
for req in existing_requests:
|
||||||
if (
|
if req.name != self.name and (
|
||||||
req.date == getdate(self.date)
|
req.date == getdate(self.date)
|
||||||
or getdate() < getdate(req.date)
|
or getdate() < getdate(req.date)
|
||||||
or (
|
or (
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -26,5 +26,8 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"cypress": "^13.9.0",
|
"cypress": "^13.9.0",
|
||||||
"cypress-file-upload": "^5.0.8"
|
"cypress-file-upload": "^5.0.8"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"pre-commit": "^1.2.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user