local-it/mitgliederverwaltung
2
3
Fork 0
Code Issues 72 Pull requests 3 Projects 4 Releases Packages 1 Activity Actions

Implements settings for member fields closes #223 #300

Merged
carla merged 26 commits from feature/223_memberfields_settings into main 2026-01-12 13:24:54 +01:00
Conversation 5 Commits 26 Files changed 34 +154 -134
7 changed files with 154 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e38de7d690 - Show all commits

6
lib/mv_web/live/custom_field_live/form_component.ex
View file

@ -26,12 +26,12 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
type="button" type="button"
phx-click="cancel" phx-click="cancel"
phx-target={@myself} phx-target={@myself}
aria-label={gettext("Back to custom field overview")} aria-label={gettext("Back to settings")}
> >
<.icon name="hero-arrow-left" class="w-4 h-4" /> <.icon name="hero-arrow-left" class="w-4 h-4" />
</.button> </.button>
<h3 class="card-title"> <h3 class="card-title">
{if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")} {if @custom_field, do: gettext("Edit Data Field"), else: gettext("New Data Field")}
</h3> </h3>
</div> </div>
@ -66,7 +66,7 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
{gettext("Cancel")} {gettext("Cancel")}
</.button> </.button>
<.button phx-disable-with={gettext("Saving...")} variant="primary"> <.button phx-disable-with={gettext("Saving...")} variant="primary">
{gettext("Save Custom Field")} {gettext("Save Data Field")}
</.button> </.button>
</div> </div>
</.form> </.form>

4
lib/mv_web/live/custom_field_live/index_component.ex
View file

@ -29,7 +29,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
phx-click="new_custom_field" phx-click="new_custom_field"
phx-target={@myself} phx-target={@myself}
> >
<.icon name="hero-plus" /> {gettext("New Custom Field")} <.icon name="hero-plus" /> {gettext("New Data Field")}
</.button> </.button>
</div> </div>
</div> </div>
@ -111,7 +111,7 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
<%!-- Delete Confirmation Modal --%> <%!-- Delete Confirmation Modal --%>
<dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open"> <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
<div class="modal-box"> <div class="modal-box">
<h3 class="text-lg font-bold">{gettext("Delete Custom Field")}</h3> <h3 class="text-lg font-bold">{gettext("Delete Data Field")}</h3>
<div class="py-4 space-y-4"> <div class="py-4 space-y-4">
<div class="alert alert-warning"> <div class="alert alert-warning">

6
lib/mv_web/live/custom_field_value_live/show.ex
View file

@ -26,7 +26,7 @@ defmodule MvWeb.CustomFieldValueLive.Show do
~H""" ~H"""
<Layouts.app flash={@flash} current_user={@current_user}> <Layouts.app flash={@flash} current_user={@current_user}>
<.header> <.header>
Custom field value {@custom_field_value.id} Data field value {@custom_field_value.id}
<:subtitle>This is a custom_field_value record from your database.</:subtitle> <:subtitle>This is a custom_field_value record from your database.</:subtitle>
<:actions> <:actions>
@ -62,6 +62,6 @@ defmodule MvWeb.CustomFieldValueLive.Show do
|> assign(:custom_field_value, Ash.get!(Mv.Membership.CustomFieldValue, id))} |> assign(:custom_field_value, Ash.get!(Mv.Membership.CustomFieldValue, id))}
end end
defp page_title(:show), do: "Show Custom field value" defp page_title(:show), do: "Show data field value"
defp page_title(:edit), do: "Edit Custom field value" defp page_title(:edit), do: "Edit data field value"
end end

6
lib/mv_web/live/global_settings_live.ex
View file

@ -118,12 +118,12 @@ defmodule MvWeb.GlobalSettingsLive do
{:noreply, {:noreply,
socket socket
|> assign(:active_editing_section, nil) |> assign(:active_editing_section, nil)
|> put_flash(:info, gettext("Custom field %{action} successfully", action: action))} |> put_flash(:info, gettext("Data field %{action} successfully", action: action))}
end end
@impl true @impl true
def handle_info({:custom_field_deleted, _custom_field}, socket) do def handle_info({:custom_field_deleted, _custom_field}, socket) do
{:noreply, put_flash(socket, :info, gettext("Custom field deleted successfully"))} {:noreply, put_flash(socket, :info, gettext("Data field deleted successfully"))}
end end
@impl true @impl true
@ -132,7 +132,7 @@ defmodule MvWeb.GlobalSettingsLive do
put_flash( put_flash(
socket, socket,
:error, :error,
gettext("Failed to delete custom field: %{error}", error: inspect(error)) gettext("Failed to delete data field: %{error}", error: inspect(error))
)} )}
end end

92
priv/gettext/de/LC_MESSAGES/default.po
View file

@ -608,11 +608,6 @@ msgstr "Wähle ein Benutzerdefiniertes Feld"
msgid "Custom field" msgid "Custom field"
msgstr "Benutzerdefinierte Felder" msgstr "Benutzerdefinierte Felder"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Custom field %{action} successfully"
msgstr "Benutzerdefiniertes Feld erfolgreich %{action}"
#: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/custom_field_value_live/form.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Custom field value %{action} successfully" msgid "Custom field value %{action} successfully"
@ -646,11 +641,6 @@ msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld z
msgid "All custom field values will be permanently deleted when you delete this custom field." msgid "All custom field values will be permanently deleted when you delete this custom field."
msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht." msgstr "Alle benutzerdefinierten Feldwerte werden beim Löschen dieses benutzerdefinierten Feldes dauerhaft gelöscht."
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format
msgid "Delete Custom Field"
msgstr "Benutzerdefiniertes Feld löschen"
#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Delete Custom Field and All Values" msgid "Delete Custom Field and All Values"
@ -1249,32 +1239,6 @@ msgstr "Alle auswählen"
msgid "Select none" msgid "Select none"
msgstr "Keine auswählen" msgstr "Keine auswählen"
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Back to custom field overview"
msgstr "Zurück zur Felderliste"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Custom field deleted successfully"
msgstr "Benutzerdefiniertes Feld erfolgreich gelöscht"
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Edit Custom Field"
msgstr "Benutzerdefiniertes Feld bearbeiten"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Failed to delete custom field: %{error}"
msgstr "Konnte Feld nicht löschen: %{error}"
#: lib/mv_web/live/custom_field_live/form_component.ex
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "New Custom Field"
msgstr "Neues Benutzerdefiniertes Feld"
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Slug does not match. Deletion cancelled." msgid "Slug does not match. Deletion cancelled."
@ -1726,11 +1690,6 @@ msgstr "Zyklen regenerieren"
msgid "Regenerating..." msgid "Regenerating..."
msgstr "Regeneriere..." msgstr "Regeneriere..."
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Save Custom Field"
msgstr "Benutzerdefiniertes Feld speichern"
#: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/custom_field_value_live/form.ex
#, elixir-autogen, elixir-format, fuzzy #, elixir-autogen, elixir-format, fuzzy
msgid "Save Custom Field Value" msgid "Save Custom Field Value"
@ -1857,6 +1816,47 @@ msgstr "Spalten ein-/ausblenden"
msgid "The cycle will be calculated based on this date and the interval." msgid "The cycle will be calculated based on this date and the interval."
msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet." msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Back to settings"
msgstr "Zurück zu den Einstellungen"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Data field %{action} successfully"
msgstr "Datenfeld erfolgreich %{action}"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Data field deleted successfully"
msgstr "Datenfeld erfolgreich gelöscht"
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Delete Data Field"
msgstr "Datenfeld löschen"
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Edit Data Field"
msgstr "Datenfeld bearbeiten"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Failed to delete data field: %{error}"
msgstr "Konnte Datenfeld nicht löschen: %{error}"
#: lib/mv_web/live/custom_field_live/form_component.ex
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "New Data Field"
msgstr "Neues Datenfeld"
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Save Data Field"
msgstr "Datenfeld speichern"
#~ #: lib/mv_web/live/member_live/index.html.heex #~ #: lib/mv_web/live/member_live/index.html.heex
#~ #, elixir-autogen, elixir-format #~ #, elixir-autogen, elixir-format
#~ msgid "Show current cycle" #~ msgid "Show current cycle"
@ -1992,6 +1992,11 @@ msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
#~ msgid "Cycle Period" #~ msgid "Cycle Period"
#~ msgstr "Zyklus" #~ msgstr "Zyklus"
#~ #: lib/mv_web/live/custom_field_live/form_component.ex
#~ #, elixir-autogen, elixir-format
#~ msgid "Back to custom field overview"
#~ msgstr "Zurück zur Felderliste"
#~ #: 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 "Include joining period" #~ msgid "Include joining period"
@ -2070,6 +2075,11 @@ msgstr "Der Zyklus wird basierend auf diesem Datum und dem Intervall berechnet."
#~ msgid "Default Contribution Type" #~ msgid "Default Contribution Type"
#~ msgstr "Standard-Beitragsart" #~ msgstr "Standard-Beitragsart"
#~ #: lib/mv_web/live/custom_field_live/form_component.ex
#~ #, elixir-autogen, elixir-format, fuzzy
#~ msgid "Save Custom Field"
#~ msgstr "Benutzerdefiniertes Feld speichern"
#~ #: lib/mv_web/live/member_live/form.ex #~ #: lib/mv_web/live/member_live/form.ex
#~ #, elixir-autogen, elixir-format #~ #, elixir-autogen, elixir-format
#~ msgid "yearly" #~ msgid "yearly"

82
priv/gettext/default.pot
View file

@ -609,11 +609,6 @@ msgstr ""
msgid "Custom field" msgid "Custom field"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Custom field %{action} successfully"
msgstr ""
#: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/custom_field_value_live/form.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Custom field value %{action} successfully" msgid "Custom field value %{action} successfully"
@ -647,11 +642,6 @@ msgstr[1] ""
msgid "All custom field values will be permanently deleted when you delete this custom field." msgid "All custom field values will be permanently deleted when you delete this custom field."
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format
msgid "Delete Custom Field"
msgstr ""
#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Delete Custom Field and All Values" msgid "Delete Custom Field and All Values"
@ -1250,32 +1240,6 @@ msgstr ""
msgid "Select none" msgid "Select none"
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Back to custom field overview"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Custom field deleted successfully"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Edit Custom Field"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Failed to delete custom field: %{error}"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format
msgid "New Custom Field"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Slug does not match. Deletion cancelled." msgid "Slug does not match. Deletion cancelled."
@ -1727,11 +1691,6 @@ msgstr ""
msgid "Regenerating..." msgid "Regenerating..."
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Save Custom Field"
msgstr ""
#: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/custom_field_value_live/form.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Save Custom Field Value" msgid "Save Custom Field Value"
@ -1857,3 +1816,44 @@ msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "The cycle will be calculated based on this date and the interval." msgid "The cycle will be calculated based on this date and the interval."
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Back to settings"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Data field %{action} successfully"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Data field deleted successfully"
msgstr ""
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format
msgid "Delete Data Field"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Edit Data Field"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Failed to delete data field: %{error}"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format
msgid "New Data Field"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Save Data Field"
msgstr ""

92
priv/gettext/en/LC_MESSAGES/default.po
View file

@ -609,11 +609,6 @@ msgstr ""
msgid "Custom field" msgid "Custom field"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Custom field %{action} successfully"
msgstr ""
#: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/custom_field_value_live/form.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Custom field value %{action} successfully" msgid "Custom field value %{action} successfully"
@ -647,11 +642,6 @@ msgstr[1] ""
msgid "All custom field values will be permanently deleted when you delete this custom field." msgid "All custom field values will be permanently deleted when you delete this custom field."
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format
msgid "Delete Custom Field"
msgstr ""
#: lib/mv_web/live/custom_field_live/index_component.ex #: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Delete Custom Field and All Values" msgid "Delete Custom Field and All Values"
@ -1250,32 +1240,6 @@ msgstr ""
msgid "Select none" msgid "Select none"
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format
msgid "Back to custom field overview"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Custom field deleted successfully"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Edit Custom Field"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "Failed to delete custom field: %{error}"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "New Custom Field"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Slug does not match. Deletion cancelled." msgid "Slug does not match. Deletion cancelled."
@ -1727,11 +1691,6 @@ msgstr ""
msgid "Regenerating..." msgid "Regenerating..."
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Save Custom Field"
msgstr ""
#: lib/mv_web/live/custom_field_value_live/form.ex #: lib/mv_web/live/custom_field_value_live/form.ex
#, elixir-autogen, elixir-format, fuzzy #, elixir-autogen, elixir-format, fuzzy
msgid "Save Custom Field Value" msgid "Save Custom Field Value"
@ -1858,6 +1817,47 @@ msgstr ""
msgid "The cycle will be calculated based on this date and the interval." msgid "The cycle will be calculated based on this date and the interval."
msgstr "" msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Back to settings"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Data field %{action} successfully"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Data field deleted successfully"
msgstr ""
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Delete Data Field"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Edit Data Field"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Failed to delete data field: %{error}"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#: lib/mv_web/live/custom_field_live/index_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "New Data Field"
msgstr ""
#: lib/mv_web/live/custom_field_live/form_component.ex
#, elixir-autogen, elixir-format, fuzzy
msgid "Save Data Field"
msgstr ""
#~ #: lib/mv_web/live/member_live/index.html.heex #~ #: lib/mv_web/live/member_live/index.html.heex
#~ #: lib/mv_web/live/components/payment_filter_component.ex #~ #: lib/mv_web/live/components/payment_filter_component.ex
#~ #, elixir-autogen, elixir-format #~ #, elixir-autogen, elixir-format
@ -1997,6 +1997,11 @@ msgstr ""
#~ msgid "Cycle Period" #~ msgid "Cycle Period"
#~ msgstr "" #~ msgstr ""
#~ #: lib/mv_web/live/custom_field_live/form_component.ex
#~ #, elixir-autogen, elixir-format
#~ msgid "Back to custom field overview"
#~ msgstr ""
#~ #: lib/mv_web/live/member_field_live/form_component.ex #~ #: lib/mv_web/live/member_field_live/form_component.ex
#~ #: lib/mv_web/live/member_field_live/index_component.ex #~ #: lib/mv_web/live/member_field_live/index_component.ex
#~ #, elixir-autogen, elixir-format #~ #, elixir-autogen, elixir-format
@ -2060,6 +2065,11 @@ msgstr ""
#~ msgid "Default Contribution Type" #~ msgid "Default Contribution Type"
#~ msgstr "" #~ msgstr ""
#~ #: lib/mv_web/live/custom_field_live/form_component.ex
#~ #, elixir-autogen, elixir-format, fuzzy
#~ msgid "Save Custom Field"
#~ msgstr ""
#~ #: lib/mv_web/live/member_live/form.ex #~ #: lib/mv_web/live/member_live/form.ex
#~ #, elixir-autogen, elixir-format #~ #, elixir-autogen, elixir-format
#~ msgid "yearly" #~ msgid "yearly"