bug die dritte Darius du bist toll

This commit is contained in:
Holger Trampe 2021-10-07 19:48:03 +02:00
parent a91791ae29
commit 8447f1eb2e
3 changed files with 19 additions and 1 deletions

View File

@ -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>

View File

@ -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)