diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 08f8560..8605afe 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ 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))