Merge branch 'main' into feature/286_export_pdf

lib/mv/authorization/permission_sets.ex

@@ -178,7 +178,9 @@ defmodule Mv.Authorization.PermissionSets do
         # Groups overview
         "/groups",
         # Group detail
-        "/groups/:slug"
+        "/groups/:slug",
+        # Statistics
+        "/statistics"
       ]
     }
   end
@@ -243,7 +245,9 @@ defmodule Mv.Authorization.PermissionSets do
         # Group detail
         "/groups/:slug",
         # Edit group
-        "/groups/:slug/edit"
+        "/groups/:slug/edit",
+        # Statistics
+        "/statistics"
       ]
     }
   end

lib/mv/membership_fees/cycle_generator.ex

@@ -87,7 +87,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
   def generate_cycles_for_member(member_or_id, opts \\ [])
 
   def generate_cycles_for_member(member_id, opts) when is_binary(member_id) do
-    case load_member(member_id) do
+    case load_member(member_id, opts) do
       {:ok, member} -> generate_cycles_for_member(member, opts)
       {:error, reason} -> {:error, reason}
     end
@@ -97,25 +97,25 @@ defmodule Mv.MembershipFees.CycleGenerator do
     today = Keyword.get(opts, :today, Date.utc_today())
     skip_lock? = Keyword.get(opts, :skip_lock?, false)
 
-    do_generate_cycles_with_lock(member, today, skip_lock?)
+    do_generate_cycles_with_lock(member, today, skip_lock?, opts)
   end
 
   # Generate cycles with lock handling
   # Returns {:ok, cycles, notifications} - notifications are never sent here,
   # they should be returned to the caller (e.g., via after_action hook)
-  defp do_generate_cycles_with_lock(member, today, true = _skip_lock?) do
-    # Lock already set by caller (e.g., regenerate_cycles_on_type_change)
+  defp do_generate_cycles_with_lock(member, today, true = _skip_lock?, opts) do
+    # Lock already set by caller (e.g., regenerate_cycles_on_type_change or seeds)
     # Just generate cycles without additional locking
-    do_generate_cycles(member, today)
+    do_generate_cycles(member, today, opts)
   end
 
-  defp do_generate_cycles_with_lock(member, today, false) do
+  defp do_generate_cycles_with_lock(member, today, false, opts) do
     lock_key = :erlang.phash2(member.id)
 
     Repo.transaction(fn ->
       Ecto.Adapters.SQL.query!(Repo, "SELECT pg_advisory_xact_lock($1)", [lock_key])
 
-      case do_generate_cycles(member, today) do
+      case do_generate_cycles(member, today, opts) do
         {:ok, cycles, notifications} ->
           # Return cycles and notifications - do NOT send notifications here
           # They will be sent by the caller (e.g., via after_action hook)
@@ -235,25 +235,33 @@ defmodule Mv.MembershipFees.CycleGenerator do
 
   # Private functions
 
-  defp load_member(member_id) do
-    system_actor = SystemActor.get_system_actor()
-    opts = Helpers.ash_actor_opts(system_actor)
+  # Use actor from opts when provided (e.g. seeds pass admin); otherwise system actor
+  defp get_actor(opts) do
+    case Keyword.get(opts, :actor) do
+      nil -> SystemActor.get_system_actor()
+      actor -> actor
+    end
+  end
+
+  defp load_member(member_id, opts) do
+    actor = get_actor(opts)
+    read_opts = Helpers.ash_actor_opts(actor)
 
     query =
       Member
       |> Ash.Query.filter(id == ^member_id)
       |> Ash.Query.load([:membership_fee_type, :membership_fee_cycles])
 
-    case Ash.read_one(query, opts) do
+    case Ash.read_one(query, read_opts) do
       {:ok, nil} -> {:error, :member_not_found}
       {:ok, member} -> {:ok, member}
       {:error, reason} -> {:error, reason}
     end
   end
 
-  defp do_generate_cycles(member, today) do
+  defp do_generate_cycles(member, today, opts) do
     # Reload member with relationships to ensure fresh data
-    case load_member(member.id) do
+    case load_member(member.id, opts) do
       {:ok, member} ->
         cond do
           is_nil(member.membership_fee_type_id) ->
@@ -263,7 +271,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
             {:error, :no_join_date}
 
           true ->
-            generate_missing_cycles(member, today)
+            generate_missing_cycles(member, today, opts)
         end
 
       {:error, reason} ->
@@ -271,7 +279,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
     end
   end
 
-  defp generate_missing_cycles(member, today) do
+  defp generate_missing_cycles(member, today, opts) do
     fee_type = member.membership_fee_type
     interval = fee_type.interval
     amount = fee_type.amount
@@ -287,7 +295,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
     # Only generate if start_date <= end_date
     if start_date && Date.compare(start_date, end_date) != :gt do
       cycle_starts = generate_cycle_starts(start_date, end_date, interval)
-      create_cycles(cycle_starts, member.id, fee_type.id, amount)
+      create_cycles(cycle_starts, member.id, fee_type.id, amount, opts)
     else
       {:ok, [], []}
     end
@@ -382,9 +390,9 @@ defmodule Mv.MembershipFees.CycleGenerator do
     end
   end
 
-  defp create_cycles(cycle_starts, member_id, fee_type_id, amount) do
-    system_actor = SystemActor.get_system_actor()
-    opts = Helpers.ash_actor_opts(system_actor)
+  defp create_cycles(cycle_starts, member_id, fee_type_id, amount, opts) do
+    actor = get_actor(opts)
+    create_opts = Helpers.ash_actor_opts(actor)
 
     # Always use return_notifications?: true to collect notifications
     # Notifications will be returned to the caller, who is responsible for
@@ -400,7 +408,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
         }
 
         handle_cycle_creation_result(
-          Ash.create(MembershipFeeCycle, attrs, [return_notifications?: true] ++ opts),
+          Ash.create(MembershipFeeCycle, attrs, [return_notifications?: true] ++ create_opts),
           cycle_start
         )
       end)

lib/mv/statistics.ex

@@ -0,0 +1,237 @@
+defmodule Mv.Statistics do
+  @moduledoc """
+  Aggregated statistics for members and membership fee cycles.
+
+  Used by the statistics LiveView to display counts and sums. All functions
+  accept an `opts` keyword list and pass `:actor` (and `:domain` where needed)
+  to Ash reads so that policies are enforced.
+  """
+
+  require Ash.Query
+  import Ash.Expr
+
+  require Logger
+
+  alias Mv.Membership.Member
+  alias Mv.MembershipFees
+  alias Mv.MembershipFees.MembershipFeeCycle
+
+  @doc """
+  Returns the earliest year in which any member has a join_date.
+
+  Used to determine the start of the "relevant" year range for statistics
+  (from first membership to current year). Returns `nil` if no member has
+  a join_date.
+  """
+  @spec first_join_year(keyword()) :: non_neg_integer() | nil
+  def first_join_year(opts) do
+    query =
+      Member
+      |> Ash.Query.filter(expr(not is_nil(join_date)))
+      |> Ash.Query.sort(join_date: :asc)
+      |> Ash.Query.limit(1)
+
+    case Ash.read_one(query, opts) do
+      {:ok, nil} ->
+        nil
+
+      {:ok, member} ->
+        member.join_date.year
+
+      {:error, reason} ->
+        Logger.warning("Statistics.first_join_year failed: #{inspect(reason)}")
+        nil
+    end
+  end
+
+  @doc """
+  Returns the count of active members (exit_date is nil).
+  """
+  @spec active_member_count(keyword()) :: non_neg_integer()
+  def active_member_count(opts) do
+    query =
+      Member
+      |> Ash.Query.filter(expr(is_nil(exit_date)))
+
+    case Ash.count(query, opts) do
+      {:ok, count} ->
+        count
+
+      {:error, reason} ->
+        Logger.warning("Statistics.active_member_count failed: #{inspect(reason)}")
+        0
+    end
+  end
+
+  @doc """
+  Returns the count of inactive members (exit_date is not nil).
+  """
+  @spec inactive_member_count(keyword()) :: non_neg_integer()
+  def inactive_member_count(opts) do
+    query =
+      Member
+      |> Ash.Query.filter(expr(not is_nil(exit_date)))
+
+    case Ash.count(query, opts) do
+      {:ok, count} ->
+        count
+
+      {:error, reason} ->
+        Logger.warning("Statistics.inactive_member_count failed: #{inspect(reason)}")
+        0
+    end
+  end
+
+  @doc """
+  Returns the count of members who joined in the given year (join_date in that year).
+  """
+  @spec joins_by_year(integer(), keyword()) :: non_neg_integer()
+  def joins_by_year(year, opts) do
+    first_day = Date.new!(year, 1, 1)
+    last_day = Date.new!(year, 12, 31)
+
+    query =
+      Member
+      |> Ash.Query.filter(expr(join_date >= ^first_day and join_date <= ^last_day))
+
+    case Ash.count(query, opts) do
+      {:ok, count} ->
+        count
+
+      {:error, reason} ->
+        Logger.warning("Statistics.joins_by_year failed: #{inspect(reason)}")
+        0
+    end
+  end
+
+  @doc """
+  Returns the count of members who exited in the given year (exit_date in that year).
+  """
+  @spec exits_by_year(integer(), keyword()) :: non_neg_integer()
+  def exits_by_year(year, opts) do
+    first_day = Date.new!(year, 1, 1)
+    last_day = Date.new!(year, 12, 31)
+
+    query =
+      Member
+      |> Ash.Query.filter(expr(exit_date >= ^first_day and exit_date <= ^last_day))
+
+    case Ash.count(query, opts) do
+      {:ok, count} ->
+        count
+
+      {:error, reason} ->
+        Logger.warning("Statistics.exits_by_year failed: #{inspect(reason)}")
+        0
+    end
+  end
+
+  @doc """
+  Returns totals for membership fee cycles whose cycle_start falls in the given year.
+
+  Returns a map with keys: `:total`, `:paid`, `:unpaid`, `:suspended` (each a Decimal sum).
+  """
+  @spec cycle_totals_by_year(integer(), keyword()) :: %{
+          total: Decimal.t(),
+          paid: Decimal.t(),
+          unpaid: Decimal.t(),
+          suspended: Decimal.t()
+        }
+  def cycle_totals_by_year(year, opts) do
+    first_day = Date.new!(year, 1, 1)
+    last_day = Date.new!(year, 12, 31)
+
+    query =
+      MembershipFeeCycle
+      |> Ash.Query.filter(expr(cycle_start >= ^first_day and cycle_start <= ^last_day))
+
+    query = maybe_filter_by_fee_type(query, opts)
+    # Only pass actor and domain to Ash.read; fee_type_id is only for our filter above
+    opts_for_read =
+      opts
+      |> Keyword.drop([:fee_type_id])
+      |> Keyword.put(:domain, MembershipFees)
+
+    case Ash.read(query, opts_for_read) do
+      {:ok, cycles} ->
+        cycle_totals_from_cycles(cycles)
+
+      {:error, reason} ->
+        Logger.warning("Statistics.cycle_totals_by_year failed: #{inspect(reason)}")
+        zero_cycle_totals()
+    end
+  end
+
+  defp cycle_totals_from_cycles(cycles) do
+    by_status = Enum.group_by(cycles, & &1.status)
+    sum = fn status -> sum_amounts(by_status[status] || []) end
+
+    total =
+      [:paid, :unpaid, :suspended]
+      |> Enum.map(&sum.(&1))
+      |> Enum.reduce(Decimal.new(0), &Decimal.add/2)
+
+    %{
+      total: total,
+      paid: sum.(:paid),
+      unpaid: sum.(:unpaid),
+      suspended: sum.(:suspended)
+    }
+  end
+
+  defp sum_amounts(cycles),
+    do: Enum.reduce(cycles, Decimal.new(0), fn c, acc -> Decimal.add(acc, c.amount) end)
+
+  defp zero_cycle_totals do
+    %{
+      total: Decimal.new(0),
+      paid: Decimal.new(0),
+      unpaid: Decimal.new(0),
+      suspended: Decimal.new(0)
+    }
+  end
+
+  defp maybe_filter_by_fee_type(query, opts) do
+    case Keyword.get(opts, :fee_type_id) do
+      nil ->
+        query
+
+      id when is_binary(id) ->
+        # Only apply filter for valid UUID strings (e.g. from form/URL)
+        if Ecto.UUID.cast(id) != :error do
+          Ash.Query.filter(query, expr(membership_fee_type_id == ^id))
+        else
+          query
+        end
+
+      id ->
+        Ash.Query.filter(query, expr(membership_fee_type_id == ^id))
+    end
+  end
+
+  @doc """
+  Returns the sum of amount for all cycles with status :unpaid.
+  """
+  @spec open_amount_total(keyword()) :: Decimal.t()
+  def open_amount_total(opts) do
+    query =
+      MembershipFeeCycle
+      |> Ash.Query.filter(expr(status == :unpaid))
+
+    query = maybe_filter_by_fee_type(query, opts)
+
+    opts_for_read =
+      opts
+      |> Keyword.drop([:fee_type_id])
+      |> Keyword.put(:domain, MembershipFees)
+
+    case Ash.read(query, opts_for_read) do
+      {:ok, cycles} ->
+        Enum.reduce(cycles, Decimal.new(0), fn c, acc -> Decimal.add(acc, c.amount) end)
+
+      {:error, reason} ->
+        Logger.warning("Statistics.open_amount_total failed: #{inspect(reason)}")
+        Decimal.new(0)
+    end
+  end
+end

lib/mv_web/components/layouts/sidebar.ex

@@ -88,6 +88,14 @@ defmodule MvWeb.Layouts.Sidebar do
         />
       <% end %>
 
+      <%= if can_access_page?(@current_user, PagePaths.statistics()) do %>
+        <.menu_item
+          href={~p"/statistics"}
+          icon="hero-chart-bar"
+          label={gettext("Statistics")}
+        />
+      <% end %>
+
       <%= if admin_menu_visible?(@current_user) do %>
         <.menu_group
           icon="hero-cog-6-tooth"

lib/mv_web/live/group_live/show.ex

@@ -15,6 +15,8 @@ defmodule MvWeb.GroupLive.Show do
   """
   use MvWeb, :live_view
 
+  require Logger
+
   import MvWeb.LiveHelpers, only: [current_actor: 1]
   import MvWeb.Authorization
 
@@ -22,7 +24,15 @@ defmodule MvWeb.GroupLive.Show do
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket}
+    {:ok,
+     socket
+     |> assign(:show_add_member_input, false)
+     |> assign(:member_search_query, "")
+     |> assign(:available_members, [])
+     |> assign(:selected_member_ids, [])
+     |> assign(:selected_members, [])
+     |> assign(:show_member_dropdown, false)
+     |> assign(:focused_member_index, nil)}
   end
 
   @impl true
@@ -122,6 +132,128 @@ defmodule MvWeb.GroupLive.Show do
               )}
             </p>
 
+            <%= if can?(@current_user, :update, Mv.Membership.Group) do %>
+              <div class="mb-4">
+                <%= if assigns[:show_add_member_input] do %>
+                  <div class="join w-full">
+                    <form phx-change="search_members" class="flex-1">
+                      <div class="relative">
+                        <div class="input input-bordered join-item w-full flex flex-wrap gap-1 items-center py-1 px-2">
+                          <%= for member <- @selected_members do %>
+                            <span class="badge badge-outline badge flex items-center gap-1">
+                              {MvWeb.Helpers.MemberHelpers.display_name(member)}
+                              <button
+                                type="button"
+                                class="btn btn-ghost btn-xs p-0 h-4 w-4 min-h-0"
+                                phx-click="remove_selected_member"
+                                phx-value-member_id={member.id}
+                                aria-label={
+                                  gettext("Remove %{name}",
+                                    name: MvWeb.Helpers.MemberHelpers.display_name(member)
+                                  )
+                                }
+                              >
+                                <.icon name="hero-x-mark" class="size-3" />
+                              </button>
+                            </span>
+                          <% end %>
+                          <input
+                            type="text"
+                            id="member-search-input"
+                            role="combobox"
+                            phx-hook="ComboBox"
+                            phx-focus="show_member_dropdown"
+                            phx-debounce="300"
+                            phx-keydown="member_dropdown_keydown"
+                            phx-mounted={JS.focus()}
+                            value={@member_search_query}
+                            placeholder={
+                              if Enum.empty?(@selected_members),
+                                do: gettext("Search for a member..."),
+                                else: ""
+                            }
+                            class="flex-1 min-w-[120px] border-0 focus:outline-none bg-transparent"
+                            name="member_search"
+                            aria-label={gettext("Search for a member")}
+                            aria-autocomplete="list"
+                            aria-controls="member-dropdown"
+                            aria-expanded={to_string(@show_member_dropdown)}
+                            aria-activedescendant={
+                              if @focused_member_index,
+                                do: "member-option-#{@focused_member_index}",
+                                else: nil
+                            }
+                            autocomplete="off"
+                          />
+                        </div>
+
+                        <%= if length(@available_members) > 0 do %>
+                          <div
+                            id="member-dropdown"
+                            role="listbox"
+                            aria-label={gettext("Available members")}
+                            class={"absolute z-10 w-full mt-1 bg-base-100 border border-base-300 rounded-lg shadow-lg max-h-60 overflow-auto top-full #{if !@show_member_dropdown, do: "hidden"}"}
+                            phx-click-away="hide_member_dropdown"
+                          >
+                            <%= for {member, index} <- Enum.with_index(@available_members) do %>
+                              <div
+                                id={"member-option-#{index}"}
+                                role="option"
+                                tabindex="0"
+                                aria-selected={to_string(@focused_member_index == index)}
+                                phx-click="select_member"
+                                phx-value-id={member.id}
+                                data-member-id={member.id}
+                                class={[
+                                  "px-4 py-3 cursor-pointer border-b border-base-300 last:border-b-0",
+                                  if(@focused_member_index == index,
+                                    do: "bg-base-300",
+                                    else: "hover:bg-base-200"
+                                  )
+                                ]}
+                              >
+                                <p class="font-medium">
+                                  {MvWeb.Helpers.MemberHelpers.display_name(member)}
+                                </p>
+                                <p class="text-sm text-base-content/70">
+                                  {member.email || gettext("No email")}
+                                </p>
+                              </div>
+                            <% end %>
+                          </div>
+                        <% end %>
+                      </div>
+                    </form>
+                    <button
+                      type="button"
+                      class="btn btn-primary join-item"
+                      phx-click="add_selected_members"
+                      disabled={Enum.empty?(@selected_member_ids)}
+                      aria-label={gettext("Add members")}
+                    >
+                      <.icon name="hero-plus" class="size-5" />
+                    </button>
+                    <button
+                      type="button"
+                      class="btn join-item"
+                      phx-click="hide_add_member_input"
+                      aria-label={gettext("Cancel")}
+                    >
+                      {gettext("Cancel")}
+                    </button>
+                  </div>
+                <% else %>
+                  <.button
+                    variant="primary"
+                    phx-click="show_add_member_input"
+                    aria-label={gettext("Add Member")}
+                  >
+                    {gettext("Add Member")}
+                  </.button>
+                <% end %>
+              </div>
+            <% end %>
+
             <%= if Enum.empty?(@group.members || []) do %>
               <p class="text-base-content/50 italic">{gettext("No members in this group")}</p>
             <% else %>
@@ -131,6 +263,9 @@ defmodule MvWeb.GroupLive.Show do
                     <tr>
                       <th>{gettext("Name")}</th>
                       <th>{gettext("Email")}</th>
+                      <%= if can?(@current_user, :update, Mv.Membership.Group) do %>
+                        <th class="w-0">{gettext("Actions")}</th>
+                      <% end %>
                     </tr>
                   </thead>
                   <tbody>
@@ -156,6 +291,20 @@ defmodule MvWeb.GroupLive.Show do
                             <span class="text-base-content/50 italic">—</span>
                           <% end %>
                         </td>
+                        <%= if can?(@current_user, :update, Mv.Membership.Group) do %>
+                          <td>
+                            <button
+                              type="button"
+                              class="btn btn-ghost btn-sm text-error"
+                              phx-click="remove_member"
+                              phx-value-member_id={member.id}
+                              aria-label={gettext("Remove member from group")}
+                              data-tooltip={gettext("Remove")}
+                            >
+                              <.icon name="hero-trash" class="size-4" />
+                            </button>
+                          </td>
+                        <% end %>
                       </tr>
                     <% end %>
                   </tbody>
@@ -236,11 +385,13 @@ defmodule MvWeb.GroupLive.Show do
     """
   end
 
+  # Delete Modal Events
   @impl true
   def handle_event("open_delete_modal", _params, socket) do
     {:noreply, assign(socket, show_delete_modal: true, name_confirmation: "")}
   end
 
+  @impl true
   def handle_event("cancel_delete", _params, socket) do
     {:noreply,
      socket
@@ -248,10 +399,12 @@ defmodule MvWeb.GroupLive.Show do
      |> assign(:name_confirmation, "")}
   end
 
+  @impl true
   def handle_event("update_name_confirmation", %{"name" => name}, socket) do
     {:noreply, assign(socket, :name_confirmation, name)}
   end
 
+  @impl true
   def handle_event("confirm_delete", %{"slug" => slug}, socket) do
     actor = current_actor(socket)
     group = socket.assigns.group
@@ -275,6 +428,417 @@ defmodule MvWeb.GroupLive.Show do
     end
   end
 
+  # Add Member Events
+  @impl true
+  def handle_event("show_add_member_input", _params, socket) do
+    # Reload group to ensure we have the latest members list
+    actor = current_actor(socket)
+    group = socket.assigns.group
+    socket = reload_group(socket, group.slug, actor)
+
+    {:noreply,
+     socket
+     |> assign(:show_add_member_input, true)
+     |> assign(:member_search_query, "")
+     |> assign(:available_members, [])
+     |> assign(:selected_member_ids, [])
+     |> assign(:selected_members, [])
+     |> assign(:show_member_dropdown, false)
+     |> assign(:focused_member_index, nil)}
+  end
+
+  @impl true
+  def handle_event("show_member_dropdown", _params, socket) do
+    # Use existing group.members for filtering; reload only on add/remove
+    socket =
+      socket
+      |> load_available_members("")
+      |> assign(:show_member_dropdown, true)
+      |> assign(:focused_member_index, nil)
+
+    {:noreply, socket}
+  end
+
+  @impl true
+  def handle_event("hide_add_member_input", _params, socket) do
+    {:noreply,
+     socket
+     |> assign(:show_add_member_input, false)
+     |> assign(:member_search_query, "")
+     |> assign(:available_members, [])
+     |> assign(:selected_member_ids, [])
+     |> assign(:selected_members, [])
+     |> assign(:show_member_dropdown, false)
+     |> assign(:focused_member_index, nil)}
+  end
+
+  @impl true
+  def handle_event("hide_member_dropdown", _params, socket) do
+    {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)}
+  end
+
+  @impl true
+  def handle_event("member_dropdown_keydown", %{"key" => "ArrowDown"}, socket) do
+    return_if_dropdown_closed(socket, fn ->
+      max_index = length(socket.assigns.available_members) - 1
+      current = socket.assigns.focused_member_index
+
+      new_index =
+        case current do
+          nil -> 0
+          index when index < max_index -> index + 1
+          _ -> current
+        end
+
+      {:noreply, assign(socket, focused_member_index: new_index)}
+    end)
+  end
+
+  @impl true
+  def handle_event("member_dropdown_keydown", %{"key" => "ArrowUp"}, socket) do
+    return_if_dropdown_closed(socket, fn ->
+      current = socket.assigns.focused_member_index
+
+      new_index =
+        case current do
+          nil -> 0
+          0 -> 0
+          index -> index - 1
+        end
+
+      {:noreply, assign(socket, focused_member_index: new_index)}
+    end)
+  end
+
+  @impl true
+  def handle_event("member_dropdown_keydown", %{"key" => "Enter"}, socket) do
+    return_if_dropdown_closed(socket, fn ->
+      select_focused_member(socket)
+    end)
+  end
+
+  @impl true
+  def handle_event("member_dropdown_keydown", %{"key" => "Escape"}, socket) do
+    return_if_dropdown_closed(socket, fn ->
+      {:noreply, assign(socket, show_member_dropdown: false, focused_member_index: nil)}
+    end)
+  end
+
+  @impl true
+  def handle_event("member_dropdown_keydown", _params, socket) do
+    # Ignore other keys
+    {:noreply, socket}
+  end
+
+  @impl true
+  def handle_event("search_members", %{"member_search" => query}, socket) do
+    # Use existing group.members for filtering; reload only on add/remove
+    socket =
+      socket
+      |> assign(:member_search_query, query)
+      |> load_available_members(query)
+      |> assign(:show_member_dropdown, true)
+      |> assign(:focused_member_index, nil)
+
+    {:noreply, socket}
+  end
+
+  @impl true
+  def handle_event("select_member", %{"id" => member_id}, socket) do
+    # Check if member is already selected
+    if member_id in socket.assigns.selected_member_ids do
+      {:noreply, socket}
+    else
+      # Find the selected member
+      selected_member = Enum.find(socket.assigns.available_members, &(&1.id == member_id))
+
+      if selected_member do
+        socket =
+          socket
+          |> assign(:selected_member_ids, [member_id | socket.assigns.selected_member_ids])
+          |> assign(:selected_members, [selected_member | socket.assigns.selected_members])
+          |> assign(:member_search_query, "")
+          |> assign(:show_member_dropdown, false)
+          |> assign(:focused_member_index, nil)
+
+        {:noreply, socket}
+      else
+        {:noreply, socket}
+      end
+    end
+  end
+
+  @impl true
+  def handle_event("remove_selected_member", %{"member_id" => member_id}, socket) do
+    socket =
+      socket
+      |> assign(:selected_member_ids, List.delete(socket.assigns.selected_member_ids, member_id))
+      |> assign(
+        :selected_members,
+        Enum.reject(socket.assigns.selected_members, &(&1.id == member_id))
+      )
+
+    {:noreply, socket}
+  end
+
+  @impl true
+  def handle_event("add_selected_members", _params, socket) do
+    actor = current_actor(socket)
+    group = socket.assigns.group
+
+    # Server-side authorization check
+    if can?(actor, :update, group) do
+      member_ids = Enum.uniq(socket.assigns.selected_member_ids)
+      perform_add_members(socket, group, member_ids, actor)
+    else
+      {:noreply,
+       socket
+       |> put_flash(:error, gettext("Not authorized."))
+       |> redirect(to: ~p"/groups/#{group.slug}")}
+    end
+  end
+
+  @impl true
+  def handle_event("remove_member", %{"member_id" => member_id}, socket) do
+    actor = current_actor(socket)
+    group = socket.assigns.group
+
+    # Server-side authorization check
+    if can?(actor, :update, group) do
+      perform_remove_member(socket, group, member_id, actor)
+    else
+      {:noreply,
+       socket
+       |> put_flash(:error, gettext("Not authorized."))
+       |> redirect(to: ~p"/groups/#{group.slug}")}
+    end
+  end
+
+  # Helper functions
+  defp return_if_dropdown_closed(socket, fun) do
+    if socket.assigns.show_member_dropdown do
+      fun.()
+    else
+      {:noreply, socket}
+    end
+  end
+
+  defp select_focused_member(socket) do
+    case socket.assigns.focused_member_index do
+      nil ->
+        {:noreply, socket}
+
+      index ->
+        select_member_by_index(socket, index)
+    end
+  end
+
+  defp select_member_by_index(socket, index) do
+    case Enum.at(socket.assigns.available_members, index) do
+      nil ->
+        {:noreply, socket}
+
+      member ->
+        add_member_to_selection(socket, member)
+    end
+  end
+
+  defp add_member_to_selection(socket, member) do
+    # Check if member is already selected
+    if member.id in socket.assigns.selected_member_ids do
+      {:noreply, socket}
+    else
+      socket =
+        socket
+        |> assign(:selected_member_ids, [member.id | socket.assigns.selected_member_ids])
+        |> assign(:selected_members, [member | socket.assigns.selected_members])
+        |> assign(:member_search_query, "")
+        |> assign(:show_member_dropdown, false)
+        |> assign(:focused_member_index, nil)
+
+      {:noreply, socket}
+    end
+  end
+
+  defp load_available_members(socket, query) do
+    require Ash.Query
+
+    current_member_ids = group_member_ids_set(socket.assigns.group)
+    base_query = available_members_base_query(query)
+
+    # Fetch more than 10, then exclude already-in-group and take 10 (avoids empty dropdown when first N are all in group)
+    fetch_limit = 50
+    limited_query = Ash.Query.limit(base_query, fetch_limit)
+    actor = current_actor(socket)
+
+    case Ash.read(limited_query, actor: actor, domain: Mv.Membership) do
+      {:ok, members} ->
+        available =
+          members
+          |> Enum.reject(fn m -> MapSet.member?(current_member_ids, m.id) end)
+          |> Enum.take(10)
+
+        assign(socket, available_members: available)
+
+      {:error, error} ->
+        Logger.warning("Failed to load available members for group: #{inspect(error)}")
+
+        socket
+        |> put_flash(:error, gettext("Could not load member search. Please try again."))
+        |> assign(:available_members, [])
+    end
+  end
+
+  defp available_members_base_query(query) do
+    search_query = if query && String.trim(query) != "", do: String.trim(query), else: nil
+
+    if search_query do
+      Mv.Membership.Member
+      |> Ash.Query.for_read(:search, %{query: search_query})
+    else
+      Mv.Membership.Member
+      |> Ash.Query.new()
+    end
+  end
+
+  defp group_member_ids_set(group) do
+    members = group.members || []
+    members |> Enum.map(& &1.id) |> MapSet.new()
+  end
+
+  defp perform_add_members(socket, group, member_ids, actor) when is_list(member_ids) do
+    # Add all members in a transaction-like manner
+    results =
+      Enum.map(member_ids, fn member_id ->
+        Membership.create_member_group(
+          %{member_id: member_id, group_id: group.id},
+          actor: actor
+        )
+      end)
+
+    # Check for errors
+    errors = Enum.filter(results, &match?({:error, _}, &1))
+
+    if Enum.empty?(errors) do
+      handle_successful_add_members(socket, group, actor)
+    else
+      handle_failed_add_members(socket, group, errors, actor)
+    end
+  end
+
+  defp perform_add_members(socket, _group, _member_ids, _actor) do
+    {:noreply,
+     socket
+     |> put_flash(:error, gettext("No members selected."))}
+  end
+
+  defp handle_successful_add_members(socket, group, actor) do
+    socket = reload_group(socket, group.slug, actor)
+
+    {:noreply,
+     socket
+     |> assign(:show_add_member_input, false)
+     |> assign(:member_search_query, "")
+     |> assign(:available_members, [])
+     |> assign(:selected_member_ids, [])
+     |> assign(:selected_members, [])
+     |> assign(:show_member_dropdown, false)
+     |> assign(:focused_member_index, nil)}
+  end
+
+  defp handle_failed_add_members(socket, group, errors, actor) do
+    error_messages = extract_error_messages(errors)
+
+    # Still reload to show any successful additions
+    socket = reload_group(socket, group.slug, actor)
+
+    {:noreply,
+     socket
+     |> put_flash(
+       :error,
+       gettext("Some members could not be added: %{errors}", errors: error_messages)
+     )
+     |> assign(:show_add_member_input, true)}
+  end
+
+  defp extract_error_messages(errors) do
+    Enum.map(errors, fn {:error, error} ->
+      format_single_error(error)
+    end)
+    |> Enum.uniq()
+    |> Enum.join(", ")
+  end
+
+  defp format_single_error(%{errors: [%{message: message}]}) when is_binary(message), do: message
+
+  defp format_single_error(%{errors: [%{field: :member_id, message: message}]})
+       when is_binary(message),
+       do: message
+
+  defp format_single_error(error), do: format_error(error)
+
+  defp perform_remove_member(socket, group, member_id, actor) do
+    require Ash.Query
+
+    # Find the MemberGroup association
+    query =
+      Mv.Membership.MemberGroup
+      |> Ash.Query.filter(member_id == ^member_id and group_id == ^group.id)
+
+    case Ash.read_one(query, actor: actor, domain: Mv.Membership) do
+      {:ok, nil} ->
+        {:noreply,
+         socket
+         |> put_flash(:error, gettext("Member is not in this group."))}
+
+      {:ok, member_group} ->
+        case Membership.destroy_member_group(member_group, actor: actor) do
+          :ok ->
+            # Reload group with members and member_count
+            socket = reload_group(socket, group.slug, actor)
+
+            {:noreply, socket}
+
+          {:error, error} ->
+            error_message = format_error(error)
+
+            {:noreply,
+             socket
+             |> put_flash(
+               :error,
+               gettext("Failed to remove member: %{error}", error: error_message)
+             )}
+        end
+
+      {:error, error} ->
+        error_message = format_error(error)
+
+        {:noreply,
+         socket
+         |> put_flash(
+           :error,
+           gettext("Failed to remove member: %{error}", error: error_message)
+         )}
+    end
+  end
+
+  defp reload_group(socket, slug, actor) do
+    require Ash.Query
+
+    query =
+      Mv.Membership.Group
+      |> Ash.Query.filter(slug == ^slug)
+      |> Ash.Query.load([:members, :member_count])
+
+    case Ash.read_one(query, actor: actor, domain: Mv.Membership) do
+      {:ok, group} ->
+        assign(socket, :group, group)
+
+      {:error, _} ->
+        socket
+    end
+  end
+
   defp handle_delete_confirmation(socket, group, actor) do
     if socket.assigns.name_confirmation == group.name do
       perform_group_deletion(socket, group, actor)

lib/mv_web/live/statistics_live.ex

@@ -0,0 +1,628 @@
+defmodule MvWeb.StatisticsLive do
+  @moduledoc """
+  LiveView for the statistics page at /statistics.
+
+  Displays aggregated member and membership fee cycle statistics.
+  """
+  use MvWeb, :live_view
+
+  require Logger
+
+  import MvWeb.LiveHelpers, only: [current_actor: 1]
+  alias Mv.Statistics
+  alias Mv.MembershipFees.MembershipFeeType
+  alias MvWeb.Helpers.MembershipFeeHelpers
+
+  @impl true
+  def mount(_params, _session, socket) do
+    # Only static assigns and fee types here; load_statistics runs once in handle_params
+    socket =
+      socket
+      |> assign(:page_title, gettext("Statistics"))
+      |> assign(:selected_fee_type_id, nil)
+      |> load_fee_types()
+
+    {:ok, socket}
+  end
+
+  @impl true
+  def handle_params(params, uri, socket) do
+    # Query params: after push_patch, params may not include query string in some cases;
+    # always derive from URI as well so fee_type_id is reliable.
+    uri_query = if uri, do: URI.decode_query(URI.parse(uri).query || ""), else: %{}
+    fee_type_id = params["fee_type_id"] || uri_query["fee_type_id"]
+    fee_type_id = normalize_fee_type_id(fee_type_id)
+
+    socket =
+      socket
+      |> assign(:selected_fee_type_id, fee_type_id)
+      |> load_statistics()
+
+    {:noreply, socket}
+  end
+
+  defp normalize_fee_type_id(nil), do: nil
+  defp normalize_fee_type_id(""), do: nil
+
+  defp normalize_fee_type_id(id) when is_binary(id) do
+    case String.trim(id) do
+      "" -> nil
+      trimmed -> trimmed
+    end
+  end
+
+  defp normalize_fee_type_id(_), do: nil
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <Layouts.app flash={@flash} current_user={@current_user}>
+      <.header>
+        {gettext("Statistics")}
+        <:subtitle>{gettext("Overview from first membership to today")}</:subtitle>
+      </.header>
+
+      <section class="mb-8" aria-labelledby="members-heading">
+        <h2 id="members-heading" class="text-xl font-semibold mb-4">{gettext("Members")}</h2>
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-4 mb-6">
+          <div class="card bg-base-200 shadow-md border border-base-300">
+            <div class="card-body p-5">
+              <h3 class="card-title text-sm font-medium text-base-content/80">
+                {gettext("Active members")}
+              </h3>
+              <p
+                class="text-3xl font-bold tabular-nums"
+                aria-label={gettext("Active members") <> ": " <> to_string(@active_count)}
+              >
+                {@active_count}
+              </p>
+            </div>
+          </div>
+          <div class="card bg-base-200 shadow-md border border-base-300">
+            <div class="card-body p-5">
+              <h3 class="card-title text-sm font-medium text-base-content/80">
+                {gettext("Inactive members")}
+              </h3>
+              <p
+                class="text-3xl font-bold tabular-nums"
+                aria-label={gettext("Inactive members") <> ": " <> to_string(@inactive_count)}
+              >
+                {@inactive_count}
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="card bg-base-200 shadow-md border border-base-300">
+          <div class="card-body">
+            <h3 class="card-title text-lg mb-4">{gettext("Member numbers by year")}</h3>
+            <p class="text-sm text-base-content/70 mb-4">
+              {gettext("From %{first} to %{last} (relevant years with membership data)",
+                first: @years |> List.last() |> to_string(),
+                last: @years |> List.first() |> to_string()
+              )}
+            </p>
+            <.member_numbers_table joins_exits_by_year={@joins_exits_by_year} />
+          </div>
+        </div>
+      </section>
+
+      <section class="mb-8" aria-labelledby="contributions-heading">
+        <h2 id="contributions-heading" class="text-xl font-semibold mb-4">
+          {gettext("Contributions")}
+        </h2>
+        <div class="flex flex-wrap items-end gap-4 mb-6">
+          <div class="flex items-center gap-2">
+            <form id="fee-type-form" phx-change="change_fee_type" class="flex items-center gap-2">
+              <label for="fee-type-filter" class="text-sm font-medium text-base-content/80">
+                {gettext("Fee type")}:
+              </label>
+              <select
+                id="fee-type-filter"
+                name="fee_type_id"
+                class="select select-bordered select-sm min-w-[10rem]"
+              >
+                <option value="" selected={@selected_fee_type_id in [nil, ""]}>
+                  {gettext("All")}
+                </option>
+                <%= for ft <- @membership_fee_types do %>
+                  <option
+                    value={ft.id}
+                    selected={to_string(@selected_fee_type_id) == to_string(ft.id)}
+                  >
+                    {ft.name}
+                  </option>
+                <% end %>
+              </select>
+            </form>
+          </div>
+        </div>
+        <div class="card bg-base-200 shadow-md border border-base-300">
+          <div class="card-body">
+            <h3 class="card-title text-lg mb-4">{gettext("Contributions by year")}</h3>
+            <div class="flex flex-col gap-8 items-start">
+              <div class="w-full">
+                <.contributions_bars_by_year
+                  contributions_by_year={@contributions_by_year}
+                  totals_over_all_years={@totals_over_all_years}
+                />
+              </div>
+              <div class="w-full flex flex-col items-center pt-6 mt-2 border-t border-base-300">
+                <h4 class="text-sm font-semibold mb-3">{gettext("All years combined (pie)")}</h4>
+                <.contributions_pie cycle_totals={@totals_over_all_years} />
+                <p class="text-xs text-base-content/70 mt-2">
+                  <span class="inline-block w-2 h-2 rounded-full bg-success align-middle mr-1"></span>
+                  {gettext("Paid")}
+                  <span class="inline-block w-2 h-2 rounded-full bg-warning align-middle mx-2 mr-1">
+                  </span>
+                  {gettext("Unpaid")}
+                  <span class="inline-block w-2 h-2 rounded-full bg-base-content/20 align-middle mx-2 mr-1">
+                  </span>
+                  {gettext("Suspended")}
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+    </Layouts.app>
+    """
+  end
+
+  @impl true
+  def handle_event("change_fee_type", %{"fee_type_id" => ""}, socket) do
+    {:noreply, push_patch(socket, to: ~p"/statistics")}
+  end
+
+  def handle_event("change_fee_type", %{"fee_type_id" => id}, socket) when is_binary(id) do
+    trimmed = String.trim(id)
+
+    to =
+      if trimmed == "",
+        do: ~p"/statistics",
+        else: ~p"/statistics" <> "?" <> URI.encode_query(%{"fee_type_id" => trimmed})
+
+    {:noreply, push_patch(socket, to: to)}
+  end
+
+  attr :joins_exits_by_year, :list, required: true
+
+  defp member_numbers_table(assigns) do
+    rows = assigns.joins_exits_by_year
+    total_activity = Enum.map(rows, fn r -> r.joins + r.exits end)
+    max_total = (total_activity != [] && Enum.max(total_activity)) || 1
+
+    rows_with_pct =
+      Enum.map(rows, fn row ->
+        sum = row.joins + row.exits
+
+        bar_pct =
+          if max_total > 0 and sum > 0 do
+            min(100.0, Float.round(sum / max_total * 100, 1))
+          else
+            0
+          end
+
+        seg_scale = max(sum, 1)
+        joins_pct = min(100.0, row.joins / seg_scale * 100)
+        exits_pct = min(100.0, row.exits / seg_scale * 100)
+
+        %{
+          year: row.year,
+          joins: row.joins,
+          exits: row.exits,
+          bar_pct: bar_pct,
+          joins_pct: Float.round(joins_pct, 1),
+          exits_pct: Float.round(exits_pct, 1)
+        }
+      end)
+
+    assigns = assign(assigns, :rows, rows_with_pct)
+
+    ~H"""
+    <div
+      class="overflow-x-auto"
+      role="img"
+      aria-label={gettext("Member numbers by year as table with bars")}
+    >
+      <table class="table table-sm w-full">
+        <thead class="bg-base-300">
+          <tr>
+            <th scope="col" class="text-base-content font-semibold w-20">{gettext("Year")}</th>
+            <th scope="col" class="text-base-content font-semibold">{gettext("Joins")}</th>
+            <th scope="col" class="text-base-content font-semibold">{gettext("Exits")}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= for row <- @rows do %>
+            <tr>
+              <td
+                rowspan="2"
+                class="font-mono align-middle border-b-0"
+              >
+                {row.year}
+              </td>
+              <td colspan="2" class="align-top p-1 pb-0 border-b-0">
+                <div class="h-6 rounded overflow-hidden bg-base-300 relative min-w-[4rem]">
+                  <div
+                    class="flex h-full absolute left-0 top-0 bottom-0 min-w-0 rounded"
+                    style={"width: #{max(0, row.bar_pct)}%"}
+                  >
+                    <div
+                      class="h-full bg-success min-w-0 rounded-l"
+                      style={"width: #{row.joins_pct}%"}
+                      title={gettext("Joins")}
+                    >
+                    </div>
+                    <div
+                      class="h-full bg-error min-w-0 rounded-r"
+                      style={"width: #{row.exits_pct}%"}
+                      title={gettext("Exits")}
+                    >
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
+                <span class="inline-flex items-center gap-1.5">
+                  {row.joins}
+                  <span
+                    class="inline-block w-2 h-2 rounded-full bg-success shrink-0"
+                    aria-hidden="true"
+                    title={gettext("Joins")}
+                  >
+                  </span>
+                </span>
+              </td>
+              <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
+                <span class="inline-flex items-center gap-1.5">
+                  {row.exits}
+                  <span
+                    class="inline-block w-2 h-2 rounded-full bg-error shrink-0"
+                    aria-hidden="true"
+                    title={gettext("Exits")}
+                  >
+                  </span>
+                </span>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+    """
+  end
+
+  attr :contributions_by_year, :list, required: true
+  attr :totals_over_all_years, :map, required: true
+
+  defp contributions_bars_by_year(assigns) do
+    rows = assigns.contributions_by_year
+    totals = assigns.totals_over_all_years
+
+    all_rows_with_decimals =
+      Enum.map(rows, fn row ->
+        %{
+          year: row.year,
+          summary: false,
+          total: row.total,
+          paid: row.paid,
+          unpaid: row.unpaid,
+          suspended: row.suspended
+        }
+      end) ++
+        [
+          %{
+            year: nil,
+            summary: true,
+            total: totals.total,
+            paid: totals.paid,
+            unpaid: totals.unpaid,
+            suspended: totals.suspended
+          }
+        ]
+
+    max_total = max_decimal(all_rows_with_decimals, :total)
+
+    rows_with_pct =
+      Enum.map(all_rows_with_decimals, fn row ->
+        bar_pct = bar_pct(row.total, max_total)
+
+        sum_positive =
+          Decimal.add(Decimal.add(row.paid, row.unpaid), row.suspended)
+
+        seg_scale =
+          if Decimal.compare(sum_positive, 0) == :gt, do: sum_positive, else: Decimal.new(1)
+
+        paid_pct =
+          row.paid
+          |> Decimal.div(seg_scale)
+          |> Decimal.mult(100)
+          |> Decimal.to_float()
+          |> min(100.0)
+
+        unpaid_pct =
+          row.unpaid
+          |> Decimal.div(seg_scale)
+          |> Decimal.mult(100)
+          |> Decimal.to_float()
+          |> min(100.0)
+
+        suspended_pct =
+          row.suspended
+          |> Decimal.div(seg_scale)
+          |> Decimal.mult(100)
+          |> Decimal.to_float()
+          |> min(100.0)
+
+        %{
+          year: row.year,
+          summary: row.summary,
+          total_formatted: MembershipFeeHelpers.format_currency(row.total),
+          paid_formatted: MembershipFeeHelpers.format_currency(row.paid),
+          unpaid_formatted: MembershipFeeHelpers.format_currency(row.unpaid),
+          suspended_formatted: MembershipFeeHelpers.format_currency(row.suspended),
+          bar_pct: bar_pct,
+          paid_pct: paid_pct,
+          unpaid_pct: unpaid_pct,
+          suspended_pct: suspended_pct
+        }
+      end)
+
+    assigns = assign(assigns, :rows, rows_with_pct)
+
+    ~H"""
+    <div
+      class="overflow-x-auto"
+      role="img"
+      aria-label={gettext("Contributions by year as table with stacked bars")}
+    >
+      <table class="table table-sm w-full">
+        <thead class="bg-base-300">
+          <tr>
+            <th scope="col" class="text-base-content font-semibold w-20">{gettext("Year")}</th>
+            <th scope="col" class="text-base-content font-semibold">{gettext("Paid")}</th>
+            <th scope="col" class="text-base-content font-semibold">{gettext("Unpaid")}</th>
+            <th scope="col" class="text-base-content font-semibold">{gettext("Suspended")}</th>
+            <th scope="col" class="text-base-content font-semibold">{gettext("Total")}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= for row <- @rows do %>
+            <tr class={row.summary && "border-t-2 border-base-300 bg-base-300/30"}>
+              <td
+                rowspan="2"
+                class={"font-mono align-middle border-b-0 #{if row.summary, do: "font-semibold", else: ""}"}
+              >
+                <%= if row.summary do %>
+                  {gettext("Total")}
+                <% else %>
+                  {row.year}
+                <% end %>
+              </td>
+              <td colspan="4" class="align-top p-1 pb-0 border-b-0">
+                <div class="h-6 rounded overflow-hidden bg-base-300 relative min-w-[4rem]">
+                  <div
+                    class="flex h-full absolute left-0 top-0 bottom-0 min-w-0 rounded"
+                    style={"width: #{max(0, Float.round(row.bar_pct, 1))}%"}
+                  >
+                    <div
+                      class="h-full bg-success min-w-0 rounded-l"
+                      style={"width: #{Float.round(row.paid_pct, 1)}%"}
+                      title={gettext("Paid")}
+                    >
+                    </div>
+                    <div
+                      class="h-full bg-warning min-w-0"
+                      style={"width: #{Float.round(row.unpaid_pct, 1)}%"}
+                      title={gettext("Unpaid")}
+                    >
+                    </div>
+                    <div
+                      class="h-full bg-base-content/20 min-w-0 rounded-r"
+                      style={"width: #{Float.round(row.suspended_pct, 1)}%"}
+                      title={gettext("Suspended")}
+                    >
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
+            <tr class={row.summary && "bg-base-300/30"}>
+              <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
+                <span class="inline-flex items-center gap-1.5">
+                  {row.paid_formatted}
+                  <span
+                    class="inline-block w-2 h-2 rounded-full bg-success shrink-0"
+                    aria-hidden="true"
+                    title={gettext("Paid")}
+                  >
+                  </span>
+                </span>
+              </td>
+              <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
+                <span class="inline-flex items-center gap-1.5">
+                  {row.unpaid_formatted}
+                  <span
+                    class="inline-block w-2 h-2 rounded-full bg-warning shrink-0"
+                    aria-hidden="true"
+                    title={gettext("Unpaid")}
+                  >
+                  </span>
+                </span>
+              </td>
+              <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
+                <span class="inline-flex items-center gap-1.5">
+                  {row.suspended_formatted}
+                  <span
+                    class="inline-block w-2 h-2 rounded-full bg-base-content/20 shrink-0"
+                    aria-hidden="true"
+                    title={gettext("Suspended")}
+                  >
+                  </span>
+                </span>
+              </td>
+              <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
+                {row.total_formatted}
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+    """
+  end
+
+  defp max_decimal(rows, key) do
+    Enum.reduce(rows, Decimal.new(0), fn row, acc ->
+      val = Map.get(row, key)
+      if Decimal.compare(val, acc) == :gt, do: val, else: acc
+    end)
+  end
+
+  defp bar_pct(value, max) do
+    scale = if Decimal.compare(max, 0) == :gt, do: max, else: Decimal.new(1)
+    pct = value |> Decimal.div(scale) |> Decimal.mult(100) |> Decimal.to_float()
+    min(100.0, pct)
+  end
+
+  attr :cycle_totals, :map, required: true
+
+  defp contributions_pie(assigns) do
+    paid = assigns.cycle_totals.paid
+    unpaid = assigns.cycle_totals.unpaid
+    suspended = assigns.cycle_totals.suspended
+
+    sum_positive = Decimal.add(Decimal.add(paid, unpaid), suspended)
+    scale = if Decimal.compare(sum_positive, 0) == :gt, do: sum_positive, else: Decimal.new(1)
+
+    paid_pct = Decimal.div(paid, scale) |> Decimal.mult(100) |> Decimal.to_float()
+    unpaid_pct = Decimal.div(unpaid, scale) |> Decimal.mult(100) |> Decimal.to_float()
+    suspended_pct = Decimal.div(suspended, scale) |> Decimal.mult(100) |> Decimal.to_float()
+
+    # Conic gradient: 0deg = top, clockwise. Success (paid), warning (unpaid), base-300 (suspended)
+    # Use theme CSS variables (--color-*) so the pie renders in all themes
+    paid_deg = paid_pct * 3.6
+    unpaid_deg = unpaid_pct * 3.6
+
+    gradient_stops =
+      "var(--color-success) 0deg, var(--color-success) #{paid_deg}deg, var(--color-warning) #{paid_deg}deg, var(--color-warning) #{paid_deg + unpaid_deg}deg, var(--color-base-300) #{paid_deg + unpaid_deg}deg, var(--color-base-300) 360deg"
+
+    assigns =
+      assigns
+      |> assign(:paid_pct, paid_pct)
+      |> assign(:unpaid_pct, unpaid_pct)
+      |> assign(:suspended_pct, suspended_pct)
+      |> assign(:gradient_stops, gradient_stops)
+
+    ~H"""
+    <div
+      class="w-40 h-40 min-h-[10rem] rounded-full shrink-0 border-2 border-base-300 bg-base-300"
+      style={"background: conic-gradient(#{@gradient_stops});"}
+      role="img"
+      aria-label={
+        gettext(
+          "Contributions pie: paid %{paid}%%, unpaid %{unpaid}%%, suspended %{suspended}%%",
+          paid: Float.round(@paid_pct, 1),
+          unpaid: Float.round(@unpaid_pct, 1),
+          suspended: Float.round(@suspended_pct, 1)
+        )
+      }
+      title={"#{gettext("Paid")}: #{Float.round(@paid_pct, 1)}%, #{gettext("Unpaid")}: #{Float.round(@unpaid_pct, 1)}%, #{gettext("Suspended")}: #{Float.round(@suspended_pct, 1)}%"}
+    >
+    </div>
+    """
+  end
+
+  defp load_fee_types(socket) do
+    actor = current_actor(socket)
+
+    case MembershipFeeType
+         |> Ash.Query.sort(name: :asc)
+         |> Ash.read(domain: Mv.MembershipFees, actor: actor) do
+      {:ok, fee_types} ->
+        assign(socket, :membership_fee_types, fee_types)
+
+      {:error, reason} ->
+        Logger.warning("StatisticsLive: failed to load fee types: #{inspect(reason)}")
+
+        socket
+        |> put_flash(:error, gettext("Fee types could not be loaded."))
+        |> assign(:membership_fee_types, [])
+    end
+  end
+
+  defp load_statistics(socket) do
+    actor = current_actor(socket)
+    fee_type_id = socket.assigns[:selected_fee_type_id]
+    # Member stats must never depend on fee type (only contributions do)
+    opts_member = [actor: actor]
+
+    opts_contributions =
+      [actor: actor] ++ if fee_type_id, do: [fee_type_id: fee_type_id], else: []
+
+    current_year = Date.utc_today().year
+    first_year = Statistics.first_join_year(opts_member) || current_year
+    years = first_year..current_year |> Enum.to_list() |> Enum.reverse()
+
+    active_count = Statistics.active_member_count(opts_member)
+    inactive_count = Statistics.inactive_member_count(opts_member)
+    joins_exits_by_year = build_joins_exits_by_year(years, opts_member)
+    contributions_by_year = build_contributions_by_year(years, opts_contributions)
+    totals_over_all_years = sum_cycle_totals(contributions_by_year)
+
+    assign(socket,
+      years: years,
+      active_count: active_count,
+      inactive_count: inactive_count,
+      joins_exits_by_year: joins_exits_by_year,
+      contributions_by_year: contributions_by_year,
+      totals_over_all_years: totals_over_all_years
+    )
+  end
+
+  defp build_joins_exits_by_year(years, opts) do
+    Enum.map(years, fn y ->
+      %{
+        year: y,
+        joins: Statistics.joins_by_year(y, opts),
+        exits: Statistics.exits_by_year(y, opts)
+      }
+    end)
+  end
+
+  defp build_contributions_by_year(years, opts) do
+    Enum.map(years, fn y ->
+      totals = Statistics.cycle_totals_by_year(y, opts)
+
+      %{
+        year: y,
+        total: totals.total,
+        paid: totals.paid,
+        unpaid: totals.unpaid,
+        suspended: totals.suspended
+      }
+    end)
+  end
+
+  defp sum_cycle_totals(contributions_by_year) do
+    Enum.reduce(
+      contributions_by_year,
+      %{
+        total: Decimal.new(0),
+        paid: Decimal.new(0),
+        unpaid: Decimal.new(0),
+        suspended: Decimal.new(0)
+      },
+      fn row, acc ->
+        %{
+          total: Decimal.add(acc.total, row.total),
+          paid: Decimal.add(acc.paid, row.paid),
+          unpaid: Decimal.add(acc.unpaid, row.unpaid),
+          suspended: Decimal.add(acc.suspended, row.suspended)
+        }
+      end
+    )
+  end
+end

lib/mv_web/page_paths.ex

@@ -9,6 +9,7 @@ defmodule MvWeb.PagePaths do
   # Sidebar top-level menu paths
   @members "/members"
   @membership_fee_types "/membership_fee_types"
+  @statistics "/statistics"
 
   # Administration submenu paths (all must match router)
   @users "/users"
@@ -31,6 +32,9 @@ defmodule MvWeb.PagePaths do
   @doc "Path for Membership Fee Types index (sidebar and page permission check)."
   def membership_fee_types, do: @membership_fee_types
 
+  @doc "Path for Statistics page (sidebar and page permission check)."
+  def statistics, do: @statistics
+
   @doc "Paths for Administration menu; show group if user can access any of these."
   def admin_menu_paths, do: @admin_page_paths
 

lib/mv_web/router.ex

@@ -73,6 +73,9 @@ defmodule MvWeb.Router do
 
       # Membership Fee Types Management
       live "/membership_fee_types", MembershipFeeTypeLive.Index, :index
+
+      # Statistics
+      live "/statistics", StatisticsLive, :index
       live "/membership_fee_types/new", MembershipFeeTypeLive.Form, :new
       live "/membership_fee_types/:id/edit", MembershipFeeTypeLive.Form, :edit