MIDNIGHT/enlight-lms
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #665 from saadchaudharry/main

Browse Source 
Fix:timetable validation
This commit is contained in:
Jannat Patel
2023-10-27 12:04:36 +05:30
committed by GitHub
parent a9b05f4256 8c0c09a21b
commit e4005792af
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/lms/doctype/lms_batch/lms_batch.py
View File

@@ -12,6 +12,7 @@ from frappe.utils import (
cint, cint,
format_date, format_date,
format_datetime, format_datetime,
get_time,
) )
from lms.lms.utils import get_lessons, get_lesson_index, get_lesson_url from lms.lms.utils import get_lessons, get_lesson_index, get_lesson_url
from lms.www.utils import get_quiz_details, get_assignment_details from lms.www.utils import get_quiz_details, get_assignment_details
@@ -116,23 +117,27 @@ class LMSBatch(Document):
def validate_timetable(self): def validate_timetable(self):
for schedule in self.timetable: for schedule in self.timetable:
if schedule.start_time and schedule.end_time: if schedule.start_time and schedule.end_time:
if ( if get_time(schedule.start_time) > get_time(schedule.end_time) or get_time(
schedule.start_time > schedule.end_time or schedule.start_time == schedule.end_time schedule.start_time
): ) == get_time(schedule.end_time):
frappe.throw( frappe.throw(
_("Row #{0} Start time cannot be greater than or equal to end time.").format( _("Row #{0} Start time cannot be greater than or equal to end time.").format(
schedule.idx schedule.idx
) )
) )
if schedule.start_time < self.start_time or schedule.start_time > self.end_time: if get_time(schedule.start_time) < get_time(self.start_time) or get_time(
schedule.start_time
) > get_time(self.end_time):
frappe.throw( frappe.throw(
_("Row #{0} Start time cannot be outside the batch duration.").format( _("Row #{0} Start time cannot be outside the batch duration.").format(
schedule.idx schedule.idx
) )
) )
if schedule.end_time < self.start_time or schedule.end_time > self.end_time: if get_time(schedule.end_time) < get_time(self.start_time) or get_time(
schedule.end_time
) > get_time(self.end_time):
frappe.throw( frappe.throw(
_("Row #{0} End time cannot be outside the batch duration.").format(schedule.idx) _("Row #{0} End time cannot be outside the batch duration.").format(schedule.idx)
) )