feat: improve field order for approvals and add seeds
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
parent
a5ce7cb921
commit
a7481f6ab1
GPG key ID:
40E7A58C4AA1EDB2
8 changed files with 245 additions and 109 deletions
|
|
@ -110,11 +110,6 @@ msgstr "Feld hinzufügen"
|
|||
msgid "Add members"
|
||||
msgstr "Mitglieder hinzufügen"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Additional form data"
|
||||
msgstr "Weitere Formulardaten"
|
||||
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Address"
|
||||
|
|
@ -1121,7 +1116,6 @@ msgstr "Rolle bearbeiten"
|
|||
|
||||
#: lib/mv_web/live/group_live/show.ex
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: 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
|
||||
|
|
@ -1374,7 +1368,6 @@ msgid "First Name"
|
|||
msgstr "Vorname"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_live/index.html.heex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "First name"
|
||||
|
|
@ -1792,7 +1785,6 @@ msgid "Last Name"
|
|||
msgstr "Nachname"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_live/index.html.heex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Last name"
|
||||
|
|
@ -2178,6 +2170,7 @@ msgstr "Neuer Betrag"
|
|||
|
||||
#: lib/mv_web/live/components/member_filter_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_field_live/index_component.ex
|
||||
#: lib/mv_web/live/member_live/index/formatter.ex
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
|
|
@ -2681,11 +2674,6 @@ msgstr "Mitglied aus Gruppe entfernen"
|
|||
msgid "Reorder"
|
||||
msgstr "Umordnen"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Request data"
|
||||
msgstr "Antragsdaten"
|
||||
|
||||
#: lib/mv_web/live/custom_field_live/form_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
|
|
@ -2711,11 +2699,6 @@ msgstr "Passwort zurücksetzen"
|
|||
msgid "Review by"
|
||||
msgstr "Geprüft von"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Review information"
|
||||
msgstr "Bearbeitungsinformationen"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Reviewed at"
|
||||
|
|
@ -3575,6 +3558,7 @@ msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
|
|||
|
||||
#: lib/mv_web/live/components/member_filter_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_field_live/index_component.ex
|
||||
#: lib/mv_web/live/member_live/index/formatter.ex
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
|
|
@ -3776,3 +3760,38 @@ msgstr "aktualisiert"
|
|||
#, elixir-autogen, elixir-format
|
||||
msgid "without %{name}"
|
||||
msgstr "ohne %{name}"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Applicant data"
|
||||
msgstr "Angaben des Antragstellers"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Copy"
|
||||
msgstr "Kopieren"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Copy join page URL"
|
||||
msgstr "URL der Beitrittsseite kopieren"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Join page URL"
|
||||
msgstr "URL der Beitrittsseite"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Join page URL copied to clipboard."
|
||||
msgstr "URL der Beitrittsseite in die Zwischenablage kopiert."
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Link to the public join page (share this with applicants):"
|
||||
msgstr "Link zur öffentlichen Beitrittsseite (diesen Link mit Interessent*innen teilen):"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Status and review"
|
||||
msgstr "Status und Prüfung"
|
||||
|
|
|
|||
|
|
@ -111,11 +111,6 @@ msgstr ""
|
|||
msgid "Add members"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Additional form data"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Address"
|
||||
|
|
@ -1122,7 +1117,6 @@ msgstr ""
|
|||
|
||||
#: lib/mv_web/live/group_live/show.ex
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: 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
|
||||
|
|
@ -1375,7 +1369,6 @@ msgid "First Name"
|
|||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_live/index.html.heex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "First name"
|
||||
|
|
@ -1793,7 +1786,6 @@ msgid "Last Name"
|
|||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_live/index.html.heex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Last name"
|
||||
|
|
@ -2179,6 +2171,7 @@ msgstr ""
|
|||
|
||||
#: lib/mv_web/live/components/member_filter_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_field_live/index_component.ex
|
||||
#: lib/mv_web/live/member_live/index/formatter.ex
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
|
|
@ -2682,11 +2675,6 @@ msgstr ""
|
|||
msgid "Reorder"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Request data"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/custom_field_live/form_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
|
|
@ -2712,11 +2700,6 @@ msgstr ""
|
|||
msgid "Review by"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Review information"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Reviewed at"
|
||||
|
|
@ -3575,6 +3558,7 @@ msgstr ""
|
|||
|
||||
#: lib/mv_web/live/components/member_filter_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_field_live/index_component.ex
|
||||
#: lib/mv_web/live/member_live/index/formatter.ex
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
|
|
@ -3776,3 +3760,38 @@ msgstr ""
|
|||
#, elixir-autogen, elixir-format
|
||||
msgid "without %{name}"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Applicant data"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Copy"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Copy join page URL"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Join page URL"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Join page URL copied to clipboard."
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Link to the public join page (share this with applicants):"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Status and review"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -111,11 +111,6 @@ msgstr ""
|
|||
msgid "Add members"
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Additional form data"
|
||||
msgstr "Additional form data"
|
||||
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Address"
|
||||
|
|
@ -1122,7 +1117,6 @@ msgstr ""
|
|||
|
||||
#: lib/mv_web/live/group_live/show.ex
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: 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
|
||||
|
|
@ -1375,7 +1369,6 @@ msgid "First Name"
|
|||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_live/index.html.heex
|
||||
#, elixir-autogen, elixir-format, fuzzy
|
||||
msgid "First name"
|
||||
|
|
@ -1793,7 +1786,6 @@ msgid "Last Name"
|
|||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_live/index.html.heex
|
||||
#, elixir-autogen, elixir-format, fuzzy
|
||||
msgid "Last name"
|
||||
|
|
@ -2179,6 +2171,7 @@ msgstr ""
|
|||
|
||||
#: lib/mv_web/live/components/member_filter_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_field_live/index_component.ex
|
||||
#: lib/mv_web/live/member_live/index/formatter.ex
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
|
|
@ -2682,11 +2675,6 @@ msgstr ""
|
|||
msgid "Reorder"
|
||||
msgstr "Reorder"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Request data"
|
||||
msgstr "Request data"
|
||||
|
||||
#: lib/mv_web/live/custom_field_live/form_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
|
|
@ -2712,11 +2700,6 @@ msgstr "Reset your password"
|
|||
msgid "Review by"
|
||||
msgstr "Review by"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Review information"
|
||||
msgstr "Review information"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/index.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Reviewed at"
|
||||
|
|
@ -3575,6 +3558,7 @@ msgstr ""
|
|||
|
||||
#: lib/mv_web/live/components/member_filter_component.ex
|
||||
#: lib/mv_web/live/custom_field_live/index_component.ex
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#: lib/mv_web/live/member_field_live/index_component.ex
|
||||
#: lib/mv_web/live/member_live/index/formatter.ex
|
||||
#: lib/mv_web/live/member_live/show.ex
|
||||
|
|
@ -3776,3 +3760,38 @@ msgstr ""
|
|||
#, elixir-autogen, elixir-format
|
||||
msgid "without %{name}"
|
||||
msgstr "without %{name}"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Applicant data"
|
||||
msgstr "Applicant data"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Copy"
|
||||
msgstr "Copy"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Copy join page URL"
|
||||
msgstr "Copy join page URL"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Join page URL"
|
||||
msgstr "Join page URL"
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Join page URL copied to clipboard."
|
||||
msgstr "Join page URL copied to clipboard."
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Link to the public join page (share this with applicants):"
|
||||
msgstr "Link to the public join page (share this with applicants):"
|
||||
|
||||
#: lib/mv_web/live/join_request_live/show.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Status and review"
|
||||
msgstr "Status and review"
|
||||
|
|
|
|||
|
|
@ -263,6 +263,21 @@ default_hidden_in_overview = %{
|
|||
"membership_fee_start_date" => false
|
||||
}
|
||||
|
||||
# Default join form field selection (email + name + address + join_date); join form stays disabled.
|
||||
default_join_form_field_ids = [
|
||||
"email",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"street",
|
||||
"house_number",
|
||||
"postal_code",
|
||||
"city",
|
||||
"country",
|
||||
"join_date"
|
||||
]
|
||||
|
||||
default_join_form_field_required = %{"email" => true}
|
||||
|
||||
case Membership.get_settings() do
|
||||
{:ok, existing_settings} ->
|
||||
updates =
|
||||
|
|
@ -304,7 +319,9 @@ case Membership.get_settings() do
|
|||
|> Ash.Changeset.for_create(:create, %{
|
||||
club_name: default_club_name,
|
||||
member_field_visibility: default_hidden_in_overview,
|
||||
default_membership_fee_type_id: default_fee_type.id
|
||||
default_membership_fee_type_id: default_fee_type.id,
|
||||
join_form_field_ids: default_join_form_field_ids,
|
||||
join_form_field_required: default_join_form_field_required
|
||||
})
|
||||
|> Ash.create!()
|
||||
end
|
||||
|
|
|
|||
|
|
@ -481,19 +481,28 @@ for {email, values} <- custom_value_assignments do
|
|||
end
|
||||
end
|
||||
|
||||
# Join form: enable so membership application list is visible in dev
|
||||
# Join form: enable so membership application list is visible in dev; default field list includes address + join_date
|
||||
default_join_form_field_ids = [
|
||||
"email",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"street",
|
||||
"house_number",
|
||||
"postal_code",
|
||||
"city",
|
||||
"country",
|
||||
"join_date"
|
||||
]
|
||||
|
||||
default_join_form_field_required = %{"email" => true}
|
||||
|
||||
case Membership.get_settings() do
|
||||
{:ok, settings} ->
|
||||
unless settings.join_form_enabled do
|
||||
Membership.update_settings(settings, %{
|
||||
join_form_enabled: true,
|
||||
join_form_field_ids: settings.join_form_field_ids || ["email", "first_name", "last_name", "city"],
|
||||
join_form_field_required: settings.join_form_field_required || %{
|
||||
"email" => true,
|
||||
"first_name" => false,
|
||||
"last_name" => false,
|
||||
"city" => false
|
||||
}
|
||||
join_form_field_ids: settings.join_form_field_ids || default_join_form_field_ids,
|
||||
join_form_field_required: settings.join_form_field_required || default_join_form_field_required
|
||||
})
|
||||
end
|
||||
_ ->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue