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

Icon Video auskommentiert weil kein Video

This commit is contained in:
holger.trampe 2020-10-29 19:14:33 +01:00
parent b3f2e00d09
commit 085d5b4d0b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
View File

Binary file not shown.

9
standards/templatetags/counter_tag.py
View File

@ -377,7 +377,8 @@ def getsumworkday(workday):
if(len(workday.breaks.all()) > 0): if(len(workday.breaks.all()) > 0):
for ele in workday.breaks.all(): 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) finalsum = ((workday.end - workday.start).seconds - sum_break)
@ -402,7 +403,8 @@ def getsumbreak(workday):
if(len(workday.breaks.all()) > 0): if(len(workday.breaks.all()) > 0):
for ele in workday.breaks.all(): 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) return int(sum_break/60)
@ -536,7 +538,8 @@ def gettimeoveralldiff(workday, user):
if(len(workday.breaks.all()) > 0): if(len(workday.breaks.all()) > 0):
for ele in workday.breaks.all(): 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) finalsum = ((workday.end - workday.start).seconds - sum_break)
hastowork = datetime.timedelta(hours=workday.target) hastowork = datetime.timedelta(hours=workday.target)

3
users/views.py
View File

@ -1320,6 +1320,9 @@ def cronactionsdaily(request, code):
wd.end = datetime(wd.start.year, wd.start.month, wd.start.day, 23, 59) wd.end = datetime(wd.start.year, wd.start.month, wd.start.day, 23, 59)
wd.save() wd.save()
# Breaks beenden
# TASK: Breaks hier beenden, die nicht beendet wurden
yesterday = date.today() - timedelta(days=1) yesterday = date.today() - timedelta(days=1)
weekday = yesterday.weekday() weekday = yesterday.weekday()
workdays_yesterday = len(Workday.objects.filter(user=user, start__day=yesterday.day, start__month=yesterday.month, start__year=yesterday.year)) workdays_yesterday = len(Workday.objects.filter(user=user, start__day=yesterday.day, start__month=yesterday.month, start__year=yesterday.year))