From f7247e14ab5818e9419f20db801cd9ceef314552 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Thu, 25 Mar 2021 08:20:56 +0100 Subject: [PATCH] Erster Teil Abwesenheitantrag schick machen --- .../timemanagement/realtime_dropdown.html | 6 +- .../timemanagement/tm_ab_update.html | 19 +- .../timemanagement/tm_ab_update_SAVE.html | 442 ++++++++++++++++++ timemanagement/views.py | 1 - 4 files changed, 461 insertions(+), 7 deletions(-) create mode 100644 timemanagement/templates/timemanagement/tm_ab_update_SAVE.html diff --git a/timemanagement/templates/timemanagement/realtime_dropdown.html b/timemanagement/templates/timemanagement/realtime_dropdown.html index 5ebb42d..a8a447b 100644 --- a/timemanagement/templates/timemanagement/realtime_dropdown.html +++ b/timemanagement/templates/timemanagement/realtime_dropdown.html @@ -159,7 +159,7 @@ Gleitzeitkonto: else{ now = new Date(); viewtime = now - starttime_view - breaktime; - console.log(viewtime); + if(isNaN(viewtime)){ location.href = location.href; } @@ -221,8 +221,8 @@ Gleitzeitkonto: }, success: function( data ) { - // TODO: Hier ist anscheinend der Fehler der zu NaN:NaN usw. führt! - console.log("break end add " + data["actualbreaktime"]); + // TODO: Hier ist anscheinend der Fehler der zu NaN:NaN usw. führt! Sollte jetzt passen! + //console.log("break end add " + data["actualbreaktime"]); breaktime = data["actualbreaktime"]; $("#breaksum").html(convertMS(data["actualbreaktime"])); } diff --git a/timemanagement/templates/timemanagement/tm_ab_update.html b/timemanagement/templates/timemanagement/tm_ab_update.html index 5adc1a9..27c9603 100644 --- a/timemanagement/templates/timemanagement/tm_ab_update.html +++ b/timemanagement/templates/timemanagement/tm_ab_update.html @@ -38,8 +38,9 @@ {{form.representator|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}} +

+ {% endfor %} +
-
+ +
diff --git a/timemanagement/templates/timemanagement/tm_ab_update_SAVE.html b/timemanagement/templates/timemanagement/tm_ab_update_SAVE.html new file mode 100644 index 0000000..5adc1a9 --- /dev/null +++ b/timemanagement/templates/timemanagement/tm_ab_update_SAVE.html @@ -0,0 +1,442 @@ +{% extends "users/base.html" %} +{% block content %} +{% load crispy_forms_tags %} +{% load counter_tag %} +{% load l10n %} +{% load mathfilters %} +{% if request.user.profile.agency.module_timemanagement %} +
+ +

Abwesenheit von {{absence.user.first_name}} {{absence.user.last_name}} Bearbeiten

+ {% getLastEditedAbsence absence as absencehistorie %} + + {% if absencehistorie.history_user != None %} + Zuletzt bearbeitet von {{absencehistorie.history_user.first_name}} {{absencehistorie.history_user.last_name}} am {{absencehistorie.history_date|date:"d.m.Y, H:i"}} + {% endif %} +
+
+
+
+ {% csrf_token %} + {{form.media}} +
+
+ {{form.start |as_crispy_field }} + {{form.startday_info |as_crispy_field }} +
+
+ {{form.end |as_crispy_field }} + {{form.endday_info |as_crispy_field }} +
+
+
+
+
+ {{form.reason|as_crispy_field}} +
+
+ {{form.representator|as_crispy_field}} +
+
+ +
+
+
Begründung
+

{% if absence.info|length > 0 %} + {{absence.info}} + {% else %} + Keine Begründung + {% endif %}

+
+
+
+
+
+
An- oder Ablehnung
+

{% if absence.confirm_info|length > 0 %} + {{absence.confirm_info}} + {% else %} + Kein Hinweis + {% endif %} +

+
+
+
+ {% getAbsenceLastHistory absence as ab_history %} + {% if ab_history != None %} + Zuletzt geändert am {{ab_history.history_date|date:"d.m.Y, H:i"}} von {{ab_history.history_user.get_full_name}} + {% endif %} +
+ +
+
+
Übersicht Urlaubstage
+ +
+ +  Tage /  verbleibend im Jahr  + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
Gewünschte Tage
Resturlaub
Urlaub nächstes Jahr + Rest ()
Summe Urlaubstage
+
+ +
+
+ +
+
+
+
+ {{form.holidays_normal}} + {{form.holidays_rest}} + {{form.holidays_normal_next}} + {{form.holidays_rest_next}} +
+ +Abbrechen + + + + + +{% endif %} +{% endblock content %} diff --git a/timemanagement/views.py b/timemanagement/views.py index 1c516e7..c42ae62 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -651,7 +651,6 @@ def TimeAjax(request): # END BREAK elif request.GET["action"] == "end_break": wd = list(Workday.objects.filter(user=request.user, agency=request.user.profile.agency, end=None, delflag = False))[0] - toendbreak = list(wd.breaks.filter(end=None))[0] toendbreak.end = timezone.now() toendbreak.save()