Changed style of last action button.

Author: MarcoSteinacher

django/geno/forms.py

@@ -215,7 +215,11 @@ def __init__(self, *args, **kwargs):
                 CollapsibleSection(
                     _("Mitglieder-Attribute"),
                     Div(
-                        HTML('<p class="text-xs font-medium text-gray-500 mb-2">{}</p>'.format(_("Filter A"))),
+                        HTML(
+                            '<p class="text-xs font-medium text-gray-500 mb-2">{}</p>'.format(
+                                _("Filter A")
+                            )
+                        ),
                         Div(
                             Div("select_attributeA", css_class="mb-4"),
                             Div("select_attributeA_value", css_class="mb-4"),
@@ -224,7 +228,11 @@ def __init__(self, *args, **kwargs):
                         css_class="mb-4",
                     ),
                     Div(
-                        HTML('<p class="text-xs font-medium text-gray-500 mb-2">{}</p>'.format(_("Filter B"))),
+                        HTML(
+                            '<p class="text-xs font-medium text-gray-500 mb-2">{}</p>'.format(
+                                _("Filter B")
+                            )
+                        ),
                         Div(
                             Div("select_attributeB", css_class="mb-4"),
                             Div("select_attributeB_value", css_class="mb-4"),
@@ -242,9 +250,14 @@ def __init__(self, *args, **kwargs):
                     Div("select_flag_04", css_class="mb-4"),
                     Div("select_flag_05", css_class="mb-4"),
                     Div("ignore_join_date", css_class="mb-4"),
-                    *([Div("share_paid_01", css_class="mb-4"), Div("share_unpaid", css_class="mb-4")]
-                      if settings.GENO_ID == "HSG"
-                      else []),
+                    *(
+                        [
+                            Div("share_paid_01", css_class="mb-4"),
+                            Div("share_unpaid", css_class="mb-4"),
+                        ]
+                        if settings.GENO_ID == "HSG"
+                        else []
+                    ),
                     collapsed=True,
                 ),
                 initial_display="none",

django/geno/templates/geno/member_send_mail.html

@@ -141,19 +141,25 @@ <h3 class="text-lg font-medium text-font-important-light dark:text-font-importan
           </a>
         {% else %}
           {# Submit button with form attribute #}
-          {% component "unfold/components/button.html" with submit=1 attrs=attrs_button %}
-          {% trans "Weiter" %}
-        {% endcomponent %}
-        {# Back button (shown on steps 2 and 3) #}
-        {% if back_url %}
-          {% component "unfold/components/button.html" with href=back_url variant="default" %}
-          {% trans "Zurück" %}
-        {% endcomponent %}
-      {% endif %}
-    {% endif %}
+          {% if last_step %}
+            {% component "unfold/components/button.html" with submit=1 attrs=attrs_button class="bg-red-600" %}
+            {% trans "Aktion ausführen!" %}
+            {% endcomponent %}
+          {% else %}
+            {% component "unfold/components/button.html" with submit=1 attrs=attrs_button %}
+            {% trans "Weiter" %}
+            {% endcomponent %}
+          {% endif %}
+          {# Back button (shown on steps 2 and 3) #}
+          {% if back_url %}
+            {% component "unfold/components/button.html" with href=back_url variant="default" %}
+            {% trans "Zurück" %}
+            {% endcomponent %}
+          {% endif %}
+        {% endif %}
+      </div>
+    </div>
   </div>
-</div>
-</div>
 {% endblock %}
 
 {% block extrajs %}

django/geno/views.py

@@ -3148,7 +3148,9 @@ def send_member_mail_filter_by_invoice(form, member_list):
         if member["id"]:
             count += 1
     if count == 0:
-        errors.append(_("Keine Empfänger:innen gefunden, welche diesen Filterkriterien entsprechen."))
+        errors.append(
+            _("Keine Empfänger:innen gefunden, welche diesen Filterkriterien entsprechen.")
+        )
     return errors
 
 
@@ -3160,6 +3162,7 @@ class MailWizardView(CohivaAdminViewMixin, FormView):
     permission_required = "geno.send_mail"
     template_name = "geno/member_send_mail.html"
     form_class = MemberMailForm
+    last_step = False
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -3172,6 +3175,7 @@ def get_context_data(self, **kwargs):
                 "response": self.result,
                 "attrs_button": {"form": "mail-wizard-form"},
                 "back_url": self.back_url,
+                "last_step": self.last_step,
             }
         )
         # Override title to show step
@@ -3230,6 +3234,7 @@ class MailWizardActionView(MailWizardView):
     form_class = MemberMailActionForm
     form_action = reverse_lazy("geno:mail-wizard-action")
     back_url = reverse_lazy("geno:mail-wizard-select")
+    last_step = True
 
     def get_initial(self):
         return {"email_copy": settings.GENO_DEFAULT_EMAIL}