Merge pull request #611 from kerstenkenan/Pauses-updates

Pauses updates - Listorder descending & Collapsing filters
SuperCoopBerlin · Jan 22, 2025 · 1a1a9b3 · 1a1a9b3
2 parents c250e8b + 31e0388
commit 1a1a9b3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/tapir/coop/templates/coop/membership_pause/membership_pause_list.html b/tapir/coop/templates/coop/membership_pause/membership_pause_list.html
@@ -17,29 +17,38 @@
     <div class="card mb-2">
         <div class="card-header d-flex justify-content-between align-items-center">
             <h5>{% translate "Membership pauses" %}</h5>
-            <div>
-                <div class="btn-group">
-                    <button type="button"
-                            class="{% tapir_button_link %} btn dropdown-toggle"
-                            data-bs-toggle="dropdown">{% translate "Export" %}</button>
-                    <div class="dropdown-menu dropdown-menu-right">
-                        {% for format in view.export_formats %}
-                            <a class="dropdown-item" href="{% export_url format %}">
-                                download <code>.{{ format }}</code>
-                            </a>
-                        {% endfor %}
-                    </div>
+            <div class="btn-group">
+                <button type="button"
+                        class="{% tapir_button_link %} btn dropdown-toggle m-1"
+                        data-bs-toggle="dropdown">{% translate "Export" %}</button>
+                <div class="dropdown-menu dropdown-menu-right">
+                    {% for format in view.export_formats %}
+                        <a class="dropdown-item" href="{% export_url format %}">
+                            download <code>.{{ format }}</code>
+                        </a>
+                    {% endfor %}
                 </div>
-                <a class="{% tapir_button_link_to_action %}"
+                <a class="{% tapir_button_link_to_action %} m-1 rounded"
                    href="{% url 'coop:membership_pause_create' %}">
                     <span class="material-icons">add_circle_outline</span>
                     {% translate "Create a new pause" %}
                 </a>
+                <div>
+                    <button class="{% tapir_button_link_to_action %} m-1"
+                            type="button"
+                            data-bs-toggle="collapse"
+                            data-bs-target="#collapseFilter"
+                            aria-expanded="false"
+                            aria-controls="collapseFilter">
+                        {% translate "Filters" %}
+                        <span class="material-icons">unfold_more</span>
+                    </button>
+                </div>
             </div>
         </div>
         <ul class="list-group list-group-flush">
             {% if filter %}
-                <li class="list-group-item">
+                <li class="list-group-item collapse" id="collapseFilter">
                     <form action="" method="get" class="form member-filter-form">
                         <div class="member-filter-form-filters">{% bootstrap_form filter.form %}</div>
                         <div class="member-filter-form-buttons">

diff --git a/tapir/coop/views/membership_pause.py b/tapir/coop/views/membership_pause.py
@@ -46,7 +46,7 @@ class Meta:
             "start_date",
             "end_date",
         )
-        order_by = "id"
+        order_by = "-id"
         attrs = {"class": TAPIR_TABLE_CLASSES}
 
     edit_button = django_tables2.Column(

diff --git a/tapir/translations/locale/de/LC_MESSAGES/django.po b/tapir/translations/locale/de/LC_MESSAGES/django.po
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-16 11:12+0100\n"
+"POT-Creation-Date: 2025-01-18 20:54+0100\n"
 "PO-Revision-Date: 2024-12-17 14:15+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -991,7 +991,7 @@ msgid "Beteiligungserklärung"
 msgstr "Beteiligungserklärung"
 
 #: coop/templates/coop/draftuser_list.html:22
-#: coop/templates/coop/membership_pause/membership_pause_list.html:24
+#: coop/templates/coop/membership_pause/membership_pause_list.html:23
 #: coop/templates/coop/membership_resignation_list.html:25
 #: coop/templates/coop/shareowner_list.html:23
 #: shifts/templates/shifts/members_on_alert_list.html:19
@@ -1000,6 +1000,7 @@ msgid "Export"
 msgstr "Exportieren"
 
 #: coop/templates/coop/draftuser_list.html:42
+#: coop/templates/coop/membership_pause/membership_pause_list.html:43
 #: coop/templates/coop/membership_resignation_list.html:50
 #: coop/templates/coop/shareowner_list.html:38
 #: log/templates/log/log_overview.html:34
@@ -1009,7 +1010,7 @@ msgstr "Filter"
 
 #: coop/templates/coop/draftuser_list.html:55
 #: coop/templates/coop/incoming_payment_list.html:35
-#: coop/templates/coop/membership_pause/membership_pause_list.html:47
+#: coop/templates/coop/membership_pause/membership_pause_list.html:56
 #: coop/templates/coop/membership_resignation_list.html:62
 #: coop/templates/coop/shareowner_list.html:51
 #: log/templates/log/log_overview.html:46
@@ -1020,7 +1021,7 @@ msgstr "Filter"
 
 #: coop/templates/coop/draftuser_list.html:60
 #: coop/templates/coop/incoming_payment_list.html:40
-#: coop/templates/coop/membership_pause/membership_pause_list.html:52
+#: coop/templates/coop/membership_pause/membership_pause_list.html:61
 #: coop/templates/coop/membership_resignation_list.html:67
 #: coop/templates/coop/shareowner_list.html:56
 #: shifts/templates/shifts/shiftexemption_list.html:55
@@ -2022,11 +2023,11 @@ msgid ""
 "                    "
 msgstr ""
 
-#: coop/templates/coop/membership_pause/membership_pause_list.html:36
+#: coop/templates/coop/membership_pause/membership_pause_list.html:34
 msgid "Create a new pause"
 msgstr ""
 
-#: coop/templates/coop/membership_pause/membership_pause_list.html:55
+#: coop/templates/coop/membership_pause/membership_pause_list.html:64
 #, python-format
 msgid ""
 "\n"