Merge pull request 'Implements missing member columns closes #416 and #419' (#424) from bug/416_member_columns into main

Reviewed-on: #424

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

@@ -180,6 +180,67 @@
     >
       {member.email}
     </:col>
+    <:col
+      :let={member}
+      :if={:join_date in @member_fields_visible}
+      label={
+        ~H"""
+        <.live_component
+          module={MvWeb.Components.SortHeaderComponent}
+          id={:sort_join_date}
+          field={:join_date}
+          label={gettext("Join Date")}
+          sort_field={@sort_field}
+          sort_order={@sort_order}
+        />
+        """
+      }
+    >
+      {MvWeb.MemberLive.Index.format_date(member.join_date)}
+    </:col>
+    <:col
+      :let={member}
+      :if={:exit_date in @member_fields_visible}
+      label={
+        ~H"""
+        <.live_component
+          module={MvWeb.Components.SortHeaderComponent}
+          id={:sort_exit_date}
+          field={:exit_date}
+          label={gettext("Exit Date")}
+          sort_field={@sort_field}
+          sort_order={@sort_order}
+        />
+        """
+      }
+    >
+      {MvWeb.MemberLive.Index.format_date(member.exit_date)}
+    </:col>
+    <:col
+      :let={member}
+      :if={:notes in @member_fields_visible}
+      label={gettext("Notes")}
+    >
+      {member.notes}
+    </:col>
+    <:col
+      :let={member}
+      :if={:city in @member_fields_visible}
+      label={
+        ~H"""
+        <.live_component
+          module={MvWeb.Components.SortHeaderComponent}
+          id={:sort_city}
+          field={:city}
+          label={gettext("City")}
+          sort_field={@sort_field}
+          sort_order={@sort_order}
+        />
+        """
+      }
+    >
+      {member.city}
+    </:col>
     <:col
       :let={member}
       :if={:street in @member_fields_visible}
@@ -236,57 +297,21 @@
     </:col>
     <:col
       :let={member}
-      :if={:city in @member_fields_visible}
+      :if={:membership_fee_start_date in @member_fields_visible}
       label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
-          id={:sort_city}
-          field={:city}
-          label={gettext("City")}
+          id={:sort_membership_fee_start_date}
+          field={:membership_fee_start_date}
+          label={gettext("Membership Fee Start Date")}
           sort_field={@sort_field}
           sort_order={@sort_order}
         />
         """
       }
     >
-      {member.city}
-    </:col>
-    <:col
-      :let={member}
-      :if={:join_date in @member_fields_visible}
-      label={
-        ~H"""
-        <.live_component
-          module={MvWeb.Components.SortHeaderComponent}
-          id={:sort_join_date}
-          field={:join_date}
-          label={gettext("Join Date")}
-          sort_field={@sort_field}
-          sort_order={@sort_order}
-        />
-        """
-      }
-    >
-      {MvWeb.MemberLive.Index.format_date(member.join_date)}
-    </:col>
-    <:col
-      :let={member}
-      :if={:exit_date in @member_fields_visible}
-      label={
-        ~H"""
-        <.live_component
-          module={MvWeb.Components.SortHeaderComponent}
-          id={:sort_exit_date}
-          field={:exit_date}
-          label={gettext("Exit Date")}
-          sort_field={@sort_field}
-          sort_order={@sort_order}
-        />
-        """
-      }
-    >
-      {MvWeb.MemberLive.Index.format_date(member.exit_date)}
+      {MvWeb.MemberLive.Index.format_date(member.membership_fee_start_date)}
     </:col>
     <:col
       :let={member}

priv/gettext/de/LC_MESSAGES/default.po

@@ -144,6 +144,7 @@ msgid "House Number"
 msgstr "Hausnummer"
 
 #: 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
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
@@ -1542,6 +1543,7 @@ msgstr "Du bist dabei alle %{count} Zyklen für dieses Mitglied zu löschen."
 msgid "Delete Membership Fee Type"
 msgstr "Mitgliedsbeitragsart löschen"
 
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Membership Fee Start Date"

priv/gettext/default.pot

@@ -145,6 +145,7 @@ msgid "House Number"
 msgstr ""
 
 #: 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
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
@@ -1543,6 +1544,7 @@ msgstr ""
 msgid "Delete Membership Fee Type"
 msgstr ""
 
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Membership Fee Start Date"

priv/gettext/en/LC_MESSAGES/default.po

@@ -145,6 +145,7 @@ msgid "House Number"
 msgstr ""
 
 #: 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
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
@@ -1543,6 +1544,7 @@ msgstr ""
 msgid "Delete Membership Fee Type"
 msgstr ""
 
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Membership Fee Start Date"