From 51dfbead3b57dc0f2906520df43e353953fad8da Mon Sep 17 00:00:00 2001 From: Lorenz Zahn <lorenz.zahn@student.uni-halle.de> Date: Sun, 3 Sep 2023 17:51:25 +0200 Subject: [PATCH] =?UTF-8?q?grenze=20f=C3=BCr=20projektlaufzeiten=20in=20"a?= =?UTF-8?q?lle=20mitarbeiter*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/vkk/workhours/allprojects/forms.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/vkk/workhours/allprojects/forms.py b/app/vkk/workhours/allprojects/forms.py index 3370d2f4..0c76d29b 100644 --- a/app/vkk/workhours/allprojects/forms.py +++ b/app/vkk/workhours/allprojects/forms.py @@ -57,7 +57,7 @@ class AssigneeForm(forms.Form): contributor=assignee, project__projectmanager__manager=manager, project__projectmanager__end__gte=timezone.now().date() - ).order_by('project__invoice_number') + ).select_related("project").order_by('project__invoice_number') for assignment in self._assignments: for period in self._periods: @@ -79,6 +79,10 @@ class AssigneeForm(forms.Form): if closure.exists(): disabled = closure[0].is_closed_manager + if not disabled: + disabled = period.end < assignment.project.start + disabled |= period.start > assignment.project.end + field = forms.DecimalField( required=False, min_value=0, -- GitLab