From d47f181e1d83cf2588d5e81eae455ef98aeb8b3f Mon Sep 17 00:00:00 2001 From: moanos Date: Sat, 2 Nov 2024 09:42:39 +0100 Subject: [PATCH] feat: Make updatequeue parted --- .../static/fellchensammlung/css/styles.css | 14 ++++++++++++++ .../templates/fellchensammlung/updatequeue.html | 12 +++++++++--- src/fellchensammlung/views.py | 6 ++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/fellchensammlung/static/fellchensammlung/css/styles.css b/src/fellchensammlung/static/fellchensammlung/css/styles.css index 0d5b358..afdda13 100644 --- a/src/fellchensammlung/static/fellchensammlung/css/styles.css +++ b/src/fellchensammlung/static/fellchensammlung/css/styles.css @@ -115,6 +115,10 @@ textarea { } } +.spaced { + margin-bottom: 30px; +} + /*******************************/ /* PARTIAL SPECIFIC CONTAINERS */ /*******************************/ @@ -163,6 +167,16 @@ textarea { } } +/*************/ +/* Modifiers */ +/*************/ + +/* Used to enlargen cards */ +.full-width { + width: 100%; + flex: none; +} + /***********/ /* BUTTONS */ /***********/ diff --git a/src/fellchensammlung/templates/fellchensammlung/updatequeue.html b/src/fellchensammlung/templates/fellchensammlung/updatequeue.html index 372a2ac..f7fa31f 100644 --- a/src/fellchensammlung/templates/fellchensammlung/updatequeue.html +++ b/src/fellchensammlung/templates/fellchensammlung/updatequeue.html @@ -3,9 +3,15 @@ {% block content %}

{% translate "Aktualitätscheck" %}

{% translate "Überprüfe ob Vermittlungen noch aktuell sind" %}

-
-

{% translate 'Vermittlungen zur Überprüfung' %}

- {% for adoption_notice in adoption_notices %} +
+

{% translate 'Deaktivierte Vermittlungen zur Überprüfung' %}

+ {% for adoption_notice in adoption_notices_disabled %} + {% include "fellchensammlung/partials/partial-check-adoption-notice.html" %} + {% endfor %} +
+
+

{% translate 'Aktive Vermittlungen zur Überprüfung' %}

+ {% for adoption_notice in adoption_notices_active %} {% include "fellchensammlung/partials/partial-check-adoption-notice.html" %} {% endfor %}
diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py index 7b430cc..86a60f7 100644 --- a/src/fellchensammlung/views.py +++ b/src/fellchensammlung/views.py @@ -460,8 +460,10 @@ def updatequeue(request): last_checked_adoption_list = AdoptionNotice.objects.order_by("last_checked") else: last_checked_adoption_list = AdoptionNotice.objects.filter(owner=request.user).order_by("last_checked") - adoption_notices = [adoption for adoption in last_checked_adoption_list if adoption.is_active or adoption.is_to_be_checked] - context = {"adoption_notices": adoption_notices} + adoption_notices_active = [adoption for adoption in last_checked_adoption_list if adoption.is_active] + adoption_notices_disabled = [adoption for adoption in last_checked_adoption_list if adoption.is_disabled_unchecked] + context = {"adoption_notices_disabled": adoption_notices_disabled, + "adoption_notices_active": adoption_notices_active} return render(request, 'fellchensammlung/updatequeue.html', context=context)