CHANGELOG.md

@@ -1,13 +1,3 @@
-# v0.7.0
-- Add shading to table component
-- Fix chart to sum by day
-- Fix whitespace when copying invite url
-- Make ammo type show page also display ammo groups as table
-- Make container show page also display ammo groups as table
-- Display CPR for ammo packs
-- Add original count for ammo packs
-- Add ammo pack CPR and original count to json export
-
 # v0.6.0
 - Update translations
 - Display used-up date on used-up ammo

assets/js/shot_log_chart.js

@@ -11,23 +11,22 @@ export default {
       data: {
         datasets: [{
           label: el.dataset.label,
-          data: data.map(({ date, count, label }) => ({
+          data: data.map(({ date, count, labels }) => ({
-            label,
+            labels,
             x: date,
             y: count
           })),
-          backgroundColor: `${el.dataset.color}77`,
+          backgroundColor: el.dataset.color,
           borderColor: el.dataset.color,
           fill: true,
-          borderWidth: 3,
+          borderWidth: 4
-          pointBorderWidth: 1
         }]
       },
       options: {
         elements: {
           point: {
-            radius: 9,
+            radius: 7,
-            hoverRadius: 12
+            hoverRadius: 10
           }
         },
         plugins: {
@@ -40,8 +39,7 @@ export default {
           tooltip: {
             displayColors: false,
             callbacks: {
-              title: (contexts) => contexts.map(({ raw: { x } }) => Intl.DateTimeFormat([], { timeZone: 'Etc/UTC', dateStyle: 'short' }).format(new Date(x))),
+              label: ({ raw: { labels } }) => labels
-              label: ({ raw: { label } }) => label
             }
           }
         },

lib/cannery/ammo.ex

@@ -513,28 +513,6 @@ defmodule Cannery.Ammo do
     round(count / (count + shot_group_sum) * 100)
   end
 
-  @doc """
-  Gets the original count for an ammo group
-  """
-  @spec get_original_count(AmmoGroup.t()) :: non_neg_integer()
-  def get_original_count(%AmmoGroup{count: count} = ammo_group) do
-    count + get_used_count(ammo_group)
-  end
-
-  @doc """
-  Calculates the CPR for a single ammo group
-  """
-  @spec get_cpr(AmmoGroup.t()) :: nil | float()
-  def get_cpr(%AmmoGroup{price_paid: nil}), do: nil
-
-  def get_cpr(%AmmoGroup{price_paid: price_paid} = ammo_group),
-    do: calculate_cpr(price_paid, get_original_count(ammo_group))
-
-  @spec calculate_cpr(price_paid :: float() | nil, count :: integer()) :: float() | nil
-  defp calculate_cpr(nil, _count), do: nil
-  defp calculate_cpr(_price_paid, 0), do: nil
-  defp calculate_cpr(price_paid, total_count), do: price_paid / total_count
-
   @doc """
   Creates multiple ammo_groups at once.
 

lib/cannery_web/components/ammo_group_card.ex

@@ -17,7 +17,6 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
 
     preloads = if show_container, do: [:ammo_type, :container], else: [:ammo_type]
     ammo_group = ammo_group |> Repo.preload(preloads)
-
     assigns = assigns |> assign(:ammo_group, ammo_group)
 
     ~H"""
@@ -36,16 +35,9 @@ 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: gettext("Empty"), else: @ammo_group.count %>
+          <%= if @ammo_group.count == 0, do: "Empty", else: @ammo_group.count %>
         </span>
 
-        <%= if @ammo_group |> Ammo.get_original_count() != @ammo_group.count do %>
-          <span class="rounded-lg title text-lg">
-            <%= gettext("Original Count:") %>
-            <%= @ammo_group |> Ammo.get_original_count() %>
-          </span>
-        <% end %>
-
         <%= if @ammo_group.notes do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Notes:") %>
@@ -72,13 +64,6 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
               amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
             ) %>
           </span>
-
-          <span class="rounded-lg title text-lg">
-            <%= gettext("CPR:") %>
-            <%= gettext("$%{amount}",
-              amount: @ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
-            ) %>
-          </span>
         <% end %>
 
         <%= if @show_container and @ammo_group.container do %>

lib/cannery_web/components/ammo_group_table_component.ex

@@ -1,236 +0,0 @@
-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("Original Count"), key: :original_count},
-      %{label: gettext("Price paid"), key: :price_paid},
-      %{label: gettext("CPR"), key: :cpr},
-      %{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(:original_count, ammo_group, _additional_data),
-    do: ammo_group |> Ammo.get_original_count()
-
-  defp get_value_for_key(:cpr, %{price_paid: nil}, _additional_data),
-    do: gettext("No cost information")
-
-  defp get_value_for_key(:cpr, ammo_group, _additional_data) do
-    gettext("$%{amount}",
-      amount: ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
-    )
-  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

lib/cannery_web/components/invite_card.ex

@@ -37,8 +37,10 @@ defmodule CanneryWeb.Components.InviteCard do
         <code
           id={"code-#{@invite.id}"}
           class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
-          phx-no-format
+        >
-        ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
+          <%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %>
+        </code>
+
         <%= render_slot(@code_actions) %>
       </div>
 

lib/cannery_web/components/move_ammo_group_component.ex

@@ -106,7 +106,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
     containers
     |> Enum.map(fn container ->
       columns
-      |> Map.new(fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
+      |> Enum.into(%{}, fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
     end)
   end
 

lib/cannery_web/components/table_component.ex

@@ -21,7 +21,6 @@ defmodule CanneryWeb.Components.TableComponent do
 
   use CanneryWeb, :live_component
   alias Phoenix.LiveView.Socket
-  require Integer
 
   @impl true
   @spec update(
@@ -31,8 +30,6 @@ defmodule CanneryWeb.Components.TableComponent do
                 required(:label) => String.t() | nil,
                 required(:key) => atom() | nil,
                 optional(:class) => String.t(),
-                optional(:row_class) => String.t(),
-                optional(:alternate_row_class) => String.t(),
                 optional(:sortable) => false
               }),
             required(:rows) =>
@@ -60,7 +57,7 @@ defmodule CanneryWeb.Components.TableComponent do
         :asc
       end
 
-    rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode)
+    rows = rows |> Enum.sort_by(fn row -> row |> Map.get(initial_key) end, initial_sort_mode)
 
     socket =
       socket
@@ -71,8 +68,6 @@ defmodule CanneryWeb.Components.TableComponent do
         last_sort_key: initial_key,
         sort_mode: initial_sort_mode
       )
-      |> assign_new(:row_class, fn -> "bg-white" end)
-      |> assign_new(:alternate_row_class, fn -> "bg-gray-200" end)
 
     {:ok, socket}
   end

lib/cannery_web/components/table_component.html.heex

@@ -6,7 +6,7 @@
           <%= if column |> Map.get(:sortable, true) do %>
             <th class={"p-2 #{column[:class]}"}>
               <span
-                class="cursor-pointer flex justify-center items-center space-x-2"
+                class="cursor-pointer"
                 phx-click="sort_by"
                 phx-value-sort-key={key}
                 phx-target={@myself}
@@ -33,8 +33,8 @@
       </tr>
     </thead>
     <tbody>
-      <%= for {values, i} <- @rows |> Enum.with_index() do %>
+      <%= for values <- @rows do %>
-        <tr class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}>
+        <tr>
           <%= for %{key: key} = value <- @columns do %>
             <td class={"p-2 #{value[:class]}"}>
               <%= case values |> Map.get(key) do %>

lib/cannery_web/controllers/export_controller.ex

@@ -25,9 +25,7 @@ defmodule CanneryWeb.ExportController do
     ammo_groups =
       Ammo.list_ammo_groups(current_user, true)
       |> Enum.map(fn ammo_group ->
-        cpr = ammo_group |> Ammo.get_cpr()
         used_count = ammo_group |> Ammo.get_used_count()
-        original_count = ammo_group |> Ammo.get_original_count()
         percentage_remaining = ammo_group |> Ammo.get_percentage_remaining()
 
         ammo_group
@@ -35,9 +33,7 @@ defmodule CanneryWeb.ExportController do
         |> Jason.decode!()
         |> Map.merge(%{
           "used_count" => used_count,
-          "percentage_remaining" => percentage_remaining,
+          "percentage_remaining" => percentage_remaining
-          "original_count" => original_count,
-          "cpr" => cpr
         })
       end)
 

lib/cannery_web/live/ammo_group_live/index.ex

@@ -95,11 +95,183 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     ammo_types_count = Ammo.get_ammo_types_count!(current_user)
     containers_count = Containers.get_containers_count!(current_user)
 
+    columns = [
+      %{label: gettext("Ammo type"), key: :ammo_type},
+      %{label: gettext("Count"), key: :count},
+      %{label: gettext("Price paid"), key: :price_paid},
+      %{label: gettext("% left"), key: :remaining},
+      %{label: gettext("Range"), key: :range},
+      %{label: gettext("Container"), key: :container},
+      %{label: gettext("Added on"), key: :added_on}
+    ]
+
+    columns =
+      if show_used do
+        columns ++ [%{label: gettext("Used up on"), key: :used_up_on}]
+      else
+        columns
+      end
+
+    columns = columns ++ [%{label: nil, key: :actions, sortable: false}]
+
+    rows =
+      ammo_groups
+      |> Enum.map(fn ammo_group -> ammo_group |> get_row_data_for_ammo_group(columns) end)
+
     socket
     |> assign(
       ammo_groups: ammo_groups,
       ammo_types_count: ammo_types_count,
-      containers_count: containers_count
+      containers_count: containers_count,
+      columns: columns,
+      rows: rows
     )
   end
+
+  @spec get_row_data_for_ammo_group(AmmoGroup.t(), [map()]) :: [map()]
+  defp get_row_data_for_ammo_group(ammo_group, columns) do
+    ammo_group = ammo_group |> Repo.preload([:ammo_type, :container])
+
+    columns
+    |> Enum.into(%{}, fn %{key: key} -> {key, get_value_for_key(key, ammo_group)} end)
+  end
+
+  @spec get_value_for_key(atom(), AmmoGroup.t()) :: any()
+  defp get_value_for_key(:ammo_type, %{ammo_type: ammo_type}) do
+    assigns = %{ammo_type: ammo_type}
+
+    {ammo_type.name,
+     ~H"""
+     <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} class="link">
+       <%= @ammo_type.name %>
+     </.link>
+     """}
+  end
+
+  defp get_value_for_key(:price_paid, %{price_paid: nil}), do: {"a", nil}
+
+  defp get_value_for_key(:price_paid, %{price_paid: price_paid}),
+    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
+
+  defp get_value_for_key(:added_on, %{inserted_at: inserted_at}) do
+    assigns = %{inserted_at: inserted_at}
+
+    {inserted_at,
+     ~H"""
+     <%= @inserted_at |> display_datetime() %>
+     """}
+  end
+
+  defp get_value_for_key(:used_up_on, ammo_group) 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) do
+    assigns = %{ammo_group: ammo_group}
+
+    {staged,
+     ~H"""
+     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
+       <button
+         type="button"
+         class="mx-2 my-1 text-sm btn btn-primary"
+         phx-click="toggle_staged"
+         phx-value-ammo_group_id={@ammo_group.id}
+       >
+         <%= if @ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
+       </button>
+
+       <.link
+         patch={Routes.ammo_group_index_path(Endpoint, :add_shot_group, @ammo_group)}
+         class="mx-2 my-1 text-sm btn btn-primary"
+       >
+         <%= dgettext("actions", "Record shots") %>
+       </.link>
+     </div>
+     """}
+  end
+
+  defp get_value_for_key(:remaining, ammo_group),
+    do: gettext("%{percentage}%", percentage: ammo_group |> Ammo.get_percentage_remaining())
+
+  defp get_value_for_key(:actions, ammo_group) do
+    assigns = %{ammo_group: ammo_group}
+
+    ~H"""
+    <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
+      <.link
+        navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
+        class="text-primary-600 link"
+        data-qa={"view-#{@ammo_group.id}"}
+      >
+        <i class="fa-fw fa-lg fas fa-eye"></i>
+      </.link>
+
+      <.link
+        patch={Routes.ammo_group_index_path(Endpoint, :edit, @ammo_group)}
+        class="text-primary-600 link"
+        data-qa={"edit-#{@ammo_group.id}"}
+      >
+        <i class="fa-fw fa-lg fas fa-edit"></i>
+      </.link>
+
+      <.link
+        patch={Routes.ammo_group_index_path(Endpoint, :clone, @ammo_group)}
+        class="text-primary-600 link"
+        data-qa={"clone-#{@ammo_group.id}"}
+      >
+        <i class="fa-fw fa-lg fas fa-copy"></i>
+      </.link>
+
+      <.link
+        href="#"
+        class="text-primary-600 link"
+        phx-click="delete"
+        phx-value-id={@ammo_group.id}
+        data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
+        data-qa={"delete-#{@ammo_group.id}"}
+      >
+        <i class="fa-fw fa-lg fas fa-trash"></i>
+      </.link>
+    </div>
+    """
+  end
+
+  defp get_value_for_key(:container, %{container: nil}), do: {nil, nil}
+
+  defp get_value_for_key(:container, %{container: %{name: container_name}} = ammo_group) do
+    assigns = %{ammo_group: ammo_group}
+
+    {container_name,
+     ~H"""
+     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
+       <.link
+         navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
+         class="mx-2 my-1 link"
+       >
+         <%= @ammo_group.container.name %>
+       </.link>
+
+       <.link
+         patch={Routes.ammo_group_index_path(Endpoint, :move, @ammo_group)}
+         class="mx-2 my-1 text-sm btn btn-primary"
+       >
+         <%= gettext("Move ammo") %>
+       </.link>
+     </div>
+     """}
+  end
+
+  defp get_value_for_key(key, ammo_group), do: ammo_group |> Map.get(key)
 end

lib/cannery_web/live/ammo_group_live/index.html.heex

@@ -42,7 +42,7 @@
   <% end %>
 
   <%= unless @ammo_groups |> Enum.empty?() do %>
-    <div class="flex flex-col space-y-4 justify-center items-center">
+    <div class="flex flex-col justify-center items-center">
       <.toggle_button action="toggle_show_used" value={@show_used}>
         <span class="title text-lg text-primary-600">
           <%= gettext("Show used") %>
@@ -51,92 +51,12 @@
     </div>
 
     <.live_component
-      module={CanneryWeb.Components.AmmoGroupTableComponent}
+      module={CanneryWeb.Components.TableComponent}
-      id="ammo-group-index-table"
+      id="ammo_groups_index_table"
-      ammo_groups={@ammo_groups}
+      action={@live_action}
-      current_user={@current_user}
+      columns={@columns}
-      show_used={@show_used}
+      rows={@rows}
-    >
+    />
-      <:ammo_type :let={%{name: ammo_type_name} = ammo_type}>
-        <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link">
-          <%= ammo_type_name %>
-        </.link>
-      </:ammo_type>
-      <:range :let={ammo_group}>
-        <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
-          <button
-            type="button"
-            class="mx-2 my-1 text-sm btn btn-primary"
-            phx-click="toggle_staged"
-            phx-value-ammo_group_id={ammo_group.id}
-          >
-            <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
-          </button>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group)}
-            class="mx-2 my-1 text-sm btn btn-primary"
-          >
-            <%= dgettext("actions", "Record shots") %>
-          </.link>
-        </div>
-      </:range>
-      <:container :let={%{container: %{name: container_name} = container} = ammo_group}>
-        <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
-          <.link
-            navigate={Routes.container_show_path(Endpoint, :show, container)}
-            class="mx-2 my-1 link"
-          >
-            <%= container_name %>
-          </.link>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :move, ammo_group)}
-            class="mx-2 my-1 text-sm btn btn-primary"
-          >
-            <%= gettext("Move ammo") %>
-          </.link>
-        </div>
-      </:container>
-      <:actions :let={ammo_group}>
-        <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
-          <.link
-            navigate={Routes.ammo_group_show_path(Endpoint, :show, ammo_group)}
-            class="text-primary-600 link"
-            data-qa={"view-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-eye"></i>
-          </.link>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :edit, ammo_group)}
-            class="text-primary-600 link"
-            data-qa={"edit-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-edit"></i>
-          </.link>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :clone, ammo_group)}
-            class="text-primary-600 link"
-            data-qa={"clone-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-copy"></i>
-          </.link>
-
-          <.link
-            href="#"
-            class="text-primary-600 link"
-            phx-click="delete"
-            phx-value-id={ammo_group.id}
-            data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
-            data-qa={"delete-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-trash"></i>
-          </.link>
-        </div>
-      </:actions>
-    </.live_component>
   <% end %>
 </div>
 

lib/cannery_web/live/ammo_group_live/show.ex

@@ -102,12 +102,12 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   defp display_ammo_group(%{assigns: %{current_user: current_user}} = socket, id),
     do: display_ammo_group(socket, Ammo.get_ammo_group!(id, current_user))
 
-  @spec get_table_row_for_shot_group(AmmoGroup.t(), ShotGroup.t(), [map()]) :: map()
+  @spec get_table_row_for_shot_group(AmmoGroup.t(), ShotGroup.t(), [map()]) :: [map()]
   defp get_table_row_for_shot_group(ammo_group, %{date: date} = shot_group, columns) do
     assigns = %{ammo_group: ammo_group, shot_group: shot_group}
 
     columns
-    |> Map.new(fn %{key: key} ->
+    |> Enum.into(%{}, fn %{key: key} ->
       value =
         case key do
           :date ->

lib/cannery_web/live/ammo_group_live/show.html.heex

@@ -11,7 +11,7 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Original count:") %>
-      <%= Ammo.get_original_count(@ammo_group) %>
+      <%= @ammo_group.count + Ammo.get_used_count(@ammo_group) %>
     </span>
 
     <span class="rounded-lg title text-lg">

lib/cannery_web/live/ammo_type_live/index.ex

@@ -134,7 +134,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
         end
       )
       |> Kernel.++([
-        %{label: gettext("Average CPR"), key: :avg_price_paid, type: :avg_price_paid},
+        %{label: gettext("Average Price paid"), key: :avg_price_paid, type: :avg_price_paid},
         %{label: nil, key: "actions", type: :actions, sortable: false}
       ])
 
@@ -147,7 +147,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
   defp get_ammo_type_values(ammo_type, columns, current_user) do
     columns
-    |> Map.new(fn %{key: key, type: type} ->
+    |> Enum.into(%{}, fn %{key: key, type: type} ->
       {key, get_ammo_type_value(type, key, ammo_type, current_user)}
     end)
   end

lib/cannery_web/live/ammo_type_live/show.ex

@@ -8,41 +8,13 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   alias Cannery.Ammo
   alias CanneryWeb.Endpoint
 
-  @fields_list [
+  @impl true
-    %{label: gettext("Bullet type:"), key: :bullet_type, type: :string},
+  def mount(_params, _session, socket), do: {:ok, socket |> assign(show_used: false)}
-    %{label: gettext("Bullet core:"), key: :bullet_core, type: :string},
-    %{label: gettext("Cartridge:"), key: :cartridge, type: :string},
-    %{label: gettext("Caliber:"), key: :caliber, type: :string},
-    %{label: gettext("Case material:"), key: :case_material, type: :string},
-    %{label: gettext("Jacket type:"), key: :jacket_type, type: :string},
-    %{label: gettext("Muzzle velocity:"), key: :muzzle_velocity, type: :string},
-    %{label: gettext("Powder type:"), key: :powder_type, type: :string},
-    %{label: gettext("Powder grains per charge:"), key: :powder_grains_per_charge, type: :string},
-    %{label: gettext("Grains:"), key: :grains, type: :string},
-    %{label: gettext("Pressure:"), key: :pressure, type: :string},
-    %{label: gettext("Primer type:"), key: :primer_type, type: :string},
-    %{label: gettext("Firing type:"), key: :firing_type, type: :string},
-    %{label: gettext("Tracer:"), key: :tracer, type: :boolean},
-    %{label: gettext("Incendiary:"), key: :incendiary, type: :boolean},
-    %{label: gettext("Blank:"), key: :blank, type: :boolean},
-    %{label: gettext("Corrosive:"), key: :corrosive, type: :boolean},
-    %{label: gettext("Manufacturer:"), key: :manufacturer, type: :string},
-    %{label: gettext("UPC:"), key: :upc, type: :string}
-  ]
 
   @impl true
-  def mount(_params, _session, socket),
+  def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
-    do: {:ok, socket |> assign(show_used: false, view_table: false)}
-
-  @impl true
-  def handle_params(
-        %{"id" => id},
-        _params,
-        %{assigns: %{current_user: current_user, live_action: live_action}} = socket
-      ) do
     ammo_type = Ammo.get_ammo_type!(id, current_user)
-    socket = socket |> assign(view_table: live_action == :table) |> display_ammo_type(ammo_type)
+    {:noreply, socket |> display_ammo_type(ammo_type)}
-    {:noreply, socket}
   end
 
   @impl true
@@ -64,45 +36,22 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_type()}
   end
 
-  @impl true
-  def handle_event(
-        "toggle_table",
-        _params,
-        %{assigns: %{view_table: view_table, ammo_type: ammo_type}} = socket
-      ) do
-    new_path =
-      if view_table,
-        do: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
-        else: Routes.ammo_type_show_path(Endpoint, :table, ammo_type)
-
-    {:noreply, socket |> assign(view_table: !view_table) |> push_patch(to: new_path)}
-  end
-
   defp display_ammo_type(
-         %{assigns: %{live_action: live_action, current_user: current_user, show_used: show_used}} =
+         %{
-           socket,
+           assigns: %{
+             live_action: live_action,
+             current_user: current_user,
+             show_used: show_used
+           }
+         } = socket,
          ammo_type
        ) do
-    fields_to_display =
-      @fields_list
-      |> Enum.any?(fn %{key: field, type: type} ->
-        default_value =
-          case type do
-            :boolean -> false
-            _other_type -> nil
-          end
-
-        ammo_type |> Map.get(field) != default_value
-      end)
-
     socket
     |> assign(
-      page_title: page_title(live_action, ammo_type),
+      page_title: page_title(live_action),
       ammo_type: ammo_type,
       ammo_groups: ammo_type |> Ammo.list_ammo_groups_for_type(current_user, show_used),
-      avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user),
+      avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
-      fields_list: @fields_list,
-      fields_to_display: fields_to_display
     )
   end
 
@@ -110,9 +59,6 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     socket |> display_ammo_type(ammo_type)
   end
 
-  defp page_title(action, %{name: ammo_type_name}) when action in [:show, :table],
+  defp page_title(:show), do: gettext("Show Ammo type")
-    do: ammo_type_name
+  defp page_title(:edit), do: gettext("Edit Ammo type")
-
-  defp page_title(:edit, %{name: ammo_type_name}),
-    do: gettext("Edit %{ammo_type_name}", ammo_type_name: ammo_type_name)
 end

lib/cannery_web/live/ammo_type_live/show.html.heex

@@ -39,30 +39,44 @@
 
   <hr class="hr" />
 
-  <%= if @fields_to_display do %>
   <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
-      <%= for %{label: label, key: key, type: type} <- @fields_list do %>
+    <%= for {field_name, field, type} <- [
-        <%= if @ammo_type |> Map.get(key) do %>
+          {gettext("Bullet type"), :bullet_type, :string},
+          {gettext("Bullet core"), :bullet_core, :string},
+          {gettext("Cartridge"), :cartridge, :string},
+          {gettext("Caliber"), :caliber, :string},
+          {gettext("Case material"), :case_material, :string},
+          {gettext("Jacket type"), :jacket_type, :string},
+          {gettext("Muzzle velocity"), :muzzle_velocity, :string},
+          {gettext("Powder type"), :powder_type, :string},
+          {gettext("Powder grains per charge"), :powder_grains_per_charge, :string},
+          {gettext("Grains"), :grains, :string},
+          {gettext("Pressure"), :pressure, :string},
+          {gettext("Primer type"), :primer_type, :string},
+          {gettext("Firing type"), :firing_type, :string},
+          {gettext("Tracer"), :tracer, :boolean},
+          {gettext("Incendiary"), :incendiary, :boolean},
+          {gettext("Blank"), :blank, :boolean},
+          {gettext("Corrosive"), :corrosive, :boolean},
+          {gettext("Manufacturer"), :manufacturer, :string},
+          {gettext("UPC"), :upc, :string}
+        ] do %>
+      <%= if @ammo_type |> Map.get(field) do %>
         <h3 class="title text-lg">
-            <%= label %>
+          <%= field_name %>:
         </h3>
 
         <span class="text-primary-600">
           <%= case type do %>
             <% :boolean -> %>
-                <%= @ammo_type |> Map.get(key) |> humanize() %>
+              <%= @ammo_type |> Map.get(field) |> humanize() %>
             <% _ -> %>
-                <%= @ammo_type |> Map.get(key) %>
+              <%= @ammo_type |> Map.get(field) %>
           <% end %>
         </span>
       <% end %>
     <% end %>
-    </div>
 
-    <hr class="hr" />
-  <% end %>
-
-  <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
     <h3 class="title text-lg">
       <%= gettext("Rounds:") %>
     </h3>
@@ -86,11 +100,7 @@
     <span class="text-primary-600">
       <%= @ammo_type |> Ammo.get_historical_count_for_ammo_type(@current_user) %>
     </span>
-  </div>
 
-  <hr class="hr" />
-
-  <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
     <h3 class="title text-lg">
       <%= gettext("Packs:") %>
     </h3>
@@ -114,11 +124,7 @@
     <span class="text-primary-600">
       <%= @ammo_type |> Ammo.get_ammo_groups_count_for_type(@current_user, true) %>
     </span>
-  </div>
 
-  <hr class="hr" />
-
-  <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
     <h3 class="title text-lg">
       <%= gettext("Added on:") %>
     </h3>
@@ -129,7 +135,7 @@
 
     <%= if @avg_cost_per_round do %>
       <h3 class="title text-lg">
-        <%= gettext("Average CPR") %>:
+        <%= gettext("Average Price paid") %>:
       </h3>
 
       <span class="text-primary-600">
@@ -146,44 +152,20 @@
 
   <hr class="hr" />
 
-  <div class="flex justify-center items-center space-x-4">
+  <div class="flex flex-col justify-center items-center">
     <.toggle_button action="toggle_show_used" value={@show_used}>
       <span class="title text-lg text-primary-600">
         <%= gettext("Show used") %>
       </span>
     </.toggle_button>
-
-    <.toggle_button action="toggle_table" value={@view_table}>
-      <span class="title text-lg text-primary-600">
-        <%= gettext("View as table") %>
-      </span>
-    </.toggle_button>
   </div>
 
-  <div class="w-full p-4">
+  <div>
     <%= if @ammo_groups |> Enum.empty?() do %>
-      <h2 class="px-4 title text-lg text-primary-600">
+      <h2 class="mx-8 my-4 title text-lg text-primary-600">
         <%= gettext("No ammo for this type") %>
         <%= display_emoji("😔") %>
       </h2>
-    <% else %>
-      <%= if @view_table do %>
-        <.live_component
-          module={CanneryWeb.Components.AmmoGroupTableComponent}
-          id="ammo-type-show-table"
-          ammo_groups={@ammo_groups}
-          current_user={@current_user}
-          show_used={@show_used}
-        >
-          <:container :let={%{container: %{name: container_name} = container}}>
-            <.link
-              navigate={Routes.container_show_path(Endpoint, :show, container)}
-              class="mx-2 my-1 link"
-            >
-              <%= container_name %>
-            </.link>
-          </:container>
-        </.live_component>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
         <%= for ammo_group <- @ammo_groups do %>
@@ -191,7 +173,6 @@
         <% end %>
       </div>
     <% end %>
-    <% end %>
   </div>
 </div>
 

lib/cannery_web/live/container_live/index.ex

@@ -153,12 +153,12 @@ defmodule CanneryWeb.ContainerLive.Index do
     )
   end
 
-  @spec get_row_data_for_container(Container.t(), [map()]) :: map()
+  @spec get_row_data_for_container(Container.t(), [map()]) :: [map()]
   defp get_row_data_for_container(container, columns) do
     container = container |> Repo.preload([:ammo_groups, :tags])
 
     columns
-    |> Map.new(fn %{key: key} -> {key, get_value_for_key(key, container)} end)
+    |> Enum.into(%{}, fn %{key: key} -> {key, get_value_for_key(key, container)} end)
   end
 
   @spec get_value_for_key(atom(), Container.t()) :: any()

lib/cannery_web/live/container_live/index.html.heex

@@ -26,7 +26,7 @@
     </div>
   <% end %>
 
-  <div class="w-full flex flex-row flex-wrap justify-center items-center">
+  <div class="max-w-full flex flex-row flex-wrap justify-center items-center">
     <%= if @view_table do %>
       <.live_component
         module={CanneryWeb.Components.TableComponent}

lib/cannery_web/live/container_live/show.ex

@@ -11,19 +11,15 @@ defmodule CanneryWeb.ContainerLive.Show do
   alias Phoenix.LiveView.Socket
 
   @impl true
-  def mount(_params, _session, socket),
+  def mount(_params, _session, socket), do: {:ok, socket |> assign(show_used: false)}
-    do: {:ok, socket |> assign(show_used: false, view_table: false)}
 
   @impl true
   def handle_params(
         %{"id" => id},
         _session,
-        %{assigns: %{current_user: current_user, live_action: live_action}} = socket
+        %{assigns: %{current_user: current_user}} = socket
       ) do
-    socket =
+    {:noreply, socket |> render_container(id, current_user)}
-      socket |> assign(view_table: live_action == :table) |> render_container(id, current_user)
-
-    {:noreply, socket}
   end
 
   @impl true
@@ -91,20 +87,6 @@ defmodule CanneryWeb.ContainerLive.Show do
     {:noreply, socket |> assign(:show_used, !show_used) |> render_container()}
   end
 
-  @impl true
-  def handle_event(
-        "toggle_table",
-        _params,
-        %{assigns: %{view_table: view_table, container: container}} = socket
-      ) do
-    new_path =
-      if view_table,
-        do: Routes.container_show_path(Endpoint, :show, container),
-        else: Routes.container_show_path(Endpoint, :table, container)
-
-    {:noreply, socket |> assign(view_table: !view_table) |> push_patch(to: new_path)}
-  end
-
   @spec render_container(Socket.t(), Container.id(), User.t()) :: Socket.t()
   defp render_container(
          %{assigns: %{live_action: live_action, show_used: show_used}} = socket,
@@ -120,7 +102,7 @@ defmodule CanneryWeb.ContainerLive.Show do
 
     page_title =
       case live_action do
-        action when action in [:show, :table] -> container_name
+        :show -> gettext("Show %{name}", name: container_name)
         :edit -> gettext("Edit %{name}", name: container_name)
         :edit_tags -> gettext("Edit %{name} tags", name: container_name)
       end

lib/cannery_web/live/container_live/show.html.heex

@@ -91,40 +91,19 @@
 
   <hr class="mb-4 hr" />
 
-  <div class="flex justify-center items-center space-x-4">
+  <div class="flex flex-col justify-center items-center">
     <.toggle_button action="toggle_show_used" value={@show_used}>
       <span class="title text-lg text-primary-600">
-        <%= gettext("Show used") %>
+        <%= dgettext("actions", "Show used") %>
-      </span>
-    </.toggle_button>
-
-    <.toggle_button action="toggle_table" value={@view_table}>
-      <span class="title text-lg text-primary-600">
-        <%= gettext("View as table") %>
       </span>
     </.toggle_button>
   </div>
 
-  <div class="w-full p-4">
+  <div>
     <%= if @ammo_groups |> Enum.empty?() do %>
-      <h2 class="mx-4 title text-lg text-primary-600">
+      <h2 class="mx-8 my-4 title text-lg text-primary-600">
         <%= gettext("No ammo in this container") %>
       </h2>
-    <% else %>
-      <%= if @view_table do %>
-        <.live_component
-          module={CanneryWeb.Components.AmmoGroupTableComponent}
-          id="ammo-type-show-table"
-          ammo_groups={@ammo_groups}
-          current_user={@current_user}
-          show_used={@show_used}
-        >
-          <:ammo_type :let={%{name: ammo_type_name} = ammo_type}>
-            <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link">
-              <%= ammo_type_name %>
-            </.link>
-          </:ammo_type>
-        </.live_component>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
         <%= for ammo_group <- @ammo_groups do %>
@@ -132,7 +111,6 @@
         <% end %>
       </div>
     <% end %>
-    <% end %>
   </div>
 </div>
 

lib/cannery_web/live/home_live.ex

@@ -138,7 +138,7 @@ defmodule CanneryWeb.HomeLive do
             target="_blank"
             rel="noopener noreferrer"
           >
-            <p>0.7.0</p>
+            <p>0.6.0</p>
             <i class="fas fa-md fa-info-circle"></i>
           </.link>
         </li>

lib/cannery_web/live/range_live/index.ex

@@ -88,7 +88,13 @@ defmodule CanneryWeb.RangeLive.Index do
       shot_groups
       |> Enum.map(fn shot_group -> shot_group |> get_row_data_for_shot_group(columns) end)
 
-    chart_data = shot_groups |> get_chart_data_for_shot_group()
+    chart_data =
+      shot_groups
+      |> Enum.map(fn shot_group ->
+        shot_group
+        |> get_chart_data_for_shot_group([:name, :count, :notes, :date])
+      end)
+      |> Enum.sort_by(fn %{date: date} -> date end, Date)
 
     socket
     |> assign(
@@ -100,21 +106,40 @@ defmodule CanneryWeb.RangeLive.Index do
     )
   end
 
-  @spec get_chart_data_for_shot_group([ShotGroup.t()]) :: [map()]
+  @spec get_chart_data_for_shot_group(ShotGroup.t(), keys :: [atom()]) :: map()
-  defp get_chart_data_for_shot_group(shot_groups) do
+  defp get_chart_data_for_shot_group(shot_group, keys) do
-    shot_groups
+    shot_group = shot_group |> Repo.preload(ammo_group: :ammo_type)
-    |> Repo.preload(ammo_group: :ammo_type)
-    |> Enum.group_by(fn %{date: date} -> date end, fn %{count: count} -> count end)
-    |> Enum.map(fn {date, rounds} ->
-      sum = Enum.sum(rounds)
 
-      %{
+    labels =
-        date: date,
+      if shot_group.notes do
-        count: sum,
+        [gettext("Notes: %{notes}", notes: shot_group.notes)]
-        label: gettext("Rounds shot: %{count}", count: sum)
+      else
-      }
+        []
+      end
+
+    labels = [
+      gettext(
+        "Name: %{name}",
+        name: shot_group.ammo_group.ammo_type.name
+      ),
+      gettext(
+        "Rounds shot: %{count}",
+        count: shot_group.count
+      )
+      | labels
+    ]
+
+    keys
+    |> Map.new(fn key ->
+      value =
+        case key do
+          :name -> shot_group.ammo_group.ammo_type.name
+          key -> shot_group |> Map.get(key)
+        end
+
+      {key, value}
     end)
-    |> Enum.sort_by(fn %{date: date} -> date end)
+    |> Map.put(:labels, labels)
   end
 
   @spec get_row_data_for_shot_group(ShotGroup.t(), [map()]) :: map()

lib/cannery_web/live/range_live/index.html.heex

@@ -59,9 +59,9 @@
       phx-update="ignore"
       class="max-h-72"
       data-chart-data={Jason.encode!(@chart_data)}
-      data-label={gettext("Rounds shot")}
+      data-label={gettext("Rounds fired")}
       data-color={random_color()}
-      aria-label={gettext("Rounds shot chart")}
+      aria-label={gettext("Rounds fired chart")}
       role="img"
     >
       <%= dgettext("errors", "Your browser does not support the canvas element.") %>

lib/cannery_web/router.ex

@@ -71,9 +71,8 @@ defmodule CanneryWeb.Router do
     live "/catalog/:id/clone", AmmoTypeLive.Index, :clone
     live "/catalog/:id/edit", AmmoTypeLive.Index, :edit
 
-    live "/catalog/:id/show", AmmoTypeLive.Show, :show
+    live "/catalog/:id", AmmoTypeLive.Show, :show
     live "/catalog/:id/show/edit", AmmoTypeLive.Show, :edit
-    live "/catalog/:id/show/table", AmmoTypeLive.Show, :table
 
     live "/containers", ContainerLive.Index, :index
     live "/containers/table", ContainerLive.Index, :table
@@ -82,8 +81,7 @@ defmodule CanneryWeb.Router do
     live "/containers/:id/clone", ContainerLive.Index, :clone
     live "/containers/:id/edit_tags", ContainerLive.Index, :edit_tags
 
-    live "/containers/:id/show", ContainerLive.Show, :show
+    live "/containers/:id", ContainerLive.Show, :show
-    live "/containers/:id/show/table", ContainerLive.Show, :table
     live "/containers/:id/show/edit", ContainerLive.Show, :edit
     live "/containers/:id/show/edit_tags", ContainerLive.Show, :edit_tags
 
@@ -94,7 +92,7 @@ defmodule CanneryWeb.Router do
     live "/ammo/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
     live "/ammo/:id/move", AmmoGroupLive.Index, :move
 
-    live "/ammo/:id/show", AmmoGroupLive.Show, :show
+    live "/ammo/:id", AmmoGroupLive.Show, :show
     live "/ammo/:id/show/edit", AmmoGroupLive.Show, :edit
     live "/ammo/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
     live "/ammo/:id/show/move", AmmoGroupLive.Show, :move

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.7.0",
+      version: "0.6.0",
       elixir: "1.14.1",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),

priv/gettext/actions.pot

@@ -156,7 +156,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:199
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -233,6 +233,11 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:97
+#, elixir-autogen, elixir-format
+msgid "Show used"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format

priv/gettext/de/LC_MESSAGES/actions.po

@@ -169,7 +169,7 @@ msgstr "Munition markieren"
 msgid "Why not get some ready to shoot?"
 msgstr "Warum nicht einige für den Schießstand auswählen?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:199
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -246,6 +246,11 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:97
+#, elixir-autogen, elixir-format
+msgid "Show used"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format

priv/gettext/de/LC_MESSAGES/default.po

@@ -52,12 +52,18 @@ msgstr "Admins:"
 msgid "Ammo"
 msgstr "Munition"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:96
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.ex:99
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr "Munitionsarten"
 
+#: lib/cannery_web/live/ammo_type_live/index.ex:137
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
+#, elixir-autogen, elixir-format
+msgid "Average Price paid"
+msgstr "Durchschnittlicher Kaufpreis"
+
 #: lib/cannery_web/live/tag_live/form_component.ex:79
 #, elixir-autogen, elixir-format
 msgid "Background color"
@@ -65,6 +71,7 @@ msgstr "Hintergrundfarbe"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:82
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr "Knallpatrone"
@@ -76,37 +83,42 @@ msgstr "Messing"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr "Projektilkern"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr "Patronenart"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr "Kaliber"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr "Patrone"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr "Gehäusematerial"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:72
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
+#: lib/cannery_web/live/ammo_group_live/index.ex:104
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr "Behälter"
@@ -121,17 +133,18 @@ msgstr "Behälter"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr "Korrosiv"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:100
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr "Anzahl"
 
-#: lib/cannery_web/components/ammo_group_card.ex:38
+#: lib/cannery_web/components/ammo_group_card.ex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
@@ -161,6 +174,7 @@ msgid "Edit Ammo group"
 msgstr "Munitionsgruppe bearbeiten"
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo type"
 msgstr "Munitionstyp bearbeiten"
@@ -187,12 +201,14 @@ msgstr "VM"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:76
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr "Körner"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:81
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr "Brandmunition"
@@ -244,6 +260,7 @@ msgstr "Magazin, Ladestreifen, Munitionskiste usw."
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:84
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:61
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr "Hersteller"
@@ -322,7 +339,6 @@ msgid "No tags"
 msgstr "Keine Tags"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:37
-#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
 #: lib/cannery_web/live/ammo_group_live/show.ex:88
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
@@ -331,7 +347,7 @@ msgstr "Keine Tags"
 msgid "Notes"
 msgstr "Bemerkungen"
 
-#: lib/cannery_web/components/ammo_group_card.ex:51
+#: lib/cannery_web/components/ammo_group_card.ex:43
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -344,23 +360,25 @@ msgstr "Auf dem Bücherregal"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:77
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr "Druck"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:85
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr "Kaufpreis"
 
-#: lib/cannery_web/components/ammo_group_card.ex:70
+#: lib/cannery_web/components/ammo_group_card.ex:62
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr "Kaufpreis:"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:78
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr "Zündertyp"
@@ -388,6 +406,11 @@ msgstr ""
 msgid "Settings"
 msgstr "Einstellungen"
 
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Show Ammo type"
+msgstr "Zeige Munitionsarten"
+
 #: lib/cannery_web/live/home_live.ex:83
 #, elixir-autogen, elixir-format
 msgid "Simple:"
@@ -428,6 +451,7 @@ msgstr "Die selbst-gehostete Website zur Verwaltung von Schusswaffen"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:80
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr "Leuchtspur"
@@ -475,8 +499,8 @@ msgstr "Ihre Daten bleiben bei Ihnen, Punkt"
 msgid "No tags for this container"
 msgstr "Keine Tags für diesen Behälter"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:103
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Schießplatz"
@@ -543,7 +567,6 @@ msgstr "Patronen verbleibend"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:87
 #: lib/cannery_web/live/range_live/index.ex:81
-#: lib/cannery_web/live/range_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr "Patronen abgefeuert"
@@ -558,7 +581,7 @@ msgstr "Schießkladde"
 msgid "Move Ammo group"
 msgstr "Munitionsgruppe verschieben"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.ex:270
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr "Munition verschieben"
@@ -573,14 +596,12 @@ msgstr "Kein weiterer Behälter"
 msgid "Shot log"
 msgstr "Schießkladde"
 
-#: lib/cannery_web/components/ammo_group_card.ex:71
+#: lib/cannery_web/components/ammo_group_card.ex:63
-#: lib/cannery_web/components/ammo_group_card.ex:78
+#: lib/cannery_web/live/ammo_group_live/index.ex:154
-#: lib/cannery_web/components/ammo_group_table_component.ex:159
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:136
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr "$%{amount}"
@@ -592,30 +613,35 @@ msgstr "Bimetall"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr "Patronenhülse"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr "Mündungsgeschwindigkeit"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr "Pulverkörner pro Ladung"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr "Pulverart"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:85
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr "UPC"
@@ -636,18 +662,19 @@ msgstr "Derzeitiges Passwort"
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr "Markiert"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr "Demarkiert"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:79
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr "Patronenhülsenform"
@@ -663,32 +690,36 @@ msgid "Loading..."
 msgstr "Lädt..."
 
 #: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:124
+#: lib/cannery_web/live/container_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr "%{name} bearbeiten"
 
 #: lib/cannery_web/live/container_live/index.ex:65
-#: lib/cannery_web/live/container_live/show.ex:125
+#: lib/cannery_web/live/container_live/show.ex:107
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr "Editiere %{name} Tags"
 
 #: lib/cannery_web/components/container_card.ex:63
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
 #: lib/cannery_web/live/container_live/show.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Rounds:"
 msgstr "Patronen:"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:224
+#: lib/cannery_web/live/container_live/show.ex:105
+#, elixir-autogen, elixir-format
+msgid "Show %{name}"
+msgstr "Zeige %{name}"
+
 #: lib/cannery_web/live/ammo_type_live/index.ex:178
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "Keine Preisinformationen"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:102
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% verbleibend"
@@ -759,14 +790,14 @@ msgstr "Kopien"
 msgid "Ammo types"
 msgstr "Munitionsart"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: lib/cannery_web/live/ammo_group_live/index.ex:105
 #, elixir-autogen, elixir-format
 msgid "Added on"
 msgstr "Hinzugefügt am"
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/ammo_group_card.ex:49
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:123
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "Added on:"
 msgstr "Hinzugefügt am:"
@@ -835,7 +866,7 @@ msgstr "Munitionstyp bearbeiten"
 msgid "Move Ammo"
 msgstr "Munition verschieben"
 
-#: lib/cannery_web/live/container_live/show.html.heex:111
+#: lib/cannery_web/live/container_live/show.html.heex:105
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr "Keine Munitionsgruppe in diesem Behälter"
@@ -851,7 +882,7 @@ msgid "This ammo is not in a container"
 msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
 
 #: lib/cannery_web/components/container_card.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:95
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
 #: lib/cannery_web/live/container_live/show.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Packs:"
@@ -873,36 +904,55 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:86
+#: lib/cannery_web/components/ammo_group_card.ex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr "Behälter"
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:48
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:23
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:152
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
-#: lib/cannery_web/live/container_live/show.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:61
+#: lib/cannery_web/live/ammo_group_live/index.ex:110
 #, elixir-autogen, elixir-format
 msgid "Used up on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:63
+#: lib/cannery_web/components/ammo_group_card.ex:55
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:195
+#: lib/cannery_web/live/ammo_group_live/index.ex:206
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:114
+#: lib/cannery_web/live/range_live/index.ex:121
+#, elixir-autogen, elixir-format
+msgid "Name: %{name}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:115
+#, elixir-autogen, elixir-format
+msgid "Notes: %{notes}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:62
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Rounds fired"
+msgstr "Patronen verbraucht"
+
+#: lib/cannery_web/live/range_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Rounds fired chart"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:125
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr "Patronen abgefeuert"
@@ -919,9 +969,7 @@ msgstr ""
 msgid "Rounds"
 msgstr "Patronen:"
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
 #: lib/cannery_web/live/container_live/index.html.heex:23
-#: lib/cannery_web/live/container_live/show.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -931,7 +979,7 @@ msgstr ""
 msgid "Total ever packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "Total ever packs:"
 msgstr ""
@@ -941,7 +989,7 @@ msgstr ""
 msgid "Total ever rounds"
 msgstr "Summe aller Patronen"
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Total ever rounds:"
 msgstr "Summe abgegebener Schüsse:"
@@ -951,7 +999,7 @@ msgstr "Summe abgegebener Schüsse:"
 msgid "Used packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Used packs:"
 msgstr ""
@@ -961,7 +1009,7 @@ msgstr ""
 msgid "Used rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used rounds:"
 msgstr ""
@@ -970,140 +1018,3 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used up!"
 msgstr ""
-
-#: lib/cannery_web/live/range_live/index.html.heex:64
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Rounds shot chart"
-msgstr "Patronen abgefeuert"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Blank:"
-msgstr "Knallpatrone"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet core:"
-msgstr "Projektilkern"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet type:"
-msgstr "Patronenart"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Caliber:"
-msgstr "Kaliber"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Cartridge:"
-msgstr "Patrone"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Case material:"
-msgstr "Gehäusematerial"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Corrosive:"
-msgstr "Korrosiv"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Firing type:"
-msgstr "Patronenhülsenform"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Grains:"
-msgstr "Körner"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Incendiary:"
-msgstr "Brandmunition"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Jacket type:"
-msgstr "Patronenhülse"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Manufacturer:"
-msgstr "Hersteller"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Muzzle velocity:"
-msgstr "Mündungsgeschwindigkeit"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder grains per charge:"
-msgstr "Pulverkörner pro Ladung"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder type:"
-msgstr "Pulverart"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Pressure:"
-msgstr "Druck"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Primer type:"
-msgstr "Zündertyp"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Tracer:"
-msgstr "Leuchtspur"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
-#, elixir-autogen, elixir-format, fuzzy
-msgid "UPC:"
-msgstr "UPC"
-
-#: lib/cannery_web/live/ammo_type_live/index.ex:137
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:132
-#, elixir-autogen, elixir-format
-msgid "Average CPR"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:117
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit %{ammo_type_name}"
-msgstr "%{name} bearbeiten"
-
-#: lib/cannery_web/components/ammo_group_card.ex:39
-#: lib/cannery_web/components/ammo_group_table_component.ex:233
-#, elixir-autogen, elixir-format
-msgid "Empty"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:86
-#, elixir-autogen, elixir-format
-msgid "CPR"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:77
-#, elixir-autogen, elixir-format
-msgid "CPR:"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:84
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count"
-msgstr "Ursprüngliche Anzahl:"
-
-#: lib/cannery_web/components/ammo_group_card.ex:44
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count:"
-msgstr "Ursprüngliche Anzahl:"

priv/gettext/de/LC_MESSAGES/errors.po

@@ -29,7 +29,7 @@ msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
 
 #: lib/cannery_web/live/container_live/index.ex:88
-#: lib/cannery_web/live/container_live/show.ex:75
+#: lib/cannery_web/live/container_live/show.ex:71
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Konnte %{name} nicht löschen: %{error}"
@@ -187,7 +187,7 @@ msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
 "%{multiplier}"
 
-#: lib/cannery/ammo.ex:609
+#: lib/cannery/ammo.ex:587
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -32,7 +32,7 @@ msgid "%{name} created successfully"
 msgstr "%{name} erfolgreich erstellt"
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:47
-#: lib/cannery_web/live/ammo_type_live/show.ex:56
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -51,7 +51,7 @@ msgid "%{name} enabled succesfully"
 msgstr "%{name} erfolgreich aktiviert"
 
 #: lib/cannery_web/live/container_live/index.ex:81
-#: lib/cannery_web/live/container_live/show.ex:65
+#: lib/cannery_web/live/container_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"
@@ -100,7 +100,7 @@ msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Sind Sie sicher, dass sie die Einladung für %{name} löschen möchten?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_group_live/index.ex:242
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -193,7 +193,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr "%{name} erfolgreich hinzugefügt"
 
-#: lib/cannery_web/live/container_live/show.ex:41
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} wurde von %{container_name} entfernt"
@@ -214,7 +214,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:159
+#: lib/cannery_web/live/range_live/index.ex:184
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"

priv/gettext/default.pot

@@ -37,12 +37,18 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:96
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.ex:99
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/index.ex:137
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
+#, elixir-autogen, elixir-format
+msgid "Average Price paid"
+msgstr ""
+
 #: lib/cannery_web/live/tag_live/form_component.ex:79
 #, elixir-autogen, elixir-format
 msgid "Background color"
@@ -50,6 +56,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:82
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
@@ -61,37 +68,42 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:72
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
+#: lib/cannery_web/live/ammo_group_live/index.ex:104
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -106,17 +118,18 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:100
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:38
+#: lib/cannery_web/components/ammo_group_card.ex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
@@ -146,6 +159,7 @@ msgid "Edit Ammo group"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo type"
 msgstr ""
@@ -172,12 +186,14 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:76
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:81
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -229,6 +245,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:84
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:61
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
@@ -307,7 +324,6 @@ msgid "No tags"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:37
-#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
 #: lib/cannery_web/live/ammo_group_live/show.ex:88
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
@@ -316,7 +332,7 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:51
+#: lib/cannery_web/components/ammo_group_card.ex:43
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -329,23 +345,25 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:77
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:85
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:70
+#: lib/cannery_web/components/ammo_group_card.ex:62
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:78
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -371,6 +389,11 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Show Ammo type"
+msgstr ""
+
 #: lib/cannery_web/live/home_live.ex:83
 #, elixir-autogen, elixir-format
 msgid "Simple:"
@@ -411,6 +434,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:80
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
@@ -458,8 +482,8 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:103
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -526,7 +550,6 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:87
 #: lib/cannery_web/live/range_live/index.ex:81
-#: lib/cannery_web/live/range_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
@@ -541,7 +564,7 @@ msgstr ""
 msgid "Move Ammo group"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.ex:270
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -556,14 +579,12 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:71
+#: lib/cannery_web/components/ammo_group_card.ex:63
-#: lib/cannery_web/components/ammo_group_card.ex:78
+#: lib/cannery_web/live/ammo_group_live/index.ex:154
-#: lib/cannery_web/components/ammo_group_table_component.ex:159
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:136
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr ""
@@ -575,30 +596,35 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:85
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -619,18 +645,19 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:79
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
@@ -646,32 +673,36 @@ msgid "Loading..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:124
+#: lib/cannery_web/live/container_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:65
-#: lib/cannery_web/live/container_live/show.ex:125
+#: lib/cannery_web/live/container_live/show.ex:107
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:63
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
 #: lib/cannery_web/live/container_live/show.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:224
+#: lib/cannery_web/live/container_live/show.ex:105
+#, elixir-autogen, elixir-format
+msgid "Show %{name}"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_type_live/index.ex:178
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:102
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
@@ -742,14 +773,14 @@ msgstr ""
 msgid "Ammo types"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: lib/cannery_web/live/ammo_group_live/index.ex:105
 #, elixir-autogen, elixir-format
 msgid "Added on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/ammo_group_card.ex:49
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:123
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "Added on:"
 msgstr ""
@@ -818,7 +849,7 @@ msgstr ""
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:111
+#: lib/cannery_web/live/container_live/show.html.heex:105
 #, elixir-autogen, elixir-format
 msgid "No ammo in this container"
 msgstr ""
@@ -834,7 +865,7 @@ msgid "This ammo is not in a container"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:95
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
 #: lib/cannery_web/live/container_live/show.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Packs:"
@@ -856,36 +887,55 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:86
+#: lib/cannery_web/components/ammo_group_card.ex:71
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:48
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:23
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:152
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
-#: lib/cannery_web/live/container_live/show.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:61
+#: lib/cannery_web/live/ammo_group_live/index.ex:110
 #, elixir-autogen, elixir-format
 msgid "Used up on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:63
+#: lib/cannery_web/components/ammo_group_card.ex:55
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:195
+#: lib/cannery_web/live/ammo_group_live/index.ex:206
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:114
+#: lib/cannery_web/live/range_live/index.ex:121
+#, elixir-autogen, elixir-format
+msgid "Name: %{name}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:115
+#, elixir-autogen, elixir-format
+msgid "Notes: %{notes}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:62
+#, elixir-autogen, elixir-format
+msgid "Rounds fired"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Rounds fired chart"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:125
 #, elixir-autogen, elixir-format
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -902,9 +952,7 @@ msgstr ""
 msgid "Rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
 #: lib/cannery_web/live/container_live/index.html.heex:23
-#: lib/cannery_web/live/container_live/show.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -914,7 +962,7 @@ msgstr ""
 msgid "Total ever packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "Total ever packs:"
 msgstr ""
@@ -924,7 +972,7 @@ msgstr ""
 msgid "Total ever rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Total ever rounds:"
 msgstr ""
@@ -934,7 +982,7 @@ msgstr ""
 msgid "Used packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Used packs:"
 msgstr ""
@@ -944,7 +992,7 @@ msgstr ""
 msgid "Used rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
 #, elixir-autogen, elixir-format
 msgid "Used rounds:"
 msgstr ""
@@ -953,140 +1001,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Used up!"
 msgstr ""
-
-#: lib/cannery_web/live/range_live/index.html.heex:64
-#, elixir-autogen, elixir-format
-msgid "Rounds shot chart"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
-#, elixir-autogen, elixir-format
-msgid "Blank:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
-#, elixir-autogen, elixir-format
-msgid "Bullet core:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
-#, elixir-autogen, elixir-format
-msgid "Bullet type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
-#, elixir-autogen, elixir-format
-msgid "Caliber:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
-#, elixir-autogen, elixir-format
-msgid "Cartridge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
-#, elixir-autogen, elixir-format
-msgid "Case material:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
-#, elixir-autogen, elixir-format
-msgid "Corrosive:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
-#, elixir-autogen, elixir-format
-msgid "Firing type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
-#, elixir-autogen, elixir-format
-msgid "Grains:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
-#, elixir-autogen, elixir-format
-msgid "Incendiary:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
-#, elixir-autogen, elixir-format
-msgid "Jacket type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
-#, elixir-autogen, elixir-format
-msgid "Manufacturer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
-#, elixir-autogen, elixir-format
-msgid "Muzzle velocity:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
-#, elixir-autogen, elixir-format
-msgid "Powder grains per charge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
-#, elixir-autogen, elixir-format
-msgid "Powder type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
-#, elixir-autogen, elixir-format
-msgid "Pressure:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
-#, elixir-autogen, elixir-format
-msgid "Primer type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
-#, elixir-autogen, elixir-format
-msgid "Tracer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
-#, elixir-autogen, elixir-format
-msgid "UPC:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/index.ex:137
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:132
-#, elixir-autogen, elixir-format
-msgid "Average CPR"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:117
-#, elixir-autogen, elixir-format
-msgid "Edit %{ammo_type_name}"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:39
-#: lib/cannery_web/components/ammo_group_table_component.ex:233
-#, elixir-autogen, elixir-format
-msgid "Empty"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:86
-#, elixir-autogen, elixir-format
-msgid "CPR"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:77
-#, elixir-autogen, elixir-format
-msgid "CPR:"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:84
-#, elixir-autogen, elixir-format
-msgid "Original Count"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:44
-#, elixir-autogen, elixir-format
-msgid "Original Count:"
-msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -157,7 +157,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:199
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -234,6 +234,11 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:97
+#, elixir-autogen, elixir-format
+msgid "Show used"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format

priv/gettext/en/LC_MESSAGES/default.po

@@ -38,12 +38,18 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:96
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.ex:99
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/index.ex:137
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
+#, elixir-autogen, elixir-format
+msgid "Average Price paid"
+msgstr ""
+
 #: lib/cannery_web/live/tag_live/form_component.ex:79
 #, elixir-autogen, elixir-format
 msgid "Background color"
@@ -51,6 +57,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:82
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
@@ -62,37 +69,42 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:72
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
+#: lib/cannery_web/live/ammo_group_live/index.ex:104
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -107,17 +119,18 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:100
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:38
+#: lib/cannery_web/components/ammo_group_card.ex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
@@ -147,6 +160,7 @@ msgid "Edit Ammo group"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo type"
 msgstr ""
@@ -173,12 +187,14 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:76
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:81
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -230,6 +246,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:84
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:61
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
@@ -308,7 +325,6 @@ msgid "No tags"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:37
-#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
 #: lib/cannery_web/live/ammo_group_live/show.ex:88
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
@@ -317,7 +333,7 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:51
+#: lib/cannery_web/components/ammo_group_card.ex:43
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -330,23 +346,25 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:77
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:85
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:70
+#: lib/cannery_web/components/ammo_group_card.ex:62
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:78
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -372,6 +390,11 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Show Ammo type"
+msgstr ""
+
 #: lib/cannery_web/live/home_live.ex:83
 #, elixir-autogen, elixir-format
 msgid "Simple:"
@@ -412,6 +435,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:80
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
@@ -459,8 +483,8 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:103
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -527,7 +551,6 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:87
 #: lib/cannery_web/live/range_live/index.ex:81
-#: lib/cannery_web/live/range_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
@@ -542,7 +565,7 @@ msgstr ""
 msgid "Move Ammo group"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.ex:270
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -557,14 +580,12 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:71
+#: lib/cannery_web/components/ammo_group_card.ex:63
-#: lib/cannery_web/components/ammo_group_card.ex:78
+#: lib/cannery_web/live/ammo_group_live/index.ex:154
-#: lib/cannery_web/components/ammo_group_table_component.ex:159
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:136
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr ""
@@ -576,30 +597,35 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:85
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -620,18 +646,19 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:79
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
@@ -647,32 +674,36 @@ msgid "Loading..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:124
+#: lib/cannery_web/live/container_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:65
-#: lib/cannery_web/live/container_live/show.ex:125
+#: lib/cannery_web/live/container_live/show.ex:107
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:63
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
 #: lib/cannery_web/live/container_live/show.html.heex:32
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:224
+#: lib/cannery_web/live/container_live/show.ex:105
+#, elixir-autogen, elixir-format
+msgid "Show %{name}"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_type_live/index.ex:178
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:102
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
@@ -743,14 +774,14 @@ msgstr ""
 msgid "Ammo types"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: lib/cannery_web/live/ammo_group_live/index.ex:105
 #, elixir-autogen, elixir-format
 msgid "Added on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/ammo_group_card.ex:49
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:123
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "Added on:"
 msgstr ""
@@ -819,7 +850,7 @@ msgstr ""
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:111
+#: lib/cannery_web/live/container_live/show.html.heex:105
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr ""
@@ -835,7 +866,7 @@ msgid "This ammo is not in a container"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:95
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
 #: lib/cannery_web/live/container_live/show.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Packs:"
@@ -857,36 +888,55 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:86
+#: lib/cannery_web/components/ammo_group_card.ex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:48
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:23
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:152
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
-#: lib/cannery_web/live/container_live/show.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:61
+#: lib/cannery_web/live/ammo_group_live/index.ex:110
 #, elixir-autogen, elixir-format
 msgid "Used up on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:63
+#: lib/cannery_web/components/ammo_group_card.ex:55
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:195
+#: lib/cannery_web/live/ammo_group_live/index.ex:206
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:114
+#: lib/cannery_web/live/range_live/index.ex:121
+#, elixir-autogen, elixir-format
+msgid "Name: %{name}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:115
+#, elixir-autogen, elixir-format
+msgid "Notes: %{notes}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:62
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Rounds fired"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Rounds fired chart"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:125
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -903,9 +953,7 @@ msgstr ""
 msgid "Rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
 #: lib/cannery_web/live/container_live/index.html.heex:23
-#: lib/cannery_web/live/container_live/show.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -915,7 +963,7 @@ msgstr ""
 msgid "Total ever packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "Total ever packs:"
 msgstr ""
@@ -925,7 +973,7 @@ msgstr ""
 msgid "Total ever rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Total ever rounds:"
 msgstr ""
@@ -935,7 +983,7 @@ msgstr ""
 msgid "Used packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Used packs:"
 msgstr ""
@@ -945,7 +993,7 @@ msgstr ""
 msgid "Used rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used rounds:"
 msgstr ""
@@ -954,140 +1002,3 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used up!"
 msgstr ""
-
-#: lib/cannery_web/live/range_live/index.html.heex:64
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Rounds shot chart"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Blank:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet core:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Caliber:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Cartridge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Case material:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Corrosive:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Firing type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Grains:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Incendiary:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Jacket type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Manufacturer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Muzzle velocity:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder grains per charge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Pressure:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Primer type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Tracer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
-#, elixir-autogen, elixir-format, fuzzy
-msgid "UPC:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/index.ex:137
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:132
-#, elixir-autogen, elixir-format
-msgid "Average CPR"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:117
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit %{ammo_type_name}"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:39
-#: lib/cannery_web/components/ammo_group_table_component.ex:233
-#, elixir-autogen, elixir-format
-msgid "Empty"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:86
-#, elixir-autogen, elixir-format
-msgid "CPR"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:77
-#, elixir-autogen, elixir-format
-msgid "CPR:"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:84
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:44
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count:"
-msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -16,7 +16,7 @@ msgid "Container must be empty before deleting"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:88
-#: lib/cannery_web/live/container_live/show.ex:75
+#: lib/cannery_web/live/container_live/show.ex:71
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:609
+#: lib/cannery/ammo.ex:587
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -20,7 +20,7 @@ msgid "%{name} created successfully"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:47
-#: lib/cannery_web/live/ammo_type_live/show.ex:56
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -39,7 +39,7 @@ msgid "%{name} enabled succesfully"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:81
-#: lib/cannery_web/live/container_live/show.ex:65
+#: lib/cannery_web/live/container_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
@@ -86,7 +86,7 @@ msgstr ""
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_group_live/index.ex:242
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -173,7 +173,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:41
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
@@ -194,7 +194,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:159
+#: lib/cannery_web/live/range_live/index.ex:184
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""

priv/gettext/errors.pot

@@ -16,7 +16,7 @@ msgid "Container must be empty before deleting"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:88
-#: lib/cannery_web/live/container_live/show.ex:75
+#: lib/cannery_web/live/container_live/show.ex:71
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:609
+#: lib/cannery/ammo.ex:587
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -169,7 +169,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:199
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -246,6 +246,11 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:97
+#, elixir-autogen, elixir-format
+msgid "Show used"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format

priv/gettext/es/LC_MESSAGES/default.po

@@ -52,12 +52,18 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:96
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.ex:99
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/index.ex:137
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
+#, elixir-autogen, elixir-format
+msgid "Average Price paid"
+msgstr ""
+
 #: lib/cannery_web/live/tag_live/form_component.ex:79
 #, elixir-autogen, elixir-format
 msgid "Background color"
@@ -65,6 +71,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:82
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
@@ -76,37 +83,42 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:72
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
+#: lib/cannery_web/live/ammo_group_live/index.ex:104
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -121,17 +133,18 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:100
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:38
+#: lib/cannery_web/components/ammo_group_card.ex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
@@ -161,6 +174,7 @@ msgid "Edit Ammo group"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo type"
 msgstr ""
@@ -187,12 +201,14 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:76
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:81
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -244,6 +260,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:84
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:61
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
@@ -322,7 +339,6 @@ msgid "No tags"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:37
-#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
 #: lib/cannery_web/live/ammo_group_live/show.ex:88
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
@@ -331,7 +347,7 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:51
+#: lib/cannery_web/components/ammo_group_card.ex:43
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -344,23 +360,25 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:77
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:85
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:70
+#: lib/cannery_web/components/ammo_group_card.ex:62
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:78
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -386,6 +404,11 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Show Ammo type"
+msgstr ""
+
 #: lib/cannery_web/live/home_live.ex:83
 #, elixir-autogen, elixir-format
 msgid "Simple:"
@@ -426,6 +449,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:80
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
@@ -473,8 +497,8 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:103
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -541,7 +565,6 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:87
 #: lib/cannery_web/live/range_live/index.ex:81
-#: lib/cannery_web/live/range_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
@@ -556,7 +579,7 @@ msgstr ""
 msgid "Move Ammo group"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.ex:270
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -571,14 +594,12 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:71
+#: lib/cannery_web/components/ammo_group_card.ex:63
-#: lib/cannery_web/components/ammo_group_card.ex:78
+#: lib/cannery_web/live/ammo_group_live/index.ex:154
-#: lib/cannery_web/components/ammo_group_table_component.ex:159
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:136
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr ""
@@ -590,30 +611,35 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:85
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -634,18 +660,19 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:79
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
@@ -661,32 +688,36 @@ msgid "Loading..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:124
+#: lib/cannery_web/live/container_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:65
-#: lib/cannery_web/live/container_live/show.ex:125
+#: lib/cannery_web/live/container_live/show.ex:107
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:63
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
 #: lib/cannery_web/live/container_live/show.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:224
+#: lib/cannery_web/live/container_live/show.ex:105
+#, elixir-autogen, elixir-format
+msgid "Show %{name}"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_type_live/index.ex:178
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:102
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
@@ -757,14 +788,14 @@ msgstr ""
 msgid "Ammo types"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: lib/cannery_web/live/ammo_group_live/index.ex:105
 #, elixir-autogen, elixir-format
 msgid "Added on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/ammo_group_card.ex:49
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:123
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "Added on:"
 msgstr ""
@@ -833,7 +864,7 @@ msgstr ""
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:111
+#: lib/cannery_web/live/container_live/show.html.heex:105
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr ""
@@ -849,7 +880,7 @@ msgid "This ammo is not in a container"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:95
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
 #: lib/cannery_web/live/container_live/show.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Packs:"
@@ -871,36 +902,55 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:86
+#: lib/cannery_web/components/ammo_group_card.ex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:48
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:23
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:152
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
-#: lib/cannery_web/live/container_live/show.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:61
+#: lib/cannery_web/live/ammo_group_live/index.ex:110
 #, elixir-autogen, elixir-format
 msgid "Used up on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:63
+#: lib/cannery_web/components/ammo_group_card.ex:55
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:195
+#: lib/cannery_web/live/ammo_group_live/index.ex:206
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:114
+#: lib/cannery_web/live/range_live/index.ex:121
+#, elixir-autogen, elixir-format
+msgid "Name: %{name}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:115
+#, elixir-autogen, elixir-format
+msgid "Notes: %{notes}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:62
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Rounds fired"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Rounds fired chart"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:125
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -917,9 +967,7 @@ msgstr ""
 msgid "Rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
 #: lib/cannery_web/live/container_live/index.html.heex:23
-#: lib/cannery_web/live/container_live/show.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -929,7 +977,7 @@ msgstr ""
 msgid "Total ever packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "Total ever packs:"
 msgstr ""
@@ -939,7 +987,7 @@ msgstr ""
 msgid "Total ever rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Total ever rounds:"
 msgstr ""
@@ -949,7 +997,7 @@ msgstr ""
 msgid "Used packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Used packs:"
 msgstr ""
@@ -959,7 +1007,7 @@ msgstr ""
 msgid "Used rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used rounds:"
 msgstr ""
@@ -968,140 +1016,3 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used up!"
 msgstr ""
-
-#: lib/cannery_web/live/range_live/index.html.heex:64
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Rounds shot chart"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Blank:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet core:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Caliber:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Cartridge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Case material:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Corrosive:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Firing type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Grains:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Incendiary:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Jacket type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Manufacturer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Muzzle velocity:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder grains per charge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Pressure:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Primer type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Tracer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
-#, elixir-autogen, elixir-format, fuzzy
-msgid "UPC:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/index.ex:137
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:132
-#, elixir-autogen, elixir-format
-msgid "Average CPR"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:117
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit %{ammo_type_name}"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:39
-#: lib/cannery_web/components/ammo_group_table_component.ex:233
-#, elixir-autogen, elixir-format
-msgid "Empty"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:86
-#, elixir-autogen, elixir-format
-msgid "CPR"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:77
-#, elixir-autogen, elixir-format
-msgid "CPR:"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:84
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:44
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count:"
-msgstr ""

priv/gettext/es/LC_MESSAGES/errors.po

@@ -29,7 +29,7 @@ msgid "Container must be empty before deleting"
 msgstr "el Contenedor debe estar vació antes de borrarlo"
 
 #: lib/cannery_web/live/container_live/index.ex:88
-#: lib/cannery_web/live/container_live/show.ex:75
+#: lib/cannery_web/live/container_live/show.ex:71
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "No se pudo eliminar %{name}: %{error}"
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:609
+#: lib/cannery/ammo.ex:587
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""

priv/gettext/es/LC_MESSAGES/prompts.po

@@ -32,7 +32,7 @@ msgid "%{name} created successfully"
 msgstr "%{name} creado exitosamente"
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:47
-#: lib/cannery_web/live/ammo_type_live/show.ex:56
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -51,7 +51,7 @@ msgid "%{name} enabled succesfully"
 msgstr "%{name} activado exitosamente"
 
 #: lib/cannery_web/live/container_live/index.ex:81
-#: lib/cannery_web/live/container_live/show.ex:65
+#: lib/cannery_web/live/container_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} ha sido borrado"
@@ -100,7 +100,7 @@ msgstr "Está seguro que desea eliminar %{name}?"
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Está seguro que quiere eliminar la invitación para %{name}?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_group_live/index.ex:242
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -192,7 +192,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr "%{name} añadido exitosamente"
 
-#: lib/cannery_web/live/container_live/show.ex:41
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "se ha removido %{tag_name} de %{container_name}"
@@ -213,7 +213,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr "Está seguro que desea desmontar esta munición?"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:159
+#: lib/cannery_web/live/range_live/index.ex:184
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -169,7 +169,7 @@ msgstr "Munition préparée"
 msgid "Why not get some ready to shoot?"
 msgstr "Pourquoi pas en préparer pour tirer ?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:199
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -246,6 +246,11 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:97
+#, elixir-autogen, elixir-format
+msgid "Show used"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format

priv/gettext/fr/LC_MESSAGES/default.po

@@ -52,12 +52,18 @@ msgstr "Administrateur·ices :"
 msgid "Ammo"
 msgstr "Munition"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:96
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.ex:99
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr "Type de munition"
 
+#: lib/cannery_web/live/ammo_type_live/index.ex:137
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
+#, elixir-autogen, elixir-format
+msgid "Average Price paid"
+msgstr "Prix acheté moyen"
+
 #: lib/cannery_web/live/tag_live/form_component.ex:79
 #, elixir-autogen, elixir-format
 msgid "Background color"
@@ -65,6 +71,7 @@ msgstr "Couleur de fond"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:82
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr "Vide"
@@ -76,37 +83,42 @@ msgstr "Cuivre"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr "Noyau de balle"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr "Type de balle"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr "Calibre"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr "Cartouche"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr "Matériau de la caisse"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:72
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
+#: lib/cannery_web/live/ammo_group_live/index.ex:104
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr "Conteneur"
@@ -121,17 +133,18 @@ msgstr "Conteneurs"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr "Corrosive"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:100
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr "Quantité"
 
-#: lib/cannery_web/components/ammo_group_card.ex:38
+#: lib/cannery_web/components/ammo_group_card.ex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
@@ -161,6 +174,7 @@ msgid "Edit Ammo group"
 msgstr "Éditer le groupe de munition"
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo type"
 msgstr "Éditer le type de munition"
@@ -187,12 +201,14 @@ msgstr "FMJ"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:76
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr "Graines"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:81
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr "Incendiaire"
@@ -244,6 +260,7 @@ msgstr "Chargeur, lame-chargeur, boite de munition, etc."
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:84
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:61
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr "Fabricant"
@@ -322,7 +339,6 @@ msgid "No tags"
 msgstr "Aucun tag"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:37
-#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
 #: lib/cannery_web/live/ammo_group_live/show.ex:88
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
@@ -331,7 +347,7 @@ msgstr "Aucun tag"
 msgid "Notes"
 msgstr "Notes"
 
-#: lib/cannery_web/components/ammo_group_card.ex:51
+#: lib/cannery_web/components/ammo_group_card.ex:43
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -344,23 +360,25 @@ msgstr "Sur l’étagère"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:77
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr "Pression"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:85
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr "Prix payé"
 
-#: lib/cannery_web/components/ammo_group_card.ex:70
+#: lib/cannery_web/components/ammo_group_card.ex:62
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr "Prix payé :"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:78
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr "Type d’amorce"
@@ -388,6 +406,11 @@ msgstr ""
 msgid "Settings"
 msgstr "Paramètres"
 
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Show Ammo type"
+msgstr "Montrer le type de munition"
+
 #: lib/cannery_web/live/home_live.ex:83
 #, elixir-autogen, elixir-format
 msgid "Simple:"
@@ -430,6 +453,7 @@ msgstr "Le site web de suivi d’arme à feux auto-hébergé"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:80
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr "Traceuse"
@@ -477,8 +501,8 @@ msgstr "Vos données restent avec vous, point final"
 msgid "No tags for this container"
 msgstr "Aucun tag pour ce conteneur"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:103
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Portée"
@@ -545,7 +569,6 @@ msgstr "Cartouches restantes"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:87
 #: lib/cannery_web/live/range_live/index.ex:81
-#: lib/cannery_web/live/range_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr "Cartouches tirées"
@@ -560,7 +583,7 @@ msgstr "Enregistrements de tir"
 msgid "Move Ammo group"
 msgstr "Déplacer le groupe de munition"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.ex:270
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr "Déplacer munition"
@@ -575,14 +598,12 @@ msgstr "Aucun autre conteneur"
 msgid "Shot log"
 msgstr "Évènements de tir"
 
-#: lib/cannery_web/components/ammo_group_card.ex:71
+#: lib/cannery_web/components/ammo_group_card.ex:63
-#: lib/cannery_web/components/ammo_group_card.ex:78
+#: lib/cannery_web/live/ammo_group_live/index.ex:154
-#: lib/cannery_web/components/ammo_group_table_component.ex:159
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:136
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr "%{amount} $"
@@ -594,30 +615,35 @@ msgstr "Bi-métal"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr "Type de douille"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr "Vélocité du canon"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr "Graines de poudre par charge"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr "Type de poudre"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:85
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr "UPC"
@@ -638,18 +664,19 @@ msgstr "Mot de passe actuel"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr "Sélectionné"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr "Désélectionner"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:79
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr "Type d’allumage"
@@ -665,32 +692,36 @@ msgid "Loading..."
 msgstr "Chargement en cours…"
 
 #: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:124
+#: lib/cannery_web/live/container_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr "Éditer %{name}"
 
 #: lib/cannery_web/live/container_live/index.ex:65
-#: lib/cannery_web/live/container_live/show.ex:125
+#: lib/cannery_web/live/container_live/show.ex:107
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr "Éditer les tags de %{name}"
 
 #: lib/cannery_web/components/container_card.ex:63
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
 #: lib/cannery_web/live/container_live/show.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Rounds:"
 msgstr "Cartouches :"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:224
+#: lib/cannery_web/live/container_live/show.ex:105
+#, elixir-autogen, elixir-format
+msgid "Show %{name}"
+msgstr "Montrer %{name}"
+
 #: lib/cannery_web/live/ammo_type_live/index.ex:178
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "Aucune information de prix"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:102
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% restante"
@@ -761,14 +792,14 @@ msgstr "Exemplaires"
 msgid "Ammo types"
 msgstr "Types de munition"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: lib/cannery_web/live/ammo_group_live/index.ex:105
 #, elixir-autogen, elixir-format
 msgid "Added on"
 msgstr "Ajouté le"
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/ammo_group_card.ex:49
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:123
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "Added on:"
 msgstr "Ajouté le :"
@@ -837,7 +868,7 @@ msgstr "Éditer le type de munition"
 msgid "Move Ammo"
 msgstr "Déplacer munition"
 
-#: lib/cannery_web/live/container_live/show.html.heex:111
+#: lib/cannery_web/live/container_live/show.html.heex:105
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr "Aucun groupe de munition pour ce conteneur"
@@ -853,7 +884,7 @@ msgid "This ammo is not in a container"
 msgstr "Ce groupe de munition n’est pas dans un conteneur"
 
 #: lib/cannery_web/components/container_card.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:95
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
 #: lib/cannery_web/live/container_live/show.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Packs:"
@@ -876,36 +907,55 @@ msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 "Laissez \"Utilisations restantes\" vide pour rendre l'invitation illimitée"
 
-#: lib/cannery_web/components/ammo_group_card.ex:86
+#: lib/cannery_web/components/ammo_group_card.ex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr "Conteneur"
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:48
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:23
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:152
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
-#: lib/cannery_web/live/container_live/show.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:61
+#: lib/cannery_web/live/ammo_group_live/index.ex:110
 #, elixir-autogen, elixir-format
 msgid "Used up on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:63
+#: lib/cannery_web/components/ammo_group_card.ex:55
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:195
+#: lib/cannery_web/live/ammo_group_live/index.ex:206
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:114
+#: lib/cannery_web/live/range_live/index.ex:121
+#, elixir-autogen, elixir-format
+msgid "Name: %{name}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:115
+#, elixir-autogen, elixir-format
+msgid "Notes: %{notes}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:62
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Rounds fired"
+msgstr "Cartouches utilisées"
+
+#: lib/cannery_web/live/range_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Rounds fired chart"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:125
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr "Cartouches tirées"
@@ -922,9 +972,7 @@ msgstr "Packages :"
 msgid "Rounds"
 msgstr "Cartouches :"
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
 #: lib/cannery_web/live/container_live/index.html.heex:23
-#: lib/cannery_web/live/container_live/show.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -934,7 +982,7 @@ msgstr ""
 msgid "Total ever packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "Total ever packs:"
 msgstr ""
@@ -944,7 +992,7 @@ msgstr ""
 msgid "Total ever rounds"
 msgstr "Quantité de cartouches"
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Total ever rounds:"
 msgstr "Nombre totale de cartouches tirées :"
@@ -954,7 +1002,7 @@ msgstr "Nombre totale de cartouches tirées :"
 msgid "Used packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Used packs:"
 msgstr ""
@@ -964,7 +1012,7 @@ msgstr ""
 msgid "Used rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used rounds:"
 msgstr ""
@@ -973,140 +1021,3 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used up!"
 msgstr ""
-
-#: lib/cannery_web/live/range_live/index.html.heex:64
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Rounds shot chart"
-msgstr "Cartouches tirées"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Blank:"
-msgstr "Vide"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet core:"
-msgstr "Noyau de balle"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet type:"
-msgstr "Type de balle"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Caliber:"
-msgstr "Calibre"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Cartridge:"
-msgstr "Cartouche"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Case material:"
-msgstr "Matériau de la caisse"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Corrosive:"
-msgstr "Corrosive"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Firing type:"
-msgstr "Type d’allumage"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Grains:"
-msgstr "Graines"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Incendiary:"
-msgstr "Incendiaire"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Jacket type:"
-msgstr "Type de douille"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Manufacturer:"
-msgstr "Fabricant"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Muzzle velocity:"
-msgstr "Vélocité du canon"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder grains per charge:"
-msgstr "Graines de poudre par charge"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder type:"
-msgstr "Type de poudre"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Pressure:"
-msgstr "Pression"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Primer type:"
-msgstr "Type d’amorce"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Tracer:"
-msgstr "Traceuse"
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
-#, elixir-autogen, elixir-format, fuzzy
-msgid "UPC:"
-msgstr "UPC"
-
-#: lib/cannery_web/live/ammo_type_live/index.ex:137
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:132
-#, elixir-autogen, elixir-format
-msgid "Average CPR"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:117
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit %{ammo_type_name}"
-msgstr "Éditer %{name}"
-
-#: lib/cannery_web/components/ammo_group_card.ex:39
-#: lib/cannery_web/components/ammo_group_table_component.ex:233
-#, elixir-autogen, elixir-format
-msgid "Empty"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:86
-#, elixir-autogen, elixir-format
-msgid "CPR"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:77
-#, elixir-autogen, elixir-format
-msgid "CPR:"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:84
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count"
-msgstr "Nombre original :"
-
-#: lib/cannery_web/components/ammo_group_card.ex:44
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count:"
-msgstr "Nombre original :"

priv/gettext/fr/LC_MESSAGES/errors.po

@@ -29,7 +29,7 @@ msgid "Container must be empty before deleting"
 msgstr "Le conteneur doit être vide pour être supprimé"
 
 #: lib/cannery_web/live/container_live/index.ex:88
-#: lib/cannery_web/live/container_live/show.ex:75
+#: lib/cannery_web/live/container_live/show.ex:71
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Impossible de supprimer %{name} : %{error}"
@@ -186,7 +186,7 @@ msgstr "Impossible d'analyser le nombre de copies"
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr "Nombre de copies invalide, doit être 1 et %{max}. Été %{multiplier}"
 
-#: lib/cannery/ammo.ex:609
+#: lib/cannery/ammo.ex:587
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr "Multiplicateur invalide"

priv/gettext/fr/LC_MESSAGES/prompts.po

@@ -32,7 +32,7 @@ msgid "%{name} created successfully"
 msgstr "%{name} créé· avec succès"
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:47
-#: lib/cannery_web/live/ammo_type_live/show.ex:56
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -51,7 +51,7 @@ msgid "%{name} enabled succesfully"
 msgstr "%{name} activé·e avec succès"
 
 #: lib/cannery_web/live/container_live/index.ex:81
-#: lib/cannery_web/live/container_live/show.ex:65
+#: lib/cannery_web/live/container_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} a été supprimé·e"
@@ -101,7 +101,7 @@ msgstr "Êtes-vous certain·e de supprimer %{name} ?"
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Êtes-vous certain·e de supprimer l’invitation pour %{name} ?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_group_live/index.ex:242
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -194,7 +194,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr "%{name} a été ajouté avec succès"
 
-#: lib/cannery_web/live/container_live/show.ex:41
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} a été retiré de %{container_name}"
@@ -215,7 +215,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr "Êtes-vous certain·e de vouloir désélectionner cette munition ?"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:159
+#: lib/cannery_web/live/range_live/index.ex:184
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Êtes-vous certain·e de vouloir supprimer cet enregistrement de tir ?"

priv/gettext/ga/LC_MESSAGES/actions.po

@@ -167,7 +167,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.ex:199
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -244,6 +244,11 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:97
+#, elixir-autogen, elixir-format
+msgid "Show used"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format

priv/gettext/ga/LC_MESSAGES/default.po

@@ -48,12 +48,18 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:96
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.ex:99
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/index.ex:137
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
+#, elixir-autogen, elixir-format
+msgid "Average Price paid"
+msgstr ""
+
 #: lib/cannery_web/live/tag_live/form_component.ex:79
 #, elixir-autogen, elixir-format
 msgid "Background color"
@@ -61,6 +67,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:82
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
@@ -72,37 +79,42 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:72
 #: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
+#: lib/cannery_web/live/ammo_group_live/index.ex:104
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -117,17 +129,18 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:100
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:38
+#: lib/cannery_web/components/ammo_group_card.ex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
@@ -157,6 +170,7 @@ msgid "Edit Ammo group"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo type"
 msgstr ""
@@ -183,12 +197,14 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:76
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:81
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -240,6 +256,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:84
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:61
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
@@ -318,7 +335,6 @@ msgid "No tags"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:37
-#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
 #: lib/cannery_web/live/ammo_group_live/show.ex:88
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
@@ -327,7 +343,7 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:51
+#: lib/cannery_web/components/ammo_group_card.ex:43
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -340,23 +356,25 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:77
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:85
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.ex:101
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:70
+#: lib/cannery_web/components/ammo_group_card.ex:62
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:78
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -382,6 +400,11 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/show.ex:62
+#, elixir-autogen, elixir-format
+msgid "Show Ammo type"
+msgstr ""
+
 #: lib/cannery_web/live/home_live.ex:83
 #, elixir-autogen, elixir-format
 msgid "Simple:"
@@ -422,6 +445,7 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:80
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
@@ -469,8 +493,8 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/live/ammo_group_live/index.ex:103
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -537,7 +561,6 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:87
 #: lib/cannery_web/live/range_live/index.ex:81
-#: lib/cannery_web/live/range_live/index.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
@@ -552,7 +575,7 @@ msgstr ""
 msgid "Move Ammo group"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.ex:270
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -567,14 +590,12 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:71
+#: lib/cannery_web/components/ammo_group_card.ex:63
-#: lib/cannery_web/components/ammo_group_card.ex:78
+#: lib/cannery_web/live/ammo_group_live/index.ex:154
-#: lib/cannery_web/components/ammo_group_table_component.ex:159
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:136
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr ""
@@ -586,30 +607,35 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:85
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -630,18 +656,19 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_group_live/index.ex:192
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:79
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
@@ -657,32 +684,36 @@ msgid "Loading..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:27
-#: lib/cannery_web/live/container_live/show.ex:124
+#: lib/cannery_web/live/container_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:65
-#: lib/cannery_web/live/container_live/show.ex:125
+#: lib/cannery_web/live/container_live/show.ex:107
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:63
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:67
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
 #: lib/cannery_web/live/container_live/show.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:224
+#: lib/cannery_web/live/container_live/show.ex:105
+#, elixir-autogen, elixir-format
+msgid "Show %{name}"
+msgstr ""
+
 #: lib/cannery_web/live/ammo_type_live/index.ex:178
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:102
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
@@ -753,14 +784,14 @@ msgstr ""
 msgid "Ammo types"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: lib/cannery_web/live/ammo_group_live/index.ex:105
 #, elixir-autogen, elixir-format
 msgid "Added on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/ammo_group_card.ex:49
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:123
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "Added on:"
 msgstr ""
@@ -829,7 +860,7 @@ msgstr ""
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:111
+#: lib/cannery_web/live/container_live/show.html.heex:105
 #, elixir-autogen, elixir-format
 msgid "No ammo in this container"
 msgstr ""
@@ -845,7 +876,7 @@ msgid "This ammo is not in a container"
 msgstr ""
 
 #: lib/cannery_web/components/container_card.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:95
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
 #: lib/cannery_web/live/container_live/show.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Packs:"
@@ -867,36 +898,55 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:86
+#: lib/cannery_web/components/ammo_group_card.ex:71
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:48
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:23
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:152
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
-#: lib/cannery_web/live/container_live/show.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:61
+#: lib/cannery_web/live/ammo_group_live/index.ex:110
 #, elixir-autogen, elixir-format
 msgid "Used up on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:63
+#: lib/cannery_web/components/ammo_group_card.ex:55
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:195
+#: lib/cannery_web/live/ammo_group_live/index.ex:206
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:114
+#: lib/cannery_web/live/range_live/index.ex:121
+#, elixir-autogen, elixir-format
+msgid "Name: %{name}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:115
+#, elixir-autogen, elixir-format
+msgid "Notes: %{notes}"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:62
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Rounds fired"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Rounds fired chart"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:125
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -913,9 +963,7 @@ msgstr ""
 msgid "Rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
 #: lib/cannery_web/live/container_live/index.html.heex:23
-#: lib/cannery_web/live/container_live/show.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -925,7 +973,7 @@ msgstr ""
 msgid "Total ever packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "Total ever packs:"
 msgstr ""
@@ -935,7 +983,7 @@ msgstr ""
 msgid "Total ever rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Total ever rounds:"
 msgstr ""
@@ -945,7 +993,7 @@ msgstr ""
 msgid "Used packs"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Used packs:"
 msgstr ""
@@ -955,7 +1003,7 @@ msgstr ""
 msgid "Used rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used rounds:"
 msgstr ""
@@ -964,140 +1012,3 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used up!"
 msgstr ""
-
-#: lib/cannery_web/live/range_live/index.html.heex:64
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Rounds shot chart"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Blank:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet core:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Bullet type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Caliber:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Cartridge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Case material:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Corrosive:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Firing type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Grains:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Incendiary:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Jacket type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Manufacturer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Muzzle velocity:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder grains per charge:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Powder type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Pressure:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Primer type:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Tracer:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
-#, elixir-autogen, elixir-format, fuzzy
-msgid "UPC:"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/index.ex:137
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:132
-#, elixir-autogen, elixir-format
-msgid "Average CPR"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_type_live/show.ex:117
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit %{ammo_type_name}"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:39
-#: lib/cannery_web/components/ammo_group_table_component.ex:233
-#, elixir-autogen, elixir-format
-msgid "Empty"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:86
-#, elixir-autogen, elixir-format
-msgid "CPR"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:77
-#, elixir-autogen, elixir-format
-msgid "CPR:"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_table_component.ex:84
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count"
-msgstr ""
-
-#: lib/cannery_web/components/ammo_group_card.ex:44
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Original Count:"
-msgstr ""

priv/gettext/ga/LC_MESSAGES/errors.po

@@ -30,7 +30,7 @@ msgid "Container must be empty before deleting"
 msgstr "Caithfidh an coimeádán a bheidh follamh roimh scriosadh"
 
 #: lib/cannery_web/live/container_live/index.ex:88
-#: lib/cannery_web/live/container_live/show.ex:75
+#: lib/cannery_web/live/container_live/show.ex:71
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Ní feidir %{name} a scriosadh: %{error}"
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:609
+#: lib/cannery/ammo.ex:587
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""

priv/gettext/ga/LC_MESSAGES/prompts.po

@@ -30,7 +30,7 @@ msgid "%{name} created successfully"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:47
-#: lib/cannery_web/live/ammo_type_live/show.ex:56
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -49,7 +49,7 @@ msgid "%{name} enabled succesfully"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:81
-#: lib/cannery_web/live/container_live/show.ex:65
+#: lib/cannery_web/live/container_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
@@ -96,7 +96,7 @@ msgstr ""
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_group_live/index.ex:242
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -183,7 +183,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:41
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
@@ -204,7 +204,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:159
+#: lib/cannery_web/live/range_live/index.ex:184
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""

priv/gettext/prompts.pot

@@ -19,7 +19,7 @@ msgid "%{name} created successfully"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:47
-#: lib/cannery_web/live/ammo_type_live/show.ex:56
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -38,7 +38,7 @@ msgid "%{name} enabled succesfully"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:81
-#: lib/cannery_web/live/container_live/show.ex:65
+#: lib/cannery_web/live/container_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
@@ -85,7 +85,7 @@ msgstr ""
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_group_live/index.ex:242
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -172,7 +172,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:41
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
@@ -193,7 +193,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:159
+#: lib/cannery_web/live/range_live/index.ex:184
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""

test/cannery/ammo_test.exs

@@ -232,10 +232,7 @@ defmodule Cannery.AmmoTest do
       current_user = user_fixture()
       ammo_type = ammo_type_fixture(current_user)
       container = container_fixture(current_user)
-
+      {1, [ammo_group]} = ammo_group_fixture(%{"count" => 25}, ammo_type, container, current_user)
-      {1, [ammo_group]} =
-        %{"count" => 50, "price_paid" => 36.1}
-        |> ammo_group_fixture(ammo_type, container, current_user)
 
       [
         ammo_type: ammo_type,
@@ -427,13 +424,13 @@ defmodule Cannery.AmmoTest do
                |> Ammo.get_last_used_shot_group()
     end
 
-    test "get_percentage_remaining/1 gets accurate total round count",
+    test "get_percentage_remaining/1 gets accurate total round count for ammo type",
          %{ammo_group: ammo_group, current_user: current_user} do
       assert 100 = Ammo.get_percentage_remaining(ammo_group)
 
       shot_group_fixture(%{"count" => 14}, current_user, ammo_group)
 
-      assert 72 =
+      assert 44 =
                ammo_group
                |> Repo.reload!()
                |> Repo.preload(:shot_groups, force: true)
@@ -441,66 +438,11 @@ defmodule Cannery.AmmoTest do
 
       shot_group_fixture(%{"count" => 11}, current_user, ammo_group)
 
-      assert 50 =
-               ammo_group
-               |> Repo.reload!()
-               |> Repo.preload(:shot_groups, force: true)
-               |> Ammo.get_percentage_remaining()
-
-      shot_group_fixture(%{"count" => 25}, current_user, ammo_group)
-
       assert 0 =
                ammo_group
                |> Repo.reload!()
                |> Repo.preload(:shot_groups, force: true)
                |> Ammo.get_percentage_remaining()
     end
-
-    test "get_cpr/1 gets accurate cpr",
-         %{ammo_group: ammo_group, current_user: current_user} do
-      assert %AmmoGroup{price_paid: nil} |> Ammo.get_cpr() |> is_nil()
-      assert %AmmoGroup{count: 1, price_paid: nil} |> Ammo.get_cpr() |> is_nil()
-      assert 1.0 = %AmmoGroup{count: 1, price_paid: 1.0} |> Ammo.get_cpr()
-      assert 1.5 = %AmmoGroup{count: 2, price_paid: 3.0} |> Ammo.get_cpr()
-      assert 0.722 = %AmmoGroup{count: 50, price_paid: 36.1} |> Ammo.get_cpr()
-
-      # with shot group, maintains total
-      shot_group_fixture(%{"count" => 14}, current_user, ammo_group)
-
-      assert 0.722 =
-               ammo_group
-               |> Repo.reload!()
-               |> Repo.preload(:shot_groups, force: true)
-               |> Ammo.get_cpr()
-    end
-
-    test "get_original_count/1 gets accurate original count",
-         %{ammo_group: ammo_group, current_user: current_user} do
-      assert 50 = Ammo.get_original_count(ammo_group)
-
-      shot_group_fixture(%{"count" => 14}, current_user, ammo_group)
-
-      assert 50 =
-               ammo_group
-               |> Repo.reload!()
-               |> Repo.preload(:shot_groups, force: true)
-               |> Ammo.get_original_count()
-
-      shot_group_fixture(%{"count" => 11}, current_user, ammo_group)
-
-      assert 50 =
-               ammo_group
-               |> Repo.reload!()
-               |> Repo.preload(:shot_groups, force: true)
-               |> Ammo.get_original_count()
-
-      shot_group_fixture(%{"count" => 25}, current_user, ammo_group)
-
-      assert 50 =
-               ammo_group
-               |> Repo.reload!()
-               |> Repo.preload(:shot_groups, force: true)
-               |> Ammo.get_original_count()
-    end
   end
 end

test/cannery_web/controllers/export_controller_test.exs

@@ -58,8 +58,6 @@ defmodule CanneryWeb.ExportControllerTest do
         "price_paid" => ammo_group.price_paid,
         "staged" => ammo_group.staged,
         "used_count" => ammo_group |> Ammo.get_used_count(),
-        "original_count" => ammo_group |> Ammo.get_original_count(),
-        "cpr" => ammo_group |> Ammo.get_cpr(),
         "percentage_remaining" => ammo_group |> Ammo.get_percentage_remaining()
       }
 

test/cannery_web/live/ammo_type_live_test.exs

@@ -184,9 +184,9 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
   describe "Index with ammo group" do
     setup [:register_and_log_in_user, :create_ammo_type, :create_ammo_group]
 
-    test "shows used ammo groups on toggle",
+    test "shows additional ammo type info on toggle",
          %{conn: conn, ammo_group: ammo_group, current_user: current_user} do
-      {:ok, index_live, html} = live(conn, Routes.ammo_type_index_path(conn, :index))
+      {:ok, show_live, html} = live(conn, Routes.ammo_type_index_path(conn, :index))
 
       assert html =~ dgettext("actions", "Show used")
       refute html =~ gettext("Used rounds")
@@ -194,7 +194,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       refute html =~ gettext("Used packs")
       refute html =~ gettext("Total ever packs")
 
-      html = index_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
 
       assert html =~ gettext("Used rounds")
       assert html =~ gettext("Total ever rounds")
@@ -207,8 +207,8 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
 
       shot_group_fixture(%{"count" => 5}, current_user, ammo_group)
 
-      {:ok, index_live, _html} = live(conn, Routes.ammo_type_index_path(conn, :index))
+      {:ok, show_live, _html} = live(conn, Routes.ammo_type_index_path(conn, :index))
-      html = index_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
 
       assert html =~ "15"
       assert html =~ "5"
@@ -218,22 +218,19 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
   describe "Show ammo type" do
     setup [:register_and_log_in_user, :create_ammo_type]
 
-    test "displays ammo_type", %{
+    test "displays ammo_type", %{conn: conn, ammo_type: ammo_type} do
-      conn: conn,
-      ammo_type: %{name: name, bullet_type: bullet_type} = ammo_type
-    } do
       {:ok, _show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
-      assert html =~ name
+      assert html =~ gettext("Show Ammo type")
-      assert html =~ bullet_type
+      assert html =~ ammo_type.bullet_type
     end
 
     test "updates ammo_type within modal",
-         %{conn: conn, current_user: current_user, ammo_type: %{name: name} = ammo_type} do
+         %{conn: conn, current_user: current_user, ammo_type: ammo_type} do
       {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
       assert show_live |> element("[data-qa=\"edit\"]") |> render_click() =~
-               gettext("Edit %{ammo_type_name}", ammo_type_name: name)
+               gettext("Edit Ammo type")
 
       assert_patch(show_live, Routes.ammo_type_show_path(conn, :edit, ammo_type))
 
@@ -256,35 +253,20 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
   describe "Show ammo type with ammo group" do
     setup [:register_and_log_in_user, :create_ammo_type, :create_ammo_group]
 
-    test "displays ammo group", %{
+    test "displays ammo group", %{conn: conn, ammo_type: ammo_type, container: container} do
-      conn: conn,
-      ammo_type: %{name: ammo_type_name} = ammo_type,
-      container: %{name: container_name}
-    } do
       {:ok, _show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
-      assert html =~ ammo_type_name
+      assert html =~ gettext("Show Ammo type")
       assert html =~ "some ammo group"
-      assert html =~ container_name
+      assert html =~ container.name
-    end
-
-    test "displays ammo group in table",
-         %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
-      {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
-
-      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
-      assert_patch(show_live, Routes.ammo_type_show_path(conn, :table, ammo_type))
-
-      assert html =~ "some ammo group"
-      assert html =~ container_name
     end
   end
 
   describe "Show ammo type with empty ammo group" do
     setup [:register_and_log_in_user, :create_ammo_type, :create_empty_ammo_group]
 
-    test "displays empty ammo groups on toggle",
+    test "hides empty ammo groups by default",
-         %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
+         %{conn: conn, ammo_type: ammo_type} do
       {:ok, show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
       assert html =~ dgettext("actions", "Show used")
@@ -294,24 +276,6 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
 
       assert html =~ "some ammo group"
       assert html =~ "Empty"
-      assert html =~ container_name
-    end
-
-    test "displays empty ammo groups in table on toggle",
-         %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
-      {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
-
-      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
-      assert_patch(show_live, Routes.ammo_type_show_path(conn, :table, ammo_type))
-
-      assert html =~ dgettext("actions", "Show used")
-      refute html =~ "some ammo group"
-
-      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
-
-      assert html =~ "some ammo group"
-      assert html =~ "Empty"
-      assert html =~ container_name
     end
   end
 end

test/cannery_web/live/container_live_test.exs

@@ -46,20 +46,13 @@ defmodule CanneryWeb.ContainerLiveTest do
     %{container: container}
   end
 
-  defp create_ammo_group(%{container: container, current_user: current_user}) do
-    ammo_type = ammo_type_fixture(@ammo_type_attrs, current_user)
-    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
-
-    %{ammo_type: ammo_type, ammo_group: ammo_group}
-  end
-
   defp create_empty_ammo_group(%{container: container, current_user: current_user}) do
     ammo_type = ammo_type_fixture(@ammo_type_attrs, current_user)
     {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
     shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
     ammo_group = ammo_group |> Repo.reload!()
 
-    %{ammo_type: ammo_type, ammo_group: ammo_group, shot_group: shot_group}
+    %{ammo_group: ammo_group, shot_group: shot_group}
   end
 
   describe "Index regular" do
@@ -313,14 +306,11 @@ defmodule CanneryWeb.ContainerLiveTest do
   describe "Show" do
     setup [:register_and_log_in_user, :create_container]
 
-    test "displays container", %{
+    test "displays container", %{conn: conn, container: container} do
-      conn: conn,
-      container: %{name: name, location: location} = container
-    } do
       {:ok, _show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
 
-      assert html =~ name
+      assert html =~ gettext("Show %{name}", name: container.name)
-      assert html =~ location
+      assert html =~ container.location
     end
 
     test "updates container within modal", %{
@@ -351,34 +341,11 @@ defmodule CanneryWeb.ContainerLiveTest do
     end
   end
 
-  describe "Show with ammo group" do
-    setup [:register_and_log_in_user, :create_container, :create_ammo_group]
-
-    test "displays ammo group",
-         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
-      {:ok, _show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
-
-      assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
-    end
-
-    test "displays ammo group in table",
-         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
-      {:ok, show_live, _html} = live(conn, Routes.container_show_path(conn, :show, container))
-
-      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
-      assert_patch(show_live, Routes.container_show_path(conn, :table, container))
-
-      assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
-    end
-  end
-
   describe "Show with empty ammo group" do
     setup [:register_and_log_in_user, :create_container, :create_empty_ammo_group]
 
     test "hides empty ammo groups by default",
-         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
+         %{conn: conn, container: container} do
       {:ok, show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
 
       assert html =~ dgettext("actions", "Show used")
@@ -386,24 +353,6 @@ defmodule CanneryWeb.ContainerLiveTest do
 
       html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
 
-      assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
-      assert html =~ "Empty"
-    end
-
-    test "displays empty ammo groups in table on toggle",
-         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
-      {:ok, show_live, _html} = live(conn, Routes.container_show_path(conn, :show, container))
-
-      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
-      assert_patch(show_live, Routes.container_show_path(conn, :table, container))
-
-      assert html =~ dgettext("actions", "Show used")
-      refute html =~ "some ammo group"
-
-      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
-
-      assert html =~ ammo_type_name
       assert html =~ "some ammo group"
       assert html =~ "Empty"
     end