From 8447f1eb2eda454489df8d98481c01e9d32b1f1f Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Thu, 7 Oct 2021 19:48:03 +0200
Subject: [PATCH] bug die dritte Darius du bist toll

---
 adm/templates/adm/adm_tmworkday.html          |   7 ++++++-
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 25338 -> 25583 bytes
 standards/templatetags/counter_tag.py         |  13 +++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

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 @@
     <thead>
         <trd>
             <td>Name</td>
-            <td>Relevante Arbeitstage</td>
+            <td>Relevante Arbeitstage OHNE FLAG</td>
+            <td>Relevante Arbeitstage MIT FLAG</td>
         </trd>
     </thead>
     <tbody>
         {% for user in users %}
             {% getADMAbsenceWorkdays user as workdays %}
+            {% getADMAbsenceWorkdaysTrue user as workdaystrue %}
         <tr>
             <td>{{user.username}}</td>
             <td>
                 {% for wd in workdays %} <a href="{% url 'adm-workday-update' wd.pk %}">{{wd.pk}}</a>, {% endfor %}
             </td>
+            <td>
+                {% for wd in workdaystrue %} <a href="{% url 'adm-workday-update' wd.pk %}">{{wd.pk}}</a>, {% endfor %}
+            </td>
         </tr>
         {% endfor %}
     </tbody>
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index c4e122ecb40feed853491798b994dd5d13dd0788..0e7989f61b32efda97afc45f836acc890e2aabc4 100644
GIT binary patch
delta 202
zcmex$l=1y>M!ry9UM>b8=rM{<d|W+|Plj>IM(tKskyQCCrIhU{J6af;8KY`a*n=4~
zcW&OsdN!PK<>Z!FB_O#x))`2?j?G}~ocukeJ0hg0g^_`ws0~DPfCw3&u@FKQ$hsw&
zo?7DQ;_H}HoSK)M8lGR2osw8t98y%8n!&=rP|OE%1rrOS5Tg*295V-_0Ao=X&=k$u
k&5?0j%<P>Y6T28E3vh@}u1Vx$EZE$gn9s<<#lyk~00r_maR2}S

delta 90
zcmaEVoblIDM!ry9UM>b8C^n2wJXAT6PlmB=qjoDRTMBzHgXZ?lM_A8>Gipwr6srUz
rx5hdH$)B+qY;BAT44O5YUE{f!nc5g9Kj0FdoSVeQn6tSiDW4Gl6T%#J

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)