From e98da4426addc412fb9aca0cd5c3c594c608f9aa Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Sat, 22 Feb 2025 18:14:34 +0100
Subject: [PATCH] update fields and wordings

---
 fet2020/finance/admin.py  | 10 ++++++----
 fet2020/finance/forms.py  |  4 ----
 fet2020/finance/models.py |  2 +-
 fet2020/finance/views.py  |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/fet2020/finance/admin.py b/fet2020/finance/admin.py
index 5d3e410a..7a091222 100644
--- a/fet2020/finance/admin.py
+++ b/fet2020/finance/admin.py
@@ -56,7 +56,7 @@ class BillPeriodeFilter(admin.SimpleListFilter):
 
     def lookups(self, request, model_admin):
         qs = model_admin.get_queryset(request).order_by("-date")
-        if qs.exists() is not True:
+        if not qs.exists():
             return None
 
         count = 0
@@ -203,9 +203,11 @@ class BillAdmin(admin.ModelAdmin):
     ]
 
     actions = ["make_cleared", "make_finished"]
+    autocomplete_fields = ["resolution"]
     list_filter = ["status", "affiliation", "payer", BillPeriodeFilter]
+    search_fields = ["purpose", "bankdata__name"]
+    show_facets = admin.ShowFacets.ALWAYS
     ordering = ["-id"]
-    search_fields = ["purpose"]
 
     readonly_fields = [
         "get_bankdata_name",
@@ -461,7 +463,7 @@ class FeeAdmin(admin.ModelAdmin):
                 self.message_user(
                     request,
                     (
-                        "Das PDF File konnte nicht generiert werden, weil der Status nicht auf "
+                        "Das PDF-Dokument konnte nicht generiert werden, da der Status nicht auf "
                         "'Eingereicht' gesetzt ist."
                     ),
                     messages.WARNING,
@@ -669,7 +671,7 @@ class WirefAdmin(admin.ModelAdmin):
             else:
                 self.message_user(
                     request,
-                    "Das PDF File wurde nicht generiert, weil der Status nicht offen ist.",
+                    "Das PDF-Dokument konnte nicht generiert werden, da der Status nicht auf 'Offen' gesetzt ist.",
                     messages.WARNING,
                 )
             return HttpResponseRedirect(".")
diff --git a/fet2020/finance/forms.py b/fet2020/finance/forms.py
index 30ac2dcf..54bdbb9e 100644
--- a/fet2020/finance/forms.py
+++ b/fet2020/finance/forms.py
@@ -122,7 +122,6 @@ class BillCreateForm(forms.ModelForm):
         self.fields["bill_creator"].required = True
 
         self.fields["invoice"].placeholder = "Firmenname\nStraße\nPLZ und Ort"
-        self.fields["invoice"].cols = 30
         self.fields["invoice"].rows = 4
 
         # Bank data fields
@@ -212,13 +211,11 @@ class BillUpdateForm(forms.ModelForm):
         self.fields["status"].disabled = True
 
         # Config for textarea of invoice. Calc rows for a better view.
-        self.fields["invoice"].cols = 30
         if (rows := kwargs["instance"].invoice.count("\n") + 1) < 3:
             rows = 3
         self.fields["invoice"].rows = rows
 
         # Config for textarea of comment. Calc rows for a better view.
-        self.fields["comment"].cols = 30
         rows = kwargs["instance"].comment.count("\n") + 1
         self.fields["comment"].rows = rows
 
@@ -477,7 +474,6 @@ class ResolutionCreateForm(forms.ModelForm):
 
         self.fields["option"].autofocus = True
 
-        self.fields["voting_text"].cols = 30
         self.fields["voting_text"].rows = 3
 
 
diff --git a/fet2020/finance/models.py b/fet2020/finance/models.py
index a48b304f..d447a11b 100644
--- a/fet2020/finance/models.py
+++ b/fet2020/finance/models.py
@@ -207,7 +207,7 @@ class Bill(models.Model):
         on_delete=models.SET_NULL,
         blank=True,
         null=True,
-        verbose_name="Kontodaten",
+        verbose_name="Bankdaten",
     )
 
     resolution = models.ForeignKey(
diff --git a/fet2020/finance/views.py b/fet2020/finance/views.py
index afcc84d2..dbbcf3c8 100644
--- a/fet2020/finance/views.py
+++ b/fet2020/finance/views.py
@@ -98,7 +98,7 @@ class BillListView(LoginRequiredMixin, ListView):
 
     def get_queryset(self):
         qs1 = (
-            Fee.objects.filter(bankdata__bankdata_creator__username=self.request.user)
+            Fee.objects.filter(fee_creator__username=self.request.user)
             .values("amount", "status", "id")
             .annotate(
                 date=F("date_start"), purpose=F("job"), model=Value("FEE", output_field=CharField())