diff --git a/adm/templates/adm/adm_tmworkday.html b/adm/templates/adm/adm_tmworkday.html
index fe6e9e3..6ccdca5 100644
--- a/adm/templates/adm/adm_tmworkday.html
+++ b/adm/templates/adm/adm_tmworkday.html
@@ -11,17 +11,22 @@
| Name |
- Relevante Arbeitstage |
+ Relevante Arbeitstage OHNE FLAG |
+ Relevante Arbeitstage MIT FLAG |
{% for user in users %}
{% getADMAbsenceWorkdays user as workdays %}
+ {% getADMAbsenceWorkdaysTrue user as workdaystrue %}
| {{user.username}} |
{% for wd in workdays %} {{wd.pk}}, {% endfor %}
|
+
+ {% for wd in workdaystrue %} {{wd.pk}}, {% endfor %}
+ |
{% endfor %}
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index c4e122e..0e7989f 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 826b105..57adb8f 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -1120,6 +1120,19 @@ def getADMAbsenceWorkdays(user):
# Arbeitstage an diesem Tag werden geladen
workdays = Workday.objects.filter(user=absence.user, start__day=day.day, start__month=day.month, start__year=day.year, delflag=False)
+ # Wenn es Arbeitstage gibt, dann wird geprüft, ob die Abwesenheit diesen verändert hat.
+ for workday in workdays:
+ workdays_final.append(workday)
+ return workdays_final
+
+@register.simple_tag
+def getADMAbsenceWorkdaysTrue(user):
+ workdays_final = []
+ for absence in Absence.objects.filter(user=user):
+ for day in daterange(absence.start, absence.end):
+ # Arbeitstage an diesem Tag werden geladen
+ workdays = Workday.objects.filter(user=absence.user, start__day=day.day, start__month=day.month, start__year=day.year, delflag=True)
+
# Wenn es Arbeitstage gibt, dann wird geprüft, ob die Abwesenheit diesen verändert hat.
for workday in workdays:
workdays_final.append(workday)