lib/mv_web/live/member_live/form.ex

@@ -91,24 +91,31 @@ 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">
+                  <div class="w-48">
-                    <.input field={@form[:street]} label={gettext("Street")} />
+                    <.input field={@form[:country]} label={gettext("Country")} />
-                  </div>
-                  <div class="w-16">
-                    <.input field={@form[:house_number]} label={gettext("Nr.")} />
                   </div>
                   <div class="w-24">
                     <.input field={@form[:postal_code]} label={gettext("Postal Code")} />
                   </div>
-                  <div class="w-32">
+                  <div class="w-48">
                     <.input field={@form[:city]} label={gettext("City")} />
                   </div>
                 </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>
+                <div class="w-64">
                   <.input field={@form[:email]} label={gettext("Email")} required type="email" />
                 </div>
 
@@ -606,6 +613,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

@@ -223,6 +223,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

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