From fafb6cb42802b374d9572fd39a2d5afc71e1b1b8 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Thu, 16 Sep 2021 16:27:50 +0200 Subject: [PATCH] Bug time unexpected userid --- api/views.py | 42 ++++++++++++++++++++++++++++----- users/templates/users/base.html | 26 ++------------------ 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/api/views.py b/api/views.py index 41930cf..be65da9 100644 --- a/api/views.py +++ b/api/views.py @@ -472,7 +472,12 @@ def deleteNCFile(request, fid, secretkey): @api_view(['GET'], ) def startWorkDay(request, uid, secretkey): if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': - user = User.objects.filter(username=uid).first() + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + today = date.today() targettime = 0.0 if(today.isoweekday() == 1): @@ -597,7 +602,17 @@ def loadaccounttime(user): @api_view(['GET'], ) def getTime(request, uid, secretkey): if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': - user = User.objects.filter(username=uid).first() + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + + usetime = True + + if(user.usertime!= None and user.usertime.usetime == False): + usetime = False + wd = Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False) workdaydata_workday = 0 workdaydata_starttime = 0 @@ -634,7 +649,7 @@ def getTime(request, uid, secretkey): breakstart = list(wdbreak)[0].start breaktimer = (now - breakstart).seconds * 1000 - return JsonResponse({'actualtime' : loadaccounttime(user)[0], 'workdaydata_workday' : workdaydata_workday, 'workdaydata_starttime' : workdaydata_starttime, 'breakstatus' : breakstatus, 'breaktimer' : breaktimer, 'breaksum' : breaksum}) + return JsonResponse({'actualtime' : loadaccounttime(user)[0], 'workdaydata_workday' : workdaydata_workday, 'workdaydata_starttime' : workdaydata_starttime, 'breakstatus' : breakstatus, 'breaktimer' : breaktimer, 'breaksum' : breaksum, 'usetime' : usetime}) else: return ({"status" : "FALSE"}) @@ -645,7 +660,12 @@ def getTime(request, uid, secretkey): @api_view(['GET'], ) def endWorkDay(request, uid, secretkey): if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': - user = User.objects.filter(username=uid).first() + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + wd = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] # END ALL BREAKS for b in wd.breaks.all(): @@ -674,7 +694,12 @@ def endWorkDay(request, uid, secretkey): @api_view(['GET'], ) def startBreak(request, uid, secretkey): if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': - user = User.objects.filter(username=uid).first() + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + wd = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] newbreak = Breaks(workday=wd, user=user, agency=user.profile.agency, start=timezone.now()) newbreak.save() @@ -691,8 +716,13 @@ def startBreak(request, uid, secretkey): @api_view(['GET'], ) def endBreak(request, uid, secretkey): if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': - user = User.objects.filter(username=uid).first() + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + + wd = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] toendbreak = list(wd.breaks.filter(end=None))[0] toendbreak.end = timezone.now() diff --git a/users/templates/users/base.html b/users/templates/users/base.html index a88ee13..a7f7aef 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -243,31 +243,9 @@ -