add length limits to all items

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.9.0
+- Add length limits to all string fields
+
+# v0.8.6
+- Fix duplicate entries showing up
+- Show ammo packs under a type in a table by default
+- Only show historical ammo type information when displaying "Show used" in table
+- Only show historical ammo pack information when displaying "Show used" in table
+- Fix some values not being sorted in tables properly
+- Code quality improvements
+- Show link to ammo pack in ammo pack table while viewing ammo type
+
 # v0.8.5
 - Add link in readme to github mirror
 - Fix tables unable to sort on empty dates

lib/cannery/accounts/invite.ex

@@ -48,8 +48,9 @@ defmodule Cannery.Accounts.Invite do
     %__MODULE__{}
     |> change(token: token, created_by_id: user_id)
     |> cast(attrs, [:name, :uses_left, :disabled_at])
-    |> validate_required([:name, :token, :created_by_id])
+    |> validate_length(:name, max: 255)
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
+    |> validate_required([:name, :token, :created_by_id])
   end
 
   @doc false
@@ -57,7 +58,8 @@ defmodule Cannery.Accounts.Invite do
   def update_changeset(invite, attrs) do
     invite
     |> cast(attrs, [:name, :uses_left, :disabled_at])
-    |> validate_required([:name])
+    |> validate_length(:name, max: 255)
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
+    |> validate_required([:name])
   end
 end

lib/cannery/accounts/user.ex

@@ -79,6 +79,7 @@ defmodule Cannery.Accounts.User do
     %User{}
     |> cast(attrs, [:email, :password, :locale])
     |> put_change(:invite_id, if(invite, do: invite.id))
+    |> validate_length(:locale, max: 255)
     |> validate_email()
     |> validate_password(opts)
   end
@@ -209,6 +210,7 @@ defmodule Cannery.Accounts.User do
   def locale_changeset(user_or_changeset, locale) do
     user_or_changeset
     |> cast(%{"locale" => locale}, [:locale])
+    |> validate_length(:locale, max: 255)
     |> validate_required(:locale)
   end
 end

lib/cannery/activity_log.ex

@@ -60,7 +60,8 @@ defmodule Cannery.ActivityLog do
             sg.search,
             ^trimmed_search
           )
-        }
+        },
+        distinct: sg.id
     )
   end
 

lib/cannery/activity_log/shot_group.ex

@@ -61,6 +61,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
     |> change(user_id: user_id)
     |> change(ammo_group_id: ammo_group_id)
     |> cast(attrs, [:count, :notes, :date])
+    |> validate_length(:notes, max: 255)
     |> validate_create_shot_group_count(ammo_group)
     |> validate_required([:date, :ammo_group_id, :user_id])
   end
@@ -68,6 +69,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
   def create_changeset(shot_group, _invalid_user, _invalid_ammo_group, attrs) do
     shot_group
     |> cast(attrs, [:count, :notes, :date])
+    |> validate_length(:notes, max: 255)
     |> validate_required([:ammo_group_id, :user_id])
     |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo pack"))
   end
@@ -99,6 +101,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
   def update_changeset(%__MODULE__{} = shot_group, user, attrs) do
     shot_group
     |> cast(attrs, [:count, :notes, :date])
+    |> validate_length(:notes, max: 255)
     |> validate_number(:count, greater_than: 0)
     |> validate_required([:count, :date])
     |> validate_update_shot_group_count(shot_group, user)

lib/cannery/ammo.ex

@@ -715,6 +715,7 @@ defmodule Cannery.Ammo do
       on: c.user_id == t.user_id,
       as: :t,
       where: ag.user_id == ^user_id,
+      distinct: ag.id,
       preload: ^@ammo_group_preloads
     )
     |> list_ammo_groups_include_empty(include_empty)
@@ -842,12 +843,39 @@ defmodule Cannery.Ammo do
 
   """
   @spec get_percentage_remaining(AmmoGroup.t(), User.t()) :: non_neg_integer()
-  def get_percentage_remaining(%AmmoGroup{count: 0, user_id: user_id}, %User{id: user_id}) do
+  def get_percentage_remaining(%AmmoGroup{id: ammo_group_id} = ammo_group, user) do
-    0
+    [ammo_group]
+    |> get_percentages_remaining(user)
+    |> Map.fetch!(ammo_group_id)
   end
 
-  def get_percentage_remaining(%AmmoGroup{count: count} = ammo_group, current_user) do
+  @doc """
-    round(count / get_original_count(ammo_group, current_user) * 100)
+  Calculates the percentages remaining of multiple ammo groups out of 100
+
+  ## Examples
+
+      iex> get_percentages_remaining(
+      ...>   [%AmmoGroup{id: 123, count: 5, user_id: 456}],
+      ...>   %User{id: 456}
+      ...> )
+      %{123 => 100}
+
+  """
+  @spec get_percentages_remaining([AmmoGroup.t()], User.t()) ::
+          %{optional(AmmoGroup.id()) => non_neg_integer()}
+  def get_percentages_remaining(ammo_groups, %User{id: user_id} = user) do
+    original_counts = get_original_counts(ammo_groups, user)
+
+    ammo_groups
+    |> Map.new(fn %AmmoGroup{id: ammo_group_id, count: count, user_id: ^user_id} ->
+      percentage =
+        case count do
+          0 -> 0
+          count -> round(count / Map.fetch!(original_counts, ammo_group_id) * 100)
+        end
+
+      {ammo_group_id, percentage}
+    end)
   end
 
   @doc """

lib/cannery/ammo/ammo_type.ex

@@ -42,7 +42,7 @@ defmodule Cannery.Ammo.AmmoType do
     field :name, :string
     field :desc, :string
 
-    # https://en.wikipedia.org/wiki/Bullet#Abbreviations
+    # https://shootersreference.com/reloadingdata/bullet_abbreviations/
     field :bullet_type, :string
     field :bullet_core, :string
     field :cartridge, :string
@@ -129,20 +129,46 @@ defmodule Cannery.Ammo.AmmoType do
       :upc
     ]
 
+  @spec string_fields() :: [atom()]
+  defp string_fields,
+    do: [
+      :name,
+      :bullet_type,
+      :bullet_core,
+      :cartridge,
+      :caliber,
+      :case_material,
+      :jacket_type,
+      :powder_type,
+      :pressure,
+      :primer_type,
+      :firing_type,
+      :manufacturer,
+      :upc
+    ]
+
   @doc false
   @spec create_changeset(new_ammo_type(), User.t(), attrs :: map()) :: changeset()
   def create_changeset(ammo_type, %User{id: user_id}, attrs) do
+    changeset =
       ammo_type
       |> change(user_id: user_id)
       |> cast(attrs, changeset_fields())
+
+    string_fields()
+    |> Enum.reduce(changeset, fn field, acc -> acc |> validate_length(field, max: 255) end)
     |> validate_required([:name, :user_id])
   end
 
   @doc false
   @spec update_changeset(t() | new_ammo_type(), attrs :: map()) :: changeset()
   def update_changeset(ammo_type, attrs) do
+    changeset =
       ammo_type
       |> cast(attrs, changeset_fields())
+
+    string_fields()
+    |> Enum.reduce(changeset, fn field, acc -> acc |> validate_length(field, max: 255) end)
     |> validate_required(:name)
   end
 end

lib/cannery/containers.ex

@@ -32,6 +32,7 @@ defmodule Cannery.Containers do
       as: :t,
       where: c.user_id == ^user_id,
       order_by: c.name,
+      distinct: c.id,
       preload: ^@container_preloads
     )
     |> list_containers_search(search)
@@ -91,7 +92,7 @@ defmodule Cannery.Containers do
   @doc """
   Gets a single container.
 
-  Raises `Ecto.NoResultsError` if the Container does not exist.
+  Raises `KeyError` if the Container does not exist.
 
   ## Examples
 
@@ -99,18 +100,37 @@ defmodule Cannery.Containers do
       %Container{}
 
       iex> get_container!(456, %User{id: 123})
-      ** (Ecto.NoResultsError)
+      ** (KeyError)
 
   """
   @spec get_container!(Container.id(), User.t()) :: Container.t()
-  def get_container!(id, %User{id: user_id}) do
+  def get_container!(id, user) do
-    Repo.one!(
+    [id]
+    |> get_containers(user)
+    |> Map.fetch!(id)
+  end
+
+  @doc """
+  Gets multiple containers.
+
+
+  ## Examples
+
+      iex> get_containers([123], %User{id: 123})
+      %{123 => %Container{}}
+
+  """
+  @spec get_containers([Container.id()], User.t()) :: %{optional(Container.id()) => Container.t()}
+  def get_containers(ids, %User{id: user_id}) do
+    Repo.all(
       from c in Container,
         where: c.user_id == ^user_id,
-        where: c.id == ^id,
+        where: c.id in ^ids,
         order_by: c.name,
-        preload: ^@container_preloads
+        preload: ^@container_preloads,
+        select: {c.id, c}
     )
+    |> Map.new()
   end
 
   @doc """

lib/cannery/containers/container.ex

@@ -53,6 +53,8 @@ defmodule Cannery.Containers.Container do
     container
     |> change(user_id: user_id)
     |> cast(attrs, [:name, :desc, :type, :location])
+    |> validate_length(:name, max: 255)
+    |> validate_length(:type, max: 255)
     |> validate_required([:name, :type, :user_id])
   end
 
@@ -61,6 +63,8 @@ defmodule Cannery.Containers.Container do
   def update_changeset(container, attrs) do
     container
     |> cast(attrs, [:name, :desc, :type, :location])
+    |> validate_length(:name, max: 255)
+    |> validate_length(:type, max: 255)
     |> validate_required([:name, :type])
   end
 end

lib/cannery/containers/tag.ex

@@ -47,6 +47,9 @@ defmodule Cannery.Containers.Tag do
     tag
     |> change(user_id: user_id)
     |> cast(attrs, [:name, :bg_color, :text_color])
+    |> validate_length(:name, max: 255)
+    |> validate_length(:bg_color, max: 12)
+    |> validate_length(:text_color, max: 12)
     |> validate_required([:name, :bg_color, :text_color, :user_id])
   end
 
@@ -55,6 +58,9 @@ defmodule Cannery.Containers.Tag do
   def update_changeset(tag, attrs) do
     tag
     |> cast(attrs, [:name, :bg_color, :text_color])
+    |> validate_length(:name, max: 255)
+    |> validate_length(:bg_color, max: 12)
+    |> validate_length(:text_color, max: 12)
     |> validate_required([:name, :bg_color, :text_color])
   end
 end

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -39,6 +39,7 @@
     <%= textarea(f, :notes,
       id: "add-shot-group-form-notes",
       class: "input input-primary col-span-2",
+      maxlength: 255,
       placeholder: gettext("Really great weather"),
       phx_hook: "MaintainAttrs",
       phx_update: "ignore"

lib/cannery_web/components/ammo_group_table_component.ex

@@ -14,6 +14,7 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
             required(:id) => UUID.t(),
             required(:current_user) => User.t(),
             required(:ammo_groups) => [AmmoGroup.t()],
+            required(:show_used) => boolean(),
             optional(:ammo_type) => Rendered.t(),
             optional(:range) => Rendered.t(),
             optional(:container) => Rendered.t(),
@@ -22,7 +23,11 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{id: _id, ammo_groups: _ammo_group, current_user: _current_user} = assigns, socket) do
+  def update(
+        %{id: _id, ammo_groups: _ammo_group, current_user: _current_user, show_used: _show_used} =
+          assigns,
+        socket
+      ) do
     socket =
       socket
       |> assign(assigns)
@@ -43,7 +48,8 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
              ammo_type: ammo_type,
              range: range,
              container: container,
-             actions: actions
+             actions: actions,
+             show_used: show_used
            }
          } = socket
        ) do
@@ -74,12 +80,24 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
       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("CPR"), key: :cpr}
-      %{label: gettext("% left"), key: :remaining},
+      | columns
-      %{label: gettext("Notes"), key: :notes}
+    ]
+
+    columns =
+      if show_used do
+        [
+          %{label: gettext("Original Count"), key: :original_count},
+          %{label: gettext("% left"), key: :remaining}
+          | columns
+        ]
+      else
+        columns
+      end
+
+    columns = [
+      %{label: if(show_used, do: gettext("Current Count"), else: gettext("Count")), key: :count}
       | columns
     ]
 
@@ -90,14 +108,21 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
         [%{label: gettext("Ammo type"), key: :ammo_type} | columns]
       end
 
+    containers =
+      ammo_groups
+      |> Enum.map(fn %{container_id: container_id} -> container_id end)
+      |> Containers.get_containers(current_user)
+
     extra_data = %{
       current_user: current_user,
       ammo_type: ammo_type,
       columns: columns,
       container: container,
+      containers: containers,
       original_counts: Ammo.get_original_counts(ammo_groups, current_user),
       cprs: Ammo.get_cprs(ammo_groups, current_user),
       last_used_dates: ActivityLog.get_last_used_dates(ammo_groups, current_user),
+      percentages_remaining: Ammo.get_percentages_remaining(ammo_groups, current_user),
       actions: actions,
       range: range
     }
@@ -148,10 +173,11 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
      """}
   end
 
-  defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data), do: {"", nil}
+  defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data),
+    do: {0, gettext("No cost information")}
 
   defp get_value_for_key(:price_paid, %{price_paid: price_paid}, _additional_data),
-    do: gettext("$%{amount}", amount: display_currency(price_paid))
+    do: {price_paid, gettext("$%{amount}", amount: display_currency(price_paid))}
 
   defp get_value_for_key(:purchased_on, %{purchased_on: purchased_on} = assigns, _additional_data) do
     {purchased_on,
@@ -183,11 +209,14 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
      """}
   end
 
-  defp get_value_for_key(:remaining, ammo_group, %{current_user: current_user}),
+  defp get_value_for_key(
-    do:
+         :remaining,
-      gettext("%{percentage}%",
+         %{id: ammo_group_id},
-        percentage: ammo_group |> Ammo.get_percentage_remaining(current_user)
+         %{percentages_remaining: percentages_remaining}
-      )
+       ) do
+    percentage = Map.fetch!(percentages_remaining, ammo_group_id)
+    {percentage, gettext("%{percentage}%", percentage: percentage)}
+  end
 
   defp get_value_for_key(:actions, ammo_group, %{actions: actions}) do
     assigns = %{actions: actions, ammo_group: ammo_group}
@@ -202,12 +231,13 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
   defp get_value_for_key(
          :container,
          %{container_id: container_id} = ammo_group,
-         %{container: container, current_user: current_user}
+         %{container: container_block, containers: containers}
        ) do
+    container = %{name: container_name} = Map.fetch!(containers, container_id)
+
     assigns = %{
-      container:
+      container: container,
-        %{name: container_name} = container_id |> Containers.get_container!(current_user),
+      container_block: container_block,
-      container_block: container,
       ammo_group: ammo_group
     }
 
@@ -217,21 +247,24 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
      """}
   end
 
-  defp get_value_for_key(:original_count, %{id: ammo_group_id}, %{
+  defp get_value_for_key(
-         original_counts: original_counts
+         :original_count,
-       }) do
+         %{id: ammo_group_id},
+         %{original_counts: original_counts}
+       ) do
     Map.fetch!(original_counts, ammo_group_id)
   end
 
   defp get_value_for_key(:cpr, %{price_paid: nil}, _additional_data),
-    do: gettext("No cost information")
+    do: {0, gettext("No cost information")}
 
   defp get_value_for_key(:cpr, %{id: ammo_group_id}, %{cprs: cprs}) do
-    gettext("$%{amount}", amount: display_currency(Map.fetch!(cprs, ammo_group_id)))
+    amount = Map.fetch!(cprs, ammo_group_id)
+    {amount, gettext("$%{amount}", amount: display_currency(amount))}
   end
 
   defp get_value_for_key(:count, %{count: count}, _additional_data),
-    do: if(count == 0, do: gettext("Empty"), else: count)
+    do: if(count == 0, do: {0, gettext("Empty")}, else: count)
 
   defp get_value_for_key(key, ammo_group, _additional_data), do: ammo_group |> Map.get(key)
 

lib/cannery_web/components/ammo_type_table_component.ex

@@ -103,13 +103,13 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
           [
             %{
               label: gettext("Used packs"),
-              key: :used_packs_count,
+              key: :used_pack_count,
-              type: :used_packs_count
+              type: :used_pack_count
             },
             %{
               label: gettext("Total ever packs"),
-              key: :historical_packs_count,
+              key: :historical_pack_count,
-              type: :historical_packs_count
+              type: :historical_pack_count
             }
           ]
         else
@@ -122,23 +122,21 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
       ])
 
     round_counts = ammo_types |> Ammo.get_round_count_for_ammo_types(current_user)
-
-    used_counts =
-      show_used && ammo_types |> ActivityLog.get_used_count_for_ammo_types(current_user)
-
-    historical_round_counts =
-      show_used && ammo_types |> Ammo.get_historical_count_for_ammo_types(current_user)
-
     packs_count = ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user)
-
-    historical_packs_count =
-      show_used && ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user, true)
-
-    used_packs_count =
-      show_used && ammo_types |> Ammo.get_used_ammo_groups_count_for_types(current_user)
-
     average_costs = ammo_types |> Ammo.get_average_cost_for_ammo_types(current_user)
 
+    [used_counts, historical_round_counts, historical_pack_counts, used_pack_counts] =
+      if show_used do
+        [
+          ammo_types |> ActivityLog.get_used_count_for_ammo_types(current_user),
+          ammo_types |> Ammo.get_historical_count_for_ammo_types(current_user),
+          ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user, true),
+          ammo_types |> Ammo.get_used_ammo_groups_count_for_types(current_user)
+        ]
+      else
+        [nil, nil, nil, nil]
+      end
+
     extra_data = %{
       actions: actions,
       current_user: current_user,
@@ -146,8 +144,8 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
       round_counts: round_counts,
       historical_round_counts: historical_round_counts,
       packs_count: packs_count,
-      used_packs_count: used_packs_count,
+      used_pack_counts: used_pack_counts,
-      historical_packs_count: historical_packs_count,
+      historical_pack_counts: historical_pack_counts,
       average_costs: average_costs
     }
 
@@ -185,54 +183,68 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
     do: ammo_type |> Map.get(key) |> humanize()
 
   defp get_ammo_type_value(:round_count, _key, %{id: ammo_type_id}, %{round_counts: round_counts}),
-    do: Map.get(round_counts, ammo_type_id)
+    do: Map.get(round_counts, ammo_type_id, 0)
 
   defp get_ammo_type_value(
          :historical_round_count,
          _key,
          %{id: ammo_type_id},
          %{historical_round_counts: historical_round_counts}
-       ),
+       ) do
-       do: Map.get(historical_round_counts, ammo_type_id)
+    Map.get(historical_round_counts, ammo_type_id, 0)
-
+  end
-  defp get_ammo_type_value(:used_round_count, _key, %{id: ammo_type_id}, %{
-         used_counts: used_counts
-       }),
-       do: Map.get(used_counts, ammo_type_id)
 
   defp get_ammo_type_value(
-         :historical_packs_count,
+         :used_round_count,
          _key,
          %{id: ammo_type_id},
-         %{historical_packs_count: historical_packs_count}
+         %{used_counts: used_counts}
-       ),
+       ) do
-       do: Map.get(historical_packs_count, ammo_type_id)
+    Map.get(used_counts, ammo_type_id, 0)
+  end
 
-  defp get_ammo_type_value(:used_packs_count, _key, %{id: ammo_type_id}, %{
+  defp get_ammo_type_value(
-         used_packs_count: used_packs_count
+         :historical_pack_count,
-       }),
+         _key,
-       do: Map.get(used_packs_count, ammo_type_id)
+         %{id: ammo_type_id},
+         %{historical_pack_counts: historical_pack_counts}
+       ) do
+    Map.get(historical_pack_counts, ammo_type_id, 0)
+  end
+
+  defp get_ammo_type_value(
+         :used_pack_count,
+         _key,
+         %{id: ammo_type_id},
+         %{used_pack_counts: used_pack_counts}
+       ) do
+    Map.get(used_pack_counts, ammo_type_id, 0)
+  end
 
   defp get_ammo_type_value(:ammo_count, _key, %{id: ammo_type_id}, %{packs_count: packs_count}),
     do: Map.get(packs_count, ammo_type_id)
 
-  defp get_ammo_type_value(:avg_price_paid, _key, %{id: ammo_type_id}, %{
+  defp get_ammo_type_value(
-         average_costs: average_costs
+         :avg_price_paid,
-       }) do
+         _key,
+         %{id: ammo_type_id},
+         %{average_costs: average_costs}
+       ) do
     case Map.get(average_costs, ammo_type_id) do
-      nil -> gettext("No cost information")
+      nil -> {0, gettext("No cost information")}
-      count -> gettext("$%{amount}", amount: display_currency(count))
+      count -> {count, gettext("$%{amount}", amount: display_currency(count))}
     end
   end
 
-  defp get_ammo_type_value(:name, _key, ammo_type, _other_data) do
+  defp get_ammo_type_value(:name, _key, %{name: ammo_type_name} = ammo_type, _other_data) 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_ammo_type_value(:actions, _key, ammo_type, %{actions: actions}) do

lib/cannery_web/components/core_components.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.CoreComponents do
   import CanneryWeb.{Gettext, ViewHelpers}
   alias Cannery.{Accounts, Accounts.Invite, Accounts.User}
   alias Cannery.{Ammo, Ammo.AmmoGroup}
-  alias Cannery.{Containers, Containers.Container, Containers.Tag}
+  alias Cannery.{Containers.Container, Containers.Tag}
   alias CanneryWeb.{Endpoint, HomeLive}
   alias CanneryWeb.Router.Helpers, as: Routes
   alias Phoenix.LiveView.{JS, Rendered}
@@ -91,7 +91,7 @@ defmodule CanneryWeb.CoreComponents do
   attr :original_count, :integer, default: nil
   attr :cpr, :integer, default: nil
   attr :last_used_date, Date, default: nil
-  attr :show_container, :boolean, default: false
+  attr :container, Container, default: nil
   slot(:inner_block)
 
   def ammo_group_card(assigns)

lib/cannery_web/components/core_components/ammo_group_card.html.heex

@@ -50,17 +50,11 @@
       <%= gettext("$%{amount}", amount: display_currency(@cpr)) %>
     </span>
 
-    <span
+    <span :if={@container} class="rounded-lg title text-lg">
-      :if={@show_container && Containers.get_container!(@ammo_group.container_id, @current_user)}
-      class="rounded-lg title text-lg"
-    >
       <%= gettext("Container:") %>
 
-      <.link
+      <.link navigate={Routes.container_show_path(Endpoint, :show, @container)} class="link">
-        navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container_id)}
+        <%= @container.name %>
-        class="link"
-      >
-        <%= Containers.get_container!(@ammo_group.container_id, @current_user).name %>
       </.link>
     </span>
   </div>

lib/cannery_web/components/core_components/modal.html.heex

@@ -6,6 +6,7 @@
     p-8 flex flex-col justify-center items-center cursor-auto"
   style="background-color: rgba(0,0,0,0.4);"
   phx-remove={hide_modal()}
+  aria-label={gettext("Close modal")}
 >
   <span class="hidden"></span>
 </.link>
@@ -31,6 +32,7 @@
         text-gray-500 hover:text-gray-800
         transition-all duration-500 ease-in-out"
       phx-remove={hide_modal()}
+      aria-label={gettext("Close modal")}
     >
       <i class="fa-fw fa-lg fas fa-times"></i>
     </.link>

lib/cannery_web/controllers/export_controller.ex

@@ -32,18 +32,17 @@ defmodule CanneryWeb.ExportController do
     used_counts = ammo_groups |> ActivityLog.get_used_counts(current_user)
     original_counts = ammo_groups |> Ammo.get_original_counts(current_user)
     cprs = ammo_groups |> Ammo.get_cprs(current_user)
+    percentages_remaining = ammo_groups |> Ammo.get_percentages_remaining(current_user)
 
     ammo_groups =
       ammo_groups
       |> Enum.map(fn %{id: ammo_group_id} = ammo_group ->
-        percentage_remaining = ammo_group |> Ammo.get_percentage_remaining(current_user)
-
         ammo_group
         |> Jason.encode!()
         |> Jason.decode!()
         |> Map.merge(%{
           "used_count" => Map.get(used_counts, ammo_group_id),
-          "percentage_remaining" => percentage_remaining,
+          "percentage_remaining" => Map.fetch!(percentages_remaining, ammo_group_id),
           "original_count" => Map.get(original_counts, ammo_group_id),
           "cpr" => Map.get(cprs, ammo_group_id)
         })

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

@@ -78,6 +78,7 @@
       id="ammo-group-index-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">

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

@@ -19,7 +19,10 @@
     </div>
 
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
-    <%= text_input(f, :name, class: "text-center col-span-2 input input-primary") %>
+    <%= text_input(f, :name,
+      class: "text-center col-span-2 input input-primary",
+      maxlength: 255
+    ) %>
     <%= error_tag(f, :name, "col-span-3 text-center") %>
 
     <%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-600") %>
@@ -40,6 +43,7 @@
     <%= label(f, :bullet_type, gettext("Bullet type"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :bullet_type,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("FMJ")
     ) %>
     <%= error_tag(f, :bullet_type, "col-span-3 text-center") %>
@@ -47,6 +51,7 @@
     <%= label(f, :bullet_core, gettext("Bullet core"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :bullet_core,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("Steel")
     ) %>
     <%= error_tag(f, :bullet_core, "col-span-3 text-center") %>
@@ -54,6 +59,7 @@
     <%= label(f, :cartridge, gettext("Cartridge"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :cartridge,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("5.56x46mm NATO")
     ) %>
     <%= error_tag(f, :cartridge, "col-span-3 text-center") %>
@@ -61,6 +67,7 @@
     <%= label(f, :caliber, gettext("Caliber"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :caliber,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext(".223")
     ) %>
     <%= error_tag(f, :caliber, "col-span-3 text-center") %>
@@ -68,6 +75,7 @@
     <%= label(f, :case_material, gettext("Case material"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :case_material,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("Brass")
     ) %>
     <%= error_tag(f, :case_material, "col-span-3 text-center") %>
@@ -75,6 +83,7 @@
     <%= label(f, :jacket_type, gettext("Jacket type"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :jacket_type,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("Bimetal")
     ) %>
     <%= error_tag(f, :case_material, "col-span-3 text-center") %>
@@ -90,7 +99,10 @@
     <%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %>
 
     <%= label(f, :powder_type, gettext("Powder type"), class: "title text-lg text-primary-600") %>
-    <%= text_input(f, :powder_type, class: "text-center col-span-2 input input-primary") %>
+    <%= text_input(f, :powder_type,
+      class: "text-center col-span-2 input input-primary",
+      maxlength: 255
+    ) %>
     <%= error_tag(f, :powder_type, "col-span-3 text-center") %>
 
     <%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"),
@@ -114,6 +126,7 @@
     <%= label(f, :pressure, gettext("Pressure"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :pressure,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("+P")
     ) %>
     <%= error_tag(f, :pressure, "col-span-3 text-center") %>
@@ -121,6 +134,7 @@
     <%= label(f, :primer_type, gettext("Primer type"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :primer_type,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("Boxer")
     ) %>
     <%= error_tag(f, :primer_type, "col-span-3 text-center") %>
@@ -128,6 +142,7 @@
     <%= label(f, :firing_type, gettext("Firing type"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :firing_type,
       class: "text-center col-span-2 input input-primary",
+      maxlength: 255,
       placeholder: gettext("Centerfire")
     ) %>
     <%= error_tag(f, :firing_type, "col-span-3 text-center") %>
@@ -149,11 +164,17 @@
     <%= error_tag(f, :corrosive, "col-span-3 text-center") %>
 
     <%= label(f, :manufacturer, gettext("Manufacturer"), class: "title text-lg text-primary-600") %>
-    <%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %>
+    <%= text_input(f, :manufacturer,
+      class: "text-center col-span-2 input input-primary",
+      maxlength: 255
+    ) %>
     <%= error_tag(f, :manufacturer, "col-span-3 text-center") %>
 
     <%= label(f, :upc, gettext("UPC"), class: "title text-lg text-primary-600") %>
-    <%= text_input(f, :upc, class: "text-center col-span-2 input input-primary") %>
+    <%= text_input(f, :upc,
+      class: "text-center col-span-2 input input-primary",
+      maxlength: 255
+    ) %>
     <%= error_tag(f, :upc, "col-span-3 text-center") %>
 
     <%= submit(dgettext("actions", "Save"),

lib/cannery_web/live/ammo_type_live/show.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{ActivityLog, Ammo, Ammo.AmmoType}
+  alias Cannery.{ActivityLog, Ammo, Ammo.AmmoType, Containers}
   alias CanneryWeb.Endpoint
 
   @fields_list [
@@ -30,17 +30,12 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   ]
 
   @impl true
-  def mount(_params, _session, %{assigns: %{live_action: live_action}} = socket),
+  def mount(_params, _session, socket),
-    do: {:ok, socket |> assign(show_used: false, view_table: live_action == :table)}
+    do: {:ok, socket |> assign(show_used: false, view_table: true)}
 
   @impl true
-  def handle_params(%{"id" => id}, _params, %{assigns: %{live_action: live_action}} = socket) do
+  def handle_params(%{"id" => id}, _params, socket) do
-    socket =
+    {:noreply, socket |> display_ammo_type(id)}
-      socket
-      |> assign(view_table: live_action == :table)
-      |> display_ammo_type(id)
-
-    {:noreply, socket}
   end
 
   @impl true
@@ -61,23 +56,14 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_type()}
   end
 
-  def handle_event(
+  def handle_event("toggle_table", _params, %{assigns: %{view_table: view_table}} = socket) do
-        "toggle_table",
+    {:noreply, socket |> assign(:view_table, !view_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 |> push_patch(to: new_path)}
   end
 
   defp display_ammo_type(
          %{assigns: %{live_action: live_action, current_user: current_user, show_used: show_used}} =
            socket,
-         %AmmoType{} = ammo_type
+         %AmmoType{name: ammo_type_name} = ammo_type
        ) do
     fields_to_display =
       @fields_list
@@ -112,11 +98,23 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
         [nil, nil, nil, nil, nil]
       end
 
+    page_title =
+      case live_action do
+        :show -> ammo_type_name
+        :edit -> gettext("Edit %{ammo_type_name}", ammo_type_name: ammo_type_name)
+      end
+
+    containers =
+      ammo_groups
+      |> Enum.map(fn %{container_id: container_id} -> container_id end)
+      |> Containers.get_containers(current_user)
+
     socket
     |> assign(
-      page_title: page_title(live_action, ammo_type),
+      page_title: page_title,
       ammo_type: ammo_type,
       ammo_groups: ammo_groups,
+      containers: containers,
       cprs: ammo_groups |> Ammo.get_cprs(current_user),
       last_used_dates: ammo_groups |> ActivityLog.get_last_used_dates(current_user),
       avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type(current_user),
@@ -142,10 +140,4 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
 
   @spec display_currency(float()) :: String.t()
   defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
-
-  defp page_title(action, %{name: ammo_type_name}) when action in [:show, :table],
-    do: ammo_type_name
-
-  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

@@ -170,6 +170,7 @@
           id="ammo-type-show-table"
           ammo_groups={@ammo_groups}
           current_user={@current_user}
+          show_used={@show_used}
         >
           <:container :let={{_ammo_group, %{name: container_name} = container}}>
             <.link
@@ -179,17 +180,32 @@
               <%= container_name %>
             </.link>
           </:container>
+          <:actions :let={%{count: ammo_group_count} = 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"
+                aria-label={
+                  dgettext("actions", "View ammo group of %{ammo_group_count} bullets",
+                    ammo_group_count: ammo_group_count
+                  )
+                }
+              >
+                <i class="fa-fw fa-lg fas fa-eye"></i>
+              </.link>
+            </div>
+          </:actions>
         </.live_component>
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
           <.ammo_group_card
-            :for={%{id: ammo_group_id} = ammo_group <- @ammo_groups}
+            :for={%{id: ammo_group_id, container_id: container_id} = ammo_group <- @ammo_groups}
             ammo_group={ammo_group}
             original_count={@original_counts && Map.fetch!(@original_counts, ammo_group_id)}
             cpr={Map.get(@cprs, ammo_group_id)}
             last_used_date={Map.get(@last_used_dates, ammo_group_id)}
             current_user={@current_user}
-            show_container={true}
+            container={Map.fetch!(@containers, container_id)}
           />
         </div>
       <% end %>

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

@@ -21,7 +21,8 @@
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :name,
       class: "input input-primary col-span-2",
-      placeholder: gettext("My cool ammo can")
+      placeholder: gettext("My cool ammo can"),
+      maxlength: 255
     ) %>
     <%= error_tag(f, :name, "col-span-3 text-center") %>
 
@@ -38,7 +39,8 @@
     <%= label(f, :type, gettext("Type"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :type,
       class: "input input-primary col-span-2",
-      placeholder: gettext("Magazine, Clip, Ammo Box, etc")
+      placeholder: gettext("Magazine, Clip, Ammo Box, etc"),
+      maxlength: 255
     ) %>
     <%= error_tag(f, :type, "col-span-3 text-center") %>
 

lib/cannery_web/live/container_live/show.ex

@@ -104,7 +104,7 @@ defmodule CanneryWeb.ContainerLive.Show do
 
     page_title =
       case live_action do
-        action when action in [:show, :table] -> container_name
+        :show -> 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

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

lib/cannery_web/live/invite_live/form_component.html.heex

@@ -18,7 +18,10 @@
       <%= changeset_errors(@changeset) %>
     </div>
 
-    <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
+    <%= label(f, :name, gettext("Name"),
+      class: "title text-lg text-primary-600",
+      maxlength: 255
+    ) %>
     <%= text_input(f, :name, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :name, "col-span-3") %>
 

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

@@ -31,6 +31,7 @@
     <%= textarea(f, :notes,
       id: "shot-group-form-notes",
       class: "input input-primary col-span-2",
+      maxlength: 255,
       placeholder: gettext("Really great weather"),
       phx_hook: "MaintainAttrs",
       phx_update: "ignore"

lib/cannery_web/live/tag_live/form_component.html.heex

@@ -19,7 +19,7 @@
     </div>
 
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
-    <%= text_input(f, :name, class: "input input-primary col-span-2") %>
+    <%= text_input(f, :name, class: "input input-primary col-span-2", maxlength: 255) %>
     <%= error_tag(f, :name, "col-span-3") %>
 
     <%= label(f, :bg_color, gettext("Background color"), class: "title text-lg text-primary-600") %>

lib/cannery_web/router.ex

@@ -77,7 +77,6 @@ defmodule CanneryWeb.Router do
 
     live "/type/:id", AmmoTypeLive.Show, :show
     live "/type/:id/edit", AmmoTypeLive.Show, :edit
-    live "/type/:id/table", AmmoTypeLive.Show, :table
 
     live "/containers", ContainerLive.Index, :index
     live "/containers/new", ContainerLive.Index, :new

mix.exs

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

priv/gettext/actions.pot

@@ -120,12 +120,12 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:56
+#: lib/cannery_web/components/add_shot_group_component.html.heex:57
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:180
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:104
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:105
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 #: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
@@ -209,7 +209,7 @@ msgid "add an ammo type first"
 msgstr ""
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:121
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:122
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:143
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
@@ -321,7 +321,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -342,18 +342,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:155
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:170
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:171
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:189
 #, elixir-autogen, elixir-format
 msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -133,12 +133,12 @@ msgstr "Bestätigungsmail erneut senden"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:56
+#: lib/cannery_web/components/add_shot_group_component.html.heex:57
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:180
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -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:104
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:105
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 #: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
@@ -222,7 +222,7 @@ msgid "add an ammo type first"
 msgstr ""
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:121
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:122
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -313,7 +313,7 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:143
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Munition markieren"
@@ -345,7 +345,7 @@ msgstr "Munition markieren"
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -355,18 +355,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:155
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:170
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:171
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:189
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -38,7 +38,7 @@ msgstr "Admins:"
 msgid "Ammo"
 msgstr "Munition"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:90
+#: lib/cannery_web/components/ammo_group_table_component.ex:108
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
@@ -50,47 +50,47 @@ msgid "Background color"
 msgstr "Hintergrundfarbe"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:65
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:143
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr "Knallpatrone"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr "Messing"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:47
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr "Projektilkern"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr "Patronenart"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:49
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:61
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr "Kaliber"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:48
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr "Patrone"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:50
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr "Gehäusematerial"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: 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:59
 #, elixir-autogen, elixir-format
@@ -106,12 +106,12 @@ msgid "Containers"
 msgstr "Behälter"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:66
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:147
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr "Korrosiv"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:77
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
@@ -124,8 +124,8 @@ msgid "Count:"
 msgstr "Anzahl:"
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:28
-#: lib/cannery_web/live/container_live/form_component.html.heex:28
+#: lib/cannery_web/live/container_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
@@ -151,24 +151,24 @@ msgstr "Einladung bearbeiten"
 msgid "Edit Tag"
 msgstr "Tag bearbeiten"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Example bullet type abbreviations"
 msgstr "Beispiel Munitionstyp Abkürzungen"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr "VM"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:59
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr "Körner"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:64
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr "Brandmunition"
@@ -202,7 +202,7 @@ msgstr "Für 60 Tage eingeloggt bleiben"
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
-#: lib/cannery_web/live/container_live/form_component.html.heex:45
+#: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr "Standort"
@@ -213,18 +213,18 @@ msgstr "Standort"
 msgid "Location:"
 msgstr "Standort:"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr "Magazin, Ladestreifen, Munitionskiste usw."
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:67
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:151
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:166
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr "Hersteller"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:32
+#: lib/cannery_web/live/container_live/form_component.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr "Metallene Munitionskiste mit Anime-Girl-Sticker"
@@ -296,7 +296,6 @@ msgid "No tags"
 msgstr "Keine Tags"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
-#: lib/cannery_web/components/ammo_group_table_component.ex:82
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.ex:92
@@ -311,18 +310,18 @@ msgstr "Bemerkungen"
 msgid "Notes:"
 msgstr "Bemerkungen:"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:49
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr "Auf dem Bücherregal"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:60
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:114
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr "Druck"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
+#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
@@ -334,7 +333,7 @@ msgid "Price paid:"
 msgstr "Kaufpreis:"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:61
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:134
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr "Zündertyp"
@@ -367,7 +366,7 @@ msgstr "Einstellungen"
 msgid "Simple:"
 msgstr "Einfach:"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr "Stahl"
@@ -402,14 +401,14 @@ msgid "The self-hosted firearm tracker website"
 msgstr "Die selbst-gehostete Website zur Verwaltung von Schusswaffen"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:63
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:135
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr "Leuchtspur"
 
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr "Art"
@@ -425,7 +424,7 @@ msgstr "Art:"
 msgid "Users"
 msgstr "Benutzer"
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:25
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr "Verbleibende Nutzung"
@@ -440,7 +439,7 @@ 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:73
+#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -451,10 +450,10 @@ msgstr "Schießplatz"
 msgid "Range day"
 msgstr "Range Day"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
+#: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
 #: lib/cannery_web/live/ammo_group_live/show.ex:93
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr "Datum"
@@ -526,9 +525,9 @@ msgstr "Kein weiterer Behälter"
 msgid "Shot log"
 msgstr "Schießkladde"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:154
+#: lib/cannery_web/components/ammo_group_table_component.ex:180
-#: lib/cannery_web/components/ammo_group_table_component.ex:230
+#: lib/cannery_web/components/ammo_group_table_component.ex:263
-#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/ammo_type_table_component.ex:235
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
@@ -538,37 +537,37 @@ msgstr "Schießkladde"
 msgid "$%{amount}"
 msgstr "$%{amount}"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr "Bimetall"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:51
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr "Patronenhülse"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:52
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:91
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr "Mündungsgeschwindigkeit"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr "Pulverkörner pro Ladung"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:53
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:101
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr "Pulverart"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:68
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:155
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr "UPC"
@@ -592,7 +591,7 @@ msgid "New password"
 msgstr "Neues Passwort"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:62
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr "Patronenhülsenform"
@@ -621,14 +620,15 @@ msgstr "Editiere %{name} Tags"
 msgid "Rounds:"
 msgstr "Patronen:"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
+#: lib/cannery_web/components/ammo_group_table_component.ex:177
-#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/components/ammo_group_table_component.ex:259
+#: lib/cannery_web/components/ammo_type_table_component.ex:234
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "Keine Preisinformationen"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:81
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% verbleibend"
@@ -791,12 +791,12 @@ msgstr ""
 msgid "isn't he cute >:3"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:29
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr "Behälter"
@@ -809,7 +809,7 @@ msgstr "Behälter"
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:188
+#: lib/cannery_web/components/ammo_group_table_component.ex:218
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -991,18 +991,18 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:150
+#: lib/cannery_web/live/ammo_type_live/show.ex:104
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{ammo_type_name}"
 msgstr "%{name} bearbeiten"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:234
+#: lib/cannery_web/components/ammo_group_table_component.ex:267
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
@@ -1012,7 +1012,7 @@ msgstr ""
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:78
+#: lib/cannery_web/components/ammo_group_table_component.ex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr "Ursprüngliche Anzahl:"
@@ -1032,7 +1032,7 @@ msgstr ""
 msgid "Total packs:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
@@ -1042,12 +1042,12 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:172
+#: lib/cannery_web/components/ammo_group_table_component.ex:198
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:58
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
@@ -1199,38 +1199,38 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:117
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:57
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:43
-#: lib/cannery_web/live/range_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:54
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:121
 #: lib/cannery_web/components/container_table_component.ex:67
 #: lib/cannery_web/components/move_ammo_group_component.ex:70
@@ -1249,3 +1249,14 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
+
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
+#, elixir-autogen, elixir-format
+msgid "Current Count"
+msgstr ""
+
+#: lib/cannery_web/components/core_components/modal.html.heex:9
+#: lib/cannery_web/components/core_components/modal.html.heex:35
+#, elixir-autogen, elixir-format
+msgid "Close modal"
+msgstr ""

priv/gettext/de/LC_MESSAGES/errors.po

@@ -23,7 +23,7 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery/containers.ex:200
+#: lib/cannery/containers.ex:220
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
@@ -117,22 +117,22 @@ msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
 
-#: lib/cannery/accounts/user.ex:144
+#: lib/cannery/accounts/user.ex:145
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "hat sich nicht geändert"
 
-#: lib/cannery/accounts/user.ex:165
+#: lib/cannery/accounts/user.ex:166
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"
 
-#: lib/cannery/accounts/user.ex:202
+#: lib/cannery/accounts/user.ex:203
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "ist nicht gültig"
 
-#: lib/cannery/accounts/user.ex:99
+#: lib/cannery/accounts/user.ex:100
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
@@ -172,7 +172,7 @@ msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
 "%{multiplier}"
 
-#: lib/cannery/ammo.ex:1015
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -187,27 +187,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:72
+#: lib/cannery/activity_log/shot_group.ex:74
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:86
+#: lib/cannery/activity_log/shot_group.ex:88
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:84
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr "Anzahl muss weniger als %{count} betragen"
 
-#: lib/cannery/activity_log/shot_group.ex:78
+#: lib/cannery/activity_log/shot_group.ex:80
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 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:72
-#: lib/cannery_web/live/ammo_type_live/show.ex:54
+#: lib/cannery_web/live/ammo_type_live/show.ex:49
 #: lib/cannery_web/live/tag_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -128,12 +128,12 @@ msgstr "Passwort erfolgreich geändert."
 msgid "Please check your email to verify your account"
 msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:58
+#: lib/cannery_web/components/add_shot_group_component.html.heex:59
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:181
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:46
+#: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."

priv/gettext/default.pot

@@ -34,7 +34,7 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:90
+#: lib/cannery_web/components/ammo_group_table_component.ex:108
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
@@ -46,47 +46,47 @@ msgid "Background color"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:65
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:143
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:47
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:49
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:61
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:48
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:50
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: 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:59
 #, elixir-autogen, elixir-format
@@ -102,12 +102,12 @@ msgid "Containers"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:66
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:147
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:77
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
@@ -120,8 +120,8 @@ msgid "Count:"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:28
-#: lib/cannery_web/live/container_live/form_component.html.heex:28
+#: lib/cannery_web/live/container_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -147,24 +147,24 @@ msgstr ""
 msgid "Edit Tag"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Example bullet type abbreviations"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:59
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:64
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -198,7 +198,7 @@ msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
-#: lib/cannery_web/live/container_live/form_component.html.heex:45
+#: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
@@ -209,18 +209,18 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:67
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:151
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:166
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:32
+#: lib/cannery_web/live/container_live/form_component.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr ""
@@ -292,7 +292,6 @@ msgid "No tags"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
-#: lib/cannery_web/components/ammo_group_table_component.ex:82
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.ex:92
@@ -307,18 +306,18 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:49
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:60
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:114
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
+#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
@@ -330,7 +329,7 @@ msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:61
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:134
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -361,7 +360,7 @@ msgstr ""
 msgid "Simple:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr ""
@@ -396,14 +395,14 @@ msgid "The self-hosted firearm tracker website"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:63
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:135
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -419,7 +418,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:25
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
@@ -434,7 +433,7 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:73
+#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -445,10 +444,10 @@ msgstr ""
 msgid "Range day"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
+#: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
 #: lib/cannery_web/live/ammo_group_live/show.ex:93
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr ""
@@ -520,9 +519,9 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:154
+#: lib/cannery_web/components/ammo_group_table_component.ex:180
-#: lib/cannery_web/components/ammo_group_table_component.ex:230
+#: lib/cannery_web/components/ammo_group_table_component.ex:263
-#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/ammo_type_table_component.ex:235
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
@@ -532,37 +531,37 @@ msgstr ""
 msgid "$%{amount}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:51
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:52
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:91
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:53
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:101
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:68
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:155
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -586,7 +585,7 @@ msgid "New password"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:62
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
@@ -615,14 +614,15 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
+#: lib/cannery_web/components/ammo_group_table_component.ex:177
-#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/components/ammo_group_table_component.ex:259
+#: lib/cannery_web/components/ammo_type_table_component.ex:234
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:81
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
@@ -785,12 +785,12 @@ msgstr ""
 msgid "isn't he cute >:3"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:29
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr ""
@@ -803,7 +803,7 @@ msgstr ""
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:188
+#: lib/cannery_web/components/ammo_group_table_component.ex:218
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -985,18 +985,18 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:150
+#: lib/cannery_web/live/ammo_type_live/show.ex:104
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:234
+#: lib/cannery_web/components/ammo_group_table_component.ex:267
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:78
+#: lib/cannery_web/components/ammo_group_table_component.ex:91
 #, elixir-autogen, elixir-format
 msgid "Original Count"
 msgstr ""
@@ -1026,7 +1026,7 @@ msgstr ""
 msgid "Total packs:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
@@ -1036,12 +1036,12 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:172
+#: lib/cannery_web/components/ammo_group_table_component.ex:198
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:58
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
@@ -1182,38 +1182,38 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:117
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:57
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:43
-#: lib/cannery_web/live/range_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:54
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:121
 #: lib/cannery_web/components/container_table_component.ex:67
 #: lib/cannery_web/components/move_ammo_group_component.ex:70
@@ -1232,3 +1232,14 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
+
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
+#, elixir-autogen, elixir-format
+msgid "Current Count"
+msgstr ""
+
+#: lib/cannery_web/components/core_components/modal.html.heex:9
+#: lib/cannery_web/components/core_components/modal.html.heex:35
+#, elixir-autogen, elixir-format
+msgid "Close modal"
+msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -120,12 +120,12 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:56
+#: lib/cannery_web/components/add_shot_group_component.html.heex:57
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:180
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:104
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:105
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 #: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
@@ -209,7 +209,7 @@ msgid "add an ammo type first"
 msgstr ""
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:121
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:122
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:143
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
@@ -321,7 +321,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr ""
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -342,18 +342,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:155
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:170
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:171
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:189
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -34,7 +34,7 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:90
+#: lib/cannery_web/components/ammo_group_table_component.ex:108
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
@@ -46,47 +46,47 @@ msgid "Background color"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:65
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:143
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:47
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:49
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:61
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:48
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:50
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: 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:59
 #, elixir-autogen, elixir-format
@@ -102,12 +102,12 @@ msgid "Containers"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:66
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:147
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:77
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
@@ -120,8 +120,8 @@ msgid "Count:"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:28
-#: lib/cannery_web/live/container_live/form_component.html.heex:28
+#: lib/cannery_web/live/container_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -147,24 +147,24 @@ msgstr ""
 msgid "Edit Tag"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Example bullet type abbreviations"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:59
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:64
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -198,7 +198,7 @@ msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
-#: lib/cannery_web/live/container_live/form_component.html.heex:45
+#: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
@@ -209,18 +209,18 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:67
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:151
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:166
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:32
+#: lib/cannery_web/live/container_live/form_component.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr ""
@@ -292,7 +292,6 @@ msgid "No tags"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
-#: lib/cannery_web/components/ammo_group_table_component.ex:82
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.ex:92
@@ -307,18 +306,18 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:49
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:60
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:114
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
+#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
@@ -330,7 +329,7 @@ msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:61
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:134
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -361,7 +360,7 @@ msgstr ""
 msgid "Simple:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr ""
@@ -396,14 +395,14 @@ msgid "The self-hosted firearm tracker website"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:63
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:135
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -419,7 +418,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:25
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
@@ -434,7 +433,7 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:73
+#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -445,10 +444,10 @@ msgstr ""
 msgid "Range day"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
+#: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
 #: lib/cannery_web/live/ammo_group_live/show.ex:93
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr ""
@@ -520,9 +519,9 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:154
+#: lib/cannery_web/components/ammo_group_table_component.ex:180
-#: lib/cannery_web/components/ammo_group_table_component.ex:230
+#: lib/cannery_web/components/ammo_group_table_component.ex:263
-#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/ammo_type_table_component.ex:235
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
@@ -532,37 +531,37 @@ msgstr ""
 msgid "$%{amount}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:51
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:52
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:91
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:53
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:101
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:68
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:155
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -586,7 +585,7 @@ msgid "New password"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:62
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
@@ -615,14 +614,15 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
+#: lib/cannery_web/components/ammo_group_table_component.ex:177
-#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/components/ammo_group_table_component.ex:259
+#: lib/cannery_web/components/ammo_type_table_component.ex:234
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:81
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
@@ -785,12 +785,12 @@ msgstr ""
 msgid "isn't he cute >:3"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:29
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr ""
@@ -803,7 +803,7 @@ msgstr ""
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:188
+#: lib/cannery_web/components/ammo_group_table_component.ex:218
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -985,18 +985,18 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:150
+#: lib/cannery_web/live/ammo_type_live/show.ex:104
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:234
+#: lib/cannery_web/components/ammo_group_table_component.ex:267
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:78
+#: lib/cannery_web/components/ammo_group_table_component.ex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr ""
@@ -1026,7 +1026,7 @@ msgstr ""
 msgid "Total packs:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
@@ -1036,12 +1036,12 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:172
+#: lib/cannery_web/components/ammo_group_table_component.ex:198
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:58
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
@@ -1182,38 +1182,38 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:117
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:57
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:43
-#: lib/cannery_web/live/range_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:54
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:121
 #: lib/cannery_web/components/container_table_component.ex:67
 #: lib/cannery_web/components/move_ammo_group_component.ex:70
@@ -1232,3 +1232,14 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
+
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
+#, elixir-autogen, elixir-format
+msgid "Current Count"
+msgstr ""
+
+#: lib/cannery_web/components/core_components/modal.html.heex:9
+#: lib/cannery_web/components/core_components/modal.html.heex:35
+#, elixir-autogen, elixir-format
+msgid "Close modal"
+msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/cannery/containers.ex:200
+#: lib/cannery/containers.ex:220
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr ""
@@ -103,23 +103,23 @@ msgstr ""
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:144
+#: lib/cannery/accounts/user.ex:145
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:165
+#: lib/cannery/accounts/user.ex:166
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
 ## From Ecto.Changeset.put_change/3
-#: lib/cannery/accounts/user.ex:202
+#: lib/cannery/accounts/user.ex:203
 #, elixir-autogen, elixir-format, fuzzy
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:99
+#: lib/cannery/accounts/user.ex:100
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -155,7 +155,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:1015
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -170,27 +170,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:72
+#: lib/cannery/activity_log/shot_group.ex:74
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:86
+#: lib/cannery/activity_log/shot_group.ex:88
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:84
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:78
+#: lib/cannery/activity_log/shot_group.ex:80
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -19,7 +19,7 @@ msgid "%{name} created successfully"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
-#: lib/cannery_web/live/ammo_type_live/show.ex:54
+#: lib/cannery_web/live/ammo_type_live/show.ex:49
 #: lib/cannery_web/live/tag_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -109,12 +109,12 @@ msgstr ""
 msgid "Please check your email to verify your account"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:58
+#: lib/cannery_web/components/add_shot_group_component.html.heex:59
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:181
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:46
+#: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."

priv/gettext/errors.pot

@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 
-#: lib/cannery/containers.ex:200
+#: lib/cannery/containers.ex:220
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr ""
@@ -103,22 +103,22 @@ msgstr ""
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:144
+#: lib/cannery/accounts/user.ex:145
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:165
+#: lib/cannery/accounts/user.ex:166
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:202
+#: lib/cannery/accounts/user.ex:203
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:99
+#: lib/cannery/accounts/user.ex:100
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:1015
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -169,27 +169,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:72
+#: lib/cannery/activity_log/shot_group.ex:74
 #, elixir-autogen, elixir-format
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:86
+#: lib/cannery/activity_log/shot_group.ex:88
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:84
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format
 msgid "Count can be at most %{count} shots"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:78
+#: lib/cannery/activity_log/shot_group.ex:80
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -133,12 +133,12 @@ msgstr "Reenviar instrucciones de confirmación"
 msgid "Reset password"
 msgstr "Resetear contraseña"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:56
+#: lib/cannery_web/components/add_shot_group_component.html.heex:57
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:180
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -169,7 +169,7 @@ msgstr "Preparar munición"
 msgid "Why not get some ready to shoot?"
 msgstr "¿Por qué no preparar parte para disparar?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:104
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:105
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 #: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
@@ -222,7 +222,7 @@ msgid "add an ammo type first"
 msgstr "añade primero un tipo de munición"
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:121
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:122
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -313,7 +313,7 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:143
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Preparar munición"
@@ -345,7 +345,7 @@ msgstr "Preparar munición"
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -355,18 +355,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:155
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:170
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:171
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:189
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/es/LC_MESSAGES/default.po

@@ -38,7 +38,7 @@ msgstr "Aministradores:"
 msgid "Ammo"
 msgstr "Munición"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:90
+#: lib/cannery_web/components/ammo_group_table_component.ex:108
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
@@ -50,47 +50,47 @@ msgid "Background color"
 msgstr "Color de fondo"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:65
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:143
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr "Fogueo"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr "Latón"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:47
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr "Núcleo de bala"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr "Tipo de bala"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:49
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:61
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr "Calibre"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:48
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr "Cartucho"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:50
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr "Material del casquillo"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: 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:59
 #, elixir-autogen, elixir-format
@@ -106,12 +106,12 @@ msgid "Containers"
 msgstr "Contenedores"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:66
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:147
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr "Corrosiva"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:77
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
@@ -124,8 +124,8 @@ msgid "Count:"
 msgstr "Cantidad:"
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:28
-#: lib/cannery_web/live/container_live/form_component.html.heex:28
+#: lib/cannery_web/live/container_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Descripción"
@@ -151,24 +151,24 @@ msgstr "Editar Invitación"
 msgid "Edit Tag"
 msgstr "Editar Etiqueta"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Example bullet type abbreviations"
 msgstr "Abreviaciones de tipo de bala ejemplo"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr "Bala encamisada"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:59
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr "Grano"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:64
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr "Incendiaria"
@@ -202,7 +202,7 @@ msgstr "Mantener registrado durante 60 días"
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
-#: lib/cannery_web/live/container_live/form_component.html.heex:45
+#: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr "Localización"
@@ -213,18 +213,18 @@ msgstr "Localización"
 msgid "Location:"
 msgstr "Localización:"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr "Cargador, Clip, Caja de Munición, etc"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:67
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:151
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:166
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr "Fabricante"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:32
+#: lib/cannery_web/live/container_live/form_component.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr "Lata de munición metálica con la pegatina de chica de anime"
@@ -296,7 +296,6 @@ msgid "No tags"
 msgstr "Sin etiquetas"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
-#: lib/cannery_web/components/ammo_group_table_component.ex:82
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.ex:92
@@ -311,18 +310,18 @@ msgstr "Notas"
 msgid "Notes:"
 msgstr "Notas:"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:49
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr "En la estantería"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:60
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:114
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr "Presión"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
+#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
@@ -334,7 +333,7 @@ msgid "Price paid:"
 msgstr "Precio pagado:"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:61
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:134
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr "Tipo de espoleta"
@@ -367,7 +366,7 @@ msgstr "Ajustes"
 msgid "Simple:"
 msgstr "Simple:"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr "Acero"
@@ -403,14 +402,14 @@ msgid "The self-hosted firearm tracker website"
 msgstr "La página de seguimiento de armas autogestionada"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:63
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:135
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr "Trazadora"
 
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr "Tipo"
@@ -426,7 +425,7 @@ msgstr "Tipo:"
 msgid "Users"
 msgstr "Usuarios"
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:25
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr "Usos restantes"
@@ -441,7 +440,7 @@ msgstr "Tus datos se quedan contigo, sin excepciones"
 msgid "No tags for this container"
 msgstr "Contenedor sin etiquetas"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:73
+#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -452,10 +451,10 @@ msgstr "Campo de tiro"
 msgid "Range day"
 msgstr "Día de disparar"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
+#: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
 #: lib/cannery_web/live/ammo_group_live/show.ex:93
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr "Fecha"
@@ -527,9 +526,9 @@ msgstr "No hay otros contenedores"
 msgid "Shot log"
 msgstr "Registro de tiros"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:154
+#: lib/cannery_web/components/ammo_group_table_component.ex:180
-#: lib/cannery_web/components/ammo_group_table_component.ex:230
+#: lib/cannery_web/components/ammo_group_table_component.ex:263
-#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/ammo_type_table_component.ex:235
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
@@ -539,37 +538,37 @@ msgstr "Registro de tiros"
 msgid "$%{amount}"
 msgstr "$%{amount}"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr "Bimetal"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:51
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr "Tipo de camisa"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:52
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:91
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr "Velocidad de boca"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr "Granos de polvora por carga"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:53
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:101
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr "Tipo de polvora"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:68
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:155
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -593,7 +592,7 @@ msgid "New password"
 msgstr "Nueva contraseña"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:62
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr "Tipo de fuego"
@@ -622,14 +621,15 @@ msgstr "Editar etiquetas de %{name}"
 msgid "Rounds:"
 msgstr "Balas:"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
+#: lib/cannery_web/components/ammo_group_table_component.ex:177
-#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/components/ammo_group_table_component.ex:259
+#: lib/cannery_web/components/ammo_type_table_component.ex:234
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "No hay información de coste"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:81
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% restantes"
@@ -792,13 +792,13 @@ msgstr "Logo de cannery"
 msgid "isn't he cute >:3"
 msgstr "acaso no es mono >:3"
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:29
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 "Deje \"Usos restantes\" en blanco para hacer las invitaciónes ilimitadas"
 
-#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr "Contenedor:"
@@ -811,7 +811,7 @@ msgstr "Contenedor:"
 msgid "Show used"
 msgstr "Mostrar usadas"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:188
+#: lib/cannery_web/components/ammo_group_table_component.ex:218
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -993,18 +993,18 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:150
+#: lib/cannery_web/live/ammo_type_live/show.ex:104
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr "Editar %{ammo_type_name}"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:234
+#: lib/cannery_web/components/ammo_group_table_component.ex:267
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr "Vacio"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
@@ -1014,7 +1014,7 @@ msgstr ""
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:78
+#: lib/cannery_web/components/ammo_group_table_component.ex:91
 #, elixir-autogen, elixir-format
 msgid "Original Count"
 msgstr "Cantidad Original"
@@ -1034,7 +1034,7 @@ msgstr "Menu principal"
 msgid "Total packs:"
 msgstr "Paquetes totales:"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr "Usada por última vez en"
@@ -1044,12 +1044,12 @@ msgstr "Usada por última vez en"
 msgid "Last used on:"
 msgstr "Usada por última vez en:"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:172
+#: lib/cannery_web/components/ammo_group_table_component.ex:198
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr "Nunca usada"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:58
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
@@ -1201,38 +1201,38 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:117
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:57
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:43
-#: lib/cannery_web/live/range_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:54
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:121
 #: lib/cannery_web/components/container_table_component.ex:67
 #: lib/cannery_web/components/move_ammo_group_component.ex:70
@@ -1251,3 +1251,14 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
+
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
+#, elixir-autogen, elixir-format
+msgid "Current Count"
+msgstr ""
+
+#: lib/cannery_web/components/core_components/modal.html.heex:9
+#: lib/cannery_web/components/core_components/modal.html.heex:35
+#, elixir-autogen, elixir-format
+msgid "Close modal"
+msgstr ""

priv/gettext/es/LC_MESSAGES/errors.po

@@ -23,7 +23,7 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery/containers.ex:200
+#: lib/cannery/containers.ex:220
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "El contenedor debe estar vacío antes de ser borrado"
@@ -119,22 +119,22 @@ msgstr "El enlace de confirmación de usuario no es válido o ha caducado."
 msgid "You are not authorized to view this page."
 msgstr "No está autorizado a ver esta página."
 
-#: lib/cannery/accounts/user.ex:144
+#: lib/cannery/accounts/user.ex:145
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "no cambió"
 
-#: lib/cannery/accounts/user.ex:165
+#: lib/cannery/accounts/user.ex:166
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "no coincide con la contraseña"
 
-#: lib/cannery/accounts/user.ex:202
+#: lib/cannery/accounts/user.ex:203
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "no es válido"
 
-#: lib/cannery/accounts/user.ex:99
+#: lib/cannery/accounts/user.ex:100
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "debe tener el signo @ y no contener espacios"
@@ -170,7 +170,7 @@ msgstr "No se ha podido procesar el número de copias"
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr "Número inválido de copias, debe ser entre 1 y %{max}. Fue %{multiplier"
 
-#: lib/cannery/ammo.ex:1015
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr "Multiplicador inválido"
@@ -185,27 +185,27 @@ msgstr "Por favor escoja un tipo de munición y un contenedor"
 msgid "Your browser does not support the canvas element."
 msgstr "Su navegador no es compatible con el elemento lienzo."
 
-#: lib/cannery/activity_log/shot_group.ex:72
+#: lib/cannery/activity_log/shot_group.ex:74
 #, elixir-autogen, elixir-format
 msgid "Please select a valid user and ammo pack"
 msgstr "Por favor escoja un usuario y tipo de munición valido"
 
-#: lib/cannery/activity_log/shot_group.ex:86
+#: lib/cannery/activity_log/shot_group.ex:88
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:84
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr "El recuento debe ser menos de %{count}"
 
-#: lib/cannery/activity_log/shot_group.ex:78
+#: lib/cannery/activity_log/shot_group.ex:80
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 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:72
-#: lib/cannery_web/live/ammo_type_live/show.ex:54
+#: lib/cannery_web/live/ammo_type_live/show.ex:49
 #: lib/cannery_web/live/tag_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
@@ -73,7 +73,7 @@ msgstr "Está seguro que desea eliminar %{email}? Esta acción es permanente!"
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Está seguro que desea eliminar %{name}?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -128,12 +128,12 @@ msgstr "Contraseña cambiada exitosamente."
 msgid "Please check your email to verify your account"
 msgstr "Por favor chequea el correo para verificar tu cuenta"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:58
+#: lib/cannery_web/components/add_shot_group_component.html.heex:59
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:181
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:46
+#: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -133,12 +133,12 @@ msgstr "Renvoyer les instructions de confirmation"
 msgid "Reset password"
 msgstr "Réinitialisé le mot de passe"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:56
+#: lib/cannery_web/components/add_shot_group_component.html.heex:57
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:180
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -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:104
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:105
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 #: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
@@ -222,7 +222,7 @@ msgid "add an ammo type first"
 msgstr "Ajoutez d'abord un type de munitions"
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:121
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:122
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -313,7 +313,7 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:143
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Munition préparée"
@@ -345,7 +345,7 @@ msgstr "Munition préparée"
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -355,18 +355,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:155
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:170
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:171
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:189
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/fr/LC_MESSAGES/default.po

@@ -38,7 +38,7 @@ msgstr "Administrateur·ices :"
 msgid "Ammo"
 msgstr "Munition"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:90
+#: lib/cannery_web/components/ammo_group_table_component.ex:108
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
@@ -50,47 +50,47 @@ msgid "Background color"
 msgstr "Couleur de fond"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:65
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:143
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr "Vide"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr "Cuivre"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:47
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr "Noyau de balle"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr "Type de balle"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:49
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:61
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr "Calibre"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:48
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr "Cartouche"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:50
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr "Matériau de la caisse"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: 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:59
 #, elixir-autogen, elixir-format
@@ -106,12 +106,12 @@ msgid "Containers"
 msgstr "Conteneurs"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:66
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:147
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr "Corrosive"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:77
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
@@ -124,8 +124,8 @@ msgid "Count:"
 msgstr "Quantité :"
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:28
-#: lib/cannery_web/live/container_live/form_component.html.heex:28
+#: lib/cannery_web/live/container_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Description"
@@ -151,24 +151,24 @@ msgstr "Modifier l’invitation"
 msgid "Edit Tag"
 msgstr "Modifier le tag"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Example bullet type abbreviations"
 msgstr "Exemple d’abréviations de type de balle"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr "FMJ"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:59
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr "Graines"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:64
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr "Incendiaire"
@@ -202,7 +202,7 @@ msgstr "Me garder authentifié durant 60 jours"
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
-#: lib/cannery_web/live/container_live/form_component.html.heex:45
+#: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr "Localisation"
@@ -213,18 +213,18 @@ msgstr "Localisation"
 msgid "Location:"
 msgstr "Localisation :"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr "Chargeur, lame-chargeur, boite de munition, etc."
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:67
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:151
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:166
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr "Fabricant"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:32
+#: lib/cannery_web/live/container_live/form_component.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr "Boite de munition avec le sticker de fille d’animation"
@@ -296,7 +296,6 @@ msgid "No tags"
 msgstr "Aucun tag"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
-#: lib/cannery_web/components/ammo_group_table_component.ex:82
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.ex:92
@@ -311,18 +310,18 @@ msgstr "Notes"
 msgid "Notes:"
 msgstr "Notes :"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:49
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr "Sur l’étagère"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:60
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:114
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr "Pression"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
+#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
@@ -334,7 +333,7 @@ msgid "Price paid:"
 msgstr "Prix payé :"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:61
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:134
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr "Type d’amorce"
@@ -367,7 +366,7 @@ msgstr "Paramètres"
 msgid "Simple:"
 msgstr "Simple :"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr "Acier"
@@ -404,14 +403,14 @@ msgid "The self-hosted firearm tracker website"
 msgstr "Le site web de suivi d’arme à feux auto-hébergé"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:63
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:135
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr "Traceuse"
 
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr "Type"
@@ -427,7 +426,7 @@ msgstr "Type :"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:25
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr "Utilisations restantes"
@@ -442,7 +441,7 @@ 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:73
+#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -453,10 +452,10 @@ msgstr "Portée"
 msgid "Range day"
 msgstr "Journée de stand"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
+#: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
 #: lib/cannery_web/live/ammo_group_live/show.ex:93
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr "Date"
@@ -528,9 +527,9 @@ msgstr "Aucun autre conteneur"
 msgid "Shot log"
 msgstr "Évènements de tir"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:154
+#: lib/cannery_web/components/ammo_group_table_component.ex:180
-#: lib/cannery_web/components/ammo_group_table_component.ex:230
+#: lib/cannery_web/components/ammo_group_table_component.ex:263
-#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/ammo_type_table_component.ex:235
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
@@ -540,37 +539,37 @@ msgstr "Évènements de tir"
 msgid "$%{amount}"
 msgstr "%{amount} $"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr "Bi-métal"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:51
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr "Type de douille"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:52
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:91
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr "Vélocité du canon"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr "Graines de poudre par charge"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:53
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:101
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr "Type de poudre"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:68
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:155
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr "UPC"
@@ -594,7 +593,7 @@ msgid "New password"
 msgstr "Nouveau mot de passe"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:62
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr "Type d’allumage"
@@ -623,14 +622,15 @@ msgstr "Éditer les tags de %{name}"
 msgid "Rounds:"
 msgstr "Cartouches :"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
+#: lib/cannery_web/components/ammo_group_table_component.ex:177
-#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/components/ammo_group_table_component.ex:259
+#: lib/cannery_web/components/ammo_type_table_component.ex:234
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "Aucune information de prix"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:81
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% restante"
@@ -793,13 +793,13 @@ msgstr "Logo de Cannery"
 msgid "isn't he cute >:3"
 msgstr "N'est-il mignon >:3"
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:29
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 "Laissez \"Utilisations restantes\" vide pour rendre l'invitation illimitée"
 
-#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr "Conteneur"
@@ -812,7 +812,7 @@ msgstr "Conteneur"
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:188
+#: lib/cannery_web/components/ammo_group_table_component.ex:218
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -994,18 +994,18 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:150
+#: lib/cannery_web/live/ammo_type_live/show.ex:104
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{ammo_type_name}"
 msgstr "Éditer %{name}"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:234
+#: lib/cannery_web/components/ammo_group_table_component.ex:267
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
@@ -1015,7 +1015,7 @@ msgstr ""
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:78
+#: lib/cannery_web/components/ammo_group_table_component.ex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr "Nombre original :"
@@ -1035,7 +1035,7 @@ msgstr ""
 msgid "Total packs:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
@@ -1045,12 +1045,12 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:172
+#: lib/cannery_web/components/ammo_group_table_component.ex:198
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:58
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
@@ -1202,38 +1202,38 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:117
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:57
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:43
-#: lib/cannery_web/live/range_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:54
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:121
 #: lib/cannery_web/components/container_table_component.ex:67
 #: lib/cannery_web/components/move_ammo_group_component.ex:70
@@ -1252,3 +1252,14 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
+
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
+#, elixir-autogen, elixir-format
+msgid "Current Count"
+msgstr ""
+
+#: lib/cannery_web/components/core_components/modal.html.heex:9
+#: lib/cannery_web/components/core_components/modal.html.heex:35
+#, elixir-autogen, elixir-format
+msgid "Close modal"
+msgstr ""

priv/gettext/fr/LC_MESSAGES/errors.po

@@ -23,7 +23,7 @@ msgstr ""
 # # Run "mix gettext.extract" to bring this file up to
 # # date. Leave "msgstr"s empty as changing them here has no
 # # effect: edit them in PO (.po) files instead.
-#: lib/cannery/containers.ex:200
+#: lib/cannery/containers.ex:220
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Le conteneur doit être vide pour être supprimé"
@@ -118,22 +118,22 @@ msgstr "Le lien de confirmation d’utilisateur·ice est invalide ou a expiré."
 msgid "You are not authorized to view this page."
 msgstr "Vous n’êtes pas autorisé·e à voir cette page."
 
-#: lib/cannery/accounts/user.ex:144
+#: lib/cannery/accounts/user.ex:145
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "est inchangé"
 
-#: lib/cannery/accounts/user.ex:165
+#: lib/cannery/accounts/user.ex:166
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "le mot de passe ne correspond pas"
 
-#: lib/cannery/accounts/user.ex:202
+#: lib/cannery/accounts/user.ex:203
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "n’est pas valide"
 
-#: lib/cannery/accounts/user.ex:99
+#: lib/cannery/accounts/user.ex:100
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "doit contenir le symbole @ et aucune espace"
@@ -171,7 +171,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:1015
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr "Multiplicateur invalide"
@@ -186,27 +186,27 @@ msgstr "Veuillez choisir un type de munitions et un conteneur"
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:72
+#: lib/cannery/activity_log/shot_group.ex:74
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr "Veuillez choisir un utilisateur valide et un groupe de munitions"
 
-#: lib/cannery/activity_log/shot_group.ex:86
+#: lib/cannery/activity_log/shot_group.ex:88
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:84
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr "La quantité doit être inférieur à %{count}"
 
-#: lib/cannery/activity_log/shot_group.ex:78
+#: lib/cannery/activity_log/shot_group.ex:80
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 msgstr ""

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:72
-#: lib/cannery_web/live/ammo_type_live/show.ex:54
+#: lib/cannery_web/live/ammo_type_live/show.ex:49
 #: lib/cannery_web/live/tag_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Êtes-vous certain·e de supprimer %{name} ?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -129,12 +129,12 @@ msgstr "Mot de passe mis à jour avec succès."
 msgid "Please check your email to verify your account"
 msgstr "Veuillez vérifier votre mél pour confirmer votre compte"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:58
+#: lib/cannery_web/components/add_shot_group_component.html.heex:59
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:181
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:46
+#: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."

priv/gettext/ga/LC_MESSAGES/actions.po

@@ -131,12 +131,12 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:56
+#: lib/cannery_web/components/add_shot_group_component.html.heex:57
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:180
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:104
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:105
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103
 #: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
@@ -220,7 +220,7 @@ msgid "add an ammo type first"
 msgstr ""
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:121
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:122
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -311,7 +311,7 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:143
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr ""
@@ -343,7 +343,7 @@ msgstr ""
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -353,18 +353,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:155
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:170
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:171
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:132
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:189
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/ga/LC_MESSAGES/default.po

@@ -36,7 +36,7 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:90
+#: lib/cannery_web/components/ammo_group_table_component.ex:108
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
@@ -48,47 +48,47 @@ msgid "Background color"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:65
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:143
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:47
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:49
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:61
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:48
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:50
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:66
+#: 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:59
 #, elixir-autogen, elixir-format
@@ -104,12 +104,12 @@ msgid "Containers"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:66
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:147
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:77
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
@@ -122,8 +122,8 @@ msgid "Count:"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:28
-#: lib/cannery_web/live/container_live/form_component.html.heex:28
+#: lib/cannery_web/live/container_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -149,24 +149,24 @@ msgstr ""
 msgid "Edit Tag"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Example bullet type abbreviations"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:59
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:64
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -200,7 +200,7 @@ msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
-#: lib/cannery_web/live/container_live/form_component.html.heex:45
+#: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
@@ -211,18 +211,18 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:67
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:151
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:166
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:32
+#: lib/cannery_web/live/container_live/form_component.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr ""
@@ -294,7 +294,6 @@ msgid "No tags"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
-#: lib/cannery_web/components/ammo_group_table_component.ex:82
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.ex:92
@@ -309,18 +308,18 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:49
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:60
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:114
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:79
+#: lib/cannery_web/components/ammo_group_table_component.ex:83
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
@@ -332,7 +331,7 @@ msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:61
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:134
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -363,7 +362,7 @@ msgstr ""
 msgid "Simple:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr ""
@@ -398,14 +397,14 @@ msgid "The self-hosted firearm tracker website"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:63
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:135
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -421,7 +420,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:25
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
@@ -436,7 +435,7 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:73
+#: lib/cannery_web/components/ammo_group_table_component.ex:79
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -447,10 +446,10 @@ msgstr ""
 msgid "Range day"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
+#: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
 #: lib/cannery_web/live/ammo_group_live/show.ex:93
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr ""
@@ -522,9 +521,9 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:154
+#: lib/cannery_web/components/ammo_group_table_component.ex:180
-#: lib/cannery_web/components/ammo_group_table_component.ex:230
+#: lib/cannery_web/components/ammo_group_table_component.ex:263
-#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/ammo_type_table_component.ex:235
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
@@ -534,37 +533,37 @@ msgstr ""
 msgid "$%{amount}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:51
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:52
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:91
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:108
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:53
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:101
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:68
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:155
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -588,7 +587,7 @@ msgid "New password"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:62
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:142
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
@@ -617,14 +616,15 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:227
+#: lib/cannery_web/components/ammo_group_table_component.ex:177
-#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/components/ammo_group_table_component.ex:259
+#: lib/cannery_web/components/ammo_type_table_component.ex:234
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:81
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
@@ -787,12 +787,12 @@ msgstr ""
 msgid "isn't he cute >:3"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:29
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr ""
@@ -805,7 +805,7 @@ msgstr ""
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:188
+#: lib/cannery_web/components/ammo_group_table_component.ex:218
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -987,18 +987,18 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:150
+#: lib/cannery_web/live/ammo_type_live/show.ex:104
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:234
+#: lib/cannery_web/components/ammo_group_table_component.ex:267
 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
@@ -1008,7 +1008,7 @@ msgstr ""
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:78
+#: lib/cannery_web/components/ammo_group_table_component.ex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr ""
@@ -1028,7 +1028,7 @@ msgstr ""
 msgid "Total packs:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
@@ -1038,12 +1038,12 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:172
+#: lib/cannery_web/components/ammo_group_table_component.ex:198
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:58
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
@@ -1193,38 +1193,38 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:117
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:71
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:57
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:43
-#: lib/cannery_web/live/range_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:54
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:121
 #: lib/cannery_web/components/container_table_component.ex:67
 #: lib/cannery_web/components/move_ammo_group_component.ex:70
@@ -1243,3 +1243,14 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
+
+#: lib/cannery_web/components/ammo_group_table_component.ex:100
+#, elixir-autogen, elixir-format
+msgid "Current Count"
+msgstr ""
+
+#: lib/cannery_web/components/core_components/modal.html.heex:9
+#: lib/cannery_web/components/core_components/modal.html.heex:35
+#, elixir-autogen, elixir-format
+msgid "Close modal"
+msgstr ""

priv/gettext/ga/LC_MESSAGES/errors.po

@@ -24,7 +24,7 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery/containers.ex:200
+#: lib/cannery/containers.ex:220
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Caithfidh an coimeádán a bheidh follamh roimh scriosadh"
@@ -119,22 +119,22 @@ msgstr "Tá nasc an úsáideoir a deimhnigh neamhbailí nó as dáta."
 msgid "You are not authorized to view this page."
 msgstr "Níl cead agaibh féachaint ar an leathanach seo."
 
-#: lib/cannery/accounts/user.ex:144
+#: lib/cannery/accounts/user.ex:145
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "Níor athraigh sé"
 
-#: lib/cannery/accounts/user.ex:165
+#: lib/cannery/accounts/user.ex:166
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:202
+#: lib/cannery/accounts/user.ex:203
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:99
+#: lib/cannery/accounts/user.ex:100
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:1015
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -185,27 +185,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:72
+#: lib/cannery/activity_log/shot_group.ex:74
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:86
+#: lib/cannery/activity_log/shot_group.ex:88
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:84
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:78
+#: lib/cannery/activity_log/shot_group.ex:80
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 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:72
-#: lib/cannery_web/live/ammo_type_live/show.ex:54
+#: lib/cannery_web/live/ammo_type_live/show.ex:49
 #: lib/cannery_web/live/tag_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -120,12 +120,12 @@ msgstr ""
 msgid "Please check your email to verify your account"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:58
+#: lib/cannery_web/components/add_shot_group_component.html.heex:59
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:181
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:46
+#: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."

priv/gettext/prompts.pot

@@ -19,7 +19,7 @@ msgid "%{name} created successfully"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:72
-#: lib/cannery_web/live/ammo_type_live/show.ex:54
+#: lib/cannery_web/live/ammo_type_live/show.ex:49
 #: lib/cannery_web/live/tag_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -109,12 +109,12 @@ msgstr ""
 msgid "Please check your email to verify your account"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:58
+#: lib/cannery_web/components/add_shot_group_component.html.heex:59
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:181
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:46
+#: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."

test/cannery/ammo_test.exs

@@ -45,7 +45,7 @@ defmodule Cannery.AmmoTest do
       assert Ammo.list_ammo_types(current_user) == [ammo_type]
     end
 
-    test "list_ammo_types/1 returns relevant ammo_types for a user",
+    test "list_ammo_types/2 returns relevant ammo_types for a user",
          %{current_user: current_user} do
       ammo_type_a =
         %{"name" => "bullets", "desc" => "has some pews in it", "grains" => 5}
@@ -89,12 +89,12 @@ defmodule Cannery.AmmoTest do
       assert Ammo.list_ammo_types("tracer", current_user) == [ammo_type_c]
     end
 
-    test "get_ammo_type!/1 returns the ammo_type with given id",
+    test "get_ammo_type!/2 returns the ammo_type with given id",
          %{ammo_type: ammo_type, current_user: current_user} do
       assert Ammo.get_ammo_type!(ammo_type.id, current_user) == ammo_type
     end
 
-    test "create_ammo_type/1 with valid data creates a ammo_type",
+    test "create_ammo_type/2 with valid data creates a ammo_type",
          %{current_user: current_user} do
       assert {:ok, %AmmoType{} = ammo_type} = Ammo.create_ammo_type(@valid_attrs, current_user)
       assert ammo_type.bullet_type == "some bullet_type"
@@ -105,12 +105,12 @@ defmodule Cannery.AmmoTest do
       assert ammo_type.grains == 120
     end
 
-    test "create_ammo_type/1 with invalid data returns error changeset",
+    test "create_ammo_type/2 with invalid data returns error changeset",
          %{current_user: current_user} do
       assert {:error, %Changeset{}} = Ammo.create_ammo_type(@invalid_attrs, current_user)
     end
 
-    test "update_ammo_type/2 with valid data updates the ammo_type",
+    test "update_ammo_type/3 with valid data updates the ammo_type",
          %{ammo_type: ammo_type, current_user: current_user} do
       assert {:ok, %AmmoType{} = ammo_type} =
                Ammo.update_ammo_type(ammo_type, @update_attrs, current_user)
@@ -123,7 +123,7 @@ defmodule Cannery.AmmoTest do
       assert ammo_type.grains == 456
     end
 
-    test "update_ammo_type/2 with invalid data returns error changeset",
+    test "update_ammo_type/3 with invalid data returns error changeset",
          %{ammo_type: ammo_type, current_user: current_user} do
       assert {:error, %Changeset{}} =
                Ammo.update_ammo_type(ammo_type, @invalid_attrs, current_user)
@@ -131,7 +131,7 @@ defmodule Cannery.AmmoTest do
       assert ammo_type == Ammo.get_ammo_type!(ammo_type.id, current_user)
     end
 
-    test "delete_ammo_type/1 deletes the ammo_type",
+    test "delete_ammo_type/2 deletes the ammo_type",
          %{ammo_type: ammo_type, current_user: current_user} do
       assert {:ok, %AmmoType{}} = Ammo.delete_ammo_type(ammo_type, current_user)
       assert_raise Ecto.NoResultsError, fn -> Ammo.get_ammo_type!(ammo_type.id, current_user) end
@@ -785,7 +785,7 @@ defmodule Cannery.AmmoTest do
       assert %{^another_ammo_type_id => 1} = ammo_groups_count
     end
 
-    test "list_staged_ammo_groups/2 returns all ammo_groups that are staged",
+    test "list_staged_ammo_groups/1 returns all ammo_groups that are staged",
          %{
            ammo_type: ammo_type,
            container: container,
@@ -797,7 +797,7 @@ defmodule Cannery.AmmoTest do
       assert Ammo.list_staged_ammo_groups(current_user) == [another_ammo_group]
     end
 
-    test "get_ammo_group!/1 returns the ammo_group with given id",
+    test "get_ammo_group!/2 returns the ammo_group with given id",
          %{ammo_group: %{id: ammo_group_id} = ammo_group, current_user: current_user} do
       assert Ammo.get_ammo_group!(ammo_group_id, current_user) == ammo_group
     end
@@ -861,7 +861,7 @@ defmodule Cannery.AmmoTest do
                |> Ammo.create_ammo_groups(1, current_user)
     end
 
-    test "update_ammo_group/2 with valid data updates the ammo_group",
+    test "update_ammo_group/3 with valid data updates the ammo_group",
          %{ammo_group: ammo_group, current_user: current_user} do
       assert {:ok, %AmmoGroup{} = ammo_group} =
                Ammo.update_ammo_group(ammo_group, @update_attrs, current_user)
@@ -871,7 +871,7 @@ defmodule Cannery.AmmoTest do
       assert ammo_group.price_paid == 456.7
     end
 
-    test "update_ammo_group/2 with invalid data returns error changeset",
+    test "update_ammo_group/3 with invalid data returns error changeset",
          %{ammo_group: ammo_group, current_user: current_user} do
       assert {:error, %Changeset{}} =
                Ammo.update_ammo_group(ammo_group, @invalid_attrs, current_user)
@@ -879,13 +879,13 @@ defmodule Cannery.AmmoTest do
       assert ammo_group == Ammo.get_ammo_group!(ammo_group.id, current_user)
     end
 
-    test "delete_ammo_group/1 deletes the ammo_group",
+    test "delete_ammo_group/2 deletes the ammo_group",
          %{ammo_group: ammo_group, current_user: current_user} do
       assert {:ok, %AmmoGroup{}} = Ammo.delete_ammo_group(ammo_group, current_user)
       assert_raise KeyError, fn -> Ammo.get_ammo_group!(ammo_group.id, current_user) end
     end
 
-    test "get_percentage_remaining/1 gets accurate total round count",
+    test "get_percentage_remaining/2 gets accurate total round count",
          %{ammo_group: %{id: ammo_group_id} = ammo_group, current_user: current_user} do
       assert 100 = ammo_group |> Ammo.get_percentage_remaining(current_user)
 
@@ -902,6 +902,53 @@ defmodule Cannery.AmmoTest do
       assert 0 = ammo_group |> Ammo.get_percentage_remaining(current_user)
     end
 
+    test "get_percentages_remaining/2 gets accurate total round count", %{
+      ammo_group: %{id: ammo_group_id} = ammo_group,
+      ammo_type: ammo_type,
+      container: container,
+      current_user: current_user
+    } do
+      assert %{ammo_group_id => 100} ==
+               [ammo_group] |> Ammo.get_percentages_remaining(current_user)
+
+      {1, [%{id: another_ammo_group_id} = another_ammo_group]} =
+        %{"count" => 50, "price_paid" => 36.1}
+        |> ammo_group_fixture(ammo_type, container, current_user)
+
+      percentages =
+        [ammo_group, another_ammo_group] |> Ammo.get_percentages_remaining(current_user)
+
+      assert %{^ammo_group_id => 100} = percentages
+      assert %{^another_ammo_group_id => 100} = percentages
+
+      shot_group_fixture(%{"count" => 14}, current_user, ammo_group)
+      ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
+
+      percentages =
+        [ammo_group, another_ammo_group] |> Ammo.get_percentages_remaining(current_user)
+
+      assert %{^ammo_group_id => 72} = percentages
+      assert %{^another_ammo_group_id => 100} = percentages
+
+      shot_group_fixture(%{"count" => 11}, current_user, ammo_group)
+      ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
+
+      percentages =
+        [ammo_group, another_ammo_group] |> Ammo.get_percentages_remaining(current_user)
+
+      assert %{^ammo_group_id => 50} = percentages
+      assert %{^another_ammo_group_id => 100} = percentages
+
+      shot_group_fixture(%{"count" => 25}, current_user, ammo_group)
+      ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
+
+      percentages =
+        [ammo_group, another_ammo_group] |> Ammo.get_percentages_remaining(current_user)
+
+      assert %{^ammo_group_id => 0} = percentages
+      assert %{^another_ammo_group_id => 100} = percentages
+    end
+
     test "get_cpr/2 gets accurate cpr",
          %{ammo_type: ammo_type, container: container, current_user: current_user} do
       {1, [ammo_group]} = ammo_group_fixture(%{"count" => 1}, ammo_type, container, current_user)

test/cannery/containers_test.exs

@@ -28,14 +28,14 @@ defmodule Cannery.ContainersTest do
     "type" => nil
   }
   @valid_tag_attrs %{
-    "bg_color" => "some bg-color",
+    "bg_color" => "#100000",
     "name" => "some name",
-    "text_color" => "some text-color"
+    "text_color" => "#000000"
   }
   @update_tag_attrs %{
-    "bg_color" => "some updated bg-color",
+    "bg_color" => "#100001",
     "name" => "some updated name",
-    "text_color" => "some updated text-color"
+    "text_color" => "#000001"
   }
   @invalid_tag_attrs %{
     "bg_color" => nil,
@@ -90,12 +90,24 @@ defmodule Cannery.ContainersTest do
       assert Containers.list_containers("asajslkdflskdf", current_user) == []
     end
 
-    test "get_container!/1 returns the container with given id",
+    test "get_container!/2 returns the container with given id",
          %{current_user: current_user, container: container} do
       assert Containers.get_container!(container.id, current_user) == container
+      assert_raise KeyError, fn -> Containers.get_container!(current_user.id, current_user) end
     end
 
-    test "create_container/1 with valid data creates a container", %{current_user: current_user} do
+    test "get_containers/2 returns the container with given id",
+         %{current_user: current_user, container: %{id: container_id} = container} do
+      assert %{container_id => container} ==
+               Containers.get_containers([container_id], current_user)
+
+      %{id: another_container_id} = another_container = container_fixture(current_user)
+      containers = [container_id, another_container_id] |> Containers.get_containers(current_user)
+      assert %{^container_id => ^container} = containers
+      assert %{^another_container_id => ^another_container} = containers
+    end
+
+    test "create_container/2 with valid data creates a container", %{current_user: current_user} do
       assert {:ok, %Container{} = container} =
                @valid_attrs |> Containers.create_container(current_user)
 
@@ -106,12 +118,12 @@ defmodule Cannery.ContainersTest do
       assert container.user_id == current_user.id
     end
 
-    test "create_container/1 with invalid data returns error changeset",
+    test "create_container/2 with invalid data returns error changeset",
          %{current_user: current_user} do
       assert {:error, %Changeset{}} = @invalid_attrs |> Containers.create_container(current_user)
     end
 
-    test "update_container/2 with valid data updates the container",
+    test "update_container/3 with valid data updates the container",
          %{current_user: current_user, container: container} do
       assert {:ok, %Container{} = container} =
                Containers.update_container(container, current_user, @update_attrs)
@@ -122,7 +134,7 @@ defmodule Cannery.ContainersTest do
       assert container.type == "some updated type"
     end
 
-    test "update_container/2 with invalid data returns error changeset",
+    test "update_container/3 with invalid data returns error changeset",
          %{current_user: current_user, container: container} do
       assert {:error, %Changeset{}} =
                Containers.update_container(container, current_user, @invalid_attrs)
@@ -130,11 +142,11 @@ defmodule Cannery.ContainersTest do
       assert container == Containers.get_container!(container.id, current_user)
     end
 
-    test "delete_container/1 deletes the container",
+    test "delete_container/2 deletes the container",
          %{current_user: current_user, container: container} do
       assert {:ok, %Container{}} = Containers.delete_container(container, current_user)
 
-      assert_raise Ecto.NoResultsError, fn ->
+      assert_raise KeyError, fn ->
         Containers.get_container!(container.id, current_user)
       end
     end
@@ -168,36 +180,36 @@ defmodule Cannery.ContainersTest do
       assert Containers.list_tags("hollows", current_user) == [tag_b]
     end
 
-    test "get_tag!/1 returns the tag with given id", %{tag: tag, current_user: current_user} do
+    test "get_tag!/2 returns the tag with given id", %{tag: tag, current_user: current_user} do
       assert Containers.get_tag!(tag.id, current_user) == tag
     end
 
-    test "create_tag/1 with valid data creates a tag", %{current_user: current_user} do
+    test "create_tag/2 with valid data creates a tag", %{current_user: current_user} do
       assert {:ok, %Tag{} = tag} = Containers.create_tag(@valid_tag_attrs, current_user)
-      assert tag.bg_color == "some bg-color"
+      assert tag.bg_color == "#100000"
       assert tag.name == "some name"
-      assert tag.text_color == "some text-color"
+      assert tag.text_color == "#000000"
     end
 
-    test "create_tag/1 with invalid data returns error changeset",
+    test "create_tag/2 with invalid data returns error changeset",
          %{current_user: current_user} do
       assert {:error, %Changeset{}} = Containers.create_tag(@invalid_tag_attrs, current_user)
     end
 
-    test "update_tag/2 with valid data updates the tag", %{tag: tag, current_user: current_user} do
+    test "update_tag/3 with valid data updates the tag", %{tag: tag, current_user: current_user} do
       assert {:ok, %Tag{} = tag} = Containers.update_tag(tag, @update_tag_attrs, current_user)
-      assert tag.bg_color == "some updated bg-color"
+      assert tag.bg_color == "#100001"
       assert tag.name == "some updated name"
-      assert tag.text_color == "some updated text-color"
+      assert tag.text_color == "#000001"
     end
 
-    test "update_tag/2 with invalid data returns error changeset",
+    test "update_tag/3 with invalid data returns error changeset",
          %{tag: tag, current_user: current_user} do
       assert {:error, %Changeset{}} = Containers.update_tag(tag, @invalid_tag_attrs, current_user)
       assert tag == Containers.get_tag!(tag.id, current_user)
     end
 
-    test "delete_tag/1 deletes the tag", %{tag: tag, current_user: current_user} do
+    test "delete_tag/2 deletes the tag", %{tag: tag, current_user: current_user} do
       assert {:ok, %Tag{}} = Containers.delete_tag(tag, current_user)
       assert_raise Ecto.NoResultsError, fn -> Containers.get_tag!(tag.id, current_user) end
     end

test/cannery_web/live/ammo_group_live_test.exs

@@ -116,7 +116,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert html =~ dgettext("prompts", "Ammo added successfully")
-      assert html =~ "42"
+      assert html =~ "\n42\n"
     end
 
     test "saves multiple new ammo_groups", %{conn: conn, current_user: current_user} do
@@ -202,7 +202,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert html =~ dgettext("prompts", "Ammo updated successfully")
-      assert html =~ "43"
+      assert html =~ "\n43\n"
     end
 
     test "clones ammo_group in listing", %{conn: conn, ammo_group: ammo_group} do
@@ -229,7 +229,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert html =~ dgettext("prompts", "Ammo added successfully")
-      assert html =~ "42"
+      assert html =~ "\n42\n"
       assert html =~ gettext("$%{amount}", amount: display_currency(120.5))
     end
 
@@ -257,7 +257,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert html =~ dgettext("prompts", "Ammo added successfully")
-      assert html =~ "43"
+      assert html =~ "\n43\n"
       assert html =~ gettext("$%{amount}", amount: display_currency(120.5))
     end
 
@@ -309,12 +309,8 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       assert html =~ dgettext("actions", "Show used")
       refute html =~ gettext("$%{amount}", amount: display_currency(50.00))
 
-      refute html =~
+      percentage = ammo_group |> Ammo.get_percentage_remaining(current_user)
-               "\n" <>
+      refute html =~ "\n#{gettext("%{percentage}%", percentage: percentage)}\n"
-                 gettext("%{percentage}%",
-                   percentage: ammo_group |> Ammo.get_percentage_remaining(current_user)
-                 ) <>
-                 "\n"
 
       html =
         show_live
@@ -323,12 +319,8 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
       assert html =~ gettext("$%{amount}", amount: display_currency(50.00))
 
-      assert html =~
+      percentage = ammo_group |> Ammo.get_percentage_remaining(current_user)
-               "\n" <>
+      assert html =~ "\n#{gettext("%{percentage}%", percentage: percentage)}\n"
-                 gettext("%{percentage}%",
-                   percentage: ammo_group |> Ammo.get_percentage_remaining(current_user)
-                 ) <>
-                 "\n"
     end
   end
 

test/cannery_web/live/ammo_type_live_test.exs

@@ -230,9 +230,9 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ gettext("Used packs")
       assert html =~ gettext("Total ever packs")
 
-      assert html =~ "20"
+      assert html =~ "\n20\n"
-      assert html =~ "0"
+      assert html =~ "\n0\n"
-      assert html =~ "1"
+      assert html =~ "\n1\n"
 
       shot_group_fixture(%{"count" => 5}, current_user, ammo_group)
 
@@ -243,8 +243,8 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
         |> element(~s/input[type="checkbox"][aria-labelledby="toggle_show_used-label"}]/)
         |> render_click()
 
-      assert html =~ "15"
+      assert html =~ "\n15\n"
-      assert html =~ "5"
+      assert html =~ "\n5\n"
     end
   end
 
@@ -297,7 +297,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       {:ok, _show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
       assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
+      assert html =~ "\n20\n"
       assert html =~ container_name
     end
 
@@ -310,9 +310,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
         |> element(~s/input[type="checkbox"][aria-labelledby="toggle_table-label"}]/)
         |> render_click()
 
-      assert_patch(show_live, Routes.ammo_type_show_path(conn, :table, ammo_type))
+      assert html =~ "\n20\n"
-
-      assert html =~ "some ammo group"
       assert html =~ container_name
     end
   end
@@ -325,14 +323,14 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       {:ok, show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
       assert html =~ dgettext("actions", "Show used")
-      refute html =~ "some ammo group"
+      refute html =~ "\n20\n"
 
       html =
         show_live
         |> element(~s/input[type="checkbox"][aria-labelledby="toggle_show_used-label"}]/)
         |> render_click()
 
-      assert html =~ "some ammo group"
+      assert html =~ "\n20\n"
       assert html =~ "Empty"
       assert html =~ container_name
     end
@@ -346,17 +344,15 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
         |> element(~s/input[type="checkbox"][aria-labelledby="toggle_table-label"}]/)
         |> 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"
+      refute html =~ "\n20\n"
 
       html =
         show_live
         |> element(~s/input[type="checkbox"][aria-labelledby="toggle_show_used-label"}]/)
         |> render_click()
 
-      assert html =~ "some ammo group"
+      assert html =~ "\n20\n"
       assert html =~ "Empty"
       assert html =~ container_name
     end

test/cannery_web/live/container_live_test.exs

@@ -273,7 +273,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       {:ok, _show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
 
       assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
+      assert html =~ "\n20\n"
     end
 
     test "displays ammo group in table",
@@ -286,7 +286,7 @@ defmodule CanneryWeb.ContainerLiveTest do
         |> render_click()
 
       assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
+      assert html =~ "\n20\n"
     end
   end
 
@@ -298,7 +298,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       {:ok, show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
 
       assert html =~ dgettext("actions", "Show used")
-      refute html =~ "some ammo group"
+      refute html =~ "\n20\n"
 
       html =
         show_live
@@ -306,7 +306,7 @@ defmodule CanneryWeb.ContainerLiveTest do
         |> render_click()
 
       assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
+      assert html =~ "\n20\n"
       assert html =~ "Empty"
     end
 
@@ -320,7 +320,7 @@ defmodule CanneryWeb.ContainerLiveTest do
         |> render_click()
 
       assert html =~ dgettext("actions", "Show used")
-      refute html =~ "some ammo group"
+      refute html =~ "\n20\n"
 
       html =
         show_live
@@ -328,7 +328,7 @@ defmodule CanneryWeb.ContainerLiveTest do
         |> render_click()
 
       assert html =~ ammo_type_name
-      assert html =~ "some ammo group"
+      assert html =~ "\n20\n"
       assert html =~ "Empty"
     end
   end

test/cannery_web/live/tag_live_test.exs

@@ -10,14 +10,14 @@ defmodule CanneryWeb.TagLiveTest do
   @moduletag :tag_live_test
 
   @create_attrs %{
-    "bg_color" => "some bg-color",
+    "bg_color" => "#100000",
     "name" => "some name",
-    "text_color" => "some text-color"
+    "text_color" => "#000000"
   }
   @update_attrs %{
-    "bg_color" => "some updated bg-color",
+    "bg_color" => "#100001",
     "name" => "some updated name",
-    "text_color" => "some updated text-color"
+    "text_color" => "#000001"
   }
 
   # @invalid_attrs %{
@@ -86,7 +86,7 @@ defmodule CanneryWeb.TagLiveTest do
         |> follow_redirect(conn, Routes.tag_index_path(conn, :index))
 
       assert html =~ dgettext("actions", "%{name} created successfully", name: "some name")
-      assert html =~ "some bg-color"
+      assert html =~ "#100000"
     end
 
     test "updates tag in listing", %{conn: conn, tag: tag} do
@@ -110,7 +110,7 @@ defmodule CanneryWeb.TagLiveTest do
       assert html =~
                dgettext("prompts", "%{name} updated successfully", name: "some updated name")
 
-      assert html =~ "some updated bg-color"
+      assert html =~ "#100001"
     end
 
     test "deletes tag in listing", %{conn: conn, tag: tag} do

test/support/fixtures.ex

@@ -149,9 +149,9 @@ defmodule Cannery.Fixtures do
   def tag_fixture(attrs \\ %{}, %User{} = user) do
     attrs
     |> Enum.into(%{
-      "bg_color" => "some bg-color",
+      "bg_color" => "#100000",
       "name" => "some name",
-      "text_color" => "some text-color"
+      "text_color" => "#000000"
     })
     |> Containers.create_tag(user)
     |> unwrap_ok_tuple()