DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agenturlöschen START

This commit is contained in:
holger.trampe 2020-11-11 19:44:04 +01:00
parent c056f648a7
commit e085dca5ab
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
users/signals.py
View File

@ -899,34 +899,35 @@ def calculateHolidays(user, start, end, start_half, end_half):
weekdays = [] weekdays = []
freedaycounter = 0 freedaycounter = 0
for dt in daterange(start, end): for dt in daterange(start, end):
day_found = False
if dt.isoweekday() not in weekdays: if dt.isoweekday() not in weekdays:
counter += 1 counter += 1
for freeday in allfreedays.all(): for freeday in allfreedays.all():
if(dt == freeday.day): if(dt == freeday.day):
freedaycounter += 1 freedaycounter += 1
day_found = True
if(dt.isoweekday() == 1): if day_found == False:
if user.usertime.wd_mo == 0.0: if(dt.isoweekday() == 1):
freedaycounter += 1 if user.usertime.wd_mo == 0.0:
elif(dt.isoweekday() == 2): freedaycounter += 1
if user.usertime.wd_tu == 0.0: elif(dt.isoweekday() == 2):
freedaycounter += 1 if user.usertime.wd_tu == 0.0:
elif(dt.isoweekday() == 3): freedaycounter += 1
if user.usertime.wd_we == 0.0: elif(dt.isoweekday() == 3):
freedaycounter += 1 if user.usertime.wd_we == 0.0:
elif(dt.isoweekday() == 4): freedaycounter += 1
if user.usertime.wd_th == 0.0: elif(dt.isoweekday() == 4):
freedaycounter += 1 if user.usertime.wd_th == 0.0:
elif(dt.isoweekday() == 5): freedaycounter += 1
if user.usertime.wd_fr == 0.0: elif(dt.isoweekday() == 5):
freedaycounter += 1 if user.usertime.wd_fr == 0.0:
elif(dt.isoweekday() == 6): freedaycounter += 1
if user.usertime.wd_sa == 0.0: elif(dt.isoweekday() == 6):
freedaycounter += 1 if user.usertime.wd_sa == 0.0:
elif(dt.isoweekday() == 7): freedaycounter += 1
if user.usertime.wd_so == 0.0: elif(dt.isoweekday() == 7):
freedaycounter += 1 if user.usertime.wd_so == 0.0:
freedaycounter += 1
return restdays - counter + freedaycounter return restdays - counter + freedaycounter