diff --git a/timemanagement/templates/timemanagement/realtime_dropdown.html b/timemanagement/templates/timemanagement/realtime_dropdown.html index a8a447b..d17c582 100644 --- a/timemanagement/templates/timemanagement/realtime_dropdown.html +++ b/timemanagement/templates/timemanagement/realtime_dropdown.html @@ -147,7 +147,7 @@ Gleitzeitkonto: } start = false; - + function realTimeClock() { if(start != false){ @@ -159,13 +159,7 @@ Gleitzeitkonto: else{ now = new Date(); viewtime = now - starttime_view - breaktime; - - if(isNaN(viewtime)){ - location.href = location.href; - } - else{ - $("#realtimeclock").html(convertMS(viewtime)); - } + $("#realtimeclock").html(convertMS(viewtime)); } } @@ -221,9 +215,9 @@ Gleitzeitkonto: }, 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"]; + startbreaktime_view = data["actualbreaktime"]; + starttime_view = Date.parse(data["wdtime"]); $("#breaksum").html(convertMS(data["actualbreaktime"])); } }); diff --git a/timemanagement/views.py b/timemanagement/views.py index e21e57d..517d36d 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -654,7 +654,7 @@ def TimeAjax(request): toendbreak = list(wd.breaks.filter(end=None))[0] toendbreak.end = timezone.now() toendbreak.save() - + wd = list(Workday.objects.filter(user=request.user, agency=request.user.profile.agency, end=None, delflag = False))[0] breaksum = 0 for b in wd.breaks.all(): @@ -663,7 +663,8 @@ def TimeAjax(request): data = { "success" : True, - "actualbreaktime" : breaksum*1000 + "actualbreaktime" : breaksum*1000, + "wdtime" : wd.start } # REMOVE WORKDAY elif request.GET["action"] == "remove_workday":