diff --git a/timemanagement/views.py b/timemanagement/views.py index 47c52c2..08e6e54 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -445,9 +445,12 @@ def TimeUpdate(request, pk, team=0): @login_required def TimeAdd(request, team=0, pk=0): + # Nutzer fügt selber einen neuen Arbeitstag hinzu if(team == 0): user = request.user form = AddWorkdayForm(request.POST, instance=request.user) + form.fields['target'] = 2.0 + # Verwalter fügt einen Arbeitstag hinzu else: user = User.objects.get(pk=pk) form = AddWorkdayForm(request.POST, instance=user) @@ -487,9 +490,29 @@ def TimeAdd(request, team=0, pk=0): } return render(request, 'timemanagement/timemanagement_add.html', context) else: + + form = AddWorkdayForm() + + # Setzt die Zielarbeitszeit auf die in den Vertragsdaten hinterlegten Wert + today = date.today() + if(today.isoweekday() == 1): + form.fields["target"].initial = user.usertime.wd_mo + elif(today.isoweekday() == 2): + form.fields["target"].initial = user.usertime.wd_tu + elif(today.isoweekday() == 3): + form.fields["target"].initial = user.usertime.wd_we + elif(today.isoweekday() == 4): + form.fields["target"].initial = user.usertime.wd_th + elif(today.isoweekday() == 5): + form.fields["target"].initial = user.usertime.wd_fr + elif(today.isoweekday() == 6): + form.fields["target"].initial = user.usertime.wd_sa + elif(today.isoweekday() == 7): + form.fields["target"].initial = user.usertime.wd_so + context = { "active_link" : "timemanagement", - "form" : AddWorkdayForm(), + "form" : form, "team" : team, "user" : user }