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

Fehler bei Berechnung NIcht-Urlaubstage

This commit is contained in:
holger.trampe 2021-01-29 10:50:52 +01:00
parent 5b03db0293
commit 45c1b9e99d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dasettings/views.py
View File

@ -987,7 +987,7 @@ def SettingsAjaxRouter(request):
# EVERY ELEMENT GET ID AND SAVE NEW DAY-INFO # EVERY ELEMENT GET ID AND SAVE NEW DAY-INFO
user_to_recalculate = User.objects.get(pk=request.GET["userid"]) user_to_recalculate = User.objects.get(pk=request.GET["userid"])
# DELETE ALL USED DAYS # 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) post_save.disconnect(save_newabsence, sender=Absence)
for ab in absences: 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 ab_counter = 0
# RECALCULATE ALL ABSENCES # RECALCULATE ALL ABSENCES
@ -1036,8 +1036,6 @@ def SettingsAjaxRouter(request):
return render(request, 'dasettings/data_absence_yeardata.html', context) return render(request, 'dasettings/data_absence_yeardata.html', context)
# RESET TIMEMANAGEMENT # RESET TIMEMANAGEMENT
elif request.method == "GET" and request.GET['action'] == "del_tmdata" : elif request.method == "GET" and request.GET['action'] == "del_tmdata" :
tempuser = User.objects.get(pk=request.GET['userid']) tempuser = User.objects.get(pk=request.GET['userid'])
if(request.user.has_perm('users.usermanager') and request.user.profile.agency == tempuser.profile.agency): if(request.user.has_perm('users.usermanager') and request.user.profile.agency == tempuser.profile.agency):
deluntildate = tempuser.usertime.usetime_start deluntildate = tempuser.usertime.usetime_start
@ -1045,7 +1043,6 @@ def SettingsAjaxRouter(request):
return JsonResponse({"success" : success, "data" : data}) return JsonResponse({"success" : success, "data" : data})
# Change external Access # Change external Access
elif request.method == "GET" and request.GET['action'] == "changeexternalaccess" : 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.user.has_perm('users.absencemanager') and request.user.profile.agency.pk == int(request.GET['agency'])):
if(request.GET['newvalue'] == "true"): if(request.GET['newvalue'] == "true"):
request.user.profile.agency.agencycal_publicstatus = 1 request.user.profile.agency.agencycal_publicstatus = 1