From 085d5b4d0bc9936c972d9a5c8cfa844059f46fb9 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Thu, 29 Oct 2020 19:14:33 +0100
Subject: [PATCH] Icon Video auskommentiert weil kein Video

---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 19353 -> 19389 bytes
 standards/templatetags/counter_tag.py         |   9 ++++++---
 users/views.py                                |   3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 08f85607b427f7327234349d851a2b10a2d3088a..8605afe17ec7f5c3cb922a477a3886569420afc3 100644
GIT binary patch
delta 457
zcmbV{ODIHP7>57%KgVD)6Ng-O%9ufz%(%w5rIaZvA|<J_a$+&a<_sn!JLQ{_<XVc9
z8h=9A5t*6=Qsh$D*hnc^P>uz$_0_j{Hc!txHHp1RSeq>tGczt=n(oMH30cD#F5N&C
ze)KV&bzz<_uo0-xWMAz!*Rl3=Ki7Geq%uwNr4wv-7UfGL$z0)9nCZ!Oj8WRobh;Y<
zqe~*2T~o%vSZ~~ymw$Wb>|>atEQf|A3OWw3LTy=F2#Lh(SB@Pr=bqw_ZgQ^?q20VU
zoX|#o5ckyJ9LA#vJC`|LsLyqQIBIk|@j!#_)U?05BwhO1wd8I|3F;<QPGWwO8s(4f
zQ4E5{eTyQoun9^sHwx{)3&lWD0Z=Jcio+aU(O-5842kCQ9AK7)D~1r7@N{F7dORK2
zqljl6`xK}=$1$~5UEz$1sxOV+_?j6!(^}0c-bGvOhm3g9T7M+PCde?y7;m9$ZwVaK
H=`H;PELDXg

delta 439
zcmdlxopI)LM!ry9UM>b8*v&FK{!!RQzSGJYML=!}V=ZF|Lk&X~;{v9I49$!wjM*$j
z7BIdGL#$XW(`0UyN8AD+&CD!JLQH&<f2o{eY@K{mRbRt}SR>Tb>IM2385oMej$neA
zvt6x&aqeUX^=!t)lh>#pWn4bFNMi@%`pw#!-<TM8PFB*n%y@M2H=VnTXC`0K{lR!)
z@>#tp{0~8<uz+2|!B}*4@<BC`$u0VEjL$be)?dNI_;GTN(M?9K$!W&=8n+;>V<O-|
z=E=v6!x_6K%bSQY&e&{f62d4T!UVKL1!M`tshek;8Zt6kZ$4{wnu*b4^GwV8jEps#
zE3LH{8D~#kVpGq!ZnBDPF5{NTlWgM|cTN6eyNU7O<fV4k7>`e`vA@H3adM=?Eyf3v
vO&sSkzMXu@aW&)5&2>(HSr~aY*SMcx<`iII<l+Egp2@!6=8S5STfHp+DCmU{

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 9e3a4a4..666f478 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -377,7 +377,8 @@ def getsumworkday(workday):
 	if(len(workday.breaks.all()) > 0):
 
 		for ele in workday.breaks.all():
-			sum_break += (ele.end - ele.start).seconds
+			if ele.end != None:
+				sum_break += (ele.end - ele.start).seconds
 
 	finalsum = ((workday.end - workday.start).seconds - sum_break)
 
@@ -402,7 +403,8 @@ def getsumbreak(workday):
 	if(len(workday.breaks.all()) > 0):
 
 		for ele in workday.breaks.all():
-			sum_break += (ele.end - ele.start).seconds
+			if ele.end != None:
+				sum_break += (ele.end - ele.start).seconds
 
 	return int(sum_break/60)
 
@@ -536,7 +538,8 @@ def gettimeoveralldiff(workday, user):
 	if(len(workday.breaks.all()) > 0):
 
 		for ele in workday.breaks.all():
-			sum_break += (ele.end - ele.start).seconds
+			if ele.end != None:
+				sum_break += (ele.end - ele.start).seconds
 
 	finalsum = ((workday.end - workday.start).seconds - sum_break)
 	hastowork = datetime.timedelta(hours=workday.target)
diff --git a/users/views.py b/users/views.py
index dce90b7..5a7054b 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1320,6 +1320,9 @@ def cronactionsdaily(request, code):
 						wd.end = datetime(wd.start.year, wd.start.month, wd.start.day, 23, 59)
 						wd.save()
 
+					# Breaks beenden
+					# TASK: Breaks hier beenden, die nicht beendet wurden
+
 					yesterday = date.today() - timedelta(days=1)
 					weekday = yesterday.weekday()
 					workdays_yesterday = len(Workday.objects.filter(user=user, start__day=yesterday.day, start__month=yesterday.month, start__year=yesterday.year))