Agenturlöschen START
This commit is contained in:
parent
c056f648a7
commit
e085dca5ab
|
|
@ -899,34 +899,35 @@ def calculateHolidays(user, start, end, start_half, end_half):
|
|||
weekdays = []
|
||||
freedaycounter = 0
|
||||
for dt in daterange(start, end):
|
||||
|
||||
day_found = False
|
||||
if dt.isoweekday() not in weekdays:
|
||||
counter += 1
|
||||
for freeday in allfreedays.all():
|
||||
if(dt == freeday.day):
|
||||
freedaycounter += 1
|
||||
|
||||
if(dt.isoweekday() == 1):
|
||||
if user.usertime.wd_mo == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 2):
|
||||
if user.usertime.wd_tu == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 3):
|
||||
if user.usertime.wd_we == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 4):
|
||||
if user.usertime.wd_th == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 5):
|
||||
if user.usertime.wd_fr == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 6):
|
||||
if user.usertime.wd_sa == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 7):
|
||||
if user.usertime.wd_so == 0.0:
|
||||
freedaycounter += 1
|
||||
day_found = True
|
||||
if day_found == False:
|
||||
if(dt.isoweekday() == 1):
|
||||
if user.usertime.wd_mo == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 2):
|
||||
if user.usertime.wd_tu == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 3):
|
||||
if user.usertime.wd_we == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 4):
|
||||
if user.usertime.wd_th == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 5):
|
||||
if user.usertime.wd_fr == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 6):
|
||||
if user.usertime.wd_sa == 0.0:
|
||||
freedaycounter += 1
|
||||
elif(dt.isoweekday() == 7):
|
||||
if user.usertime.wd_so == 0.0:
|
||||
freedaycounter += 1
|
||||
|
||||
return restdays - counter + freedaycounter
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue