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

Fehler bei NaN nochmal überarbeitet

This commit is contained in:
holger.trampe 2021-03-26 14:47:05 +01:00
parent a7764977f5
commit 7fce2a1664
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
timemanagement/views.py
View File

@ -654,7 +654,7 @@ def TimeAjax(request):
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()
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]
breaksum = 0 breaksum = 0
for b in wd.breaks.all(): for b in wd.breaks.all():
@ -663,7 +663,8 @@ def TimeAjax(request):
data = { data = {
"success" : True, "success" : True,
"actualbreaktime" : breaksum*1000 "actualbreaktime" : breaksum*1000,
"wdtime" : wd.start
} }
# REMOVE WORKDAY # REMOVE WORKDAY
elif request.GET["action"] == "remove_workday": elif request.GET["action"] == "remove_workday":