diff --git a/timemanagement/templates/timemanagement/realtime_dropdown.html b/timemanagement/templates/timemanagement/realtime_dropdown.html
index 7e3a745..f85c479 100644
--- a/timemanagement/templates/timemanagement/realtime_dropdown.html
+++ b/timemanagement/templates/timemanagement/realtime_dropdown.html
@@ -37,6 +37,9 @@ Gleitzeitkonto:
-{{actualaccounttime.0}} Stunden
{% endif %}
+
+
+
diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html
index 16b5c86..b8e5a19 100644
--- a/timemanagement/templates/timemanagement/rendered_table.html
+++ b/timemanagement/templates/timemanagement/rendered_table.html
@@ -225,8 +225,48 @@
+
+{% if user|usergperm:"absencemanager" %}
+
+
+
+
+
+ Bitte wählen Sie den Mitarbeiter aus, für den Sie eine neue Abwesenheit anlegen wollen.
+
+
+ {% for us in usersofagency %}
+
+ {% endfor %}
+
+
+
+
+
+
+{% endif %}
-
Abwesenheiten{% if request.user.profile.showtooltips %} {% endif %}
+ Abwesenheiten{% if request.user.profile.showtooltips %} {% endif %}
+
+ {% if user|usergperm:"absencemanager" %} {% endif %}
diff --git a/timemanagement/views.py b/timemanagement/views.py
index ffdd255..8f33398 100644
--- a/timemanagement/views.py
+++ b/timemanagement/views.py
@@ -906,7 +906,8 @@ def TimeAjax(request):
"need_days_next" : need_days_next,
"need_days_this" : need_days_this,
"other_absences" : other_absences_string,
- "userown_absences" : userown_absences_string
+ "userown_absences" : userown_absences_string,
+ "choosenuser_name" : user.first_name + " " + user.last_name
}
# REQUEST USER NO RIGHTS
else:
diff --git a/users/views.py b/users/views.py
index aa4cf30..a71e07b 100644
--- a/users/views.py
+++ b/users/views.py
@@ -987,7 +987,7 @@ def absencecheck(user, daytocheck):
return returnstat
-# CRONJOBS UM 00:01!
+# CRONJOBS UM 00:05!
def cronactionsdaily(request, code):
data = {}
if(code == settings.CRONAPIKEY):
@@ -1044,7 +1044,7 @@ def cronactionsdaily(request, code):
targettworktime = user.usertime.wd_so
# Es wird nur ein Arbeitstag erstellt, wenn KEINE Abwesenheiten vorliegen und der Nutzer an diesem Tag arbeiten muss
- if(workdays_yesterday == 0 and absencecheck(user, yesterday) == False and targettworktime > 0.0):
+ if(workdays_yesterday == 0 and absencecheck(user, yesterday) == False and targettworktime > 0.0 and user.usertime.usetime_start <= today):
workdaytemp = Workday(user=user, agency=user.profile.agency, start=datetime(yesterday.year, yesterday.month, yesterday.day, 8, 0), end=datetime(yesterday.year, yesterday.month, yesterday.day, 8, 0), target=targettworktime)
workdaytemp.save()