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

BUGS

This commit is contained in:
holger.trampe 2020-11-09 21:00:27 +01:00
parent 99116da8d3
commit 3ae7eb829d
2 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
timemanagement/views.py
View File

@ -1046,6 +1046,7 @@ Berücksichtigt sowohl Wochenende als auch in der Agentur hinterlegte Freitage/S
''' '''
@login_required @login_required
def calculateHolidays(request, start, end, start_half, end_half, user): def calculateHolidays(request, start, end, start_half, end_half, user):
restdays = 0 restdays = 0
allfreedays = FreeDays.objects.filter(agency=request.user.profile.agency) allfreedays = FreeDays.objects.filter(agency=request.user.profile.agency)
if(end == start): if(end == start):
@ -1066,34 +1067,36 @@ def calculateHolidays(request, start, end, start_half, end_half, user):
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
# Prüfung, ob der Mitarbeiter an diesem Tag überhaupt arbeitet. Wenn nicht, wird der Freedaycounter einfach erhöht # Prüfung, ob der Mitarbeiter an diesem Tag überhaupt arbeitet. Wenn nicht, wird der Freedaycounter einfach erhöht
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
@ -1121,7 +1124,7 @@ def calculatingHolidaysByAbsence(request, absence):
weekdays = [] weekdays = []
freedaycounter = 0 freedaycounter = 0
for dt in daterange(absence.start, absence.end): for dt in daterange(absence.start, absence.end):
day_found = False
if dt.isoweekday() not in weekdays: if dt.isoweekday() not in weekdays:
finalholidayinabsence += 1 finalholidayinabsence += 1
# Prüfung, ob freie Tage vorhanden sind # Prüfung, ob freie Tage vorhanden sind
@ -1129,30 +1132,31 @@ def calculatingHolidaysByAbsence(request, absence):
# FREEDAY FOUND # FREEDAY FOUND
if(dt == freeday.day): if(dt == freeday.day):
freedaycounter += 1 freedaycounter += 1
day_found = True
# Prüfung, ob der Mitarbeiter an diesem Tag überhaupt arbeitet. Wenn nicht, wird der Freedaycounter einfach erhöht # Prüfung, ob der Mitarbeiter an diesem Tag überhaupt arbeitet. Wenn nicht, wird der Freedaycounter einfach erhöht
stat = False stat = False
if(dt.isoweekday() == 1): if day_found == False:
if absence.user.usertime.wd_mo == 0.0: if(dt.isoweekday() == 1):
freedaycounter += 1 if absence.user.usertime.wd_mo == 0.0:
elif(dt.isoweekday() == 2): freedaycounter += 1
if absence.user.usertime.wd_tu == 0.0:# elif(dt.isoweekday() == 2):
freedaycounter += 1 if absence.user.usertime.wd_tu == 0.0:#
elif(dt.isoweekday() == 3): freedaycounter += 1
if absence.user.usertime.wd_we == 0.0: elif(dt.isoweekday() == 3):
freedaycounter += 1 if absence.user.usertime.wd_we == 0.0:
elif(dt.isoweekday() == 4): freedaycounter += 1
if absence.user.usertime.wd_th == 0.0: elif(dt.isoweekday() == 4):
freedaycounter += 1 if absence.user.usertime.wd_th == 0.0:
elif(dt.isoweekday() == 5): freedaycounter += 1
if absence.user.usertime.wd_fr == 0.0: elif(dt.isoweekday() == 5):
freedaycounter += 1 if absence.user.usertime.wd_fr == 0.0:
elif(dt.isoweekday() == 6): freedaycounter += 1
if absence.user.usertime.wd_sa == 0.0: elif(dt.isoweekday() == 6):
freedaycounter += 1 if absence.user.usertime.wd_sa == 0.0:
elif(dt.isoweekday() == 7): freedaycounter += 1
if absence.user.usertime.wd_so == 0.0: elif(dt.isoweekday() == 7):
freedaycounter += 1 if absence.user.usertime.wd_so == 0.0:
freedaycounter += 1
return finalholidayinabsence - freedaycounter return finalholidayinabsence - freedaycounter

2
users/views.py
View File

@ -513,7 +513,7 @@ def dashboard(request):
filterdate = datetime.now() filterdate = datetime.now()
#news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__let=filterdate).filter(go_offline_on__get=filterdate).order_by('-go_online_on')[:4] #news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__let=filterdate).filter(go_offline_on__get=filterdate).order_by('-go_online_on')[:4]
news_all = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date') | News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__isnull=True).order_by('-created_date') news_all = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-go_online_on') | News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__isnull=True).order_by('-go_online_on')
# Maximal fünf News final zur Seite schicken! # Maximal fünf News final zur Seite schicken!
news = [] news = []