forked from shibao/cannery
		
	make ammo type show page and container show page also display ammo groups as table
This commit is contained in:
		@@ -35,7 +35,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
 | 
			
		||||
      <div class="flex flex-col justify-center items-center">
 | 
			
		||||
        <span class="rounded-lg title text-lg">
 | 
			
		||||
          <%= gettext("Count:") %>
 | 
			
		||||
          <%= if @ammo_group.count == 0, do: "Empty", else: @ammo_group.count %>
 | 
			
		||||
          <%= if @ammo_group.count == 0, do: gettext("Empty"), else: @ammo_group.count %>
 | 
			
		||||
        </span>
 | 
			
		||||
 | 
			
		||||
        <%= if @ammo_group.notes do %>
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										222
									
								
								lib/cannery_web/components/ammo_group_table_component.ex
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										222
									
								
								lib/cannery_web/components/ammo_group_table_component.ex
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,222 @@
 | 
			
		||||
defmodule CanneryWeb.Components.AmmoGroupTableComponent do
 | 
			
		||||
  @moduledoc """
 | 
			
		||||
  A component that displays a list of ammo groups
 | 
			
		||||
  """
 | 
			
		||||
  use CanneryWeb, :live_component
 | 
			
		||||
  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Repo}
 | 
			
		||||
  alias Ecto.UUID
 | 
			
		||||
  alias Phoenix.LiveView.{Rendered, Socket}
 | 
			
		||||
 | 
			
		||||
  @impl true
 | 
			
		||||
  @spec update(
 | 
			
		||||
          %{
 | 
			
		||||
            required(:id) => UUID.t(),
 | 
			
		||||
            required(:current_user) => User.t(),
 | 
			
		||||
            required(:ammo_groups) => [AmmoGroup.t()],
 | 
			
		||||
            optional(:show_used) => boolean(),
 | 
			
		||||
            optional(:ammo_type) => Rendered.t(),
 | 
			
		||||
            optional(:range) => Rendered.t(),
 | 
			
		||||
            optional(:container) => Rendered.t(),
 | 
			
		||||
            optional(:actions) => Rendered.t(),
 | 
			
		||||
            optional(any()) => any()
 | 
			
		||||
          },
 | 
			
		||||
          Socket.t()
 | 
			
		||||
        ) :: {:ok, Socket.t()}
 | 
			
		||||
  def update(%{id: _id, ammo_groups: _ammo_group, current_user: _current_user} = assigns, socket) do
 | 
			
		||||
    socket =
 | 
			
		||||
      socket
 | 
			
		||||
      |> assign(assigns)
 | 
			
		||||
      |> assign_new(:show_used, fn -> false end)
 | 
			
		||||
      |> assign_new(:ammo_type, fn -> [] end)
 | 
			
		||||
      |> assign_new(:range, fn -> [] end)
 | 
			
		||||
      |> assign_new(:container, fn -> [] end)
 | 
			
		||||
      |> assign_new(:actions, fn -> [] end)
 | 
			
		||||
      |> display_ammo_groups()
 | 
			
		||||
 | 
			
		||||
    {:ok, socket}
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  defp display_ammo_groups(
 | 
			
		||||
         %{
 | 
			
		||||
           assigns: %{
 | 
			
		||||
             ammo_groups: ammo_groups,
 | 
			
		||||
             current_user: current_user,
 | 
			
		||||
             show_used: show_used,
 | 
			
		||||
             ammo_type: ammo_type,
 | 
			
		||||
             range: range,
 | 
			
		||||
             container: container,
 | 
			
		||||
             actions: actions
 | 
			
		||||
           }
 | 
			
		||||
         } = socket
 | 
			
		||||
       ) do
 | 
			
		||||
    columns =
 | 
			
		||||
      if actions == [] do
 | 
			
		||||
        []
 | 
			
		||||
      else
 | 
			
		||||
        [%{label: nil, key: :actions, sortable: false}]
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
    columns =
 | 
			
		||||
      if show_used do
 | 
			
		||||
        [%{label: gettext("Used up on"), key: :used_up_on} | columns]
 | 
			
		||||
      else
 | 
			
		||||
        columns
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
    columns = [%{label: gettext("Added on"), key: :added_on} | columns]
 | 
			
		||||
 | 
			
		||||
    columns =
 | 
			
		||||
      if container == [] do
 | 
			
		||||
        columns
 | 
			
		||||
      else
 | 
			
		||||
        [%{label: gettext("Container"), key: :container} | columns]
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
    columns =
 | 
			
		||||
      if range == [] do
 | 
			
		||||
        columns
 | 
			
		||||
      else
 | 
			
		||||
        [%{label: gettext("Range"), key: :range} | columns]
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
    columns = [
 | 
			
		||||
      %{label: gettext("Count"), key: :count},
 | 
			
		||||
      %{label: gettext("Price paid"), key: :price_paid},
 | 
			
		||||
      %{label: gettext("% left"), key: :remaining},
 | 
			
		||||
      %{label: gettext("Notes"), key: :notes}
 | 
			
		||||
      | columns
 | 
			
		||||
    ]
 | 
			
		||||
 | 
			
		||||
    columns =
 | 
			
		||||
      if ammo_type == [] do
 | 
			
		||||
        columns
 | 
			
		||||
      else
 | 
			
		||||
        [%{label: gettext("Ammo type"), key: :ammo_type} | columns]
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
    rows =
 | 
			
		||||
      ammo_groups
 | 
			
		||||
      |> Repo.preload([:ammo_type, :container])
 | 
			
		||||
      |> Enum.map(fn ammo_group ->
 | 
			
		||||
        ammo_group
 | 
			
		||||
        |> get_row_data_for_ammo_group(%{
 | 
			
		||||
          current_user: current_user,
 | 
			
		||||
          ammo_type: ammo_type,
 | 
			
		||||
          columns: columns,
 | 
			
		||||
          container: container,
 | 
			
		||||
          actions: actions,
 | 
			
		||||
          range: range
 | 
			
		||||
        })
 | 
			
		||||
      end)
 | 
			
		||||
 | 
			
		||||
    socket |> assign(columns: columns, rows: rows)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  @impl true
 | 
			
		||||
  def render(assigns) do
 | 
			
		||||
    ~H"""
 | 
			
		||||
    <div class="w-full">
 | 
			
		||||
      <.live_component
 | 
			
		||||
        module={CanneryWeb.Components.TableComponent}
 | 
			
		||||
        id={@id}
 | 
			
		||||
        columns={@columns}
 | 
			
		||||
        rows={@rows}
 | 
			
		||||
      />
 | 
			
		||||
    </div>
 | 
			
		||||
    """
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  @spec get_row_data_for_ammo_group(AmmoGroup.t(), additional_data :: map()) :: map()
 | 
			
		||||
  defp get_row_data_for_ammo_group(ammo_group, %{columns: columns} = additional_data) do
 | 
			
		||||
    ammo_group = ammo_group |> Repo.preload([:ammo_type, :container])
 | 
			
		||||
 | 
			
		||||
    columns
 | 
			
		||||
    |> Map.new(fn %{key: key} ->
 | 
			
		||||
      {key, get_value_for_key(key, ammo_group, additional_data)}
 | 
			
		||||
    end)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  @spec get_value_for_key(atom(), AmmoGroup.t(), additional_data :: map()) ::
 | 
			
		||||
          any() | {any(), Rendered.t()}
 | 
			
		||||
  defp get_value_for_key(
 | 
			
		||||
         :ammo_type,
 | 
			
		||||
         %{ammo_type: %{name: ammo_type_name} = ammo_type},
 | 
			
		||||
         %{ammo_type: ammo_type_block}
 | 
			
		||||
       ) do
 | 
			
		||||
    assigns = %{ammo_type: ammo_type, ammo_type_block: ammo_type_block}
 | 
			
		||||
 | 
			
		||||
    {ammo_type_name,
 | 
			
		||||
     ~H"""
 | 
			
		||||
     <%= render_slot(@ammo_type_block, @ammo_type) %>
 | 
			
		||||
     """}
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data), do: {"", nil}
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:price_paid, %{price_paid: price_paid}, _additional_data),
 | 
			
		||||
    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:added_on, %{inserted_at: inserted_at}, _additional_data) do
 | 
			
		||||
    assigns = %{inserted_at: inserted_at}
 | 
			
		||||
 | 
			
		||||
    {inserted_at,
 | 
			
		||||
     ~H"""
 | 
			
		||||
     <%= @inserted_at |> display_datetime() %>
 | 
			
		||||
     """}
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:used_up_on, ammo_group, _additional_data) do
 | 
			
		||||
    last_shot_group_date =
 | 
			
		||||
      case ammo_group |> Ammo.get_last_used_shot_group() do
 | 
			
		||||
        %{date: last_shot_group_date} -> last_shot_group_date
 | 
			
		||||
        _no_shot_groups -> nil
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
    assigns = %{last_shot_group_date: last_shot_group_date}
 | 
			
		||||
 | 
			
		||||
    {last_shot_group_date,
 | 
			
		||||
     ~H"""
 | 
			
		||||
     <%= @last_shot_group_date |> display_date() %>
 | 
			
		||||
     """}
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:range, %{staged: staged} = ammo_group, %{range: range}) do
 | 
			
		||||
    assigns = %{range: range, ammo_group: ammo_group}
 | 
			
		||||
 | 
			
		||||
    {staged,
 | 
			
		||||
     ~H"""
 | 
			
		||||
     <%= render_slot(@range, @ammo_group) %>
 | 
			
		||||
     """}
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:remaining, ammo_group, _additional_data),
 | 
			
		||||
    do: gettext("%{percentage}%", percentage: ammo_group |> Ammo.get_percentage_remaining())
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:actions, ammo_group, %{actions: actions}) do
 | 
			
		||||
    assigns = %{actions: actions, ammo_group: ammo_group}
 | 
			
		||||
 | 
			
		||||
    ~H"""
 | 
			
		||||
    <%= render_slot(@actions, @ammo_group) %>
 | 
			
		||||
    """
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:container, %{container: nil}, _additional_data), do: {nil, nil}
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(
 | 
			
		||||
         :container,
 | 
			
		||||
         %{container: %{name: container_name}} = ammo_group,
 | 
			
		||||
         %{container: container}
 | 
			
		||||
       ) do
 | 
			
		||||
    assigns = %{container: container, ammo_group: ammo_group}
 | 
			
		||||
 | 
			
		||||
    {container_name,
 | 
			
		||||
     ~H"""
 | 
			
		||||
     <%= render_slot(@container, @ammo_group) %>
 | 
			
		||||
     """}
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(:count, %{count: count}, _additional_data),
 | 
			
		||||
    do: if(count == 0, do: gettext("Empty"), else: count)
 | 
			
		||||
 | 
			
		||||
  defp get_value_for_key(key, ammo_group, _additional_data), do: ammo_group |> Map.get(key)
 | 
			
		||||
end
 | 
			
		||||
@@ -106,7 +106,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
 | 
			
		||||
    containers
 | 
			
		||||
    |> Enum.map(fn container ->
 | 
			
		||||
      columns
 | 
			
		||||
      |> Enum.into(%{}, fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
 | 
			
		||||
      |> Map.new(fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
 | 
			
		||||
    end)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@
 | 
			
		||||
          <%= if column |> Map.get(:sortable, true) do %>
 | 
			
		||||
            <th class={"p-2 #{column[:class]}"}>
 | 
			
		||||
              <span
 | 
			
		||||
                class="cursor-pointer"
 | 
			
		||||
                class="cursor-pointer flex justify-center items-center space-x-2"
 | 
			
		||||
                phx-click="sort_by"
 | 
			
		||||
                phx-value-sort-key={key}
 | 
			
		||||
                phx-target={@myself}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user