diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index e8a52dd..fd28685 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 94eddbb..c154809 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -372,7 +372,7 @@ def getsumworkday(workday): mon, sec = divmod(finalsum, 60) hr, mon = divmod(mon, 60) #return ("%d Stunden und %02d:%02d" % (hr, mon, sec)) - return ("%d Stunden und %02d Minuten" % (hr, mon)) + return ("%d Stunden, %02d Minuten" % (hr, mon)) @register.simple_tag def getsumbreak(workday): diff --git a/timemanagement/__pycache__/views.cpython-38.pyc b/timemanagement/__pycache__/views.cpython-38.pyc index 1e7c11a..5085494 100644 Binary files a/timemanagement/__pycache__/views.cpython-38.pyc and b/timemanagement/__pycache__/views.cpython-38.pyc differ diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html index 1510267..9b8f916 100644 --- a/timemanagement/templates/timemanagement/timemanagement_management.html +++ b/timemanagement/templates/timemanagement/timemanagement_management.html @@ -13,7 +13,7 @@ # Start Ende - Stunden + Arbeitszeit Pausen Gesamtzeit Gleitzeit in h @@ -23,7 +23,7 @@ {% for workday in workdays %} - + {{forloop.counter}} @@ -48,8 +48,8 @@ - - + + {% endfor %} @@ -57,7 +57,44 @@ - +{% for workday in workdays %} + + +{% endfor %}