diff --git a/dasettings/forms.py b/dasettings/forms.py index 4e7fdd8..31acecf 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -66,15 +66,18 @@ class UserTimeForm(forms.ModelForm): labels = { "holiday" : "Urlaubstage", "loose_holidedate" : "Urlaubstage aus Vorjahr verfallen am", + "startdate" : "Einstellungsdatum", + "holiday_start" : "Urlaubstage bei Einstellung", "wd_mo" : "Montag", "wd_tu" : "Dienstag", "wd_we" : "Mittwoch", "wd_th" : "Donnerstag", "wd_fr" : "Freitag", } - fields = ["holiday", "loose_holidedate", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr"] + fields = ["holiday", "loose_holidedate", "startdate", "holiday_start", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr"] widgets = { - 'loose_holidedate': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}) + 'loose_holidedate': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}), + "startdate" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}) } @@ -130,14 +133,14 @@ class UserProfileForm(forms.ModelForm): class Meta: model = Profile labels = { - "persnumber" : "Personalnummer", - "visible" : "Im Organigramm sichtbar", - "phonemobile" : "Mobilnummer", - "phone_public" : "Nur Interne Verwendung der Mobilnummer", - "phoneland" : "Festnetznummer", - "image": "Profilbild", - "func" : "Agenturfunktion", - "compfunc" : "Tätigkeit" + "persnumber" : "Personalnummer", + "visible" : "Im Organigramm sichtbar", + "phonemobile" : "Mobilnummer", + "phone_public" : "Nur Interne Verwendung der Mobilnummer", + "phoneland" : "Festnetznummer", + "image": "Profilbild", + "func" : "Agenturfunktion", + "compfunc" : "Tätigkeit" } widgets = {"parent" : forms.HiddenInput()} fields = ["parent", "func", "compfunc", "visible", "phoneland", "phonemobile", "phone_public", "persnumber", "image" ] diff --git a/dasettings/templates/dasettings/settings.html b/dasettings/templates/dasettings/settings.html index b0e75e0..a4ab6b8 100644 --- a/dasettings/templates/dasettings/settings.html +++ b/dasettings/templates/dasettings/settings.html @@ -99,7 +99,7 @@
Agenturinformationen{% if request.user.profile.showtooltips %} {% endif %}
- {% block agency_content %} + {% block agency_content %} {% include "dasettings/agency_content.html" %} {% endblock %} diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index fbdc7e2..c956c94 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -176,7 +176,9 @@

Urlaub 

{{usertime_form.media}} {{usertime_form.holiday|as_crispy_field}} - {{usertime_form.loose_holidedate|as_crispy_field}} + {{usertime_form.holiday_start|as_crispy_field}} + {{usertime_form.loose_holidedate|as_crispy_field}} + {{usertime_form.startdate|as_crispy_field}}
diff --git a/dasettings/views.py b/dasettings/views.py index 3b6e1c9..2e1c7da 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -544,7 +544,6 @@ def UserProfileUpdate(request, pk, newuser=0): elif(request.POST["form_type"] == "contract"): formtosave = UserTimeForm(request.POST, instance=UserTime.objects.get(user=usertochange)) - print(formtosave) if(formtosave.is_valid()): messages.success(request, f'Vertragsdaten gespeichert!') formtosave.save() @@ -792,8 +791,7 @@ def ManageAgInAgn(request, pk): for a in network.adminagencys.all(): allagofagn.append(a) - print(allagofagn) - + context = { 'active_link' : 'dasettings', 'agn' : list(agn)[0], diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index c8b86bc..b038731 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -29,7 +29,7 @@ {% if perms.users.standardmanager %}
  • - {% if unpubstandards_of_user|length > 0 %} + {% if unpubstandards_of_user|length > 0 %} {{unpubstandards_of_user|length}}   {%endif%} Unveröffentlichte Standards diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 74b17f9..5ee75a9 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 2dbf71d..1d00d60 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -2,7 +2,7 @@ from django import template from django.contrib.auth.models import Group, User from users.models import AgencyGroup, Agency, AgencyNetwork, AgencyNetworkPreperation from standards.models import Standards, StandardCommentRate, StandardComments -from timemanagement.models import Workday, FreeDays +from timemanagement.models import Workday, FreeDays, Absence from message.models import Message import os from django.conf import settings @@ -414,4 +414,29 @@ def isfreedayname(user, daytocheck): if len(fd) > 0: returnstat = True returnstat = fd[0].name - return returnstat \ No newline at end of file + return returnstat + +# RETURN ALL ABSENCE ELEMENTS FOR THAT DAY +@register.simple_tag +def getabscenceday(loggeduser, user, daytocheck): + + returnstat = False + if(loggeduser.has_perm("users.absencemanager")): + absencedays = Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck) + else: + absencedays = (Absence.objects.filter(agency=user.profile.agency, user=loggeduser, confirm_status=1) | Absence.objects.filter(agency=user.profile.agency, user=user, confirm_status=0)) & (Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck) ) + if(len(absencedays) > 0): + returnstat = list(absencedays)[0] + + return returnstat + +@register.simple_tag +def getsomeyears(start): + years = [] + start_int = int(start) + years = [start_int-4, start_int-3,start_int-2,start_int-1,start_int, start_int+1, start_int+2, start_int+3, start_int+4] + return years + +@register.simple_tag +def getsomemonths(): + return ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"] \ No newline at end of file diff --git a/timemanagement/forms.py b/timemanagement/forms.py index b41aadf..3374716 100644 --- a/timemanagement/forms.py +++ b/timemanagement/forms.py @@ -1,19 +1,65 @@ from bootstrap_datepicker_plus import DatePickerInput from django import forms from django.forms import ModelForm -from .models import Absence - +from .models import Absence, AbsenceReason +from users.models import UserFullName class AddAbsence(forms.ModelForm): - class Meta: model = Absence labels = { - "start" : "Beginn der Abwesenheit", - "end" : "Ende der Abwesenheit", - } - fields = ['start', 'end'] + "start" : "Beginn der Abwesenheit", + "start_ishalf" : "Halber Tag?", + "end" : "Ende der Abwesenheit", + "end_ishalf" : "Halber Tag?", + "reason" : "Abwesenheitsgrund", + "representator" : "Vertreter", + "info" : "Begründung" + } widgets = { - 'start': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}), - 'end': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}), - } \ No newline at end of file + 'start': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}), + 'end': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}), + } + + + fields = ['start', 'start_ishalf', 'end','end_ishalf', 'reason', "representator", 'info'] + + def __init__(self, *arg, **kwargs): + super(AddAbsence, self).__init__(*arg, **kwargs) + self.fields['reason'].queryset = AbsenceReason.objects.filter(agency=kwargs['instance'].profile.agency).order_by('-name') + self.fields['representator'].queryset = UserFullName.objects.filter(profile__agency=kwargs['instance'].profile.agency) + self.fields['info'].widget.attrs['rows'] = 3 + self.fields['start'].required = True + self.fields['end'].required = True + self.fields['reason'].required = True + + self.fields['nextmonth'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['prevmonth'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['nextyear'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['prevyear'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['activemonth'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['activeyear'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + self.fields['userid'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput()) + + ''' + def clean(self): + start_date = self.cleaned_data['start'] + end_date = self.cleaned_data['end'] + + if end_date <= start_date: + raise forms.ValidationError("Das Ende der Abwesenheit muss am oder nach dem Start der Abwesenheit liegen.") + return super(AddAbsence, self).clean() + ''' + +class ConfirmAbsenceForm(forms.ModelForm): + class Meta: + model = Absence + + labels = { + "confirm_info" : "Begründung zur Annahme/zur Ablehnung" + } + fields = ['confirm_info'] + + def __init__(self, *arg, **kwargs): + super(ConfirmAbsenceForm, self).__init__(*arg, **kwargs) + self.fields['confirm_info'].widget.attrs['rows'] = 3 \ No newline at end of file diff --git a/timemanagement/models.py b/timemanagement/models.py index 9e92da3..758b83e 100644 --- a/timemanagement/models.py +++ b/timemanagement/models.py @@ -1,6 +1,7 @@ from django.db import models from django.contrib.auth.models import User from users.models import Agency +from django.core.exceptions import ValidationError # Create your models here. class Workday(models.Model): @@ -24,17 +25,31 @@ class AbsenceReason(models.Model): need_rep = models.BooleanField(default=True) is_holiday = models.BooleanField(default=True) + def __str__(self): + return f'{self.name}' + class Absence(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) agency = models.ForeignKey(Agency, on_delete=models.CASCADE) start = models.DateTimeField(default=None, null=True, blank=True) end = models.DateTimeField(default=None, null=True, blank=True) - start_ishalf = models.BooleanField(default=False) - end_ishalf = models.BooleanField(default=False) + start_ishalf = models.BooleanField(default=False, blank=True) + end_ishalf = models.BooleanField(default=False, blank=True) reason = models.ForeignKey("AbsenceReason", on_delete=models.SET_NULL, null=True, blank=True) info = models.TextField(blank=True, verbose_name='Abwesenheitsbegründung', default="") + ''' + CONFIRM_STATUS INFOS + + 0 = NO NEED TO CONFIRM AND CONFORM OK + 1 = IS CONFIRMED, AWAITING OK + 2 = NOT CONFIRMED + + ''' confirm_status = models.IntegerField(default=0) confirm_info = models.TextField(blank=True, verbose_name='Begründung', default="") + representator = models.ForeignKey(User, blank=True, default=None, null=True, on_delete=models.CASCADE, related_name="Vertreter") + + class FreeDays(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE) diff --git a/timemanagement/templates/timemanagement/rendered_confirmform.html b/timemanagement/templates/timemanagement/rendered_confirmform.html new file mode 100644 index 0000000..c096873 --- /dev/null +++ b/timemanagement/templates/timemanagement/rendered_confirmform.html @@ -0,0 +1,23 @@ +{% load crispy_forms_tags %} +
    Abwesenheit für {{absence.user.first_name}} {{absence.user.last_name}} annehmen oder ablehnen
    +
    +
    Informationen der Abwesenheit
    +Von: {{absence.start|date:"d.m Y"}}
    +Bis: {{absence.end|date:"d.m Y"}}
    +Grund: {{absence.reason.name}}
    +Informationen: {{absence.info}}
    +
    +
    + + {% csrf_token %} + {{confirmform|crispy}} +
    • +
    + + +
    + + \ No newline at end of file diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html index e9a2388..ca718a9 100644 --- a/timemanagement/templates/timemanagement/rendered_table.html +++ b/timemanagement/templates/timemanagement/rendered_table.html @@ -1,18 +1,17 @@ {% load counter_tag %} - -
    - - - - -
    - - + + {% for da in days_this_month %} {% endfor %} - + {% for us in usersofagency %} {% setdateforloopcounter forloop.counter %} @@ -27,12 +26,72 @@ {% isfreeday user da as isfree %} {% isfreedayname user da as isfreename %} - {% if isfree %} - @@ -40,26 +99,123 @@ {% endfor %}
    - {% for da in days_this_month %} +
    +
    + + + +
    +     		{{da|date:"d D"}}
    + {% getabscenceday user us da as abday %} + {% if isfree %} + + {% elif da.weekday == 5 or da.weekday == 6 %} - - {% else %} + + + {% elif abday != False %} + + {% if abday.confirm_status == 0 %} + {% if user|usergperm:"absencemanager" %} + + {% else %} + + {% endif %} + {% elif abday.confirm_status == 1 %} + {% if user|usergperm:"absencemanager" %} + + {% else %} + + {% endif %} + {% else %} + + {% endif %} + + {% else %} + {% endif %}
    - - + - - \ No newline at end of file diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html index faf6858..4587bb3 100644 --- a/timemanagement/templates/timemanagement/timemanagement_management.html +++ b/timemanagement/templates/timemanagement/timemanagement_management.html @@ -68,7 +68,7 @@
    - Arbeitstag löschen +
    Arbeitstag löschen
    Möchten Sie wirklich den Arbeitstag am {{workday.start|date:"d.m"}} löschen? diff --git a/timemanagement/templates/timemanagement/tm_ab_all.html b/timemanagement/templates/timemanagement/tm_ab_all.html new file mode 100644 index 0000000..f867545 --- /dev/null +++ b/timemanagement/templates/timemanagement/tm_ab_all.html @@ -0,0 +1,93 @@ +
    +
    + + + + + + + + + + + + + + {% for abday in allabsences %} + + + + + + + + + + {% endfor %} + +
    MitarbeiterStartEndeGrundInfoStatus 
    {{abday.user.first_name}} {{abday.user.last_name}}{{abday.start|date:"d.M Y"}}{{abday.end|date:"d.M Y"}}{{abday.reason.name}}{{abday.info}}{% if abday.confirm_status == 0 %} Genehmigt {% elif abday.confirm_status == 1 %} Beantragt {% else %} Abgelehnt {% endif %} + +
    +
    +
    + + +{% for ab in allabsences %} + + +{% endfor %} \ No newline at end of file diff --git a/timemanagement/templates/timemanagement/tm_ab_management.html b/timemanagement/templates/timemanagement/tm_ab_management.html index 28be539..ef75fc5 100644 --- a/timemanagement/templates/timemanagement/tm_ab_management.html +++ b/timemanagement/templates/timemanagement/tm_ab_management.html @@ -3,48 +3,143 @@ {% load crispy_forms_tags %} {% load counter_tag %} {% if request.user.profile.agency.module_timemanagement_ze %} - - - - - - +

    Abwesenheiten{% if request.user.profile.showtooltips %} {% endif %}

    -
    -
    - Lade Kalenderdaten... -
    -     + + + + + + + + + + + + {% else %}

    Das Modul Abwesenheits- und Zeiterfassung wurde in ihrer Agentur deaktiviert.

    diff --git a/timemanagement/templates/timemanagement/tm_ab_toconfirm.html b/timemanagement/templates/timemanagement/tm_ab_toconfirm.html new file mode 100644 index 0000000..47f855f --- /dev/null +++ b/timemanagement/templates/timemanagement/tm_ab_toconfirm.html @@ -0,0 +1,57 @@ +{% load counter_tag %} +
    +
    + + + + + + + + + + + + + {% for abday in needtoconfirm %} + + + + + + + + + {% endfor %} + +
    MitarbeiterStartEndeGrundInfoStatus ändern
    {{abday.user.first_name}} {{abday.user.last_name}}{{abday.start|date:"d.M Y"}}{{abday.end|date:"d.M Y"}}{{abday.reason.name}}{{abday.info}} + +
    +
    +
    + + + \ No newline at end of file diff --git a/timemanagement/templates/timemanagement/tm_ab_userown.html b/timemanagement/templates/timemanagement/tm_ab_userown.html new file mode 100644 index 0000000..aa18020 --- /dev/null +++ b/timemanagement/templates/timemanagement/tm_ab_userown.html @@ -0,0 +1,50 @@ +
    +
    + + + + + + + + + + + + {% for abday in userown %} + + + + + + + + {% endfor %} + +
    StartEndeGrundStatusBegründung
    {{abday.start|date:"d.M Y"}}{{abday.end|date:"d.M Y"}}{{abday.reason.name}}{% if abday.confirm_status == 0 %} Genehmigt {% elif abday.confirm_status == 1 %} Beantragt {% else %} Abgelehnt {% endif %}{{abday.confirm_info}}
    +
    +
    + \ No newline at end of file diff --git a/timemanagement/views.py b/timemanagement/views.py index a72a7d6..cf2bc1c 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -1,7 +1,7 @@ -from django.shortcuts import render +from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required from django.http import JsonResponse -from .models import Workday, Breaks, FreeDays +from .models import Workday, Breaks, FreeDays, AbsenceReason, Absence from django.utils import timezone import requests, csv, os from django.templatetags.static import static @@ -11,7 +11,11 @@ from django.contrib.auth.models import User from calendar import monthrange import datetime import calendar -from .forms import AddAbsence +from .forms import AddAbsence, ConfirmAbsenceForm +from django.contrib import messages +from users.models import UserFullName + + def loadingFreeDays(plz): # Getting land @@ -46,70 +50,124 @@ def get_datetime_range(year, month): @login_required def AbsenceManagmenet(request, activemonth=False, activeyear=False): - prevmonth = "" - nextmonth = "" - - - #MONTH - if(not activemonth or activemonth > 12 or activemonth < 1): - activemonth = int(activemonth) - #Active month - activemonth=date.today().month - - if(activemonth == 1): - prevmonth = 12 - else: - prevmonth = activemonth-1 - if(activemonth == 12): - nextmonth = 1 + # NEW ABSENCE + if(request.method == "POST"): + ''' + + Nachdem eine neue Abwesenheit gespeichert wurde, geht es zur normalen Seite zurück, jedoch mit den Daten des + aktuell angezeigten Monate/Jahr + + ''' + if(request.POST.get("form_type") == "absenceform"): + formtocheck = AddAbsence(request.POST, instance=request.user) + if(formtocheck.is_valid()): + + try: + workinguser = UserFullName.objects.get(pk=formtocheck.cleaned_data["userid"]) + + # DIFFERENT USER AGENCY + if(workinguser.profile.agency != request.user.profile.agency): + messages.success(request, f'Das dürfen Sie nicht!') + return redirect('tma-management', formtocheck.cleaned_data['activemonth'], formtocheck.cleaned_data['activeyear']) + # ALL OK - START SAVING ABSENCE + else: + confirmstat = 0 + if(request.user.has_perm("absencemanager") == False): + confirmstat = 1 + messages.success(request, f'Abwesenheit beantragt') + # SEND NOTIFICATION + else: + messages.success(request, f'Abwesenheit eingetragen') + + rep = None + if(formtocheck.cleaned_data["representator"] != None): + rep = User.objects.get(pk=formtocheck.cleaned_data["representator"].pk) + + newab = Absence(agency=request.user.profile.agency, user=workinguser, start=formtocheck.cleaned_data["start"],end=formtocheck.cleaned_data["end"], representator=rep, confirm_status=confirmstat, info=formtocheck.cleaned_data["info"], reason=formtocheck.cleaned_data["reason"], start_ishalf=formtocheck.cleaned_data["start_ishalf"], end_ishalf=formtocheck.cleaned_data["end_ishalf"]).save() + # USER NOT FOUND + except: + messages.success(request, f'Fehler bei Benutzerzuweisung!') + return redirect('tma-management', formtocheck.cleaned_data['activemonth'], formtocheck.cleaned_data['activeyear']) + + return redirect('tma-management', formtocheck.cleaned_data['activemonth'], formtocheck.cleaned_data['activeyear']) + else: + messages.success(request, f'Fehler beim eintragen der neuen Abwesenheit!') + return redirect('tma-management', formtocheck.cleaned_data['activemonth'], formtocheck.cleaned_data['activeyear']) else: - nextmonth = activemonth + 1 + return redirect('tma-management') + # NORMAL VIEW else: + prevmonth = "" + nextmonth = "" + #MONTH + if(not activemonth or activemonth > 12 or activemonth < 1): + activemonth = int(activemonth) + #Active month + activemonth=date.today().month + + if(activemonth == 1): + prevmonth = 12 + else: + prevmonth = activemonth-1 + + if(activemonth == 12): + nextmonth = 1 + else: + nextmonth = activemonth + 1 + else: + + if(activemonth == 1): + prevmonth = 12 + else: + prevmonth = activemonth-1 + + if(activemonth == 12): + nextmonth = 1 + else: + nextmonth = activemonth + 1 + + #YEAR + nextyear = date.today().year + prevyear = date.today().year + + if(not activeyear): + activeyear = date.today().year + else: + if(nextmonth == 1): + nextyear = activeyear + 1 + else: + nextyear = activeyear + if(prevmonth == 12): + prevyear = activeyear - 1 + else: + prevyear = activeyear - if(activemonth == 1): - prevmonth = 12 - else: - prevmonth = activemonth-1 + context = { + "active_link" : "abscence", + "usersofagency" : User.objects.filter(profile__agency=request.user.profile.agency).order_by("-last_name"), + "days_this_month" : get_datetime_range(activeyear,activemonth), + "nextmonth" : nextmonth, + "prevmonth" : prevmonth, + "nextyear" : nextyear, + "prevyear" : prevyear, + "activemonth" : activemonth, + "activeyear" : activeyear, + "abscenceform" : AddAbsence(instance=request.user), + "userown" : Absence.objects.filter(agency=request.user.profile.agency, user=request.user).order_by("start") + } - if(activemonth == 12): - nextmonth = 1 - else: - nextmonth = activemonth + 1 + if(request.user.has_perm("users.absencemanager")): + context.update({ + "needtoconfirm" : Absence.objects.filter(agency=request.user.profile.agency, confirm_status=1).order_by("-start"), + "allabsences" : Absence.objects.filter(agency=request.user.profile.agency).order_by("-start") + }) - #YEAR - nextyear = date.today().year - prevyear = date.today().year - - if(not activeyear): - activeyear = date.today().year - else: - if(nextmonth == 1): - nextyear = activeyear + 1 - else: - nextyear = activeyear - if(prevmonth == 12): - prevyear = activeyear - 1 - else: - prevyear = activeyear - - context = { - "active_link" : "abscence", - "usersofagency" : User.objects.filter(profile__agency=request.user.profile.agency).order_by("-last_name"), - "days_this_month" : get_datetime_range(activeyear,activemonth), - "nextmonth" : nextmonth, - "prevmonth" : prevmonth, - "nextyear" : nextyear, - "prevyear" : prevyear, - "activemonth" : activemonth, - "activeyear" : activeyear, - "abscenceform" : AddAbsence() - } - return render(request, 'timemanagement/tm_ab_management.html', context) + return render(request, 'timemanagement/tm_ab_management.html', context) @login_required -def TimeManagement(request): +def TimeManagement(request): context = { "active_link" : "timemanagement", "workdays" : Workday.objects.filter(agency=request.user.profile.agency, user=request.user).order_by("-start") @@ -187,8 +245,8 @@ def TimeAjax(request): } else: data = { "success" : False} - # REMOVE WORKDAY - elif request.GET["action"] == "testdjango": + # Get Rendered Table + elif request.GET["action"] == "getrenderedtable": prevmonth = "" nextmonth = "" activemonth = int(request.GET["activemonth"]) @@ -248,9 +306,57 @@ def TimeAjax(request): "nextyear" : nextyear, "prevyear" : prevyear } - - return render(request, "timemanagement/rendered_table.html", context) + + # Get Rendered Table + elif request.GET["action"] == "checkrequired": + reason = AbsenceReason.objects.get(pk=request.GET["rid"]) + if(reason.agency == request.user.profile.agency): + data = { + "success" : True, + "isreq" : reason.need_rep + } + else: + data = { + "success" : False + } + # DELETE ABSENCE + elif request.GET["action"] == "remove_absence": + absence = Absence.objects.get(pk=request.GET["ab"]) + + if(request.user.has_perm("users.absencemanager") and absence.agency == request.user.profile.agency): + absence.delete() + data = { + "success" : True + } + # GET FORM FOR CONFIRM ABSENCE + elif request.GET["action"] == "getrenderedform": + + context = { + "confirmform" : ConfirmAbsenceForm(instance=request.user), + "absence" : Absence.objects.get(pk=request.GET["abscenceid"]) + } + + return render(request, "timemanagement/rendered_confirmform.html", context) + elif request.GET["action"] == "confirmornotabscence": + absence = Absence.objects.get(pk=request.GET["absencetowork"]) + new_stat = request.GET["newconfstat"] + + info = request.GET["info"] + + if(absence.user.profile.agency == request.user.profile.agency and request.user.has_perm("users.absencemanager")): + absence.confirm_status = new_stat + absence.confirm_info = info + absence.save() + messages.success(request, f'Abwesenheit gespeichert!') + else: + messages.success(request, f'Das dürfen Sie nicht!') + + data = { + "success" : True, + "activemonth" : request.GET["activemonth"], + "activeyear" : request.GET["activeyear"] + } else: data = { "success" : False @@ -258,3 +364,4 @@ def TimeAjax(request): return JsonResponse(data) + diff --git a/users/admin.py b/users/admin.py index ed873be..6a960c1 100644 --- a/users/admin.py +++ b/users/admin.py @@ -6,7 +6,7 @@ from django.contrib.auth.models import Permission from message.models import Message from cloud.models import DataFile from organizer.models import AGContacts -from timemanagement.models import Workday, Breaks, AbsenceReason, FreeDays +from timemanagement.models import Workday, Breaks, AbsenceReason, FreeDays, Absence admin.site.register(StandardComments) admin.site.register(StandardCommentRate) @@ -25,4 +25,5 @@ admin.site.register(UserTime) admin.site.register(Workday) admin.site.register(Breaks) admin.site.register(AbsenceReason) +admin.site.register(Absence) admin.site.register(FreeDays) diff --git a/users/models.py b/users/models.py index ebda601..c4ab975 100644 --- a/users/models.py +++ b/users/models.py @@ -252,7 +252,9 @@ class UserTime(models.Model): wd_th = models.FloatField(default=8.0) wd_fr = models.FloatField(default=8.0) holiday = models.FloatField(default=24.0) - loose_holidedate = models.DateField(default=datetime.date(datetime.datetime.now().year + 1, 4,30)) + holiday_start = models.FloatField(default=0.0) + loose_holidedate = models.DateField(default=datetime.date(datetime.datetime.now().year + 1, 4,30)) + startdate = models.DateTimeField(default=None, blank=True, null=True) ''' diff --git a/users/static/users/img/registerbackground.jpg b/users/static/users/img/registerbackground.jpg index 2aa0057..49841c9 100644 Binary files a/users/static/users/img/registerbackground.jpg and b/users/static/users/img/registerbackground.jpg differ