From 45c1b9e99dc45f755f77445dc6fa5b49d4bb91c4 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 29 Jan 2021 10:50:52 +0100 Subject: [PATCH] Fehler bei Berechnung NIcht-Urlaubstage --- dasettings/views.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dasettings/views.py b/dasettings/views.py index 5f7fa45..2af2988 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -987,7 +987,7 @@ def SettingsAjaxRouter(request): # EVERY ELEMENT GET ID AND SAVE NEW DAY-INFO user_to_recalculate = User.objects.get(pk=request.GET["userid"]) # DELETE ALL USED DAYS - absences = Absence.objects.filter(user=user_to_recalculate) + absences = Absence.objects.filter(user=user_to_recalculate, reason__is_holiday=True) post_save.disconnect(save_newabsence, sender=Absence) for ab in absences: @@ -1018,7 +1018,7 @@ def SettingsAjaxRouter(request): } - absences = Absence.objects.filter(user=user_to_recalculate) + absences = Absence.objects.filter(user=user_to_recalculate, reason__is_holiday=True) ab_counter = 0 # RECALCULATE ALL ABSENCES @@ -1036,8 +1036,6 @@ def SettingsAjaxRouter(request): return render(request, 'dasettings/data_absence_yeardata.html', context) # RESET TIMEMANAGEMENT elif request.method == "GET" and request.GET['action'] == "del_tmdata" : - - tempuser = User.objects.get(pk=request.GET['userid']) if(request.user.has_perm('users.usermanager') and request.user.profile.agency == tempuser.profile.agency): deluntildate = tempuser.usertime.usetime_start @@ -1045,7 +1043,6 @@ def SettingsAjaxRouter(request): return JsonResponse({"success" : success, "data" : data}) # Change external Access elif request.method == "GET" and request.GET['action'] == "changeexternalaccess" : - if(request.user.has_perm('users.absencemanager') and request.user.profile.agency.pk == int(request.GET['agency'])): if(request.GET['newvalue'] == "true"): request.user.profile.agency.agencycal_publicstatus = 1