Merge remote-tracking branch 'origin/main' into issue/mitgliederverwaltung-547

# Conflicts:
#	lib/mv_web/live/member_live/index.html.heex
This commit is contained in:
Simon 2026-07-12 12:29:47 +02:00
commit fe6d1c52f9
9 changed files with 72 additions and 75 deletions

View file

@ -158,8 +158,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
</.badge>
<.icon name="hero-chevron-down" class="size-4" />
</.button>
<!--
<!--
NOTE: We use a div panel instead of ul.menu/li structure to avoid DaisyUI menu styles
(padding, display, hover, font sizes) that would interfere with our form controls.
Filter controls are form elements (fieldset with legend, radio inputs), not menu items.
@ -232,8 +232,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
</div>
</fieldset>
</div>
<!-- Groups: one row per group with All / Yes / No (like Custom Fields) -->
<!-- Groups: one row per group with All / Yes / No (like Custom Fields) -->
<div :if={length(@groups) > 0} class="mb-4">
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
{gettext("Groups")}
@ -299,8 +299,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
</fieldset>
</div>
</div>
<!-- Fee Types: one row per fee type with All / Yes / No (same style as Groups) -->
<!-- Fee Types: one row per fee type with All / Yes / No (same style as Groups) -->
<div :if={length(@fee_types) > 0} class="mb-4">
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
{gettext("Fee types")}
@ -366,8 +366,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
</fieldset>
</div>
</div>
<!-- Dates Group (built-in fields: exit_date with mode selector, join_date range) -->
<!-- Dates Group (built-in fields: exit_date with mode selector, join_date range) -->
<div class="mb-4">
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
{gettext("Dates")}
@ -484,8 +484,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
</div>
</fieldset>
</div>
<!-- Custom Date Fields Group (in-memory filter; one row per :date custom field) -->
<!-- Custom Date Fields Group (in-memory filter; one row per :date custom field) -->
<div :if={length(@date_custom_fields) > 0} class="mb-4">
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
{gettext("Custom date fields")}
@ -523,8 +523,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
</fieldset>
</div>
</div>
<!-- Custom Fields Group -->
<!-- Custom Fields Group -->
<div :if={length(@boolean_custom_fields) > 0} class="mb-2">
<div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
{gettext("Individual datafields")}
@ -590,8 +590,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
</fieldset>
</div>
</div>
<!-- Footer -->
<!-- Footer -->
<div class="mt-4 flex justify-between pt-3 border-t border-base-200">
<.button
type="button"