diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html
index d9d8e09..c275f02 100644
--- a/standards/templates/standards/standards_management.html
+++ b/standards/templates/standards/standards_management.html
@@ -137,7 +137,8 @@
- {% if perms.users.standardgopublic %}
+ {% getUnpubStandards request.user as standardUnPubCount %}
+ {% if standardUnPubCount > 0 %}
{% if standard.public %}
Veröffentlichung aufheben
{% else %}
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index bf5bbd9..35dc2a5 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 9bee505..6fec9de 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -84,7 +84,6 @@ def getAbsenceAsks(user):
return unconfirmedab
# WORKDAY HISTORY
-# TASK: Hier flag prüfen, ob der User selbst den Tag bearbeitet hat - aktuell werden nur fremde Änderugnen angezeigt
@register.simple_tag
def getWorkDayHistory(workday):
workday = Workday.objects.get(pk=workday.pk)
diff --git a/timemanagement/templates/timemanagement/tm_ab_update.html b/timemanagement/templates/timemanagement/tm_ab_update.html
index 27c9603..ee0b495 100644
--- a/timemanagement/templates/timemanagement/tm_ab_update.html
+++ b/timemanagement/templates/timemanagement/tm_ab_update.html
@@ -39,6 +39,11 @@
+
+
+ {{form.confirm_info|as_crispy_field}}
+
+
+
Bearbeitungsverlauf
- {% for historyele in absence.history.all %}
-
Von {{historyele.history_user.get_full_name}} am {{historyele.history_date|date:"d.m.Y H:i"}}
- {{historyele.confirm_info}}
- {{historyele.confirm_status}}
-
+ {% for historyele in absence.history.all %}
+
+
+
+

+
+
+ {{historyele.history_user.get_full_name}} am {{historyele.history_date|date:"d.m.Y, H:i"}}
+
+ {% if historyele.confirm_status == 0 %}
+ Angenommen {% if historyele.confirm_info|length > 0 %}| Begründung: {{historyele.confirm_info}} {% endif %}
+ {% elif historyele.confirm_status == 1 %}
+ in Bearbeitung {% if historyele.confirm_info|length > 0 %}| Begründung: {{historyele.confirm_info}} {% endif %}
+ {% else %}
+ Abgelehnt
+ {% endif %}
+
+
+
{% endfor %}
@@ -152,7 +176,7 @@
$("#id_info").val("{{absence.info}}");
$("#id_info").prop("disabled", true);
$("#id_confirm_info").val("{{absence.confirm_info}}");
- $("#id_confirm_info").prop("disabled", true);
+ //$("#id_confirm_info").prop("disabled", true);
date_start = "{{start}}";
date_end = "{{end}}";
diff --git a/timemanagement/views.py b/timemanagement/views.py
index c42ae62..b2feb0c 100644
--- a/timemanagement/views.py
+++ b/timemanagement/views.py
@@ -110,7 +110,7 @@ def AbsenceUpdate(request, pk):
absence.endday_info = str(formtocheck.cleaned_data["endday_info"])
absence.reason = formtocheck.cleaned_data["reason"]
#absence.info = formtocheck.cleaned_data["info"]
- #absence.confirm_info = formtocheck.cleaned_data["confirm_info"]
+ absence.confirm_info = formtocheck.cleaned_data["confirm_info"]
rep = None
if(formtocheck.cleaned_data["representator"] != None):
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 517f19a..4a78fbb 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -163,7 +163,6 @@
Agentur
-
{% getUnpubStandards request.user as standardUnPubCount %}
{% if active_link == 'standards' %}