Merge branch 'main' into feat/447_concistency

lib/mv_web/live/member_live/form.ex

@@ -90,21 +90,10 @@ defmodule MvWeb.MemberLive.Form do
                     </div>
                   </div>
 
-                  <%!-- Address Row --%>
+                  <%!-- Address: Country, Postal Code, City in one row --%>
                   <div class="flex gap-4">
-                    <div class="flex-1">
-                      <.input
-                        field={@form[:street]}
-                        label={gettext("Street")}
-                        required={@member_field_required_map[:street]}
-                      />
-                    </div>
-                    <div class="w-16">
-                      <.input
-                        field={@form[:house_number]}
-                        label={gettext("Nr.")}
-                        required={@member_field_required_map[:house_number]}
-                      />
+                    <div class="w-48">
+                      <.input field={@form[:country]} label={gettext("Country")} />
                     </div>
                     <div class="w-24">
                       <.input
@@ -113,17 +102,23 @@ defmodule MvWeb.MemberLive.Form do
                         required={@member_field_required_map[:postal_code]}
                       />
                     </div>
-                    <div class="w-32">
-                      <.input
-                        field={@form[:city]}
-                        label={gettext("City")}
-                        required={@member_field_required_map[:city]}
-                      />
+                    <div class="w-48">
+                      <.input field={@form[:city]} label={gettext("City")} />
                     </div>
                   </div>
 
-                  <%!-- Email (always required) --%>
-                  <div>
+                  <%!-- Street and Nr. below --%>
+                  <div class="flex gap-4">
+                    <div class="w-64">
+                      <.input field={@form[:street]} label={gettext("Street")} />
+                    </div>
+                    <div class="w-24">
+                      <.input field={@form[:house_number]} label={gettext("Nr.")} />
+                    </div>
+                  </div>
+
+                  <%!-- Email --%>
+                  <div class="w-64">
                     <.input field={@form[:email]} label={gettext("Email")} required type="email" />
                   </div>
 
@@ -782,6 +777,7 @@ defmodule MvWeb.MemberLive.Form do
     |> extract_form_value(form, :house_number, &to_string/1)
     |> extract_form_value(form, :postal_code, &to_string/1)
     |> extract_form_value(form, :city, &to_string/1)
+    |> extract_form_value(form, :country, &to_string/1)
     |> extract_form_value(form, :join_date, &format_date_value/1)
     |> extract_form_value(form, :exit_date, &format_date_value/1)
     |> extract_form_value(form, :notes, &to_string/1)

lib/mv_web/live/member_live/index.html.heex

@@ -232,6 +232,24 @@
       >
         {member.notes}
       </:col>
+      <:col
+        :let={member}
+        :if={:country in @member_fields_visible}
+        label={
+          ~H"""
+          <.live_component
+            module={MvWeb.Components.SortHeaderComponent}
+            id={:sort_country}
+            field={:country}
+            label={gettext("Country")}
+            sort_field={@sort_field}
+            sort_order={@sort_order}
+          />
+          """
+        }
+      >
+        {member.country}
+      </:col>
       <:col
         :let={member}
         :if={:city in @member_fields_visible}

lib/mv_web/live/member_live/show.ex

@@ -571,8 +571,8 @@ defmodule MvWeb.MemberLive.Show do
       |> Enum.filter(&(&1 && &1 != ""))
       |> Enum.join(" ")
 
-    [street_part, city_part]
-    |> Enum.filter(&(&1 != ""))
+    [member.country, street_part, city_part]
+    |> Enum.filter(&(&1 && &1 != ""))
     |> Enum.join(", ")
     |> case do
       "" -> nil