Refactor filters to use cycle status instead of paid field
Replace paid_filter with cycle_status_filter that filters based on membership fee cycle status (last or current cycle). Update PaymentFilterComponent to use new filter with options All, Paid, Unpaid. Remove membership fee status filter dropdown. Extend filter_members_by_cycle_status/3 to support both paid and unpaid filtering. Update toggle_cycle_view to preserve filter state in URL.
This commit is contained in:
parent
098b3b0a2a
commit
c65b3808bf
10 changed files with 490 additions and 247 deletions
|
|
@ -113,6 +113,41 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatus do
|
|||
}
|
||||
end
|
||||
|
||||
@doc """
|
||||
Filters members by cycle status (paid or unpaid).
|
||||
|
||||
Returns members that have the specified status in either the last completed cycle
|
||||
or the current cycle, depending on `show_current`.
|
||||
|
||||
## Parameters
|
||||
|
||||
- `members` - List of member structs with loaded cycles
|
||||
- `status` - Cycle status to filter by (`:paid` or `:unpaid`)
|
||||
- `show_current` - If true, filter by current cycle; if false, filter by last completed cycle
|
||||
|
||||
## Returns
|
||||
|
||||
List of members with the specified cycle status
|
||||
|
||||
## Examples
|
||||
|
||||
# Filter unpaid members in last cycle
|
||||
iex> filter_members_by_cycle_status(members, :unpaid, false)
|
||||
[%Member{}, ...]
|
||||
|
||||
# Filter paid members in current cycle
|
||||
iex> filter_members_by_cycle_status(members, :paid, true)
|
||||
[%Member{}, ...]
|
||||
"""
|
||||
@spec filter_members_by_cycle_status([Member.t()], :paid | :unpaid, boolean()) :: [Member.t()]
|
||||
def filter_members_by_cycle_status(members, status, show_current \\ false)
|
||||
when status in [:paid, :unpaid] do
|
||||
Enum.filter(members, fn member ->
|
||||
member_status = get_cycle_status_for_member(member, show_current)
|
||||
member_status == status
|
||||
end)
|
||||
end
|
||||
|
||||
@doc """
|
||||
Filters members by unpaid cycle status.
|
||||
|
||||
|
|
@ -127,13 +162,14 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatus do
|
|||
## Returns
|
||||
|
||||
List of members with unpaid cycles
|
||||
|
||||
## Deprecated
|
||||
|
||||
This function is kept for backwards compatibility. Use `filter_members_by_cycle_status/3` instead.
|
||||
"""
|
||||
@spec filter_unpaid_members([Member.t()], boolean()) :: [Member.t()]
|
||||
def filter_unpaid_members(members, show_current \\ false) do
|
||||
Enum.filter(members, fn member ->
|
||||
status = get_cycle_status_for_member(member, show_current)
|
||||
status == :unpaid
|
||||
end)
|
||||
filter_members_by_cycle_status(members, :unpaid, show_current)
|
||||
end
|
||||
|
||||
# Private helper function to format status label
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue