diff --git a/adm/templates/adm/adm_user_single.html b/adm/templates/adm/adm_user_single.html index 27c4580..c6d8902 100644 --- a/adm/templates/adm/adm_user_single.html +++ b/adm/templates/adm/adm_user_single.html @@ -323,10 +323,9 @@ diff --git a/dump.rdb b/dump.rdb index fff2dd0..f10f3fd 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html index 54e4dff..2e829bc 100644 --- a/timemanagement/templates/timemanagement/timemanagement_singleview.html +++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html @@ -49,6 +49,15 @@ style="background-color: #d3d3d3;" {% elif abday != False %} style="background-color: {{abday.reason.color}}; color: #ffffff" + {% else %} + {% for workday in workdays %} + {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %} + {% getWorkDayHistory workday as wd_history %} + {% if wd_history.history_user != None %} + style="background-color: #fdcc98;" + {% endif %} + {% endif %} + {% endfor %} {% endif %}> {{da|date:"l"}} @@ -330,6 +339,32 @@ {% counterWDUp %} + {% getWorkDayHistory workday as wd_history %} + + {% if wd_history.history_user != None %} + + + + {% endif %} + + {% if workday.freefield != "" %} diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html index 74e1249..3805587 100644 --- a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html +++ b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html @@ -330,7 +330,6 @@
{% endif %} - {% counterWDUp %} {% getWorkDayHistory workday as wd_history %} diff --git a/users/views.py b/users/views.py index 989846a..a0f51d0 100644 --- a/users/views.py +++ b/users/views.py @@ -1515,7 +1515,7 @@ def cronactionsdaily(request, code): try: workdays = Workday.objects.filter(user=user, end=None) for wd in workdays: - mailstatus += "\n WORKDAY AUTEND ID " + wd.pk + mailstatus += "\n WORKDAY AUTEND ID " + str(wd.pk) wd.end = datetime(wd.start.year, wd.start.month, wd.start.day, 23, 59) wd.save() except: @@ -1585,6 +1585,7 @@ def cronactionsdaily(request, code): mailstatus, 'noreply@digitale-agentur.com', ["htrampe@gmail.com", "info@digitale-agentur.com"], + #["htrampe@gmail.com"], fail_silently=True, )