From 327afba7ce810beb364582f8c5761331ea880c5f Mon Sep 17 00:00:00 2001
From: Lorenz Zahn <lorenz.zahn@student.uni-halle.de>
Date: Sat, 8 Jul 2023 15:58:08 +0200
Subject: [PATCH] small tweaks to department evaluation
---
app/vkk/workhours/accounting/departments/forms.py | 2 +-
app/vkk/workhours/accounting/departments/views.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/vkk/workhours/accounting/departments/forms.py b/app/vkk/workhours/accounting/departments/forms.py
index c33c140a..2d82a22d 100644
--- a/app/vkk/workhours/accounting/departments/forms.py
+++ b/app/vkk/workhours/accounting/departments/forms.py
@@ -4,6 +4,6 @@ from vkk.models import Period
class EvaluationForm(Form):
periods = ModelMultipleChoiceField(
- widget=SelectMultiple(attrs={"style":"height: auto;"}),
+ widget=SelectMultiple(attrs={"style":"height: 20em;"}),
queryset=Period.objects.all().order_by('-start')
)
\ No newline at end of file
diff --git a/app/vkk/workhours/accounting/departments/views.py b/app/vkk/workhours/accounting/departments/views.py
index 63ea6e98..1fe9668b 100644
--- a/app/vkk/workhours/accounting/departments/views.py
+++ b/app/vkk/workhours/accounting/departments/views.py
@@ -241,7 +241,7 @@ class EvaluationView(AccountantRequiredMixin, FormView):
vkk_project.id = salary_costs_by_project.project_id \
AND salary_costs_by_project.project_id = general_costs_by_project.project_id \
AND general_costs_by_project.project_id = department_costs_by_project.project_id \
- ;",
+ ORDER BY vkk_project.invoice_number;",
[self.kwargs['pk'], periods, self.kwargs['pk']],
)
queryset = cursor.fetchall()
--
GitLab