From cecb547bd642a663d53fd17fcb412886fb33165f Mon Sep 17 00:00:00 2001 From: carla Date: Mon, 16 Feb 2026 16:53:37 +0100 Subject: [PATCH 1/2] bug: adds membership startdate column --- lib/mv_web/live/member_live/index.html.heex | 107 ++++++++++++-------- 1 file changed, 66 insertions(+), 41 deletions(-) diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index b490618..f8be88d 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -180,6 +180,67 @@ > {member.email} + <:col + :let={member} + :if={:join_date in @member_fields_visible} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_join_date} + field={:join_date} + label={gettext("Join Date")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {MvWeb.MemberLive.Index.format_date(member.join_date)} + + <:col + :let={member} + :if={:exit_date in @member_fields_visible} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_exit_date} + field={:exit_date} + label={gettext("Exit Date")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {MvWeb.MemberLive.Index.format_date(member.exit_date)} + + <:col + :let={member} + :if={:notes in @member_fields_visible} + label={gettext("Notes")} + > + {member.notes} + + <:col + :let={member} + :if={:city in @member_fields_visible} + label={ + ~H""" + <.live_component + module={MvWeb.Components.SortHeaderComponent} + id={:sort_city} + field={:city} + label={gettext("City")} + sort_field={@sort_field} + sort_order={@sort_order} + /> + """ + } + > + {member.city} + <:col :let={member} :if={:street in @member_fields_visible} @@ -236,57 +297,21 @@ <:col :let={member} - :if={:city in @member_fields_visible} + :if={:membership_fee_start_date in @member_fields_visible} label={ ~H""" <.live_component module={MvWeb.Components.SortHeaderComponent} - id={:sort_city} - field={:city} - label={gettext("City")} + id={:sort_membership_fee_start_date} + field={:membership_fee_start_date} + label={gettext("Membership Fee Start Date")} sort_field={@sort_field} sort_order={@sort_order} /> """ } > - {member.city} - - <:col - :let={member} - :if={:join_date in @member_fields_visible} - label={ - ~H""" - <.live_component - module={MvWeb.Components.SortHeaderComponent} - id={:sort_join_date} - field={:join_date} - label={gettext("Join Date")} - sort_field={@sort_field} - sort_order={@sort_order} - /> - """ - } - > - {MvWeb.MemberLive.Index.format_date(member.join_date)} - - <:col - :let={member} - :if={:exit_date in @member_fields_visible} - label={ - ~H""" - <.live_component - module={MvWeb.Components.SortHeaderComponent} - id={:sort_exit_date} - field={:exit_date} - label={gettext("Exit Date")} - sort_field={@sort_field} - sort_order={@sort_order} - /> - """ - } - > - {MvWeb.MemberLive.Index.format_date(member.exit_date)} + {MvWeb.MemberLive.Index.format_date(member.membership_fee_start_date)} <:col :let={member} -- 2.47.2 From 49bd2eee0b0663dbd7c8592429681f3eb11c3019 Mon Sep 17 00:00:00 2001 From: carla Date: Tue, 17 Feb 2026 17:59:30 +0100 Subject: [PATCH 2/2] i18n: update translations --- priv/gettext/de/LC_MESSAGES/default.po | 2 ++ priv/gettext/default.pot | 2 ++ priv/gettext/en/LC_MESSAGES/default.po | 2 ++ 3 files changed, 6 insertions(+) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index e40d053..0187da6 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -144,6 +144,7 @@ msgid "House Number" msgstr "Hausnummer" #: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/translations/member_fields.ex #, elixir-autogen, elixir-format @@ -1542,6 +1543,7 @@ msgstr "Du bist dabei alle %{count} Zyklen für dieses Mitglied zu löschen." msgid "Delete Membership Fee Type" msgstr "Mitgliedsbeitragsart löschen" +#: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/translations/member_fields.ex #, elixir-autogen, elixir-format, fuzzy msgid "Membership Fee Start Date" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index fb156df..a05597c 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -145,6 +145,7 @@ msgid "House Number" msgstr "" #: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/translations/member_fields.ex #, elixir-autogen, elixir-format @@ -1543,6 +1544,7 @@ msgstr "" msgid "Delete Membership Fee Type" msgstr "" +#: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/translations/member_fields.ex #, elixir-autogen, elixir-format msgid "Membership Fee Start Date" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index f12d478..261cbe4 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -145,6 +145,7 @@ msgid "House Number" msgstr "" #: lib/mv_web/live/member_live/form.ex +#: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/live/member_live/show.ex #: lib/mv_web/translations/member_fields.ex #, elixir-autogen, elixir-format @@ -1543,6 +1544,7 @@ msgstr "" msgid "Delete Membership Fee Type" msgstr "" +#: lib/mv_web/live/member_live/index.html.heex #: lib/mv_web/translations/member_fields.ex #, elixir-autogen, elixir-format, fuzzy msgid "Membership Fee Start Date" -- 2.47.2