diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index b1928e8..a7482e8 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 21357aa..185a289 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -648,3 +648,27 @@ def kontingent(user): pass return kon + +''' + +Zählt ausgegebene Arbeitstage MIT +''' + +workdaycounter = 0 + +@register.simple_tag +def counterWDUp(): + global workdaycounter + workdaycounter += 1 + return '' + +@register.simple_tag +def counterWDreset(): + global workdaycounter + workdaycounter = 0 + return '' + +@register.simple_tag +def getCounterWD(): + global workdaycounter + return workdaycounter diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html index cc0e296..54d01df 100644 --- a/timemanagement/templates/timemanagement/timemanagement_management.html +++ b/timemanagement/templates/timemanagement/timemanagement_management.html @@ -9,7 +9,6 @@
-
@@ -18,6 +17,14 @@
+ +
@@ -50,62 +57,135 @@ - + {% if abday == False %} + {% else %} + + {% endif %} {% endfor %}
{{da|date:"d.m.y"}} + {% if abday != False %} {{abday.reason}} + {% if abday.start == da%} + {% if abday.startday_info == "1" %} + (nur Vormittags) + {% elif abday.startday_info == "2" %} + (nur Nachmittags) + {% endif %} + {% elif abday.end == da%} + {% if abday.endday_info == "1" %} + (nur Vormittags) + {% elif abday.endday_info == "2" %} + (nur Nachmittags) + {% endif %} + {% endif %} + {% else %} {% if abday == False %} + {% counterWDreset %} {% for workday in workdays %} {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} + + {% getCounterWD as wd_counter %} + + {% if wd_counter > 0 %} +
+ {% endif %} + + + {% counterWDUp %} {{workday.start|date:"H:i"}} {% endif %} {% endfor %} {% endif %} {% endif %}
- {% if abday == False %} + {% counterWDreset %} {% for workday in workdays %} {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %} + + {% getCounterWD as wd_counter %} + + {% if wd_counter > 0 %} +
+ {% endif %} + + + {% counterWDUp %} + {{workday.end|date:"H:i"}} {% endif %} {% endfor %} - {% endif %} +
- {% if abday == False %} - {% for workday in workdays %} - {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} - {% getsumworkdayexcludebreak workday as sumworkday %} - {{ sumworkday }} - {% endif %} - {% endfor %} - {% endif %} + {% counterWDreset %} + {% for workday in workdays %} + {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} + + {% getCounterWD as wd_counter %} + + {% if wd_counter > 0 %} +
+ {% endif %} + + + {% counterWDUp %} + + {% getsumworkdayexcludebreak workday as sumworkday %} + {{ sumworkday }} + {% endif %} + {% endfor %} +
- {% if abday == False %} + {% counterWDreset %} {% for workday in workdays %} {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} + + {% getCounterWD as wd_counter %} + + {% if wd_counter > 0 %} +
+ {% endif %} + + {% counterWDUp %} + {% getsumbreak workday as sumbreakofday %} {{sumbreakofday}} min. ({{workday.breaks.all|length}}) {% endif %} {% endfor %} - {% endif %} +
- {% if abday == False %} + + {% counterWDreset %} {% for workday in workdays %} {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} + + {% getCounterWD as wd_counter %} + + {% if wd_counter > 0 %} +
+ {% endif %} + + + {% counterWDUp %} + {% getsumworkday workday as sumwd %} {{sumwd}} {% endif %} {% endfor %} - {% endif %} +
- {% if abday == False %} + + {% counterWDreset %} {% for workday in workdays %} {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} + + {% getCounterWD as wd_counter %} + + {% if wd_counter > 0 %} +
+ {% endif %} + {% counterWDUp %} {% gettimeoveralldiff workday user as erg%} {% if erg.1 == 0 %} +{{erg.0}} @@ -116,26 +196,37 @@ {% endif %} {% endif %} {% endfor %} - {% endif %} +
- {% if abday == False %} + + {% counterWDreset %} {% for workday in workdays %} {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} + + {% getCounterWD as wd_counter %} + + {% if wd_counter > 0 %} +
+ {% endif %} + + + {% counterWDUp %} + {% endif %} {% endfor %} - {% endif %}
- -