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

Fehler bei Zeiterfassung NaN hoffentlich behoben

This commit is contained in:
holger.trampe 2021-03-24 20:44:47 +01:00
parent 1205879f7a
commit 4f445bbafe
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
timemanagement/templates/timemanagement/realtime_dropdown.html
View File

@ -159,7 +159,13 @@ Gleitzeitkonto:
else{ else{
now = new Date(); now = new Date();
viewtime = now - starttime_view - breaktime; viewtime = now - starttime_view - breaktime;
$("#realtimeclock").html(convertMS(viewtime)); console.log(viewtime);
if(isNaN(viewtime)){
location.href = location.href;
}
else{
$("#realtimeclock").html(convertMS(viewtime));
}
} }
} }
@ -215,10 +221,10 @@ Gleitzeitkonto:
}, },
success: function( data ) success: function( data )
{ {
// TASK: Hier ist anscheinend der Fehler der zu NaN:NaN usw. führt! // TODO: Hier ist anscheinend der Fehler der zu NaN:NaN usw. führt!
console.log("break end add " + data["actualbreaktime"]); console.log("break end add " + data["actualbreaktime"]);
breaktime = data["actualbreaktime"]; breaktime = data["actualbreaktime"];
$("#breaksum").html(convertMS(data["actualbreaktime"])); $("#breaksum").html(convertMS(data["actualbreaktime"]));
} }
}); });
} }

1
timemanagement/views.py
View File

@ -651,6 +651,7 @@ def TimeAjax(request):
# END BREAK # END BREAK
elif request.GET["action"] == "end_break": elif request.GET["action"] == "end_break":
wd = list(Workday.objects.filter(user=request.user, agency=request.user.profile.agency, end=None, delflag = False))[0] wd = list(Workday.objects.filter(user=request.user, agency=request.user.profile.agency, end=None, delflag = False))[0]
toendbreak = list(wd.breaks.filter(end=None))[0] toendbreak = list(wd.breaks.filter(end=None))[0]
toendbreak.end = timezone.now() toendbreak.end = timezone.now()
toendbreak.save() toendbreak.save()

1
users/views.py
View File

@ -141,7 +141,6 @@ def getICSFileAll(request, ag):
response.status_code = 401 response.status_code = 401
response['WWW-Authenticate'] = 'Basic realm="%s"' % realm response['WWW-Authenticate'] = 'Basic realm="%s"' % realm
return response return response
def getICSFileEx(request, code, ag): def getICSFileEx(request, code, ag):
if(request.method == "GET"): if(request.method == "GET"):