fix(system_dashboard_classic): Task 12140
Fix a bug where a datetime.date object is converted to a string and then compared to a datetime.date object. Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
This commit is contained in:
parent
8053566108
commit
ae7e1c86f0
|
|
@ -118,14 +118,13 @@ class SystemDashboard(models.Model):
|
|||
if not special.date_from and not special.date_to:
|
||||
sepcial_working_hours += special.working_hours
|
||||
days_special_name.append(special.name)
|
||||
elif not special.date_from and str(t_date) <= special.date_to:
|
||||
elif not special.date_from and t_date <= special.date_to:
|
||||
sepcial_working_hours += special.working_hours
|
||||
days_special_name.append(special.name)
|
||||
elif not special.date_to and str(t_date) >= special.date_from:
|
||||
elif not special.date_to and t_date >= special.date_from:
|
||||
sepcial_working_hours += special.working_hours
|
||||
days_special_name.append(special.name)
|
||||
elif special.date_from and special.date_to and str(t_date) >= special.date_from and str(
|
||||
t_date) <= special.date_to:
|
||||
elif special.date_from and special.date_to and special.date_from <= t_date <= special.date_to:
|
||||
sepcial_working_hours += special.working_hours
|
||||
days_special_name.append(special.name)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue