This commit is contained in:
parent
33652265b8
commit
3cf8244cd6
4 changed files with 28 additions and 17 deletions
|
|
@ -175,11 +175,12 @@ defmodule MvWeb.MemberLive.Show do
|
||||||
@impl true
|
@impl true
|
||||||
def handle_params(%{"id" => id}, _, socket) do
|
def handle_params(%{"id" => id}, _, socket) do
|
||||||
# Load custom fields once using assign_new to avoid repeated queries
|
# Load custom fields once using assign_new to avoid repeated queries
|
||||||
socket = assign_new(socket, :custom_fields, fn ->
|
socket =
|
||||||
Mv.Membership.CustomField
|
assign_new(socket, :custom_fields, fn ->
|
||||||
|> Ash.Query.sort(name: :asc)
|
Mv.Membership.CustomField
|
||||||
|> Ash.read!()
|
|> Ash.Query.sort(name: :asc)
|
||||||
end)
|
|> Ash.read!()
|
||||||
|
end)
|
||||||
|
|
||||||
query =
|
query =
|
||||||
Mv.Membership.Member
|
Mv.Membership.Member
|
||||||
|
|
@ -246,6 +247,7 @@ defmodule MvWeb.MemberLive.Show do
|
||||||
|
|
||||||
if assigns.email && String.trim(assigns.email) != "" do
|
if assigns.email && String.trim(assigns.email) != "" do
|
||||||
assigns = %{email: assigns.email, display: display_text}
|
assigns = %{email: assigns.email, display: display_text}
|
||||||
|
|
||||||
~H"""
|
~H"""
|
||||||
<a
|
<a
|
||||||
href={"mailto:#{@email}"}
|
href={"mailto:#{@email}"}
|
||||||
|
|
@ -297,12 +299,15 @@ defmodule MvWeb.MemberLive.Show do
|
||||||
|
|
||||||
# Finds custom field value for a given custom field id
|
# Finds custom field value for a given custom field id
|
||||||
defp find_custom_field_value(nil, _custom_field_id), do: nil
|
defp find_custom_field_value(nil, _custom_field_id), do: nil
|
||||||
defp find_custom_field_value(custom_field_values, custom_field_id) when is_list(custom_field_values) do
|
|
||||||
|
defp find_custom_field_value(custom_field_values, custom_field_id)
|
||||||
|
when is_list(custom_field_values) do
|
||||||
Enum.find(custom_field_values, fn cfv ->
|
Enum.find(custom_field_values, fn cfv ->
|
||||||
cfv.custom_field_id == custom_field_id or
|
cfv.custom_field_id == custom_field_id or
|
||||||
(cfv.custom_field && cfv.custom_field.id == custom_field_id)
|
(cfv.custom_field && cfv.custom_field.id == custom_field_id)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
defp find_custom_field_value(_custom_field_values, _custom_field_id), do: nil
|
defp find_custom_field_value(_custom_field_values, _custom_field_id), do: nil
|
||||||
|
|
||||||
# Formats custom field value based on type
|
# Formats custom field value based on type
|
||||||
|
|
@ -330,6 +335,7 @@ defmodule MvWeb.MemberLive.Show do
|
||||||
render_empty_value()
|
render_empty_value()
|
||||||
else
|
else
|
||||||
assigns = %{email: value}
|
assigns = %{email: value}
|
||||||
|
|
||||||
~H"""
|
~H"""
|
||||||
<.mailto_link email={@email} display={@email} />
|
<.mailto_link email={@email} display={@email} />
|
||||||
"""
|
"""
|
||||||
|
|
@ -351,6 +357,7 @@ defmodule MvWeb.MemberLive.Show do
|
||||||
# The visual "—" is hidden from screen readers, while the translated text is only visible to screen readers
|
# The visual "—" is hidden from screen readers, while the translated text is only visible to screen readers
|
||||||
defp render_empty_value do
|
defp render_empty_value do
|
||||||
assigns = %{text: gettext("Not set")}
|
assigns = %{text: gettext("Not set")}
|
||||||
|
|
||||||
~H"""
|
~H"""
|
||||||
<span class="text-base-content/50 italic">
|
<span class="text-base-content/50 italic">
|
||||||
<span aria-hidden="true">—</span>
|
<span aria-hidden="true">—</span>
|
||||||
|
|
|
||||||
|
|
@ -1422,6 +1422,11 @@ msgstr "Jährliches Intervall – Beitrittszeitraum nicht einbezogen"
|
||||||
msgid "Yearly Interval - Joining Cycle Included"
|
msgid "Yearly Interval - Joining Cycle Included"
|
||||||
msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
|
msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
|
||||||
|
|
||||||
|
#: lib/mv_web/live/member_live/show.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgid "Not set"
|
||||||
|
msgstr "Nicht gesetzt"
|
||||||
|
|
||||||
#~ #: lib/mv_web/live/custom_field_live/show.ex
|
#~ #: lib/mv_web/live/custom_field_live/show.ex
|
||||||
#~ #, elixir-autogen, elixir-format
|
#~ #, elixir-autogen, elixir-format
|
||||||
#~ msgid "Auto-generated identifier (immutable)"
|
#~ msgid "Auto-generated identifier (immutable)"
|
||||||
|
|
@ -1494,12 +1499,6 @@ msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
|
||||||
#~ msgid "New Custom field"
|
#~ msgid "New Custom field"
|
||||||
#~ msgstr "Benutzerdefiniertes Feld speichern"
|
#~ msgstr "Benutzerdefiniertes Feld speichern"
|
||||||
|
|
||||||
#~ #: lib/mv_web/live/user_live/form.ex
|
|
||||||
#~ #: lib/mv_web/live/user_live/show.ex
|
|
||||||
#~ #, elixir-autogen, elixir-format
|
|
||||||
#~ msgid "Not set"
|
|
||||||
#~ msgstr "Nicht gesetzt"
|
|
||||||
|
|
||||||
#~ #: lib/mv_web/live/contribution_settings_live.ex
|
#~ #: lib/mv_web/live/contribution_settings_live.ex
|
||||||
#~ #, elixir-autogen, elixir-format
|
#~ #, elixir-autogen, elixir-format
|
||||||
#~ msgid "Quarterly Interval - Joining Period Excluded"
|
#~ msgid "Quarterly Interval - Joining Period Excluded"
|
||||||
|
|
|
||||||
|
|
@ -1422,3 +1422,8 @@ msgstr ""
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
msgid "Yearly Interval - Joining Cycle Included"
|
msgid "Yearly Interval - Joining Cycle Included"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: lib/mv_web/live/member_live/show.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgid "Not set"
|
||||||
|
msgstr ""
|
||||||
|
|
|
||||||
|
|
@ -1423,6 +1423,11 @@ msgstr ""
|
||||||
msgid "Yearly Interval - Joining Cycle Included"
|
msgid "Yearly Interval - Joining Cycle Included"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: lib/mv_web/live/member_live/show.ex
|
||||||
|
#, elixir-autogen, elixir-format, fuzzy
|
||||||
|
msgid "Not set"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#~ #: lib/mv_web/live/custom_field_live/show.ex
|
#~ #: lib/mv_web/live/custom_field_live/show.ex
|
||||||
#~ #, elixir-autogen, elixir-format
|
#~ #, elixir-autogen, elixir-format
|
||||||
#~ msgid "Auto-generated identifier (immutable)"
|
#~ msgid "Auto-generated identifier (immutable)"
|
||||||
|
|
@ -1495,11 +1500,6 @@ msgstr ""
|
||||||
#~ msgid "New Custom field"
|
#~ msgid "New Custom field"
|
||||||
#~ msgstr ""
|
#~ msgstr ""
|
||||||
|
|
||||||
#~ #: lib/mv_web/live/user_live/show.ex
|
|
||||||
#~ #, elixir-autogen, elixir-format, fuzzy
|
|
||||||
#~ msgid "Not set"
|
|
||||||
#~ msgstr ""
|
|
||||||
|
|
||||||
#~ #: lib/mv_web/live/contribution_settings_live.ex
|
#~ #: lib/mv_web/live/contribution_settings_live.ex
|
||||||
#~ #, elixir-autogen, elixir-format
|
#~ #, elixir-autogen, elixir-format
|
||||||
#~ msgid "Quarterly Interval - Joining Period Excluded"
|
#~ msgid "Quarterly Interval - Joining Period Excluded"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue