Fehler bei Zeiterfassung NaN hoffentlich behoben
This commit is contained in:
parent
1205879f7a
commit
4f445bbafe
|
|
@ -159,7 +159,13 @@ Gleitzeitkonto:
|
|||
else{
|
||||
now = new Date();
|
||||
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 )
|
||||
{
|
||||
// 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"]);
|
||||
breaktime = data["actualbreaktime"];
|
||||
$("#breaksum").html(convertMS(data["actualbreaktime"]));
|
||||
$("#breaksum").html(convertMS(data["actualbreaktime"]));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -651,6 +651,7 @@ def TimeAjax(request):
|
|||
# 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]
|
||||
|
||||
toendbreak = list(wd.breaks.filter(end=None))[0]
|
||||
toendbreak.end = timezone.now()
|
||||
toendbreak.save()
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ def getICSFileAll(request, ag):
|
|||
response.status_code = 401
|
||||
response['WWW-Authenticate'] = 'Basic realm="%s"' % realm
|
||||
return response
|
||||
|
||||
|
||||
def getICSFileEx(request, code, ag):
|
||||
if(request.method == "GET"):
|
||||
|
|
|
|||
Loading…
Reference in New Issue