From e085dca5ab964357c8a723f239c3704024863207 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Wed, 11 Nov 2020 19:44:04 +0100 Subject: [PATCH] =?UTF-8?q?Agenturl=C3=B6schen=20START?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- users/signals.py | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/users/signals.py b/users/signals.py index 29cc7ac..c293063 100644 --- a/users/signals.py +++ b/users/signals.py @@ -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