devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2547 from expsa/task_12140 

fix(system_dashboard_classic): Task 12140
This commit is contained in:
FathiaBMExp 2025-03-03 11:20:23 +01:00 committed by GitHub
parent a16a5840df ae7e1c86f0
commit d10e9ec56c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
odex25_base/system_dashboard_classic/models/models.py
View File

@ -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)