From 4f445bbafeb79d5b80dbed8195314e05b1c50ef5 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 24 Mar 2021 20:44:47 +0100
Subject: [PATCH] Fehler bei Zeiterfassung NaN hoffentlich behoben

---
 .../templates/timemanagement/realtime_dropdown.html  | 12 +++++++++---
 timemanagement/views.py                              |  1 +
 users/views.py                                       |  1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/timemanagement/templates/timemanagement/realtime_dropdown.html b/timemanagement/templates/timemanagement/realtime_dropdown.html
index 37db29e..5ebb42d 100644
--- a/timemanagement/templates/timemanagement/realtime_dropdown.html
+++ b/timemanagement/templates/timemanagement/realtime_dropdown.html
@@ -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"]));
             }
          });
 	}	
diff --git a/timemanagement/views.py b/timemanagement/views.py
index c42ae62..1c516e7 100644
--- a/timemanagement/views.py
+++ b/timemanagement/views.py
@@ -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()
diff --git a/users/views.py b/users/views.py
index 26affe5..c8dfa30 100644
--- a/users/views.py
+++ b/users/views.py
@@ -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"):