From d11dace81fc61630a48c741ea588c9bb32a17923 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Wed, 17 Jan 2024 17:40:38 +0000 Subject: [PATCH] update bill list view --- fet2020/finance/views.py | 5 +- fet2020/templates/finance/index.html | 96 +++++++++++++++++----------- fet2020/templates/home.html | 2 +- 3 files changed, 65 insertions(+), 38 deletions(-) diff --git a/fet2020/finance/views.py b/fet2020/finance/views.py index 174afe89..a11d6eab 100644 --- a/fet2020/finance/views.py +++ b/fet2020/finance/views.py @@ -57,8 +57,11 @@ class BillListView(LoginRequiredMixin, ListView): model = Bill template_name = "finance/index.html" + paginate_by = 10 + def get_queryset(self): - return Bill.objects.filter(bill_creator__username=self.request.user) + qs = Bill.objects.filter(bill_creator__username=self.request.user) + return qs.order_by("-date") class BillUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView): diff --git a/fet2020/templates/finance/index.html b/fet2020/templates/finance/index.html index e68eae0e..bfa2aac7 100644 --- a/fet2020/templates/finance/index.html +++ b/fet2020/templates/finance/index.html @@ -1,50 +1,74 @@ {% extends "base.html" %} -{% block title %}Übersicht über die Rechnungen{% endblock %} +{% block title %}Eingereichte Rechnungen{% endblock %} {% block content %}
-

Übersicht über alle von dir eingereichten Rechnungen

- -
-
- - {% for result in object_list %} - -
-

Verwendungszweck: {{ result.purpose }}

-
    -
  • {{ result.date }}
    • -
  • {{ result.amount }}€
    • -
  • Status: {{ result.get_status_display }}
    • -
-
- - {% endfor %} +

Eingereichte Rechnungen

+ + Rechnung einreichen + +
+
+ + + + + + + + + + + + {% for result in object_list %} + + + + + + + + {% endfor %} + +
DatumVerwendungszweckSummeStatus
{{ result.date|date:"d.m.Y" }}{{ result.purpose }}{{ result.amount }}€ + {% if result.status == result.Status.SUBMITTED %} + {{ result.get_status_display }} + {% elif result.status == result.Status.INCOMPLETE %} + {{ result.get_status_display }} + {% elif result.status == result.Status.CLEARED %} + {{ result.get_status_display }} + {% elif result.status == result.Status.FINISHED %} + {{ result.get_status_display }} + {% endif %} + + +
-
- {% if not object_list %} -
-
-

Keine Rechnungen für dich in dieser Liste.

-
-
- {% endif %} +
+
+
{% endblock %} diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html index d9433538..e9d5dcd2 100644 --- a/fet2020/templates/home.html +++ b/fet2020/templates/home.html @@ -58,7 +58,7 @@
  • - Deine eingereichten Rechnungen + Eingereichte Rechnungen