CHANGELOG.md

@@ -1,10 +1,3 @@
-# v0.9.0
-- Add length limits to all string fields
-- Add selectable ammo types
-- Improve onboarding experience slightly
-- Remove show used view from a container since it doesn't really make that much
-  sense
-
 # v0.8.6
 - Fix duplicate entries showing up
 - Show ammo packs under a type in a table by default

lib/cannery/accounts/invite.ex

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

lib/cannery/accounts/user.ex

@@ -79,7 +79,6 @@ 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
@@ -210,7 +209,6 @@ 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

@@ -6,53 +6,38 @@ defmodule Cannery.ActivityLog do
   import Ecto.Query, warn: false
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Repo}
-  alias Ecto.{Multi, Queryable}
+  alias Ecto.Multi
 
   @doc """
   Returns the list of shot_groups.
 
   ## Examples
 
-      iex> list_shot_groups(:all, %User{id: 123})
+      iex> list_shot_groups(%User{id: 123})
       [%ShotGroup{}, ...]
 
-      iex> list_shot_groups("cool", :all, %User{id: 123})
+      iex> list_shot_groups("cool", %User{id: 123})
       [%ShotGroup{notes: "My cool shot group"}, ...]
 
-      iex> list_shot_groups("cool", :rifle, %User{id: 123})
-      [%ShotGroup{notes: "Shot some rifle rounds"}, ...]
-
   """
-  @spec list_shot_groups(AmmoType.type() | :all, User.t()) :: [ShotGroup.t()]
-  @spec list_shot_groups(search :: nil | String.t(), AmmoType.type() | :all, User.t()) ::
-          [ShotGroup.t()]
-  def list_shot_groups(search \\ nil, type, %{id: user_id}) do
-    from(sg in ShotGroup,
-      as: :sg,
-      left_join: ag in AmmoGroup,
-      as: :ag,
-      on: sg.ammo_group_id == ag.id,
-      left_join: at in AmmoType,
-      as: :at,
-      on: ag.ammo_type_id == at.id,
-      where: sg.user_id == ^user_id,
-      distinct: sg.id
-    )
-    |> list_shot_groups_search(search)
-    |> list_shot_groups_filter_type(type)
-    |> Repo.all()
-  end
+  @spec list_shot_groups(User.t()) :: [ShotGroup.t()]
+  @spec list_shot_groups(search :: nil | String.t(), User.t()) :: [ShotGroup.t()]
+  def list_shot_groups(search \\ nil, user)
 
-  @spec list_shot_groups_search(Queryable.t(), search :: String.t() | nil) ::
-          Queryable.t()
-  defp list_shot_groups_search(query, search) when search in ["", nil], do: query
+  def list_shot_groups(search, %{id: user_id}) when search |> is_nil() or search == "",
+    do: Repo.all(from sg in ShotGroup, where: sg.user_id == ^user_id)
 
-  defp list_shot_groups_search(query, search) when search |> is_binary() do
+  def list_shot_groups(search, %{id: user_id}) when search |> is_binary() do
     trimmed_search = String.trim(search)
 
-    query
-    |> where(
-      [sg: sg, ag: ag, at: at],
+    Repo.all(
+      from sg in ShotGroup,
+        left_join: ag in AmmoGroup,
+        on: sg.ammo_group_id == ag.id,
+        left_join: at in AmmoType,
+        on: ag.ammo_type_id == at.id,
+        where: sg.user_id == ^user_id,
+        where:
           fragment(
             "? @@ websearch_to_tsquery('english', ?)",
             sg.search,
@@ -67,31 +52,19 @@ defmodule Cannery.ActivityLog do
               "? @@ websearch_to_tsquery('english', ?)",
               at.search,
               ^trimmed_search
-        )
-    )
-    |> order_by([sg: sg], {
+            ),
+        order_by: {
           :desc,
           fragment(
             "ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
             sg.search,
             ^trimmed_search
           )
-    })
+        },
+        distinct: sg.id
+    )
   end
 
-  @spec list_shot_groups_filter_type(Queryable.t(), AmmoType.type() | :all) ::
-          Queryable.t()
-  defp list_shot_groups_filter_type(query, :rifle),
-    do: query |> where([at: at], at.type == :rifle)
-
-  defp list_shot_groups_filter_type(query, :pistol),
-    do: query |> where([at: at], at.type == :pistol)
-
-  defp list_shot_groups_filter_type(query, :shotgun),
-    do: query |> where([at: at], at.type == :shotgun)
-
-  defp list_shot_groups_filter_type(query, _all), do: query
-
   @spec list_shot_groups_for_ammo_group(AmmoGroup.t(), User.t()) :: [ShotGroup.t()]
   def list_shot_groups_for_ammo_group(
         %AmmoGroup{id: ammo_group_id, user_id: user_id},

lib/cannery/activity_log/shot_group.ex

@@ -61,7 +61,6 @@ 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
@@ -69,7 +68,6 @@ 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
@@ -101,7 +99,6 @@ 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

@@ -9,7 +9,7 @@ defmodule Cannery.Ammo do
   alias Cannery.Containers.{Container, ContainerTag, Tag}
   alias Cannery.{ActivityLog, ActivityLog.ShotGroup}
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
-  alias Ecto.{Changeset, Queryable}
+  alias Ecto.Changeset
 
   @ammo_group_create_limit 10_000
   @ammo_group_preloads [:ammo_type]
@@ -20,69 +20,50 @@ defmodule Cannery.Ammo do
 
   ## Examples
 
-      iex> list_ammo_types(%User{id: 123}, :all)
+      iex> list_ammo_types(%User{id: 123})
       [%AmmoType{}, ...]
 
-      iex> list_ammo_types("cool", %User{id: 123}, :shotgun)
-      [%AmmoType{name: "My cool ammo type", type: :shotgun}, ...]
+      iex> list_ammo_types("cool", %User{id: 123})
+      [%AmmoType{name: "My cool ammo type"}, ...]
 
   """
-  @spec list_ammo_types(User.t(), AmmoType.type() | :all) :: [AmmoType.t()]
-  @spec list_ammo_types(search :: nil | String.t(), User.t(), AmmoType.type() | :all) ::
-          [AmmoType.t()]
-  def list_ammo_types(search \\ nil, user, type)
+  @spec list_ammo_types(User.t()) :: [AmmoType.t()]
+  @spec list_ammo_types(search :: nil | String.t(), User.t()) :: [AmmoType.t()]
+  def list_ammo_types(search \\ nil, user)
 
-  def list_ammo_types(search, %{id: user_id}, type) do
-    from(at in AmmoType,
-      as: :at,
+  def list_ammo_types(search, %{id: user_id}) when search |> is_nil() or search == "" do
+    Repo.all(
+      from at in AmmoType,
         where: at.user_id == ^user_id,
+        order_by: at.name,
         preload: ^@ammo_type_preloads
     )
-    |> list_ammo_types_filter_type(type)
-    |> list_ammo_types_filter_search(search)
-    |> Repo.all()
   end
 
-  @spec list_ammo_types_filter_search(Queryable.t(), search :: String.t() | nil) :: Queryable.t()
-  defp list_ammo_types_filter_search(query, search) when search in ["", nil],
-    do: query |> order_by([at: at], at.name)
-
-  defp list_ammo_types_filter_search(query, search) when search |> is_binary() do
+  def list_ammo_types(search, %{id: user_id}) when search |> is_binary() do
     trimmed_search = String.trim(search)
 
-    query
-    |> where(
-      [at: at],
+    Repo.all(
+      from at in AmmoType,
+        where: at.user_id == ^user_id,
+        where:
           fragment(
             "? @@ websearch_to_tsquery('english', ?)",
             at.search,
             ^trimmed_search
-      )
-    )
-    |> order_by(
-      [at: at],
-      {
+          ),
+        order_by: {
           :desc,
           fragment(
             "ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
             at.search,
             ^trimmed_search
           )
-      }
+        },
+        preload: ^@ammo_type_preloads
     )
   end
 
-  @spec list_ammo_types_filter_type(Queryable.t(), AmmoType.type() | :all) :: Queryable.t()
-  defp list_ammo_types_filter_type(query, :rifle), do: query |> where([at: at], at.type == :rifle)
-
-  defp list_ammo_types_filter_type(query, :pistol),
-    do: query |> where([at: at], at.type == :pistol)
-
-  defp list_ammo_types_filter_type(query, :shotgun),
-    do: query |> where([at: at], at.type == :shotgun)
-
-  defp list_ammo_types_filter_type(query, _all), do: query
-
   @doc """
   Returns a count of ammo_types.
 
@@ -99,7 +80,7 @@ defmodule Cannery.Ammo do
         where: at.user_id == ^user_id,
         select: count(at.id),
         distinct: true
-    ) || 0
+    )
   end
 
   @doc """
@@ -394,31 +375,36 @@ defmodule Cannery.Ammo do
 
   """
   @spec list_ammo_groups_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
-  @spec list_ammo_groups_for_type(AmmoType.t(), User.t(), show_used :: boolean()) ::
+  @spec list_ammo_groups_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
           [AmmoGroup.t()]
-  def list_ammo_groups_for_type(ammo_type, user, show_used \\ false)
+  def list_ammo_groups_for_type(ammo_type, user, include_empty \\ false)
 
   def list_ammo_groups_for_type(
         %AmmoType{id: ammo_type_id, user_id: user_id},
         %User{id: user_id},
-        show_used
+        true = _include_empty
       ) do
-    from(ag in AmmoGroup,
-      as: :ag,
+    Repo.all(
+      from ag in AmmoGroup,
         where: ag.ammo_type_id == ^ammo_type_id,
         where: ag.user_id == ^user_id,
         preload: ^@ammo_group_preloads
     )
-    |> list_ammo_groups_for_type_show_used(show_used)
-    |> Repo.all()
   end
 
-  @spec list_ammo_groups_for_type_show_used(Queryable.t(), show_used :: boolean()) ::
-          Queryable.t()
-  def list_ammo_groups_for_type_show_used(query, false),
-    do: query |> where([ag: ag], ag.count > 0)
-
-  def list_ammo_groups_for_type_show_used(query, _true), do: query
+  def list_ammo_groups_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: ag.user_id == ^user_id,
+        where: not (ag.count == 0),
+        preload: ^@ammo_group_preloads
+    )
+  end
 
   @doc """
   Returns the list of ammo_groups for a user and container.
@@ -427,86 +413,50 @@ defmodule Cannery.Ammo do
 
       iex> list_ammo_groups_for_container(
       ...>   %Container{id: 123, user_id: 456},
-      ...>   :rifle,
       ...>   %User{id: 456}
       ...> )
       [%AmmoGroup{}, ...]
 
       iex> list_ammo_groups_for_container(
       ...>   %Container{id: 123, user_id: 456},
-      ...>   :all,
-      ...>   %User{id: 456}
+      ...>   %User{id: 456},
+      ...>   true
       ...> )
       [%AmmoGroup{}, %AmmoGroup{}, ...]
 
   """
-  @spec list_ammo_groups_for_container(
-          Container.t(),
-          AmmoType.t() | :all,
-          User.t()
-        ) :: [AmmoGroup.t()]
+  @spec list_ammo_groups_for_container(Container.t(), User.t()) :: [AmmoGroup.t()]
+  @spec list_ammo_groups_for_container(Container.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def list_ammo_groups_for_container(container, user, include_empty \\ false)
+
   def list_ammo_groups_for_container(
         %Container{id: container_id, user_id: user_id},
-        type,
-        %User{id: user_id}
+        %User{id: user_id},
+        true = _include_empty
       ) do
-    from(ag in AmmoGroup,
-      as: :ag,
-      join: at in assoc(ag, :ammo_type),
-      as: :at,
+    Repo.all(
+      from ag in AmmoGroup,
         where: ag.container_id == ^container_id,
         where: ag.user_id == ^user_id,
-      where: ag.count > 0,
         preload: ^@ammo_group_preloads
     )
-    |> list_ammo_groups_for_container_filter_type(type)
-    |> Repo.all()
   end
 
-  @spec list_ammo_groups_for_container_filter_type(Queryable.t(), AmmoType.type() | :all) ::
-          Queryable.t()
-  defp list_ammo_groups_for_container_filter_type(query, :rifle),
-    do: query |> where([at: at], at.type == :rifle)
-
-  defp list_ammo_groups_for_container_filter_type(query, :pistol),
-    do: query |> where([at: at], at.type == :pistol)
-
-  defp list_ammo_groups_for_container_filter_type(query, :shotgun),
-    do: query |> where([at: at], at.type == :shotgun)
-
-  defp list_ammo_groups_for_container_filter_type(query, _all), do: query
-
-  @doc """
-  Returns a count of ammo_groups.
-
-  ## Examples
-
-      iex> get_ammo_groups_count!(%User{id: 123})
-      3
-
-      iex> get_ammo_groups_count!(%User{id: 123}, true)
-      4
-
-  """
-  @spec get_ammo_groups_count!(User.t()) :: integer()
-  @spec get_ammo_groups_count!(User.t(), show_used :: boolean()) :: integer()
-  def get_ammo_groups_count!(%User{id: user_id}, show_used \\ false) do
-    from(ag in AmmoGroup,
-      as: :ag,
+  def list_ammo_groups_for_container(
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        where: ag.container_id == ^container_id,
         where: ag.user_id == ^user_id,
-      select: count(ag.id),
-      distinct: true
+        where: not (ag.count == 0),
+        preload: ^@ammo_group_preloads
     )
-    |> get_ammo_groups_count_show_used(show_used)
-    |> Repo.one() || 0
   end
 
-  @spec get_ammo_groups_count_show_used(Queryable.t(), show_used :: boolean()) :: Queryable.t()
-  defp get_ammo_groups_count_show_used(query, false),
-    do: query |> where([ag: ag], ag.count > 0)
-
-  defp get_ammo_groups_count_show_used(query, _true), do: query
-
   @doc """
   Returns the count of ammo_groups for an ammo type.
 
@@ -527,15 +477,15 @@ defmodule Cannery.Ammo do
 
   """
   @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: non_neg_integer()
-  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t(), show_used :: boolean()) ::
+  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
           non_neg_integer()
   def get_ammo_groups_count_for_type(
         %AmmoType{id: ammo_type_id} = ammo_type,
         user,
-        show_used \\ false
+        include_empty \\ false
       ) do
     [ammo_type]
-    |> get_ammo_groups_count_for_types(user, show_used)
+    |> get_ammo_groups_count_for_types(user, include_empty)
     |> Map.get(ammo_type_id, 0)
   end
 
@@ -560,31 +510,28 @@ defmodule Cannery.Ammo do
   """
   @spec get_ammo_groups_count_for_types([AmmoType.t()], User.t()) ::
           %{optional(AmmoType.id()) => non_neg_integer()}
-  @spec get_ammo_groups_count_for_types([AmmoType.t()], User.t(), show_used :: boolean()) ::
+  @spec get_ammo_groups_count_for_types([AmmoType.t()], User.t(), include_empty :: boolean()) ::
           %{optional(AmmoType.id()) => non_neg_integer()}
-  def get_ammo_groups_count_for_types(ammo_types, %User{id: user_id}, show_used \\ false) do
+  def get_ammo_groups_count_for_types(ammo_types, %User{id: user_id}, include_empty \\ false) do
     ammo_type_ids =
       ammo_types
       |> Enum.map(fn %AmmoType{id: ammo_type_id, user_id: ^user_id} -> ammo_type_id end)
 
     from(ag in AmmoGroup,
-      as: :ag,
       where: ag.user_id == ^user_id,
       where: ag.ammo_type_id in ^ammo_type_ids,
       group_by: ag.ammo_type_id,
       select: {ag.ammo_type_id, count(ag.id)}
     )
-    |> get_ammo_groups_count_for_types_maybe_show_used(show_used)
+    |> maybe_include_empty(include_empty)
     |> Repo.all()
     |> Map.new()
   end
 
-  @spec get_ammo_groups_count_for_types_maybe_show_used(Queryable.t(), show_used :: boolean()) ::
-          Queryable.t()
-  defp get_ammo_groups_count_for_types_maybe_show_used(query, true), do: query
+  defp maybe_include_empty(query, true), do: query
 
-  defp get_ammo_groups_count_for_types_maybe_show_used(query, _false) do
-    query |> where([ag: ag], not (ag.count == 0))
+  defp maybe_include_empty(query, _false) do
+    query |> where([ag], not (ag.count == 0))
   end
 
   @doc """
@@ -681,7 +628,7 @@ defmodule Cannery.Ammo do
     Repo.all(
       from ag in AmmoGroup,
         where: ag.container_id in ^container_ids,
-        where: ag.count > 0,
+        where: ag.count != 0,
         group_by: ag.container_id,
         select: {ag.container_id, count(ag.id)}
     )
@@ -743,20 +690,17 @@ defmodule Cannery.Ammo do
       iex> list_ammo_groups(%User{id: 123})
       [%AmmoGroup{}, ...]
 
-      iex> list_ammo_groups("cool", %User{id: 123}, true)
+      iex> list_ammo_groups("cool", true, %User{id: 123})
       [%AmmoGroup{notes: "My cool ammo group"}, ...]
 
   """
-  @spec list_ammo_groups(search :: String.t() | nil, AmmoType.type() | :all, User.t()) ::
+  @spec list_ammo_groups(User.t()) :: [AmmoGroup.t()]
+  @spec list_ammo_groups(search :: nil | String.t(), User.t()) :: [AmmoGroup.t()]
+  @spec list_ammo_groups(search :: nil | String.t(), include_empty :: boolean(), User.t()) ::
           [AmmoGroup.t()]
-  @spec list_ammo_groups(
-          search :: nil | String.t(),
-          AmmoType.type() | :all,
-          User.t(),
-          show_used :: boolean()
-        ) :: [AmmoGroup.t()]
-  def list_ammo_groups(search, type, %{id: user_id}, show_used \\ false) do
-    from(ag in AmmoGroup,
+  def list_ammo_groups(search \\ nil, include_empty \\ false, %{id: user_id}) do
+    from(
+      ag in AmmoGroup,
       as: :ag,
       join: at in assoc(ag, :ammo_type),
       as: :at,
@@ -774,32 +718,17 @@ defmodule Cannery.Ammo do
       distinct: ag.id,
       preload: ^@ammo_group_preloads
     )
-    |> list_ammo_groups_filter_on_type(type)
-    |> list_ammo_groups_show_used(show_used)
+    |> list_ammo_groups_include_empty(include_empty)
     |> list_ammo_groups_search(search)
     |> Repo.all()
   end
 
-  @spec list_ammo_groups_filter_on_type(Queryable.t(), AmmoType.type() | :all) :: Queryable.t()
-  defp list_ammo_groups_filter_on_type(query, :rifle),
-    do: query |> where([at: at], at.type == :rifle)
+  defp list_ammo_groups_include_empty(query, true), do: query
 
-  defp list_ammo_groups_filter_on_type(query, :pistol),
-    do: query |> where([at: at], at.type == :pistol)
-
-  defp list_ammo_groups_filter_on_type(query, :shotgun),
-    do: query |> where([at: at], at.type == :shotgun)
-
-  defp list_ammo_groups_filter_on_type(query, _all), do: query
-
-  @spec list_ammo_groups_show_used(Queryable.t(), show_used :: boolean()) :: Queryable.t()
-  defp list_ammo_groups_show_used(query, true), do: query
-
-  defp list_ammo_groups_show_used(query, _false) do
-    query |> where([ag: ag], not (ag.count == 0))
+  defp list_ammo_groups_include_empty(query, false) do
+    query |> where([ag], not (ag.count == 0))
   end
 
-  @spec list_ammo_groups_show_used(Queryable.t(), search :: String.t() | nil) :: Queryable.t()
   defp list_ammo_groups_search(query, nil), do: query
   defp list_ammo_groups_search(query, ""), do: query
 

lib/cannery/ammo/ammo_type.ex

@@ -42,47 +42,30 @@ defmodule Cannery.Ammo.AmmoType do
     field :name, :string
     field :desc, :string
 
-    field :type, Ecto.Enum, values: [:rifle, :shotgun, :pistol]
-
-    # common fields
-    # https://shootersreference.com/reloadingdata/bullet_abbreviations/
+    # https://en.wikipedia.org/wiki/Bullet#Abbreviations
     field :bullet_type, :string
     field :bullet_core, :string
-    # also gauge for shotguns
+    field :cartridge, :string
     field :caliber, :string
     field :case_material, :string
+    field :jacket_type, :string
+    field :muzzle_velocity, :integer
     field :powder_type, :string
+    field :powder_grains_per_charge, :integer
     field :grains, :integer
     field :pressure, :string
     field :primer_type, :string
     field :firing_type, :string
-    field :manufacturer, :string
-    field :upc, :string
-
     field :tracer, :boolean, default: false
     field :incendiary, :boolean, default: false
     field :blank, :boolean, default: false
     field :corrosive, :boolean, default: false
 
-    # rifle/pistol fields
-    field :cartridge, :string
-    field :jacket_type, :string
-    field :powder_grains_per_charge, :integer
-    field :muzzle_velocity, :integer
-
-    # shotgun fields
-    field :wadding, :string
-    field :shot_type, :string
-    field :shot_material, :string
-    field :shot_size, :string
-    field :unfired_length, :string
-    field :brass_height, :string
-    field :chamber_size, :string
-    field :load_grains, :integer
-    field :shot_charge_weight, :string
-    field :dram_equivalent, :string
+    field :manufacturer, :string
+    field :upc, :string
 
     field :user_id, :binary_id
+
     has_many :ammo_groups, AmmoGroup
 
     timestamps()
@@ -92,7 +75,6 @@ defmodule Cannery.Ammo.AmmoType do
           id: id(),
           name: String.t(),
           desc: String.t() | nil,
-          type: type(),
           bullet_type: String.t() | nil,
           bullet_core: String.t() | nil,
           cartridge: String.t() | nil,
@@ -106,16 +88,6 @@ defmodule Cannery.Ammo.AmmoType do
           pressure: String.t() | nil,
           primer_type: String.t() | nil,
           firing_type: String.t() | nil,
-          wadding: String.t() | nil,
-          shot_type: String.t() | nil,
-          shot_material: String.t() | nil,
-          shot_size: String.t() | nil,
-          unfired_length: String.t() | nil,
-          brass_height: String.t() | nil,
-          chamber_size: String.t() | nil,
-          load_grains: integer() | nil,
-          shot_charge_weight: String.t() | nil,
-          dram_equivalent: String.t() | nil,
           tracer: boolean(),
           incendiary: boolean(),
           blank: boolean(),
@@ -130,14 +102,12 @@ defmodule Cannery.Ammo.AmmoType do
   @type new_ammo_type :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_ammo_type())
-  @type type :: :rifle | :shotgun | :pistol | nil
 
   @spec changeset_fields() :: [atom()]
   defp changeset_fields,
     do: [
       :name,
       :desc,
-      :type,
       :bullet_type,
       :bullet_core,
       :cartridge,
@@ -151,16 +121,6 @@ defmodule Cannery.Ammo.AmmoType do
       :pressure,
       :primer_type,
       :firing_type,
-      :wadding,
-      :shot_type,
-      :shot_material,
-      :shot_size,
-      :unfired_length,
-      :brass_height,
-      :chamber_size,
-      :load_grains,
-      :shot_charge_weight,
-      :dram_equivalent,
       :tracer,
       :incendiary,
       :blank,
@@ -169,55 +129,20 @@ 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,
-      :wadding,
-      :shot_type,
-      :shot_material,
-      :shot_size,
-      :unfired_length,
-      :brass_height,
-      :chamber_size,
-      :shot_charge_weight,
-      :dram_equivalent,
-      :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/container.ex

@@ -53,8 +53,6 @@ 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
 
@@ -63,8 +61,6 @@ 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,9 +47,6 @@ 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
 
@@ -58,9 +55,6 @@ 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,7 +39,6 @@
     <%= 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

@@ -5,7 +5,6 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
   use CanneryWeb, :live_component
   alias Cannery.{Accounts.User, Ammo.AmmoGroup, ComparableDate}
   alias Cannery.{ActivityLog, Ammo, Containers}
-  alias CanneryWeb.Components.TableComponent
   alias Ecto.UUID
   alias Phoenix.LiveView.{Rendered, Socket}
 
@@ -55,47 +54,59 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
          } = socket
        ) do
     columns =
+      if actions == [] do
         []
-      |> TableComponent.maybe_compose_columns(
-        %{label: gettext("Actions"), key: :actions, sortable: false},
-        actions != []
-      )
-      |> TableComponent.maybe_compose_columns(%{
-        label: gettext("Last used on"),
-        key: :used_up_on,
-        type: ComparableDate
-      })
-      |> TableComponent.maybe_compose_columns(%{
-        label: gettext("Purchased on"),
-        key: :purchased_on,
-        type: ComparableDate
-      })
-      |> TableComponent.maybe_compose_columns(
-        %{label: gettext("Container"), key: :container},
-        container != []
-      )
-      |> TableComponent.maybe_compose_columns(
-        %{label: gettext("Range"), key: :range},
-        range != []
-      )
-      |> TableComponent.maybe_compose_columns(%{label: gettext("CPR"), key: :cpr})
-      |> TableComponent.maybe_compose_columns(%{label: gettext("Price paid"), key: :price_paid})
-      |> TableComponent.maybe_compose_columns(
-        %{label: gettext("% left"), key: :remaining},
-        show_used
-      )
-      |> TableComponent.maybe_compose_columns(
+      else
+        [%{label: gettext("Actions"), key: :actions, sortable: false}]
+      end
+
+    columns = [
+      %{label: gettext("Purchased on"), key: :purchased_on, type: ComparableDate},
+      %{label: gettext("Last used on"), key: :used_up_on, type: ComparableDate} | columns
+    ]
+
+    columns =
+      if container == [] do
+        columns
+      else
+        [%{label: gettext("Container"), key: :container} | columns]
+      end
+
+    columns =
+      if range == [] do
+        columns
+      else
+        [%{label: gettext("Range"), key: :range} | columns]
+      end
+
+    columns = [
+      %{label: gettext("Price paid"), key: :price_paid},
+      %{label: gettext("CPR"), key: :cpr}
+      | columns
+    ]
+
+    columns =
+      if show_used do
+        [
           %{label: gettext("Original Count"), key: :original_count},
-        show_used
-      )
-      |> TableComponent.maybe_compose_columns(%{
-        label: if(show_used, do: gettext("Current Count"), else: gettext("Count")),
-        key: :count
-      })
-      |> TableComponent.maybe_compose_columns(
-        %{label: gettext("Ammo type"), key: :ammo_type},
-        ammo_type != []
-      )
+          %{label: gettext("% left"), key: :remaining}
+          | columns
+        ]
+      else
+        columns
+      end
+
+    columns = [
+      %{label: if(show_used, do: gettext("Current Count"), else: gettext("Count")), key: :count}
+      | columns
+    ]
+
+    columns =
+      if ammo_type == [] do
+        columns
+      else
+        [%{label: gettext("Ammo type"), key: :ammo_type} | columns]
+      end
 
     containers =
       ammo_groups
@@ -129,7 +140,12 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
   def render(assigns) do
     ~H"""
     <div id={@id} class="w-full">
-      <.live_component module={TableComponent} id={"table-#{@id}"} columns={@columns} rows={@rows} />
+      <.live_component
+        module={CanneryWeb.Components.TableComponent}
+        id={"table-#{@id}"}
+        columns={@columns}
+        rows={@rows}
+      />
     </div>
     """
   end

lib/cannery_web/components/ammo_type_table_component.ex

@@ -4,7 +4,6 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
   """
   use CanneryWeb, :live_component
   alias Cannery.{Accounts.User, ActivityLog, Ammo, Ammo.AmmoType}
-  alias CanneryWeb.Components.TableComponent
   alias Ecto.UUID
   alias Phoenix.LiveView.{Rendered, Socket}
 
@@ -13,7 +12,6 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
           %{
             required(:id) => UUID.t(),
             required(:current_user) => User.t(),
-            optional(:type) => AmmoType.type() | nil,
             optional(:show_used) => boolean(),
             optional(:ammo_types) => [AmmoType.t()],
             optional(:actions) => Rendered.t(),
@@ -26,7 +24,6 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
       socket
       |> assign(assigns)
       |> assign_new(:show_used, fn -> false end)
-      |> assign_new(:type, fn -> :all end)
       |> assign_new(:actions, fn -> [] end)
       |> display_ammo_types()
 
@@ -39,118 +36,90 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
              ammo_types: ammo_types,
              current_user: current_user,
              show_used: show_used,
-             type: type,
              actions: actions
            }
          } = socket
        ) do
-    filtered_columns =
+    columns =
       [
-        %{label: gettext("Cartridge"), key: :cartridge, type: :string},
-        %{
-          label: if(type == :shotgun, do: gettext("Gauge"), else: gettext("Caliber")),
-          key: :caliber,
-          type: :string
-        },
-        %{label: gettext("Unfired shell length"), key: :unfired_length, type: :string},
-        %{label: gettext("Brass height"), key: :brass_height, type: :string},
-        %{label: gettext("Chamber size"), key: :chamber_size, type: :string},
-        %{label: gettext("Chamber size"), key: :chamber_size, type: :string},
-        %{label: gettext("Grains"), key: :grains, type: :string},
+        %{label: gettext("Name"), key: :name, type: :name},
         %{label: gettext("Bullet type"), key: :bullet_type, type: :string},
-        %{
-          label: if(type == :shotgun, do: gettext("Slug core"), else: gettext("Bullet core")),
-          key: :bullet_core,
-          type: :string
-        },
-        %{label: gettext("Jacket type"), key: :jacket_type, type: :string},
+        %{label: gettext("Bullet core"), key: :bullet_core, type: :string},
+        %{label: gettext("Cartridge"), key: :cartridge, type: :string},
+        %{label: gettext("Caliber"), key: :caliber, type: :string},
         %{label: gettext("Case material"), key: :case_material, type: :string},
-        %{label: gettext("Wadding"), key: :wadding, type: :string},
-        %{label: gettext("Shot type"), key: :shot_type, type: :string},
-        %{label: gettext("Shot material"), key: :shot_material, type: :string},
-        %{label: gettext("Shot size"), key: :shot_size, type: :string},
-        %{label: gettext("Load grains"), key: :load_grains, type: :string},
-        %{label: gettext("Shot charge weight"), key: :shot_charge_weight, type: :string},
+        %{label: gettext("Jacket type"), key: :jacket_type, type: :string},
+        %{label: gettext("Muzzle velocity"), key: :muzzle_velocity, type: :string},
         %{label: gettext("Powder type"), key: :powder_type, type: :string},
         %{
           label: gettext("Powder grains per charge"),
           key: :powder_grains_per_charge,
           type: :string
         },
+        %{label: gettext("Grains"), key: :grains, type: :string},
         %{label: gettext("Pressure"), key: :pressure, type: :string},
-        %{label: gettext("Dram equivalent"), key: :dram_equivalent, type: :string},
-        %{label: gettext("Muzzle velocity"), key: :muzzle_velocity, type: :string},
         %{label: gettext("Primer type"), key: :primer_type, type: :string},
         %{label: gettext("Firing type"), key: :firing_type, type: :string},
-        %{label: gettext("Tracer"), key: :tracer, type: :atom},
-        %{label: gettext("Incendiary"), key: :incendiary, type: :atom},
-        %{label: gettext("Blank"), key: :blank, type: :atom},
-        %{label: gettext("Corrosive"), key: :corrosive, type: :atom},
-        %{label: gettext("Manufacturer"), key: :manufacturer, type: :string}
+        %{label: gettext("Tracer"), key: :tracer, type: :boolean},
+        %{label: gettext("Incendiary"), key: :incendiary, type: :boolean},
+        %{label: gettext("Blank"), key: :blank, type: :boolean},
+        %{label: gettext("Corrosive"), key: :corrosive, type: :boolean},
+        %{label: gettext("Manufacturer"), key: :manufacturer, type: :string},
+        %{label: gettext("UPC"), key: "upc", type: :string}
       ]
       |> Enum.filter(fn %{key: key, type: type} ->
         # remove columns if all values match defaults
-        default_value = if type == :atom, do: false, else: nil
+        default_value = if type == :boolean, do: false, else: nil
 
         ammo_types
-        |> Enum.any?(fn ammo_type -> Map.get(ammo_type, key, default_value) != default_value end)
+        |> Enum.any?(fn ammo_type ->
+          not (ammo_type |> Map.get(key) == default_value)
         end)
-
-    columns =
-      [%{label: gettext("Actions"), key: "actions", type: :actions, sortable: false}]
-      |> TableComponent.maybe_compose_columns(%{
-        label: gettext("Average CPR"),
-        key: :avg_price_paid,
-        type: :avg_price_paid
-      })
-      |> TableComponent.maybe_compose_columns(
-        %{
-          label: gettext("Total ever packs"),
-          key: :historical_pack_count,
-          type: :historical_pack_count
-        },
-        show_used
-      )
-      |> TableComponent.maybe_compose_columns(
-        %{
-          label: gettext("Used packs"),
-          key: :used_pack_count,
-          type: :used_pack_count
-        },
-        show_used
-      )
-      |> TableComponent.maybe_compose_columns(%{
-        label: gettext("Packs"),
-        key: :ammo_count,
-        type: :ammo_count
-      })
-      |> TableComponent.maybe_compose_columns(
-        %{
-          label: gettext("Total ever rounds"),
-          key: :historical_round_count,
-          type: :historical_round_count
-        },
-        show_used
-      )
-      |> TableComponent.maybe_compose_columns(
+      end)
+      |> Kernel.++([
+        %{label: gettext("Rounds"), key: :round_count, type: :round_count}
+      ])
+      |> Kernel.++(
+        if show_used do
+          [
             %{
               label: gettext("Used rounds"),
               key: :used_round_count,
               type: :used_round_count
             },
-        show_used
+            %{
+              label: gettext("Total ever rounds"),
+              key: :historical_round_count,
+              type: :historical_round_count
+            }
+          ]
+        else
+          []
+        end
       )
-      |> TableComponent.maybe_compose_columns(%{
-        label: gettext("Rounds"),
-        key: :round_count,
-        type: :round_count
-      })
-      |> TableComponent.maybe_compose_columns(filtered_columns)
-      |> TableComponent.maybe_compose_columns(
-        %{label: gettext("Type"), key: :type, type: :atom},
-        type in [:all, nil]
+      |> Kernel.++([%{label: gettext("Packs"), key: :ammo_count, type: :ammo_count}])
+      |> Kernel.++(
+        if show_used do
+          [
+            %{
+              label: gettext("Used packs"),
+              key: :used_pack_count,
+              type: :used_pack_count
+            },
+            %{
+              label: gettext("Total ever packs"),
+              key: :historical_pack_count,
+              type: :historical_pack_count
+            }
+          ]
+        else
+          []
+        end
       )
-      |> TableComponent.maybe_compose_columns(%{label: gettext("Name"), key: :name, type: :name})
+      |> Kernel.++([
+        %{label: gettext("Average CPR"), key: :avg_price_paid, type: :avg_price_paid},
+        %{label: gettext("Actions"), key: "actions", type: :actions, sortable: false}
+      ])
 
     round_counts = ammo_types |> Ammo.get_round_count_for_ammo_types(current_user)
     packs_count = ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user)
@@ -193,7 +162,12 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
   def render(assigns) do
     ~H"""
     <div id={@id} class="w-full">
-      <.live_component module={TableComponent} id={"table-#{@id}"} columns={@columns} rows={@rows} />
+      <.live_component
+        module={CanneryWeb.Components.TableComponent}
+        id={"table-#{@id}"}
+        columns={@columns}
+        rows={@rows}
+      />
     </div>
     """
   end
@@ -205,7 +179,7 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
     end)
   end
 
-  defp get_ammo_type_value(:atom, key, ammo_type, _other_data),
+  defp get_ammo_type_value(:boolean, key, ammo_type, _other_data),
     do: ammo_type |> Map.get(key) |> humanize()
 
   defp get_ammo_type_value(:round_count, _key, %{id: ammo_type_id}, %{round_counts: round_counts}),

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

@@ -6,7 +6,6 @@
     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>
@@ -32,7 +31,6 @@
         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/components/core_components/toggle_button.html.heex

@@ -1,4 +1,4 @@
-<label for={@id || @action} class="relative inline-flex items-center cursor-pointer">
+<label for={@id || @action} class="inline-flex relative items-center cursor-pointer">
   <input
     id={@id || @action}
     type="checkbox"
@@ -23,7 +23,7 @@
   </div>
   <span
     id={"#{@id || @action}-label"}
-    class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300 whitespace-nowrap"
+    class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300"
   >
     <%= render_slot(@inner_block) %>
   </span>

lib/cannery_web/components/table_component.ex

@@ -135,25 +135,4 @@ defmodule CanneryWeb.Components.TableComponent do
       sort_mode
     )
   end
-
-  @doc """
-  Conditionally composes elements into the columns list, supports maps and
-  lists. Works tail to front in order for efficiency
-
-      iex> []
-      ...> |> maybe_compose_columns(%{label: "Column 3"}, true)
-      ...> |> maybe_compose_columns(%{label: "Column 2"}, false)
-      ...> |> maybe_compose_columns(%{label: "Column 1"})
-      [%{label: "Column 1"}, %{label: "Column 3"}]
-
-  """
-  @spec maybe_compose_columns(list(), element_to_add :: list() | map()) :: list()
-  @spec maybe_compose_columns(list(), element_to_add :: list() | map(), boolean()) :: list()
-  def maybe_compose_columns(columns, element_or_elements, add? \\ true)
-
-  def maybe_compose_columns(columns, elements, true) when is_list(elements),
-    do: Enum.concat(elements, columns)
-
-  def maybe_compose_columns(columns, element, true) when is_map(element), do: [element | columns]
-  def maybe_compose_columns(columns, _element_or_elements, false), do: columns
 end

lib/cannery_web/controllers/export_controller.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.ExportController do
   alias Cannery.{ActivityLog, Ammo, Containers}
 
   def export(%{assigns: %{current_user: current_user}} = conn, %{"mode" => "json"}) do
-    ammo_types = Ammo.list_ammo_types(current_user, :all)
+    ammo_types = Ammo.list_ammo_types(current_user)
     used_counts = ammo_types |> ActivityLog.get_used_count_for_ammo_types(current_user)
     round_counts = ammo_types |> Ammo.get_round_count_for_ammo_types(current_user)
     ammo_group_counts = ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user)
@@ -28,7 +28,7 @@ defmodule CanneryWeb.ExportController do
         })
       end)
 
-    ammo_groups = Ammo.list_ammo_groups(nil, :all, current_user, true)
+    ammo_groups = Ammo.list_ammo_groups(nil, true, current_user)
     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)
@@ -48,7 +48,7 @@ defmodule CanneryWeb.ExportController do
         })
       end)
 
-    shot_groups = ActivityLog.list_shot_groups(:all, current_user)
+    shot_groups = ActivityLog.list_shot_groups(current_user)
 
     containers =
       Containers.list_containers(current_user)

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -26,7 +26,7 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
       socket =
       socket
       |> assign(:ammo_group_create_limit, @ammo_group_create_limit)
-      |> assign(:ammo_types, Ammo.list_ammo_types(current_user, :all))
+      |> assign(:ammo_types, Ammo.list_ammo_types(current_user))
       |> assign_new(:containers, fn -> Containers.list_containers(current_user) end)
 
     params =

lib/cannery_web/live/ammo_group_live/index.ex

@@ -8,11 +8,11 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
-    {:ok, socket |> assign(type: :all, show_used: false, search: search) |> display_ammo_groups()}
+    {:ok, socket |> assign(show_used: false, search: search) |> display_ammo_groups()}
   end
 
   def mount(_params, _session, socket) do
-    {:ok, socket |> assign(type: :all, show_used: false, search: nil) |> display_ammo_groups()}
+    {:ok, socket |> assign(show_used: false, search: nil) |> display_ammo_groups()}
   end
 
   @impl true
@@ -119,36 +119,10 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     {:noreply, socket}
   end
 
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "rifle"}}, socket) do
-    {:noreply, socket |> assign(:type, :rifle) |> display_ammo_groups()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "shotgun"}}, socket) do
-    {:noreply, socket |> assign(:type, :shotgun) |> display_ammo_groups()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "pistol"}}, socket) do
-    {:noreply, socket |> assign(:type, :pistol) |> display_ammo_groups()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => _all}}, socket) do
-    {:noreply, socket |> assign(:type, :all) |> display_ammo_groups()}
-  end
-
   defp display_ammo_groups(
-         %{
-           assigns: %{
-             type: type,
-             search: search,
-             current_user: current_user,
-             show_used: show_used
-           }
-         } = socket
+         %{assigns: %{search: search, current_user: current_user, show_used: show_used}} = socket
        ) do
-    # get total number of ammo groups to determine whether to display onboarding
-    # prompts
-    ammo_groups_count = Ammo.get_ammo_groups_count!(current_user, true)
-    ammo_groups = Ammo.list_ammo_groups(search, type, current_user, show_used)
+    ammo_groups = Ammo.list_ammo_groups(search, show_used, current_user)
     ammo_types_count = Ammo.get_ammo_types_count!(current_user)
     containers_count = Containers.get_containers_count!(current_user)
 
@@ -156,8 +130,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     |> assign(
       ammo_groups: ammo_groups,
       ammo_types_count: ammo_types_count,
-      containers_count: containers_count,
-      ammo_groups_count: ammo_groups_count
+      containers_count: containers_count
     )
   end
 end

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

@@ -3,6 +3,14 @@
     <%= gettext("Ammo") %>
   </h1>
 
+  <h2
+    :if={@ammo_groups |> Enum.empty?() and @search |> is_nil()}
+    class="title text-xl text-primary-600"
+  >
+    <%= gettext("No Ammo") %>
+    <%= display_emoji("😔") %>
+  </h2>
+
   <%= cond do %>
     <% @containers_count == 0 -> %>
       <div class="flex justify-center items-center">
@@ -24,12 +32,7 @@
           <%= dgettext("actions", "add an ammo type first") %>
         </.link>
       </div>
-    <% @ammo_groups_count == 0 -> %>
-      <h2 class="title text-xl text-primary-600">
-        <%= gettext("No ammo") %>
-        <%= display_emoji("😔") %>
-      </h2>
-
+    <% @ammo_groups |> Enum.empty?() and @search |> is_nil() -> %>
       <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
         <%= dgettext("actions", "Add your first box!") %>
       </.link>
@@ -37,42 +40,19 @@
       <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
         <%= dgettext("actions", "Add Ammo") %>
       </.link>
+  <% end %>
 
-      <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-2xl">
-        <.form
-          :let={f}
-          for={%{}}
-          as={:ammo_type}
-          phx-change="change_type"
-          phx-submit="change_type"
-          class="flex items-center"
-        >
-          <%= label(f, :type, gettext("Type"), class: "title text-primary-600 text-lg text-center") %>
-
-          <%= select(
-            f,
-            :type,
-            [
-              {gettext("All"), :all},
-              {gettext("Rifle"), :rifle},
-              {gettext("Shotgun"), :shotgun},
-              {gettext("Pistol"), :pistol}
-            ],
-            class: "mx-2 my-1 min-w-md input input-primary",
-            value: @type
-          ) %>
-        </.form>
-
+  <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-xl">
     <.form
       :let={f}
       for={%{}}
       as={:search}
       phx-change="search"
       phx-submit="search"
-          class="grow flex items-center"
+      class="grow self-stretch flex flex-col items-stretch"
     >
       <%= text_input(f, :search_term,
-            class: "grow input input-primary",
+        class: "input input-primary",
         value: @search,
         role: "search",
         phx_debounce: 300,
@@ -199,7 +179,6 @@
       </:actions>
     </.live_component>
   <% end %>
-  <% end %>
 </div>
 
 <%= case @live_action do %>

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

@@ -15,24 +15,11 @@
       :if={@changeset.action && not @changeset.valid?()}
       class="invalid-feedback col-span-3 text-center"
     >
-      <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
+      <%= changeset_errors(@changeset) %>
     </div>
 
-    <%= label(f, :type, gettext("Type"), class: "title text-lg text-primary-600") %>
-    <%= select(
-      f,
-      :type,
-      [{gettext("Rifle"), :rifle}, {gettext("Shotgun"), :shotgun}, {gettext("Pistol"), :pistol}],
-      class: "text-center col-span-2 input input-primary",
-      maxlength: 255
-    ) %>
-    <%= error_tag(f, :type, "col-span-3 text-center") %>
-
     <%= 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",
-      maxlength: 255
-    ) %>
+    <%= text_input(f, :name, class: "text-center col-span-2 input input-primary") %>
     <%= error_tag(f, :name, "col-span-3 text-center") %>
 
     <%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-600") %>
@@ -44,238 +31,54 @@
     ) %>
     <%= error_tag(f, :desc, "col-span-3 text-center") %>
 
-    <h2 class="text-center title text-lg text-primary-600 col-span-3">
-      <%= gettext("Dimensions") %>
-    </h2>
-
-    <%= if Changeset.get_field(@changeset, :type) in [:rifle, :pistol] do %>
-      <%= 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") %>
-    <% else %>
-      <%= hidden_input(f, :cartridge, value: nil) %>
-    <% end %>
-
-    <%= label(
-      f,
-      :caliber,
-      if(Changeset.get_field(@changeset, :type) == :shotgun,
-        do: gettext("Gauge"),
-        else: 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") %>
-
-    <%= if Changeset.get_field(@changeset, :type) == :shotgun do %>
-      <%= label(f, :unfired_length, gettext("Unfired shell length"),
-        class: "title text-lg text-primary-600"
-      ) %>
-      <%= text_input(f, :unfired_length,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255
-      ) %>
-      <%= error_tag(f, :unfired_length, "col-span-3 text-center") %>
-
-      <%= label(f, :brass_height, gettext("Brass height"), class: "title text-lg text-primary-600") %>
-      <%= text_input(f, :brass_height,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255
-      ) %>
-      <%= error_tag(f, :brass_height, "col-span-3 text-center") %>
-
-      <%= label(f, :chamber_size, gettext("Chamber size"), class: "title text-lg text-primary-600") %>
-      <%= text_input(f, :chamber_size,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255
-      ) %>
-      <%= error_tag(f, :chamber_size, "col-span-3 text-center") %>
-    <% else %>
-      <%= hidden_input(f, :unfired_length, value: nil) %>
-      <%= hidden_input(f, :brass_height, value: nil) %>
-      <%= hidden_input(f, :chamber_size, value: nil) %>
-    <% end %>
-
-    <h2 class="text-center title text-lg text-primary-600 col-span-3">
-      <%= gettext("Projectile") %>
-    </h2>
-
-    <%= label(f, :grains, gettext("Grains"), class: "title text-lg text-primary-600") %>
-    <%= number_input(f, :grains,
-      step: "1",
-      class: "text-center col-span-2 input input-primary",
-      min: 1
-    ) %>
-    <%= error_tag(f, :grains, "col-span-3 text-center") %>
-
-    <%= label f, :bullet_type, class: "flex title text-lg text-primary-600 space-x-2" do %>
-      <p><%= gettext("Bullet type") %></p>
-
     <.link
       href="https://shootersreference.com/reloadingdata/bullet_abbreviations/"
-        class="link"
-        target="_blank"
-        rel="noopener noreferrer"
+      class="col-span-3 text-center link title text-md text-primary-600"
     >
-        <i class="fas fa-md fa-external-link-alt"></i>
+      <%= gettext("Example bullet type abbreviations") %>
     </.link>
-    <% end %>
+    <%= 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") %>
 
-    <%= label(
-      f,
-      :bullet_core,
-      if(Changeset.get_field(@changeset, :type) == :shotgun,
-        do: gettext("Slug core"),
-        else: gettext("Bullet core")
-      ),
-      class: "title text-lg text-primary-600"
-    ) %>
+    <%= 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") %>
 
-    <%= if Changeset.get_field(@changeset, :type) in [:rifle, :pistol] do %>
-      <%= label(f, :jacket_type, gettext("Jacket type"), class: "title text-lg text-primary-600") %>
-      <%= text_input(f, :jacket_type,
+    <%= 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("Bimetal")
+      placeholder: gettext("5.56x46mm NATO")
     ) %>
-      <%= error_tag(f, :jacket_type, "col-span-3 text-center") %>
-    <% else %>
-      <%= hidden_input(f, :jacket_type, value: nil) %>
-    <% end %>
+    <%= error_tag(f, :cartridge, "col-span-3 text-center") %>
+
+    <%= 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",
+      placeholder: gettext(".223")
+    ) %>
+    <%= error_tag(f, :caliber, "col-span-3 text-center") %>
 
     <%= 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") %>
 
-    <%= if Changeset.get_field(@changeset, :type) == :shotgun do %>
-      <%= label(f, :wadding, gettext("Wadding"), class: "title text-lg text-primary-600") %>
-      <%= text_input(f, :wadding,
+    <%= 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, :wadding, "col-span-3 text-center") %>
+    <%= error_tag(f, :case_material, "col-span-3 text-center") %>
 
-      <%= label(f, :shot_type, gettext("Shot type"), class: "title text-lg text-primary-600") %>
-      <%= text_input(f, :shot_type,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255,
-        placeholder: gettext("Target, bird, buck, etc")
-      ) %>
-      <%= error_tag(f, :shot_type, "col-span-3 text-center") %>
-
-      <%= label(f, :shot_material, gettext("Shot material"),
-        class: "title text-lg text-primary-600"
-      ) %>
-      <%= text_input(f, :shot_material,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255
-      ) %>
-      <%= error_tag(f, :shot_material, "col-span-3 text-center") %>
-
-      <%= label(f, :shot_size, gettext("Shot size"), class: "title text-lg text-primary-600") %>
-      <%= text_input(f, :shot_size,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255
-      ) %>
-      <%= error_tag(f, :shot_size, "col-span-3 text-center") %>
-
-      <%= label(f, :load_grains, gettext("Load grains"), class: "title text-lg text-primary-600") %>
-      <%= number_input(f, :load_grains,
-        step: "1",
-        class: "text-center col-span-2 input input-primary",
-        min: 1
-      ) %>
-      <%= error_tag(f, :load_grains, "col-span-3 text-center") %>
-
-      <%= label(f, :shot_charge_weight, gettext("Shot charge weight"),
-        class: "title text-lg text-primary-600"
-      ) %>
-      <%= text_input(f, :shot_charge_weight,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255
-      ) %>
-      <%= error_tag(f, :shot_charge_weight, "col-span-3 text-center") %>
-    <% else %>
-      <%= hidden_input(f, :wadding, value: nil) %>
-      <%= hidden_input(f, :shot_type, value: nil) %>
-      <%= hidden_input(f, :shot_material, value: nil) %>
-      <%= hidden_input(f, :shot_size, value: nil) %>
-      <%= hidden_input(f, :load_grains, value: nil) %>
-      <%= hidden_input(f, :shot_charge_weight, value: nil) %>
-    <% end %>
-
-    <h2 class="text-center title text-lg text-primary-600 col-span-3">
-      <%= gettext("Powder") %>
-    </h2>
-
-    <%= 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",
-      maxlength: 255
-    ) %>
-    <%= error_tag(f, :powder_type, "col-span-3 text-center") %>
-
-    <%= if Changeset.get_field(@changeset, :type) in [:rifle, :pistol] do %>
-      <%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"),
-        class: "title text-lg text-primary-600"
-      ) %>
-      <%= number_input(f, :powder_grains_per_charge,
-        step: "1",
-        class: "text-center col-span-2 input input-primary",
-        min: 1
-      ) %>
-      <%= error_tag(f, :powder_grains_per_charge, "col-span-3 text-center") %>
-    <% else %>
-      <%= hidden_input(f, :powder_grains_per_charge, value: nil) %>
-    <% end %>
-
-    <%= 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") %>
-
-    <%= if Changeset.get_field(@changeset, :type) == :shotgun do %>
-      <%= label(f, :dram_equivalent, gettext("Dram equivalent"),
-        class: "title text-lg text-primary-600"
-      ) %>
-      <%= text_input(f, :dram_equivalent,
-        class: "text-center col-span-2 input input-primary",
-        maxlength: 255
-      ) %>
-      <%= error_tag(f, :dram_equivalent, "col-span-3 text-center") %>
-    <% else %>
-      <%= hidden_input(f, :dram_equivalent, value: nil) %>
-    <% end %>
-
-    <%= if Changeset.get_field(@changeset, :type) in [:rifle, :pistol] do %>
     <%= label(f, :muzzle_velocity, gettext("Muzzle velocity"),
       class: "title text-lg text-primary-600"
     ) %>
@@ -285,18 +88,39 @@
       min: 1
     ) %>
     <%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %>
-    <% else %>
-      <%= hidden_input(f, :muzzle_velocity, value: nil) %>
-    <% end %>
 
-    <h2 class="text-center title text-lg text-primary-600 col-span-3">
-      <%= gettext("Primer") %>
-    </h2>
+    <%= 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") %>
+    <%= error_tag(f, :powder_type, "col-span-3 text-center") %>
+
+    <%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"),
+      class: "title text-lg text-primary-600"
+    ) %>
+    <%= number_input(f, :powder_grains_per_charge,
+      step: "1",
+      class: "text-center col-span-2 input input-primary",
+      min: 1
+    ) %>
+    <%= error_tag(f, :powder_grains_per_charge, "col-span-3 text-center") %>
+
+    <%= label(f, :grains, gettext("Grains"), class: "title text-lg text-primary-600") %>
+    <%= number_input(f, :grains,
+      step: "1",
+      class: "text-center col-span-2 input input-primary",
+      min: 1
+    ) %>
+    <%= error_tag(f, :grains, "col-span-3 text-center") %>
+
+    <%= 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",
+      placeholder: gettext("+P")
+    ) %>
+    <%= error_tag(f, :pressure, "col-span-3 text-center") %>
 
     <%= 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") %>
@@ -304,15 +128,10 @@
     <%= 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") %>
 
-    <h2 class="text-center title text-lg text-primary-600 col-span-3">
-      <%= gettext("Attributes") %>
-    </h2>
-
     <%= label(f, :tracer, gettext("Tracer"), class: "title text-lg text-primary-600") %>
     <%= checkbox(f, :tracer, class: "text-center col-span-2 checkbox") %>
     <%= error_tag(f, :tracer, "col-span-3 text-center") %>
@@ -329,22 +148,12 @@
     <%= checkbox(f, :corrosive, class: "text-center col-span-2 checkbox") %>
     <%= error_tag(f, :corrosive, "col-span-3 text-center") %>
 
-    <h2 class="text-center title text-lg text-primary-600 col-span-3">
-      <%= gettext("Manufacturer") %>
-    </h2>
-
     <%= 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",
-      maxlength: 255
-    ) %>
+    <%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %>
     <%= 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",
-      maxlength: 255
-    ) %>
+    <%= text_input(f, :upc, class: "text-center col-span-2 input input-primary") %>
     <%= error_tag(f, :upc, "col-span-3 text-center") %>
 
     <%= submit(dgettext("actions", "Save"),

lib/cannery_web/live/ammo_type_live/index.ex

@@ -8,11 +8,11 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
-    {:ok, socket |> assign(type: :all, show_used: false, search: search) |> list_ammo_types()}
+    {:ok, socket |> assign(show_used: false, search: search) |> list_ammo_types()}
   end
 
   def mount(_params, _session, socket) do
-    {:ok, socket |> assign(type: :all, show_used: false, search: nil) |> list_ammo_types()}
+    {:ok, socket |> assign(show_used: false, search: nil) |> list_ammo_types()}
   end
 
   @impl true
@@ -86,29 +86,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     {:noreply, socket |> push_patch(to: search_path)}
   end
 
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "rifle"}}, socket) do
-    {:noreply, socket |> assign(:type, :rifle) |> list_ammo_types()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "shotgun"}}, socket) do
-    {:noreply, socket |> assign(:type, :shotgun) |> list_ammo_types()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "pistol"}}, socket) do
-    {:noreply, socket |> assign(:type, :pistol) |> list_ammo_types()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => _all}}, socket) do
-    {:noreply, socket |> assign(:type, :all) |> list_ammo_types()}
-  end
-
-  defp list_ammo_types(
-         %{assigns: %{type: type, search: search, current_user: current_user}} = socket
-       ) do
-    socket
-    |> assign(
-      ammo_types: Ammo.list_ammo_types(search, current_user, type),
-      ammo_types_count: Ammo.get_ammo_types_count!(current_user)
-    )
+  defp list_ammo_types(%{assigns: %{search: search, current_user: current_user}} = socket) do
+    socket |> assign(ammo_types: Ammo.list_ammo_types(search, current_user))
   end
 end

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

@@ -3,7 +3,7 @@
     <%= gettext("Catalog") %>
   </h1>
 
-  <%= if @ammo_types_count == 0 do %>
+  <%= if @ammo_types |> Enum.empty?() and @search |> is_nil() do %>
     <h2 class="title text-xl text-primary-600">
       <%= gettext("No Ammo types") %>
       <%= display_emoji("😔") %>
@@ -17,41 +17,17 @@
       <%= dgettext("actions", "New Ammo type") %>
     </.link>
 
-    <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-2xl">
-      <.form
-        :let={f}
-        for={%{}}
-        as={:ammo_type}
-        phx-change="change_type"
-        phx-submit="change_type"
-        class="flex items-center"
-      >
-        <%= label(f, :type, gettext("Type"), class: "title text-primary-600 text-lg text-center") %>
-
-        <%= select(
-          f,
-          :type,
-          [
-            {gettext("All"), :all},
-            {gettext("Rifle"), :rifle},
-            {gettext("Shotgun"), :shotgun},
-            {gettext("Pistol"), :pistol}
-          ],
-          class: "mx-2 my-1 min-w-md input input-primary",
-          value: @type
-        ) %>
-      </.form>
-
+    <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-xl">
       <.form
         :let={f}
         for={%{}}
         as={:search}
         phx-change="search"
         phx-submit="search"
-        class="grow flex items-center"
+        class="grow self-stretch flex flex-col items-stretch"
       >
         <%= text_input(f, :search_term,
-          class: "grow input input-primary",
+          class: "input input-primary",
           value: @search,
           role: "search",
           phx_debounce: 300,
@@ -79,7 +55,6 @@
         ammo_types={@ammo_types}
         current_user={@current_user}
         show_used={@show_used}
-        type={@type}
       >
         <:actions :let={ammo_type}>
           <div class="px-4 py-2 space-x-4 flex justify-center items-center">

lib/cannery_web/live/ammo_type_live/show.ex

@@ -7,6 +7,28 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   alias Cannery.{ActivityLog, Ammo, Ammo.AmmoType, Containers}
   alias CanneryWeb.Endpoint
 
+  @fields_list [
+    %{label: gettext("Bullet type:"), key: :bullet_type, type: :string},
+    %{label: gettext("Bullet core:"), key: :bullet_core, type: :string},
+    %{label: gettext("Cartridge:"), key: :cartridge, type: :string},
+    %{label: gettext("Caliber:"), key: :caliber, type: :string},
+    %{label: gettext("Case material:"), key: :case_material, type: :string},
+    %{label: gettext("Jacket type:"), key: :jacket_type, type: :string},
+    %{label: gettext("Muzzle velocity:"), key: :muzzle_velocity, type: :string},
+    %{label: gettext("Powder type:"), key: :powder_type, type: :string},
+    %{label: gettext("Powder grains per charge:"), key: :powder_grains_per_charge, type: :string},
+    %{label: gettext("Grains:"), key: :grains, type: :string},
+    %{label: gettext("Pressure:"), key: :pressure, type: :string},
+    %{label: gettext("Primer type:"), key: :primer_type, type: :string},
+    %{label: gettext("Firing type:"), key: :firing_type, type: :string},
+    %{label: gettext("Tracer:"), key: :tracer, type: :boolean},
+    %{label: gettext("Incendiary:"), key: :incendiary, type: :boolean},
+    %{label: gettext("Blank:"), key: :blank, type: :boolean},
+    %{label: gettext("Corrosive:"), key: :corrosive, type: :boolean},
+    %{label: gettext("Manufacturer:"), key: :manufacturer, type: :string},
+    %{label: gettext("UPC:"), key: :upc, type: :string}
+  ]
+
   @impl true
   def mount(_params, _session, socket),
     do: {:ok, socket |> assign(show_used: false, view_table: true)}
@@ -43,8 +65,8 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
            socket,
          %AmmoType{name: ammo_type_name} = ammo_type
        ) do
-    custom_fields? =
-      fields_to_display(ammo_type)
+    fields_to_display =
+      @fields_list
       |> Enum.any?(fn %{key: field, type: type} ->
         default_value =
           case type do
@@ -103,8 +125,8 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
       packs_count: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user),
       used_packs_count: used_packs_count,
       historical_packs_count: historical_packs_count,
-      fields_to_display: fields_to_display(ammo_type),
-      custom_fields?: custom_fields?
+      fields_list: @fields_list,
+      fields_to_display: fields_to_display
     )
   end
 
@@ -116,48 +138,6 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     socket |> display_ammo_type(ammo_type)
   end
 
-  defp fields_to_display(%AmmoType{type: type}) do
-    [
-      %{label: gettext("Cartridge:"), key: :cartridge, type: :string},
-      %{
-        label: if(type == :shotgun, do: gettext("Gauge:"), else: gettext("Caliber:")),
-        key: :caliber,
-        type: :string
-      },
-      %{label: gettext("Unfired length:"), key: :unfired_length, type: :string},
-      %{label: gettext("Brass height:"), key: :brass_height, type: :string},
-      %{label: gettext("Chamber size:"), key: :chamber_size, type: :string},
-      %{label: gettext("Grains:"), key: :grains, type: :string},
-      %{label: gettext("Bullet type:"), key: :bullet_type, type: :string},
-      %{label: gettext("Bullet core:"), key: :bullet_core, type: :string},
-      %{label: gettext("Jacket type:"), key: :jacket_type, type: :string},
-      %{label: gettext("Case material:"), key: :case_material, type: :string},
-      %{label: gettext("Wadding:"), key: :wadding, type: :string},
-      %{label: gettext("Shot type:"), key: :shot_type, type: :string},
-      %{label: gettext("Shot material:"), key: :shot_material, type: :string},
-      %{label: gettext("Shot size:"), key: :shot_size, type: :string},
-      %{label: gettext("Load grains:"), key: :load_grains, type: :string},
-      %{label: gettext("Shot charge weight:"), key: :shot_charge_weight, type: :string},
-      %{label: gettext("Powder type:"), key: :powder_type, type: :string},
-      %{
-        label: gettext("Powder grains per charge:"),
-        key: :powder_grains_per_charge,
-        type: :string
-      },
-      %{label: gettext("Pressure:"), key: :pressure, type: :string},
-      %{label: gettext("Dram equivalent:"), key: :dram_equivalent, type: :string},
-      %{label: gettext("Muzzle velocity:"), key: :muzzle_velocity, type: :string},
-      %{label: gettext("Primer type:"), key: :primer_type, type: :string},
-      %{label: gettext("Firing type:"), key: :firing_type, type: :string},
-      %{label: gettext("Tracer:"), key: :tracer, type: :boolean},
-      %{label: gettext("Incendiary:"), key: :incendiary, type: :boolean},
-      %{label: gettext("Blank:"), key: :blank, type: :boolean},
-      %{label: gettext("Corrosive:"), key: :corrosive, type: :boolean},
-      %{label: gettext("Manufacturer:"), key: :manufacturer, type: :string},
-      %{label: gettext("UPC:"), key: :upc, type: :string}
-    ]
-  end
-
   @spec display_currency(float()) :: String.t()
   defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
 end

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

@@ -42,26 +42,9 @@
 
   <hr class="hr" />
 
-  <%= if @ammo_type.type || @custom_fields? do %>
+  <%= if @fields_to_display do %>
     <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
-      <h3 class="title text-lg">
-        <%= gettext("Type") %>
-      </h3>
-
-      <span class="text-primary-600">
-        <%= case @ammo_type.type do %>
-          <% :shotgun -> %>
-            <%= gettext("Shotgun") %>
-          <% :rifle -> %>
-            <%= gettext("Rifle") %>
-          <% :pistol -> %>
-            <%= gettext("Pistol") %>
-          <% _ -> %>
-            <%= gettext("None specified") %>
-        <% end %>
-      </span>
-
-      <%= for %{label: label, key: key, type: type} <- @fields_to_display do %>
+      <%= for %{label: label, key: key, type: type} <- @fields_list do %>
         <%= if @ammo_type |> Map.get(key) do %>
           <h3 class="title text-lg">
             <%= label %>

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

@@ -21,8 +21,7 @@
     <%= 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"),
-      maxlength: 255
+      placeholder: gettext("My cool ammo can")
     ) %>
     <%= error_tag(f, :name, "col-span-3 text-center") %>
 
@@ -39,8 +38,7 @@
     <%= 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"),
-      maxlength: 255
+      placeholder: gettext("Magazine, Clip, Ammo Box, etc")
     ) %>
     <%= error_tag(f, :type, "col-span-3 text-center") %>
 

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

@@ -17,17 +17,17 @@
       <%= dgettext("actions", "New Container") %>
     </.link>
 
-    <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-2xl">
+    <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-xl">
       <.form
         :let={f}
         for={%{}}
         as={:search}
         phx-change="search"
         phx-submit="search"
-        class="grow flex items-center"
+        class="grow self-stretch flex flex-col items-stretch"
       >
         <%= text_input(f, :search_term,
-          class: "grow input input-primary",
+          class: "input input-primary",
           value: @search,
           role: "search",
           phx_debounce: 300,
@@ -41,6 +41,7 @@
         </span>
       </.toggle_button>
     </div>
+  <% end %>
 
   <%= if @containers |> Enum.empty?() do %>
     <h2 class="title text-xl text-primary-600">
@@ -96,9 +97,7 @@
             phx-click="delete"
             phx-value-id={container.id}
             data-confirm={
-                dgettext("prompts", "Are you sure you want to delete %{name}?",
-                  name: container.name
-                )
+              dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name)
             }
             aria-label={
               dgettext("actions", "Delete %{container_name}", container_name: container.name)
@@ -154,9 +153,7 @@
             phx-click="delete"
             phx-value-id={container.id}
             data-confirm={
-                dgettext("prompts", "Are you sure you want to delete %{name}?",
-                  name: container.name
-                )
+              dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name)
             }
             aria-label={
               dgettext("actions", "Delete %{container_name}", container_name: container.name)
@@ -168,7 +165,6 @@
       </div>
     <% end %>
   <% end %>
-  <% end %>
 </div>
 
 <%= case @live_action do %>

lib/cannery_web/live/container_live/show.ex

@@ -11,7 +11,7 @@ defmodule CanneryWeb.ContainerLive.Show do
 
   @impl true
   def mount(_params, _session, socket),
-    do: {:ok, socket |> assign(type: :all, view_table: true)}
+    do: {:ok, socket |> assign(show_used: false, view_table: true)}
 
   @impl true
   def handle_params(%{"id" => id}, _session, %{assigns: %{current_user: current_user}} = socket) do
@@ -82,34 +82,22 @@ defmodule CanneryWeb.ContainerLive.Show do
     {:noreply, socket}
   end
 
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> render_container()}
+  end
+
   def handle_event("toggle_table", _params, %{assigns: %{view_table: view_table}} = socket) do
     {:noreply, socket |> assign(:view_table, !view_table) |> render_container()}
   end
 
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "rifle"}}, socket) do
-    {:noreply, socket |> assign(:type, :rifle) |> render_container()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "shotgun"}}, socket) do
-    {:noreply, socket |> assign(:type, :shotgun) |> render_container()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "pistol"}}, socket) do
-    {:noreply, socket |> assign(:type, :pistol) |> render_container()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => _all}}, socket) do
-    {:noreply, socket |> assign(:type, :all) |> render_container()}
-  end
-
   @spec render_container(Socket.t(), Container.id(), User.t()) :: Socket.t()
   defp render_container(
-         %{assigns: %{type: type, live_action: live_action}} = socket,
+         %{assigns: %{live_action: live_action, show_used: show_used}} = socket,
          id,
          current_user
        ) do
     %{name: container_name} = container = Containers.get_container!(id, current_user)
-    ammo_groups = Ammo.list_ammo_groups_for_container(container, type, current_user)
+    ammo_groups = Ammo.list_ammo_groups_for_container(container, current_user, show_used)
     original_counts = ammo_groups |> Ammo.get_original_counts(current_user)
     cprs = ammo_groups |> Ammo.get_cprs(current_user)
     last_used_dates = ammo_groups |> ActivityLog.get_last_used_dates(current_user)
@@ -125,7 +113,6 @@ defmodule CanneryWeb.ContainerLive.Show do
     |> assign(
       container: container,
       round_count: Ammo.get_round_count_for_container!(container, current_user),
-      ammo_groups_count: Ammo.get_ammo_groups_count_for_container!(container, current_user),
       ammo_groups: ammo_groups,
       original_counts: original_counts,
       cprs: cprs,

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

@@ -18,15 +18,22 @@
     <%= @container.location %>
   </span>
 
+  <%= unless @ammo_groups |> Enum.empty?() do %>
     <span class="rounded-lg title text-lg">
       <%= gettext("Packs:") %>
-    <%= @ammo_groups_count %>
+      <%= @ammo_groups |> Enum.reject(fn %{count: count} -> count in [0, nil] end) |> Enum.count() %>
+    </span>
+
+    <span :if={@show_used} class="rounded-lg title text-lg">
+      <%= gettext("Total packs:") %>
+      <%= Enum.count(@ammo_groups) %>
     </span>
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Rounds:") %>
       <%= @round_count %>
     </span>
+  <% end %>
 
   <div class="flex space-x-4 justify-center items-center text-primary-600">
     <.link
@@ -86,29 +93,11 @@
   <hr class="mb-4 hr" />
 
   <div class="flex justify-center items-center space-x-4">
-    <.form
-      :let={f}
-      for={%{}}
-      as={:ammo_type}
-      phx-change="change_type"
-      phx-submit="change_type"
-      class="flex items-center"
-    >
-      <%= label(f, :type, gettext("Type"), class: "title text-primary-600 text-lg text-center") %>
-
-      <%= select(
-        f,
-        :type,
-        [
-          {gettext("All"), :all},
-          {gettext("Rifle"), :rifle},
-          {gettext("Shotgun"), :shotgun},
-          {gettext("Pistol"), :pistol}
-        ],
-        class: "mx-2 my-1 min-w-md input input-primary",
-        value: @type
-      ) %>
-    </.form>
+    <.toggle_button action="toggle_show_used" value={@show_used}>
+      <span class="title text-lg text-primary-600">
+        <%= gettext("Show used") %>
+      </span>
+    </.toggle_button>
 
     <.toggle_button action="toggle_table" value={@view_table}>
       <span class="title text-lg text-primary-600">
@@ -129,7 +118,7 @@
           id="ammo-type-show-table"
           ammo_groups={@ammo_groups}
           current_user={@current_user}
-          show_used={false}
+          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,10 +18,7 @@
       <%= changeset_errors(@changeset) %>
     </div>
 
-    <%= label(f, :name, gettext("Name"),
-      class: "title text-lg text-primary-600",
-      maxlength: 255
-    ) %>
+    <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
     <%= 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,7 +31,6 @@
     <%= 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/range_live/index.ex

@@ -10,11 +10,11 @@ defmodule CanneryWeb.RangeLive.Index do
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
-    {:ok, socket |> assign(type: :all, search: search) |> display_shot_groups()}
+    {:ok, socket |> assign(search: search) |> display_shot_groups()}
   end
 
   def mount(_params, _session, socket) do
-    {:ok, socket |> assign(type: :all, search: nil) |> display_shot_groups()}
+    {:ok, socket |> assign(search: nil) |> display_shot_groups()}
   end
 
   @impl true
@@ -102,27 +102,9 @@ defmodule CanneryWeb.RangeLive.Index do
     {:noreply, socket |> push_patch(to: Routes.range_index_path(Endpoint, :search, search_term))}
   end
 
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "rifle"}}, socket) do
-    {:noreply, socket |> assign(:type, :rifle) |> display_shot_groups()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "shotgun"}}, socket) do
-    {:noreply, socket |> assign(:type, :shotgun) |> display_shot_groups()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => "pistol"}}, socket) do
-    {:noreply, socket |> assign(:type, :pistol) |> display_shot_groups()}
-  end
-
-  def handle_event("change_type", %{"ammo_type" => %{"type" => _all}}, socket) do
-    {:noreply, socket |> assign(:type, :all) |> display_shot_groups()}
-  end
-
   @spec display_shot_groups(Socket.t()) :: Socket.t()
-  defp display_shot_groups(
-         %{assigns: %{type: type, search: search, current_user: current_user}} = socket
-       ) do
-    shot_groups = ActivityLog.list_shot_groups(search, type, current_user)
+  defp display_shot_groups(%{assigns: %{search: search, current_user: current_user}} = socket) do
+    shot_groups = ActivityLog.list_shot_groups(search, current_user)
     ammo_groups = Ammo.list_staged_ammo_groups(current_user)
     chart_data = shot_groups |> get_chart_data_for_shot_group()
     original_counts = ammo_groups |> Ammo.get_original_counts(current_user)

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

@@ -74,41 +74,17 @@
       <%= dgettext("errors", "Your browser does not support the canvas element.") %>
     </canvas>
 
-    <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-2xl">
-      <.form
-        :let={f}
-        for={%{}}
-        as={:ammo_type}
-        phx-change="change_type"
-        phx-submit="change_type"
-        class="flex items-center"
-      >
-        <%= label(f, :type, gettext("Type"), class: "title text-primary-600 text-lg text-center") %>
-
-        <%= select(
-          f,
-          :type,
-          [
-            {gettext("All"), :all},
-            {gettext("Rifle"), :rifle},
-            {gettext("Shotgun"), :shotgun},
-            {gettext("Pistol"), :pistol}
-          ],
-          class: "mx-2 my-1 min-w-md input input-primary",
-          value: @type
-        ) %>
-      </.form>
-
+    <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-xl">
       <.form
         :let={f}
         for={%{}}
         as={:search}
         phx-change="search"
         phx-submit="search"
-        class="grow flex items-center"
+        class="grow self-stretch flex flex-col items-stretch"
       >
         <%= text_input(f, :search_term,
-          class: "grow input input-primary",
+          class: "input input-primary",
           value: @search,
           role: "search",
           phx_debounce: 300,

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", maxlength: 255) %>
+    <%= text_input(f, :name, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :name, "col-span-3") %>
 
     <%= label(f, :bg_color, gettext("Background color"), class: "title text-lg text-primary-600") %>

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

@@ -18,18 +18,19 @@
     <.link patch={Routes.tag_index_path(Endpoint, :new)} class="btn btn-primary">
       <%= dgettext("actions", "New Tag") %>
     </.link>
+  <% end %>
 
-    <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-2xl">
+  <div class="w-full flex flex-col sm:flex-row justify-center items-center space-y-4 sm:space-y-0 sm:space-x-4 max-w-xl">
     <.form
       :let={f}
       for={%{}}
       as={:search}
       phx-change="search"
       phx-submit="search"
-        class="grow flex items-center"
+      class="grow self-stretch flex flex-col items-stretch"
     >
       <%= text_input(f, :search_term,
-          class: "grow input input-primary",
+        class: "input input-primary",
         value: @search,
         role: "search",
         phx_debounce: 300,
@@ -69,7 +70,6 @@
       </.tag_card>
     </div>
   <% end %>
-  <% end %>
 </div>
 
 <.modal :if={@live_action in [:new, :edit]} return_to={Routes.tag_index_path(Endpoint, :index)}>

mix.exs

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

priv/gettext/actions.pot

@@ -12,12 +12,12 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -120,12 +120,12 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/components/add_shot_group_component.html.heex:56
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:350
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:44
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:125
+#: 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
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
@@ -203,13 +203,13 @@ msgstr ""
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 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:142
+#: 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"
@@ -237,13 +237,13 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:87
-#: lib/cannery_web/live/container_live/index.html.heex:145
+#: lib/cannery_web/live/container_live/index.html.heex:88
+#: lib/cannery_web/live/container_live/index.html.heex:144
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
@@ -253,20 +253,20 @@ msgstr ""
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:129
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:104
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:104
-#: lib/cannery_web/live/container_live/index.html.heex:162
-#: lib/cannery_web/live/container_live/show.html.heex:48
+#: lib/cannery_web/live/container_live/index.html.heex:103
+#: lib/cannery_web/live/container_live/index.html.heex:159
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:65
+#: lib/cannery_web/live/tag_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
@@ -277,30 +277,30 @@ msgid "Delete invite for %{invite_name}"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:161
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:77
-#: lib/cannery_web/live/container_live/index.html.heex:135
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/index.html.heex:78
+#: lib/cannery_web/live/container_live/index.html.heex:134
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:164
+#: 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"
@@ -316,45 +316,45 @@ msgstr ""
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:118
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:65
-#: lib/cannery_web/live/container_live/index.html.heex:124
+#: lib/cannery_web/live/container_live/index.html.heex:66
+#: lib/cannery_web/live/container_live/index.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:90
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:176
+#: 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:191
+#: 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:152
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:206
+#: 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

@@ -25,12 +25,12 @@ msgstr ""
 ## effect: edit them in PO (.po) files instead.
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "Munition hinzufügen"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "Fügen Sie ihre erste Box hinzu!"
@@ -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:57
+#: lib/cannery_web/components/add_shot_group_component.html.heex:56
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:350
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:44
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -149,7 +149,7 @@ msgstr "Speichern"
 msgid "Send instructions to reset password"
 msgstr "Anleitung zum Passwort zurücksetzen zusenden"
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
@@ -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:125
+#: 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
@@ -191,7 +191,7 @@ msgstr "Markieren"
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
@@ -216,13 +216,13 @@ msgstr "Sprache wechseln"
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 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:142
+#: 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"
@@ -250,13 +250,13 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:87
-#: lib/cannery_web/live/container_live/index.html.heex:145
+#: lib/cannery_web/live/container_live/index.html.heex:88
+#: lib/cannery_web/live/container_live/index.html.heex:144
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
@@ -266,20 +266,20 @@ msgstr ""
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:129
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:104
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:104
-#: lib/cannery_web/live/container_live/index.html.heex:162
-#: lib/cannery_web/live/container_live/show.html.heex:48
+#: lib/cannery_web/live/container_live/index.html.heex:103
+#: lib/cannery_web/live/container_live/index.html.heex:159
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:65
+#: lib/cannery_web/live/tag_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
@@ -290,30 +290,30 @@ msgid "Delete invite for %{invite_name}"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:161
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:77
-#: lib/cannery_web/live/container_live/index.html.heex:135
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/index.html.heex:78
+#: lib/cannery_web/live/container_live/index.html.heex:134
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:164
+#: 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"
@@ -329,45 +329,45 @@ msgstr ""
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:118
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Munition markieren"
 
-#: lib/cannery_web/live/container_live/index.html.heex:65
-#: lib/cannery_web/live/container_live/index.html.heex:124
+#: lib/cannery_web/live/container_live/index.html.heex:66
+#: lib/cannery_web/live/container_live/index.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:90
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:176
+#: 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:191
+#: 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:152
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:206
+#: 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/errors.po

@@ -69,7 +69,6 @@ msgstr "Ungültige Mailadresse oder Passwort"
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:18
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
@@ -118,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:145
+#: lib/cannery/accounts/user.ex:144
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "hat sich nicht geändert"
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"
 
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:202
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "ist nicht gültig"
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:99
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
@@ -173,7 +172,7 @@ msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
 "%{multiplier}"
 
-#: lib/cannery/ammo.ex:1114
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -188,27 +187,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:72
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:88
+#: lib/cannery/activity_log/shot_group.ex:86
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:84
+#: lib/cannery/activity_log/shot_group.ex:82
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:122
+#: lib/cannery/activity_log/shot_group.ex:119
 #, 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:80
+#: lib/cannery/activity_log/shot_group.ex:78
 #, 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:27
+#: 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"
@@ -65,15 +65,15 @@ msgstr ""
 "Sind Sie sicher, dass sie %{email} löschen möchten? Dies kann nicht "
 "zurückgenommen werden!"
 
-#: lib/cannery_web/live/container_live/index.html.heex:99
-#: lib/cannery_web/live/container_live/index.html.heex:157
-#: lib/cannery_web/live/container_live/show.html.heex:45
-#: lib/cannery_web/live/tag_live/index.html.heex:63
+#: lib/cannery_web/live/container_live/index.html.heex:100
+#: lib/cannery_web/live/container_live/index.html.heex:156
+#: lib/cannery_web/live/container_live/show.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 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:189
+#: 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:59
+#: lib/cannery_web/components/add_shot_group_component.html.heex:58
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:351
-#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:46
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -177,7 +177,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"
@@ -213,8 +213,8 @@ msgstr "Der Zwischenablage hinzugefügt"
 msgid "%{name} removed successfully"
 msgstr "%{name} erfolgreich entfernt"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Sie müssen"
@@ -257,7 +257,7 @@ msgid_plural "Ammo added successfully"
 msgstr[0] "Munitionsgruppe erfolgreich aktualisiert"
 msgstr[1] "Munitionsgruppe erfolgreich aktualisiert"
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:97
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/en/LC_MESSAGES/actions.po

@@ -12,12 +12,12 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -120,12 +120,12 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/components/add_shot_group_component.html.heex:56
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:350
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:44
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:125
+#: 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
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
@@ -203,13 +203,13 @@ msgstr ""
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 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:142
+#: 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"
@@ -237,13 +237,13 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:87
-#: lib/cannery_web/live/container_live/index.html.heex:145
+#: lib/cannery_web/live/container_live/index.html.heex:88
+#: lib/cannery_web/live/container_live/index.html.heex:144
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
@@ -253,20 +253,20 @@ msgstr ""
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:129
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:104
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:104
-#: lib/cannery_web/live/container_live/index.html.heex:162
-#: lib/cannery_web/live/container_live/show.html.heex:48
+#: lib/cannery_web/live/container_live/index.html.heex:103
+#: lib/cannery_web/live/container_live/index.html.heex:159
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:65
+#: lib/cannery_web/live/tag_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
@@ -277,30 +277,30 @@ msgid "Delete invite for %{invite_name}"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:161
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:77
-#: lib/cannery_web/live/container_live/index.html.heex:135
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/index.html.heex:78
+#: lib/cannery_web/live/container_live/index.html.heex:134
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:164
+#: 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"
@@ -316,45 +316,45 @@ msgstr ""
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:118
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:65
-#: lib/cannery_web/live/container_live/index.html.heex:124
+#: lib/cannery_web/live/container_live/index.html.heex:66
+#: lib/cannery_web/live/container_live/index.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:90
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:176
+#: 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:191
+#: 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:152
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:206
+#: 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/errors.po

@@ -56,7 +56,6 @@ msgstr ""
 msgid "Not found"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:18
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
@@ -104,23 +103,23 @@ msgstr ""
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:145
+#: lib/cannery/accounts/user.ex:144
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
 ## From Ecto.Changeset.put_change/3
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:202
 #, elixir-autogen, elixir-format, fuzzy
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:99
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -156,7 +155,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:1114
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -171,27 +170,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:72
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:88
+#: lib/cannery/activity_log/shot_group.ex:86
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:84
+#: lib/cannery/activity_log/shot_group.ex:82
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:122
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:80
+#: lib/cannery/activity_log/shot_group.ex:78
 #, 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:27
+#: 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"
@@ -50,15 +50,15 @@ msgstr ""
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:99
-#: lib/cannery_web/live/container_live/index.html.heex:157
-#: lib/cannery_web/live/container_live/show.html.heex:45
-#: lib/cannery_web/live/tag_live/index.html.heex:63
+#: lib/cannery_web/live/container_live/index.html.heex:100
+#: lib/cannery_web/live/container_live/index.html.heex:156
+#: lib/cannery_web/live/container_live/show.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:189
+#: 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:59
+#: lib/cannery_web/components/add_shot_group_component.html.heex:58
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:351
-#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:46
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -156,7 +156,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
@@ -192,8 +192,8 @@ msgstr ""
 msgid "%{name} removed successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr ""
@@ -236,7 +236,7 @@ msgid_plural "Ammo added successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:97
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/errors.pot

@@ -56,7 +56,6 @@ msgstr ""
 msgid "Not found"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:18
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
@@ -104,22 +103,22 @@ msgstr ""
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:145
+#: lib/cannery/accounts/user.ex:144
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:202
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:99
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -155,7 +154,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:1114
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -170,27 +169,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:72
 #, elixir-autogen, elixir-format
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:88
+#: lib/cannery/activity_log/shot_group.ex:86
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:84
+#: lib/cannery/activity_log/shot_group.ex:82
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:122
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format
 msgid "Count can be at most %{count} shots"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:80
+#: lib/cannery/activity_log/shot_group.ex:78
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -25,12 +25,12 @@ msgstr ""
 ## effect: edit them in PO (.po) files instead.
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "Añadir Munición"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "¡Añade tu primera caja!"
@@ -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:57
+#: lib/cannery_web/components/add_shot_group_component.html.heex:56
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:350
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:44
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -149,7 +149,7 @@ msgstr "Guardar"
 msgid "Send instructions to reset password"
 msgstr "Enviar instrucciones para reestablecer contraseña"
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "¿Por qué no añadir una?"
@@ -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:125
+#: 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
@@ -191,7 +191,7 @@ msgstr "Seleccionar"
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "añade primero un contenedor"
@@ -216,13 +216,13 @@ msgstr "Cambiar lenguaje"
 msgid "View in Catalog"
 msgstr "Ver en Catalogo"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 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:142
+#: 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"
@@ -250,13 +250,13 @@ msgstr "Desmontar del campo de tiro"
 msgid "Export Data as JSON"
 msgstr "Exportar datos como JSON"
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:87
-#: lib/cannery_web/live/container_live/index.html.heex:145
+#: lib/cannery_web/live/container_live/index.html.heex:88
+#: lib/cannery_web/live/container_live/index.html.heex:144
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
@@ -266,20 +266,20 @@ msgstr ""
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:129
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:104
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:104
-#: lib/cannery_web/live/container_live/index.html.heex:162
-#: lib/cannery_web/live/container_live/show.html.heex:48
+#: lib/cannery_web/live/container_live/index.html.heex:103
+#: lib/cannery_web/live/container_live/index.html.heex:159
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:65
+#: lib/cannery_web/live/tag_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
@@ -290,30 +290,30 @@ msgid "Delete invite for %{invite_name}"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:161
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:77
-#: lib/cannery_web/live/container_live/index.html.heex:135
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/index.html.heex:78
+#: lib/cannery_web/live/container_live/index.html.heex:134
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:164
+#: 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"
@@ -329,45 +329,45 @@ msgstr ""
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:118
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Preparar munición"
 
-#: lib/cannery_web/live/container_live/index.html.heex:65
-#: lib/cannery_web/live/container_live/index.html.heex:124
+#: lib/cannery_web/live/container_live/index.html.heex:66
+#: lib/cannery_web/live/container_live/index.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:90
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:176
+#: 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:191
+#: 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:152
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:206
+#: 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/errors.po

@@ -69,7 +69,6 @@ msgstr "Correo o contraseña incorrecta"
 msgid "Not found"
 msgstr "No se encontró"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:18
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
@@ -120,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:145
+#: lib/cannery/accounts/user.ex:144
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "no cambió"
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "no coincide con la contraseña"
 
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:202
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "no es válido"
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:99
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "debe tener el signo @ y no contener espacios"
@@ -171,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:1114
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr "Multiplicador inválido"
@@ -186,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:74
+#: lib/cannery/activity_log/shot_group.ex:72
 #, 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:88
+#: lib/cannery/activity_log/shot_group.ex:86
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:84
+#: lib/cannery/activity_log/shot_group.ex:82
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:122
+#: lib/cannery/activity_log/shot_group.ex:119
 #, 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:80
+#: lib/cannery/activity_log/shot_group.ex:78
 #, 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:27
+#: 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"
@@ -65,15 +65,15 @@ msgstr ""
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr "Está seguro que desea eliminar %{email}? Esta acción es permanente!"
 
-#: lib/cannery_web/live/container_live/index.html.heex:99
-#: lib/cannery_web/live/container_live/index.html.heex:157
-#: lib/cannery_web/live/container_live/show.html.heex:45
-#: lib/cannery_web/live/tag_live/index.html.heex:63
+#: lib/cannery_web/live/container_live/index.html.heex:100
+#: lib/cannery_web/live/container_live/index.html.heex:156
+#: lib/cannery_web/live/container_live/show.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 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:189
+#: 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:59
+#: lib/cannery_web/components/add_shot_group_component.html.heex:58
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:351
-#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:46
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -176,7 +176,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr "Está seguro que desea desmontar esta munición?"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "¿Está segure que quiere borrar este récord de disparos?"
@@ -212,8 +212,8 @@ msgstr "Copiado al portapapeles"
 msgid "%{name} removed successfully"
 msgstr "%{name} eliminado exitosamente"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Necesitará hacerlo"
@@ -256,7 +256,7 @@ msgid_plural "Ammo added successfully"
 msgstr[0] "Munición añadida exitosamente"
 msgstr[1] "Municiones añadidas exitosamente"
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:97
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -25,12 +25,12 @@ msgstr ""
 # # effect: edit them in PO (.po) files instead.
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "ajouter munition"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "Ajoutez votre première caisse !"
@@ -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:57
+#: lib/cannery_web/components/add_shot_group_component.html.heex:56
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:350
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:44
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -149,7 +149,7 @@ msgstr "Sauvegarder"
 msgid "Send instructions to reset password"
 msgstr "Envoyer les instructions pour réinitialiser le mot de passe"
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Pourquoi pas en ajouter un ?"
@@ -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:125
+#: 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
@@ -191,7 +191,7 @@ msgstr "Sélectionner"
 msgid "Copy to clipboard"
 msgstr "Copier dans le presse-papier"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "ajouter un conteneur en premier"
@@ -216,13 +216,13 @@ msgstr "Changer la langue"
 msgid "View in Catalog"
 msgstr "Voir en catalogue"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 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:142
+#: 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"
@@ -250,13 +250,13 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:87
-#: lib/cannery_web/live/container_live/index.html.heex:145
+#: lib/cannery_web/live/container_live/index.html.heex:88
+#: lib/cannery_web/live/container_live/index.html.heex:144
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
@@ -266,20 +266,20 @@ msgstr ""
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:129
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:104
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:104
-#: lib/cannery_web/live/container_live/index.html.heex:162
-#: lib/cannery_web/live/container_live/show.html.heex:48
+#: lib/cannery_web/live/container_live/index.html.heex:103
+#: lib/cannery_web/live/container_live/index.html.heex:159
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:65
+#: lib/cannery_web/live/tag_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
@@ -290,30 +290,30 @@ msgid "Delete invite for %{invite_name}"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:161
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:77
-#: lib/cannery_web/live/container_live/index.html.heex:135
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/index.html.heex:78
+#: lib/cannery_web/live/container_live/index.html.heex:134
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:164
+#: 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"
@@ -329,45 +329,45 @@ msgstr ""
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:118
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Munition préparée"
 
-#: lib/cannery_web/live/container_live/index.html.heex:65
-#: lib/cannery_web/live/container_live/index.html.heex:124
+#: lib/cannery_web/live/container_live/index.html.heex:66
+#: lib/cannery_web/live/container_live/index.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:90
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:176
+#: 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:191
+#: 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:152
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:206
+#: 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/errors.po

@@ -69,7 +69,6 @@ msgstr "Mél ou mot de passe invalide"
 msgid "Not found"
 msgstr "Pas trouvé"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:18
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
@@ -119,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:145
+#: lib/cannery/accounts/user.ex:144
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "est inchangé"
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "le mot de passe ne correspond pas"
 
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:202
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "n’est pas valide"
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:99
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "doit contenir le symbole @ et aucune espace"
@@ -172,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:1114
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr "Multiplicateur invalide"
@@ -187,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:74
+#: lib/cannery/activity_log/shot_group.ex:72
 #, 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:88
+#: lib/cannery/activity_log/shot_group.ex:86
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:84
+#: lib/cannery/activity_log/shot_group.ex:82
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:122
+#: lib/cannery/activity_log/shot_group.ex:119
 #, 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:80
+#: lib/cannery/activity_log/shot_group.ex:78
 #, 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:27
+#: 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"
@@ -66,15 +66,15 @@ msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 "Êtes-vous certain·e de supprimer %{email} ? Cette action est définitive !"
 
-#: lib/cannery_web/live/container_live/index.html.heex:99
-#: lib/cannery_web/live/container_live/index.html.heex:157
-#: lib/cannery_web/live/container_live/show.html.heex:45
-#: lib/cannery_web/live/tag_live/index.html.heex:63
+#: lib/cannery_web/live/container_live/index.html.heex:100
+#: lib/cannery_web/live/container_live/index.html.heex:156
+#: lib/cannery_web/live/container_live/show.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 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:189
+#: 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:59
+#: lib/cannery_web/components/add_shot_group_component.html.heex:58
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:351
-#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:46
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -178,7 +178,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr "Êtes-vous certain·e de vouloir désélectionner cette munition ?"
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Êtes-vous certain·e de vouloir supprimer cet enregistrement de tir ?"
@@ -214,8 +214,8 @@ msgstr "Copié dans le presse-papier"
 msgid "%{name} removed successfully"
 msgstr "%{name} retiré avec succès"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Vous aurez besoin de"
@@ -258,7 +258,7 @@ msgid_plural "Ammo added successfully"
 msgstr[0] "Groupe de munition mis à jour avec succès"
 msgstr[1] "Groupe de munition mis à jour avec succès"
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:97
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/ga/LC_MESSAGES/actions.po

@@ -23,12 +23,12 @@ msgstr ""
 ## effect: edit them in PO (.po) files instead.
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -131,12 +131,12 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/components/add_shot_group_component.html.heex:56
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:350
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
-#: lib/cannery_web/live/range_live/form_component.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:44
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
@@ -147,7 +147,7 @@ msgstr ""
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:125
+#: 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
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
@@ -214,13 +214,13 @@ msgstr ""
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 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:142
+#: 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"
@@ -248,13 +248,13 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:110
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:87
-#: lib/cannery_web/live/container_live/index.html.heex:145
+#: lib/cannery_web/live/container_live/index.html.heex:88
+#: lib/cannery_web/live/container_live/index.html.heex:144
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
@@ -264,20 +264,20 @@ msgstr ""
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:129
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:104
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:104
-#: lib/cannery_web/live/container_live/index.html.heex:162
-#: lib/cannery_web/live/container_live/show.html.heex:48
+#: lib/cannery_web/live/container_live/index.html.heex:103
+#: lib/cannery_web/live/container_live/index.html.heex:159
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:65
+#: lib/cannery_web/live/tag_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
@@ -288,30 +288,30 @@ msgid "Delete invite for %{invite_name}"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:161
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:77
-#: lib/cannery_web/live/container_live/index.html.heex:135
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/index.html.heex:78
+#: lib/cannery_web/live/container_live/index.html.heex:134
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:164
+#: 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"
@@ -327,45 +327,45 @@ msgstr ""
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:118
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:98
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:65
-#: lib/cannery_web/live/container_live/index.html.heex:124
+#: lib/cannery_web/live/container_live/index.html.heex:66
+#: lib/cannery_web/live/container_live/index.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:90
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:176
+#: 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:191
+#: 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:152
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:206
+#: 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/errors.po

@@ -70,7 +70,6 @@ msgstr "Seoladh email nó pasfhocal neamhbhailí"
 msgid "Not found"
 msgstr "Ní feidir é a fáil"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:18
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
@@ -120,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:145
+#: lib/cannery/accounts/user.ex:144
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "Níor athraigh sé"
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:202
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:99
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -171,7 +170,7 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:1114
+#: lib/cannery/ammo.ex:1043
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
@@ -186,27 +185,27 @@ msgstr ""
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:72
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:88
+#: lib/cannery/activity_log/shot_group.ex:86
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:84
+#: lib/cannery/activity_log/shot_group.ex:82
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:122
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:80
+#: lib/cannery/activity_log/shot_group.ex:78
 #, 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:27
+#: 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"
@@ -61,15 +61,15 @@ msgstr ""
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:99
-#: lib/cannery_web/live/container_live/index.html.heex:157
-#: lib/cannery_web/live/container_live/show.html.heex:45
-#: lib/cannery_web/live/tag_live/index.html.heex:63
+#: lib/cannery_web/live/container_live/index.html.heex:100
+#: lib/cannery_web/live/container_live/index.html.heex:156
+#: lib/cannery_web/live/container_live/show.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:189
+#: 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:59
+#: lib/cannery_web/components/add_shot_group_component.html.heex:58
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:351
-#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:46
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -167,7 +167,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
@@ -203,8 +203,8 @@ msgstr ""
 msgid "%{name} removed successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr ""
@@ -250,7 +250,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:97
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

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:27
+#: 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"
@@ -50,15 +50,15 @@ msgstr ""
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:99
-#: lib/cannery_web/live/container_live/index.html.heex:157
-#: lib/cannery_web/live/container_live/show.html.heex:45
-#: lib/cannery_web/live/tag_live/index.html.heex:63
+#: lib/cannery_web/live/container_live/index.html.heex:100
+#: lib/cannery_web/live/container_live/index.html.heex:156
+#: lib/cannery_web/live/container_live/show.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:189
+#: 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:59
+#: lib/cannery_web/components/add_shot_group_component.html.heex:58
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:351
-#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:37
-#: lib/cannery_web/live/range_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:46
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."
@@ -156,7 +156,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
@@ -192,8 +192,8 @@ msgstr ""
 msgid "%{name} removed successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr ""
@@ -236,7 +236,7 @@ msgid_plural "Ammo added successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:97
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/repo/migrations/20220506015344_add_locale_setting.exs

@@ -2,7 +2,7 @@ defmodule Cannery.Repo.Migrations.AddLocaleSetting do
   use Ecto.Migration
 
   def change do
-    alter table(:users) do
+    alter table("users") do
       add :locale, :string
     end
   end

priv/repo/migrations/20230322005247_add_ammo_type_types_and_shotgun_fields.exs

@@ -1,98 +0,0 @@
-defmodule Cannery.Repo.Migrations.AddAmmoTypeTypesAndShotgunFields do
-  use Ecto.Migration
-
-  def change do
-    alter table(:ammo_types) do
-      # rifle/shotgun/pistol
-      add :type, :string, default: "rifle"
-
-      add :wadding, :string
-      # target/bird/buck/slug/special
-      add :shot_type, :string
-      add :shot_material, :string
-      add :shot_size, :string
-      add :unfired_length, :string
-      add :brass_height, :string
-      add :chamber_size, :string
-      add :load_grains, :integer
-      add :shot_charge_weight, :string
-      add :dram_equivalent, :string
-    end
-
-    create index(:ammo_types, [:type])
-
-    execute(&add_fields_to_search/0, &remove_fields_from_search/0)
-  end
-
-  defp add_fields_to_search() do
-    execute """
-    ALTER TABLE ammo_types
-      ALTER COLUMN search tsvector
-      GENERATED ALWAYS AS (
-        setweight(to_tsvector('english', coalesce("name", '')), 'A') ||
-        setweight(to_tsvector('english', coalesce("desc", '')), 'B') ||
-        setweight(to_tsvector('english', coalesce("type", '')), 'B') ||
-        setweight(to_tsvector('english', coalesce("manufacturer", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("upc", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("bullet_type", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("bullet_core", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("cartridge", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("caliber", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("case_material", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("jacket_type", '')), 'D') ||
-        setweight(to_tsvector('english', immutable_to_string("muzzle_velocity", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("powder_type", '')), 'D') ||
-        setweight(to_tsvector('english', immutable_to_string("powder_grains_per_charge", '')), 'D') ||
-        setweight(to_tsvector('english', immutable_to_string("grains", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("pressure", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("primer_type", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("firing_type", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("wadding", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("shot_type", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("shot_material", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("shot_size", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("unfired_length", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("brass_height", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("chamber_size", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("load_grains", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("shot_charge_weight,", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("dram_equivalent", '')), 'D') ||
-        setweight(to_tsvector('english', boolean_to_string("tracer", 'tracer', '')), 'D') ||
-        setweight(to_tsvector('english', boolean_to_string("incendiary", 'incendiary', '')), 'D') ||
-        setweight(to_tsvector('english', boolean_to_string("blank", 'blank', '')), 'D') ||
-        setweight(to_tsvector('english', boolean_to_string("corrosive", 'corrosive', '')), 'D')
-        setwe
-      ) STORED
-    """
-  end
-
-  defp remove_fields_from_search() do
-    execute """
-    ALTER TABLE ammo_types
-      ALTER COLUMN search tsvector
-      GENERATED ALWAYS AS (
-        setweight(to_tsvector('english', coalesce("name", '')), 'A') ||
-        setweight(to_tsvector('english', coalesce("desc", '')), 'B') ||
-        setweight(to_tsvector('english', coalesce("bullet_type", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("bullet_core", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("cartridge", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("caliber", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("case_material", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("jacket_type", '')), 'C') ||
-        setweight(to_tsvector('english', immutable_to_string("muzzle_velocity", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("powder_type", '')), 'C') ||
-        setweight(to_tsvector('english', immutable_to_string("powder_grains_per_charge", '')), 'C') ||
-        setweight(to_tsvector('english', immutable_to_string("grains", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("pressure", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("primer_type", '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("firing_type", '')), 'C') ||
-        setweight(to_tsvector('english', boolean_to_string("tracer", 'tracer', '')), 'C') ||
-        setweight(to_tsvector('english', boolean_to_string("incendiary", 'incendiary', '')), 'C') ||
-        setweight(to_tsvector('english', boolean_to_string("blank", 'blank', '')), 'C') ||
-        setweight(to_tsvector('english', boolean_to_string("corrosive", 'corrosive', '')), 'C') ||
-        setweight(to_tsvector('english', coalesce("manufacturer", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("upc", '')), 'D')
-      ) STORED
-    """
-  end
-end

test/cannery/activity_log_test.exs

@@ -38,6 +38,50 @@ defmodule Cannery.ActivityLogTest do
       ]
     end
 
+    test "list_shot_groups/1 returns all shot_groups",
+         %{shot_group: shot_group, current_user: current_user} do
+      assert ActivityLog.list_shot_groups(current_user) == [shot_group]
+    end
+
+    test "list_shot_groups/2 returns relevant shot_groups for a user", %{
+      ammo_type: ammo_type,
+      ammo_group: ammo_group,
+      container: container,
+      current_user: current_user
+    } do
+      shot_group_a = shot_group_fixture(%{"notes" => "amazing"}, current_user, ammo_group)
+
+      {1, [another_ammo_group]} =
+        ammo_group_fixture(%{"notes" => "stupendous"}, ammo_type, container, current_user)
+
+      shot_group_b = shot_group_fixture(current_user, another_ammo_group)
+
+      another_ammo_type = ammo_type_fixture(%{"name" => "fabulous ammo"}, current_user)
+
+      {1, [yet_another_ammo_group]} =
+        ammo_group_fixture(another_ammo_type, container, current_user)
+
+      shot_group_c = shot_group_fixture(current_user, yet_another_ammo_group)
+
+      random_user = user_fixture()
+      random_container = container_fixture(random_user)
+      random_ammo_type = ammo_type_fixture(random_user)
+
+      {1, [random_ammo_group]} =
+        ammo_group_fixture(random_ammo_type, random_container, random_user)
+
+      _shouldnt_return = shot_group_fixture(random_user, random_ammo_group)
+
+      # notes
+      assert ActivityLog.list_shot_groups("amazing", current_user) == [shot_group_a]
+
+      # ammo group attributes
+      assert ActivityLog.list_shot_groups("stupendous", current_user) == [shot_group_b]
+
+      # ammo type attributes
+      assert ActivityLog.list_shot_groups("fabulous", current_user) == [shot_group_c]
+    end
+
     test "get_shot_group!/2 returns the shot_group with given id",
          %{shot_group: shot_group, current_user: current_user} do
       assert ActivityLog.get_shot_group!(shot_group.id, current_user) == shot_group
@@ -327,99 +371,4 @@ defmodule Cannery.ActivityLogTest do
       assert %{^another_ammo_type_id => 6} = used_counts
     end
   end
-
-  describe "list_shot_groups/3" do
-    setup do
-      current_user = user_fixture()
-      container = container_fixture(current_user)
-      ammo_type = ammo_type_fixture(current_user)
-      {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
-
-      [
-        current_user: current_user,
-        container: container,
-        ammo_type: ammo_type,
-        ammo_group: ammo_group
-      ]
-    end
-
-    test "list_shot_groups/3 returns relevant shot_groups for a type",
-         %{current_user: current_user, container: container} do
-      other_user = user_fixture()
-      other_container = container_fixture(other_user)
-
-      for type <- ["rifle", "shotgun", "pistol"] do
-        other_ammo_type = ammo_type_fixture(%{"type" => type}, other_user)
-        {1, [other_ammo_group]} = ammo_group_fixture(other_ammo_type, other_container, other_user)
-        shot_group_fixture(other_user, other_ammo_group)
-      end
-
-      rifle_ammo_type = ammo_type_fixture(%{"type" => "rifle"}, current_user)
-      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_ammo_type, container, current_user)
-      rifle_shot_group = shot_group_fixture(current_user, rifle_ammo_group)
-
-      shotgun_ammo_type = ammo_type_fixture(%{"type" => "shotgun"}, current_user)
-      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_ammo_type, container, current_user)
-      shotgun_shot_group = shot_group_fixture(current_user, shotgun_ammo_group)
-
-      pistol_ammo_type = ammo_type_fixture(%{"type" => "pistol"}, current_user)
-      {1, [pistol_ammo_group]} = ammo_group_fixture(pistol_ammo_type, container, current_user)
-      pistol_shot_group = shot_group_fixture(current_user, pistol_ammo_group)
-
-      assert [^rifle_shot_group] = ActivityLog.list_shot_groups(:rifle, current_user)
-      assert [^shotgun_shot_group] = ActivityLog.list_shot_groups(:shotgun, current_user)
-      assert [^pistol_shot_group] = ActivityLog.list_shot_groups(:pistol, current_user)
-
-      shot_groups = ActivityLog.list_shot_groups(:all, current_user)
-      assert Enum.count(shot_groups) == 3
-      assert rifle_shot_group in shot_groups
-      assert shotgun_shot_group in shot_groups
-      assert pistol_shot_group in shot_groups
-
-      shot_groups = ActivityLog.list_shot_groups(nil, current_user)
-      assert Enum.count(shot_groups) == 3
-      assert rifle_shot_group in shot_groups
-      assert shotgun_shot_group in shot_groups
-      assert pistol_shot_group in shot_groups
-    end
-
-    test "list_shot_groups/3 returns relevant shot_groups for a search", %{
-      ammo_type: ammo_type,
-      ammo_group: ammo_group,
-      container: container,
-      current_user: current_user
-    } do
-      shot_group_a = shot_group_fixture(%{"notes" => "amazing"}, current_user, ammo_group)
-
-      {1, [another_ammo_group]} =
-        ammo_group_fixture(%{"notes" => "stupendous"}, ammo_type, container, current_user)
-
-      shot_group_b = shot_group_fixture(current_user, another_ammo_group)
-
-      another_ammo_type = ammo_type_fixture(%{"name" => "fabulous ammo"}, current_user)
-
-      {1, [yet_another_ammo_group]} =
-        ammo_group_fixture(another_ammo_type, container, current_user)
-
-      shot_group_c = shot_group_fixture(current_user, yet_another_ammo_group)
-
-      another_user = user_fixture()
-      another_container = container_fixture(another_user)
-      another_ammo_type = ammo_type_fixture(another_user)
-
-      {1, [another_ammo_group]} =
-        ammo_group_fixture(another_ammo_type, another_container, another_user)
-
-      _shouldnt_return = shot_group_fixture(another_user, another_ammo_group)
-
-      # notes
-      assert ActivityLog.list_shot_groups("amazing", :all, current_user) == [shot_group_a]
-
-      # ammo group attributes
-      assert ActivityLog.list_shot_groups("stupendous", :all, current_user) == [shot_group_b]
-
-      # ammo type attributes
-      assert ActivityLog.list_shot_groups("fabulous", :all, current_user) == [shot_group_c]
-    end
-  end
 end

test/cannery/ammo_test.exs

@@ -9,6 +9,7 @@ defmodule Cannery.AmmoTest do
 
   @moduletag :ammo_test
 
+  describe "ammo_types" do
     @valid_attrs %{
       "bullet_type" => "some bullet_type",
       "case_material" => "some case_material",
@@ -34,30 +35,28 @@ defmodule Cannery.AmmoTest do
       "grains" => nil
     }
 
-  describe "list_ammo_types/2" do
     setup do
       current_user = user_fixture()
+      [ammo_type: ammo_type_fixture(current_user), current_user: current_user]
+    end
 
-      rifle_ammo_type =
-        %{
-          "name" => "bullets",
-          "type" => "rifle",
-          "desc" => "has some pews in it",
-          "grains" => 5
-        }
+    test "list_ammo_types/1 returns all ammo_types",
+         %{ammo_type: ammo_type, current_user: current_user} do
+      assert Ammo.list_ammo_types(current_user) == [ammo_type]
+    end
+
+    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}
         |> ammo_type_fixture(current_user)
 
-      shotgun_ammo_type =
-        %{
-          "name" => "hollows",
-          "type" => "shotgun",
-          "grains" => 3
-        }
+      ammo_type_b =
+        %{"name" => "hollows", "grains" => 3}
         |> ammo_type_fixture(current_user)
 
-      pistol_ammo_type =
+      ammo_type_c =
         %{
-          "type" => "pistol",
           "name" => "jackets",
           "desc" => "brass shell",
           "tracer" => true
@@ -71,78 +70,23 @@ defmodule Cannery.AmmoTest do
         }
         |> ammo_type_fixture(user_fixture())
 
-      [
-        rifle_ammo_type: rifle_ammo_type,
-        shotgun_ammo_type: shotgun_ammo_type,
-        pistol_ammo_type: pistol_ammo_type,
-        current_user: current_user
-      ]
-    end
-
-    test "list_ammo_types/2 returns all ammo_types", %{
-      rifle_ammo_type: rifle_ammo_type,
-      shotgun_ammo_type: shotgun_ammo_type,
-      pistol_ammo_type: pistol_ammo_type,
-      current_user: current_user
-    } do
-      results = Ammo.list_ammo_types(current_user, :all)
-      assert results |> Enum.count() == 3
-      assert rifle_ammo_type in results
-      assert shotgun_ammo_type in results
-      assert pistol_ammo_type in results
-    end
-
-    test "list_ammo_types/2 returns rifle ammo_types", %{
-      rifle_ammo_type: rifle_ammo_type,
-      current_user: current_user
-    } do
-      assert [^rifle_ammo_type] = Ammo.list_ammo_types(current_user, :rifle)
-    end
-
-    test "list_ammo_types/2 returns shotgun ammo_types", %{
-      shotgun_ammo_type: shotgun_ammo_type,
-      current_user: current_user
-    } do
-      assert [^shotgun_ammo_type] = Ammo.list_ammo_types(current_user, :shotgun)
-    end
-
-    test "list_ammo_types/2 returns pistol ammo_types", %{
-      pistol_ammo_type: pistol_ammo_type,
-      current_user: current_user
-    } do
-      assert [^pistol_ammo_type] = Ammo.list_ammo_types(current_user, :pistol)
-    end
-
-    test "list_ammo_types/2 returns relevant ammo_types for a user", %{
-      rifle_ammo_type: rifle_ammo_type,
-      shotgun_ammo_type: shotgun_ammo_type,
-      pistol_ammo_type: pistol_ammo_type,
-      current_user: current_user
-    } do
       # name
-      assert Ammo.list_ammo_types("bullet", current_user, :all) == [rifle_ammo_type]
-      assert Ammo.list_ammo_types("bullets", current_user, :all) == [rifle_ammo_type]
-      assert Ammo.list_ammo_types("hollow", current_user, :all) == [shotgun_ammo_type]
-      assert Ammo.list_ammo_types("jacket", current_user, :all) == [pistol_ammo_type]
+      assert Ammo.list_ammo_types("bullet", current_user) == [ammo_type_a]
+      assert Ammo.list_ammo_types("bullets", current_user) == [ammo_type_a]
+      assert Ammo.list_ammo_types("hollow", current_user) == [ammo_type_b]
+      assert Ammo.list_ammo_types("jacket", current_user) == [ammo_type_c]
 
       # desc
-      assert Ammo.list_ammo_types("pew", current_user, :all) == [rifle_ammo_type]
-      assert Ammo.list_ammo_types("brass", current_user, :all) == [pistol_ammo_type]
-      assert Ammo.list_ammo_types("shell", current_user, :all) == [pistol_ammo_type]
+      assert Ammo.list_ammo_types("pew", current_user) == [ammo_type_a]
+      assert Ammo.list_ammo_types("brass", current_user) == [ammo_type_c]
+      assert Ammo.list_ammo_types("shell", current_user) == [ammo_type_c]
 
       # grains (integer)
-      assert Ammo.list_ammo_types("5", current_user, :all) == [rifle_ammo_type]
-      assert Ammo.list_ammo_types("3", current_user, :all) == [shotgun_ammo_type]
+      assert Ammo.list_ammo_types("5", current_user) == [ammo_type_a]
+      assert Ammo.list_ammo_types("3", current_user) == [ammo_type_b]
 
       # tracer (boolean)
-      assert Ammo.list_ammo_types("tracer", current_user, :all) == [pistol_ammo_type]
-    end
-  end
-
-  describe "ammo types" do
-    setup do
-      current_user = user_fixture()
-      [ammo_type: ammo_type_fixture(current_user), current_user: current_user]
+      assert Ammo.list_ammo_types("tracer", current_user) == [ammo_type_c]
     end
 
     test "get_ammo_type!/2 returns the ammo_type with given id",
@@ -150,23 +94,6 @@ defmodule Cannery.AmmoTest do
       assert Ammo.get_ammo_type!(ammo_type.id, current_user) == ammo_type
     end
 
-    test "get_ammo_types_count!/1 returns the correct amount of ammo",
-         %{current_user: current_user} do
-      assert Ammo.get_ammo_types_count!(current_user) == 1
-
-      ammo_type_fixture(current_user)
-      assert Ammo.get_ammo_types_count!(current_user) == 2
-
-      ammo_type_fixture(current_user)
-      assert Ammo.get_ammo_types_count!(current_user) == 3
-
-      other_user = user_fixture()
-      assert Ammo.get_ammo_types_count!(other_user) == 0
-
-      ammo_type_fixture(other_user)
-      assert Ammo.get_ammo_types_count!(other_user) == 1
-    end
-
     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)
@@ -726,60 +653,8 @@ defmodule Cannery.AmmoTest do
       ]
     end
 
-    test "get_ammo_groups_count!/2 returns the correct amount of ammo",
-         %{ammo_type: ammo_type, container: container, current_user: current_user} do
-      assert Ammo.get_ammo_groups_count!(current_user) == 1
-
-      ammo_group_fixture(ammo_type, container, current_user)
-      assert Ammo.get_ammo_groups_count!(current_user) == 2
-
-      ammo_group_fixture(ammo_type, container, current_user)
-      assert Ammo.get_ammo_groups_count!(current_user) == 3
-
-      other_user = user_fixture()
-      assert Ammo.get_ammo_groups_count!(other_user) == 0
-      assert Ammo.get_ammo_groups_count!(other_user, true) == 0
-
-      other_ammo_type = ammo_type_fixture(other_user)
-      other_container = container_fixture(other_user)
-
-      {1, [another_ammo_group]} =
-        ammo_group_fixture(%{"count" => 30}, other_ammo_type, other_container, other_user)
-
-      shot_group_fixture(%{"count" => 30}, other_user, another_ammo_group)
-      assert Ammo.get_ammo_groups_count!(other_user) == 0
-      assert Ammo.get_ammo_groups_count!(other_user, true) == 1
-    end
-
-    test "list_ammo_groups/4 returns all ammo_groups for a type" do
-      current_user = user_fixture()
-      container = container_fixture(current_user)
-
-      rifle_ammo_type = ammo_type_fixture(%{"type" => "rifle"}, current_user)
-      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_ammo_type, container, current_user)
-      shotgun_ammo_type = ammo_type_fixture(%{"type" => "shotgun"}, current_user)
-      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_ammo_type, container, current_user)
-      pistol_ammo_type = ammo_type_fixture(%{"type" => "pistol"}, current_user)
-      {1, [pistol_ammo_group]} = ammo_group_fixture(pistol_ammo_type, container, current_user)
-
-      assert [^rifle_ammo_group] = Ammo.list_ammo_groups(nil, :rifle, current_user, false)
-      assert [^shotgun_ammo_group] = Ammo.list_ammo_groups(nil, :shotgun, current_user, false)
-      assert [^pistol_ammo_group] = Ammo.list_ammo_groups(nil, :pistol, current_user, false)
-
-      ammo_groups = Ammo.list_ammo_groups(nil, :all, current_user, false)
-      assert Enum.count(ammo_groups) == 3
-      assert rifle_ammo_group in ammo_groups
-      assert shotgun_ammo_group in ammo_groups
-      assert pistol_ammo_group in ammo_groups
-
-      ammo_groups = Ammo.list_ammo_groups(nil, nil, current_user, false)
-      assert Enum.count(ammo_groups) == 3
-      assert rifle_ammo_group in ammo_groups
-      assert shotgun_ammo_group in ammo_groups
-      assert pistol_ammo_group in ammo_groups
-    end
-
-    test "list_ammo_groups/4 returns all relevant ammo_groups including used", %{
+    test "list_ammo_groups/3 returns all ammo_groups",
+         %{
            ammo_type: ammo_type,
            ammo_group: ammo_group,
            container: container,
@@ -791,15 +666,14 @@ defmodule Cannery.AmmoTest do
       shot_group_fixture(%{"count" => 30}, current_user, another_ammo_group)
       another_ammo_group = Ammo.get_ammo_group!(another_ammo_group_id, current_user)
 
-      assert Ammo.list_ammo_groups(nil, :all, current_user, false) == [ammo_group]
+      assert Ammo.list_ammo_groups(nil, false, current_user) == [ammo_group]
 
-      ammo_groups = Ammo.list_ammo_groups(nil, :all, current_user, true)
-      assert Enum.count(ammo_groups) == 2
-      assert another_ammo_group in ammo_groups
-      assert ammo_group in ammo_groups
+      assert Ammo.list_ammo_groups(nil, true, current_user)
+             |> Enum.sort_by(fn %{count: count} -> count end) == [another_ammo_group, ammo_group]
     end
 
-    test "list_ammo_groups/4 returns relevant ammo groups when searched", %{
+    test "list_ammo_groups/3 returns relevant ammo groups when searched",
+         %{
            ammo_type: ammo_type,
            ammo_group: ammo_group,
            container: container,
@@ -821,80 +695,49 @@ defmodule Cannery.AmmoTest do
       {1, [fantastic_ammo_group]} =
         ammo_group_fixture(%{"count" => 47}, ammo_type, another_container, current_user)
 
-      ammo_groups = Ammo.list_ammo_groups(nil, :all, current_user, false)
-      assert Enum.count(ammo_groups) == 4
-      assert fantastic_ammo_group in ammo_groups
-      assert amazing_ammo_group in ammo_groups
-      assert another_ammo_group in ammo_groups
-      assert ammo_group in ammo_groups
+      assert Ammo.list_ammo_groups(nil, false, current_user)
+             |> Enum.sort_by(fn %{count: count} -> count end) ==
+               [fantastic_ammo_group, amazing_ammo_group, another_ammo_group, ammo_group]
 
       # search works for ammo group attributes
-      assert Ammo.list_ammo_groups("cool", :all, current_user, true) == [another_ammo_group]
+      assert Ammo.list_ammo_groups("cool", true, current_user) == [another_ammo_group]
 
       # search works for ammo type attributes
-      assert Ammo.list_ammo_groups("amazing", :all, current_user, true) == [amazing_ammo_group]
+      assert Ammo.list_ammo_groups("amazing", true, current_user) == [amazing_ammo_group]
 
       # search works for container attributes
-      assert Ammo.list_ammo_groups("fantastic", :all, current_user, true) ==
-               [fantastic_ammo_group]
+      assert Ammo.list_ammo_groups("fantastic", true, current_user) == [fantastic_ammo_group]
 
       # search works for container tag attributes
-      assert Ammo.list_ammo_groups("stupendous", :all, current_user, true) ==
-               [fantastic_ammo_group]
+      assert Ammo.list_ammo_groups("stupendous", true, current_user) == [fantastic_ammo_group]
 
-      assert Ammo.list_ammo_groups("random", :all, current_user, true) == []
+      assert Ammo.list_ammo_groups("random", true, current_user) == []
     end
 
-    test "list_ammo_groups_for_type/3 returns all ammo_groups for a type", %{
+    test "list_ammo_groups_for_type/2 returns all ammo_groups for a type",
+         %{
+           ammo_type: ammo_type,
            container: container,
+           ammo_group: ammo_group,
            current_user: current_user
          } do
-      ammo_type = ammo_type_fixture(current_user)
-      {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
-      assert [^ammo_group] = Ammo.list_ammo_groups_for_type(ammo_type, current_user)
+      another_ammo_type = ammo_type_fixture(current_user)
+      {1, [_another]} = ammo_group_fixture(another_ammo_type, container, current_user)
 
-      shot_group_fixture(current_user, ammo_group)
-      ammo_group = Ammo.get_ammo_group!(ammo_group.id, current_user)
-      assert [] == Ammo.list_ammo_groups_for_type(ammo_type, current_user)
-      assert [^ammo_group] = Ammo.list_ammo_groups_for_type(ammo_type, current_user, true)
+      assert Ammo.list_ammo_groups_for_type(ammo_type, current_user) == [ammo_group]
     end
 
-    test "list_ammo_groups_for_container/3 returns all ammo_groups for a container" do
-      current_user = user_fixture()
-      container = container_fixture(current_user)
-
-      rifle_ammo_type = ammo_type_fixture(%{"type" => "rifle"}, current_user)
-      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_ammo_type, container, current_user)
-      shotgun_ammo_type = ammo_type_fixture(%{"type" => "shotgun"}, current_user)
-      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_ammo_type, container, current_user)
-      pistol_ammo_type = ammo_type_fixture(%{"type" => "pistol"}, current_user)
-      {1, [pistol_ammo_group]} = ammo_group_fixture(pistol_ammo_type, container, current_user)
-
+    test "list_ammo_groups_for_container/2 returns all ammo_groups for a container",
+         %{
+           ammo_type: ammo_type,
+           container: container,
+           ammo_group: ammo_group,
+           current_user: current_user
+         } do
       another_container = container_fixture(current_user)
-      ammo_group_fixture(rifle_ammo_type, another_container, current_user)
-      ammo_group_fixture(shotgun_ammo_type, another_container, current_user)
-      ammo_group_fixture(pistol_ammo_type, another_container, current_user)
+      {1, [_another]} = ammo_group_fixture(ammo_type, another_container, current_user)
 
-      assert [^rifle_ammo_group] =
-               Ammo.list_ammo_groups_for_container(container, :rifle, current_user)
-
-      assert [^shotgun_ammo_group] =
-               Ammo.list_ammo_groups_for_container(container, :shotgun, current_user)
-
-      assert [^pistol_ammo_group] =
-               Ammo.list_ammo_groups_for_container(container, :pistol, current_user)
-
-      ammo_groups = Ammo.list_ammo_groups_for_container(container, :all, current_user)
-      assert Enum.count(ammo_groups) == 3
-      assert rifle_ammo_group in ammo_groups
-      assert shotgun_ammo_group in ammo_groups
-      assert pistol_ammo_group in ammo_groups
-
-      ammo_groups = Ammo.list_ammo_groups_for_container(container, nil, current_user)
-      assert Enum.count(ammo_groups) == 3
-      assert rifle_ammo_group in ammo_groups
-      assert shotgun_ammo_group in ammo_groups
-      assert pistol_ammo_group in ammo_groups
+      assert Ammo.list_ammo_groups_for_container(container, current_user) == [ammo_group]
     end
 
     test "get_ammo_groups_count_for_type/2 returns count of ammo_groups for a type", %{
@@ -942,7 +785,8 @@ defmodule Cannery.AmmoTest do
       assert %{^another_ammo_type_id => 1} = ammo_groups_count
     end
 
-    test "list_staged_ammo_groups/1 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,
            current_user: current_user
@@ -972,7 +816,8 @@ defmodule Cannery.AmmoTest do
       assert %{^another_ammo_group_id => ^another_ammo_group} = ammo_groups
     end
 
-    test "create_ammo_groups/3 with valid data creates a ammo_group", %{
+    test "create_ammo_groups/3 with valid data creates a ammo_group",
+         %{
            ammo_type: ammo_type,
            container: container,
            current_user: current_user
@@ -987,7 +832,8 @@ defmodule Cannery.AmmoTest do
       assert ammo_group.price_paid == 120.5
     end
 
-    test "create_ammo_groups/3 with valid data creates multiple ammo_groups", %{
+    test "create_ammo_groups/3 with valid data creates multiple ammo_groups",
+         %{
            ammo_type: ammo_type,
            container: container,
            current_user: current_user

test/cannery/containers_test.exs

@@ -28,14 +28,14 @@ defmodule Cannery.ContainersTest do
     "type" => nil
   }
   @valid_tag_attrs %{
-    "bg_color" => "#100000",
+    "bg_color" => "some bg-color",
     "name" => "some name",
-    "text_color" => "#000000"
+    "text_color" => "some text-color"
   }
   @update_tag_attrs %{
-    "bg_color" => "#100001",
+    "bg_color" => "some updated bg-color",
     "name" => "some updated name",
-    "text_color" => "#000001"
+    "text_color" => "some updated text-color"
   }
   @invalid_tag_attrs %{
     "bg_color" => nil,
@@ -186,9 +186,9 @@ defmodule Cannery.ContainersTest 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 == "#100000"
+      assert tag.bg_color == "some bg-color"
       assert tag.name == "some name"
-      assert tag.text_color == "#000000"
+      assert tag.text_color == "some text-color"
     end
 
     test "create_tag/2 with invalid data returns error changeset",
@@ -198,9 +198,9 @@ defmodule Cannery.ContainersTest 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 == "#100001"
+      assert tag.bg_color == "some updated bg-color"
       assert tag.name == "some updated name"
-      assert tag.text_color == "#000001"
+      assert tag.text_color == "some updated text-color"
     end
 
     test "update_tag/3 with invalid data returns error changeset",

test/cannery_web/live/ammo_group_live_test.exs

@@ -66,60 +66,6 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       assert html =~ ammo_group.ammo_type.name
     end
 
-    test "can sort by type",
-         %{conn: conn, container: container, current_user: current_user} do
-      rifle_type = ammo_type_fixture(%{"type" => "rifle"}, current_user)
-      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_type, container, current_user)
-      shotgun_type = ammo_type_fixture(%{"type" => "shotgun"}, current_user)
-      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_type, container, current_user)
-      pistol_type = ammo_type_fixture(%{"type" => "pistol"}, current_user)
-      {1, [pistol_ammo_group]} = ammo_group_fixture(pistol_type, container, current_user)
-
-      {:ok, index_live, html} = live(conn, Routes.ammo_group_index_path(conn, :index))
-
-      assert html =~ "All"
-
-      assert html =~ rifle_ammo_group.ammo_type.name
-      assert html =~ shotgun_ammo_group.ammo_type.name
-      assert html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :rifle})
-
-      assert html =~ rifle_ammo_group.ammo_type.name
-      refute html =~ shotgun_ammo_group.ammo_type.name
-      refute html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :shotgun})
-
-      refute html =~ rifle_ammo_group.ammo_type.name
-      assert html =~ shotgun_ammo_group.ammo_type.name
-      refute html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :pistol})
-
-      refute html =~ rifle_ammo_group.ammo_type.name
-      refute html =~ shotgun_ammo_group.ammo_type.name
-      assert html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :all})
-
-      assert html =~ rifle_ammo_group.ammo_type.name
-      assert html =~ shotgun_ammo_group.ammo_type.name
-      assert html =~ pistol_ammo_group.ammo_type.name
-    end
-
     test "can search for ammo_groups", %{conn: conn, ammo_group: ammo_group} do
       {:ok, index_live, html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
@@ -196,7 +142,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
         |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert html =~ dgettext("prompts", "Ammo added successfully")
-      assert Ammo.list_ammo_groups(nil, :all, current_user) |> Enum.count() == multiplier + 1
+      assert Ammo.list_ammo_groups(nil, false, current_user) |> Enum.count() == multiplier + 1
     end
 
     test "does not save invalid number of new ammo_groups", %{conn: conn} do

test/cannery_web/live/ammo_type_live_test.exs

@@ -74,77 +74,28 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ ammo_type.bullet_type
     end
 
-    test "can sort by type", %{conn: conn, current_user: current_user} do
-      rifle_type = ammo_type_fixture(%{"type" => "rifle"}, current_user)
-      shotgun_type = ammo_type_fixture(%{"type" => "shotgun"}, current_user)
-      pistol_type = ammo_type_fixture(%{"type" => "pistol"}, current_user)
-
-      {:ok, index_live, html} = live(conn, Routes.ammo_type_index_path(conn, :index))
-
-      assert html =~ "All"
-
-      assert html =~ rifle_type.name
-      assert html =~ shotgun_type.name
-      assert html =~ pistol_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :rifle})
-
-      assert html =~ rifle_type.name
-      refute html =~ shotgun_type.name
-      refute html =~ pistol_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :shotgun})
-
-      refute html =~ rifle_type.name
-      assert html =~ shotgun_type.name
-      refute html =~ pistol_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :pistol})
-
-      refute html =~ rifle_type.name
-      refute html =~ shotgun_type.name
-      assert html =~ pistol_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :all})
-
-      assert html =~ rifle_type.name
-      assert html =~ shotgun_type.name
-      assert html =~ pistol_type.name
-    end
-
     test "can search for ammo_type", %{conn: conn, ammo_type: ammo_type} do
       {:ok, index_live, html} = live(conn, Routes.ammo_type_index_path(conn, :index))
 
       assert html =~ ammo_type.bullet_type
 
       assert index_live
-             |> form(~s/form[phx-change="search"]/)
-             |> render_change(search: %{search_term: ammo_type.bullet_type}) =~
-               ammo_type.bullet_type
+             |> form(~s/form[phx-change="search"]/,
+               search: %{search_term: ammo_type.bullet_type}
+             )
+             |> render_change() =~ ammo_type.bullet_type
 
       assert_patch(index_live, Routes.ammo_type_index_path(conn, :search, ammo_type.bullet_type))
 
       refute index_live
-             |> form(~s/form[phx-change="search"]/)
-             |> render_change(search: %{search_term: "something_else"}) =~ ammo_type.bullet_type
+             |> form(~s/form[phx-change="search"]/, search: %{search_term: "something_else"})
+             |> render_change() =~ ammo_type.bullet_type
 
       assert_patch(index_live, Routes.ammo_type_index_path(conn, :search, "something_else"))
 
       assert index_live
-             |> form(~s/form[phx-change="search"]/)
-             |> render_change(search: %{search_term: ""}) =~ ammo_type.bullet_type
+             |> form(~s/form[phx-change="search"]/, search: %{search_term: ""})
+             |> render_change() =~ ammo_type.bullet_type
 
       assert_patch(index_live, Routes.ammo_type_index_path(conn, :index))
     end
@@ -163,8 +114,8 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
 
       {:ok, _view, html} =
         index_live
-        |> form("#ammo_type-form")
-        |> render_submit(ammo_type: @create_attrs)
+        |> form("#ammo_type-form", ammo_type: @create_attrs)
+        |> render_submit()
         |> follow_redirect(conn, Routes.ammo_type_index_path(conn, :index))
 
       ammo_type = ammo_type.id |> Ammo.get_ammo_type!(current_user)
@@ -187,8 +138,8 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
 
       {:ok, _view, html} =
         index_live
-        |> form("#ammo_type-form")
-        |> render_submit(ammo_type: @update_attrs)
+        |> form("#ammo_type-form", ammo_type: @update_attrs)
+        |> render_submit()
         |> follow_redirect(conn, Routes.ammo_type_index_path(conn, :index))
 
       ammo_type = ammo_type.id |> Ammo.get_ammo_type!(current_user)
@@ -212,8 +163,8 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
 
       {:ok, _view, html} =
         index_live
-        |> form("#ammo_type-form")
-        |> render_submit(ammo_type: @create_attrs)
+        |> form("#ammo_type-form", ammo_type: @create_attrs)
+        |> render_submit()
         |> follow_redirect(conn, Routes.ammo_type_index_path(conn, :index))
 
       ammo_type = ammo_type.id |> Ammo.get_ammo_type!(current_user)
@@ -237,10 +188,10 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
 
       {:ok, _view, html} =
         index_live
-        |> form("#ammo_type-form")
-        |> render_submit(
+        |> form("#ammo_type-form",
           ammo_type: Map.merge(@create_attrs, %{"bullet_type" => "some updated bullet_type"})
         )
+        |> render_submit()
         |> follow_redirect(conn, Routes.ammo_type_index_path(conn, :index))
 
       ammo_type = ammo_type.id |> Ammo.get_ammo_type!(current_user)
@@ -325,8 +276,8 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
 
       {:ok, _view, html} =
         show_live
-        |> form("#ammo_type-form")
-        |> render_submit(ammo_type: @update_attrs)
+        |> form("#ammo_type-form", ammo_type: @update_attrs)
+        |> render_submit()
         |> follow_redirect(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
       ammo_type = ammo_type.id |> Ammo.get_ammo_type!(current_user)

test/cannery_web/live/container_live_test.exs

@@ -6,7 +6,7 @@ defmodule CanneryWeb.ContainerLiveTest do
   use CanneryWeb.ConnCase
   import Phoenix.LiveViewTest
   import CanneryWeb.Gettext
-  alias Cannery.Containers
+  alias Cannery.{Containers, Repo}
 
   @moduletag :container_live_test
 
@@ -34,6 +34,10 @@ defmodule CanneryWeb.ContainerLiveTest do
     "notes" => "some ammo group",
     "count" => 20
   }
+  @shot_group_attrs %{
+    "notes" => "some shot group",
+    "count" => 20
+  }
 
   # @invalid_attrs %{desc: nil, location: nil, name: nil, type: nil}
 
@@ -49,6 +53,15 @@ defmodule CanneryWeb.ContainerLiveTest do
     %{ammo_type: ammo_type, ammo_group: ammo_group}
   end
 
+  defp create_empty_ammo_group(%{container: container, current_user: current_user}) do
+    ammo_type = ammo_type_fixture(@ammo_type_attrs, current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
+    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
+    ammo_group = ammo_group |> Repo.reload!()
+
+    %{ammo_type: ammo_type, ammo_group: ammo_group, shot_group: shot_group}
+  end
+
   describe "Index" do
     setup [:register_and_log_in_user, :create_container]
 
@@ -250,60 +263,6 @@ defmodule CanneryWeb.ContainerLiveTest do
       assert html =~ dgettext("prompts", "%{name} updated successfully", name: container.name)
       assert html =~ "some updated location"
     end
-
-    test "can sort by type",
-         %{conn: conn, container: container, current_user: current_user} do
-      rifle_type = ammo_type_fixture(%{"type" => "rifle"}, current_user)
-      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_type, container, current_user)
-      shotgun_type = ammo_type_fixture(%{"type" => "shotgun"}, current_user)
-      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_type, container, current_user)
-      pistol_type = ammo_type_fixture(%{"type" => "pistol"}, current_user)
-      {1, [pistol_ammo_group]} = ammo_group_fixture(pistol_type, container, current_user)
-
-      {:ok, index_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
-
-      assert html =~ "All"
-
-      assert html =~ rifle_ammo_group.ammo_type.name
-      assert html =~ shotgun_ammo_group.ammo_type.name
-      assert html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :rifle})
-
-      assert html =~ rifle_ammo_group.ammo_type.name
-      refute html =~ shotgun_ammo_group.ammo_type.name
-      refute html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :shotgun})
-
-      refute html =~ rifle_ammo_group.ammo_type.name
-      assert html =~ shotgun_ammo_group.ammo_type.name
-      refute html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :pistol})
-
-      refute html =~ rifle_ammo_group.ammo_type.name
-      refute html =~ shotgun_ammo_group.ammo_type.name
-      assert html =~ pistol_ammo_group.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :all})
-
-      assert html =~ rifle_ammo_group.ammo_type.name
-      assert html =~ shotgun_ammo_group.ammo_type.name
-      assert html =~ pistol_ammo_group.ammo_type.name
-    end
   end
 
   describe "Show with ammo group" do
@@ -330,4 +289,47 @@ defmodule CanneryWeb.ContainerLiveTest do
       assert html =~ "\n20\n"
     end
   end
+
+  describe "Show with empty ammo group" do
+    setup [:register_and_log_in_user, :create_container, :create_empty_ammo_group]
+
+    test "hides empty ammo groups by default",
+         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
+      {:ok, show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
+
+      assert html =~ dgettext("actions", "Show used")
+      refute html =~ "\n20\n"
+
+      html =
+        show_live
+        |> element(~s/input[type="checkbox"][aria-labelledby="toggle_show_used-label"}]/)
+        |> render_click()
+
+      assert html =~ ammo_type_name
+      assert html =~ "\n20\n"
+      assert html =~ "Empty"
+    end
+
+    test "displays empty ammo groups in table on toggle",
+         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
+      {:ok, show_live, _html} = live(conn, Routes.container_show_path(conn, :show, container))
+
+      html =
+        show_live
+        |> element(~s/input[type="checkbox"][aria-labelledby="toggle_table-label"}]/)
+        |> render_click()
+
+      assert html =~ dgettext("actions", "Show used")
+      refute html =~ "\n20\n"
+
+      html =
+        show_live
+        |> element(~s/input[type="checkbox"][aria-labelledby="toggle_show_used-label"}]/)
+        |> render_click()
+
+      assert html =~ ammo_type_name
+      assert html =~ "\n20\n"
+      assert html =~ "Empty"
+    end
+  end
 end

test/cannery_web/live/range_live_test.exs

@@ -24,12 +24,7 @@ defmodule CanneryWeb.RangeLiveTest do
       %{"count" => 5, "date" => ~N[2022-02-13 03:17:00], "notes" => "some notes"}
       |> shot_group_fixture(current_user, ammo_group)
 
-    [
-      container: container,
-      ammo_type: ammo_type,
-      ammo_group: ammo_group,
-      shot_group: shot_group
-    ]
+    %{shot_group: shot_group, ammo_group: ammo_group}
   end
 
   describe "Index" do
@@ -42,71 +37,6 @@ defmodule CanneryWeb.RangeLiveTest do
       assert html =~ shot_group.notes
     end
 
-    test "can sort by type",
-         %{conn: conn, container: container, current_user: current_user} do
-      rifle_ammo_type = ammo_type_fixture(%{"type" => "rifle"}, current_user)
-      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_ammo_type, container, current_user)
-
-      rifle_shot_group =
-        shot_group_fixture(%{"notes" => "group_one"}, current_user, rifle_ammo_group)
-
-      shotgun_ammo_type = ammo_type_fixture(%{"type" => "shotgun"}, current_user)
-      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_ammo_type, container, current_user)
-
-      shotgun_shot_group =
-        shot_group_fixture(%{"notes" => "group_two"}, current_user, shotgun_ammo_group)
-
-      pistol_ammo_type = ammo_type_fixture(%{"type" => "pistol"}, current_user)
-      {1, [pistol_ammo_group]} = ammo_group_fixture(pistol_ammo_type, container, current_user)
-
-      pistol_shot_group =
-        shot_group_fixture(%{"notes" => "group_three"}, current_user, pistol_ammo_group)
-
-      {:ok, index_live, html} = live(conn, Routes.range_index_path(conn, :index))
-
-      assert html =~ "All"
-
-      assert html =~ rifle_shot_group.notes
-      assert html =~ shotgun_shot_group.notes
-      assert html =~ pistol_shot_group.notes
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :rifle})
-
-      assert html =~ rifle_shot_group.notes
-      refute html =~ shotgun_shot_group.notes
-      refute html =~ pistol_shot_group.notes
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :shotgun})
-
-      refute html =~ rifle_shot_group.notes
-      assert html =~ shotgun_shot_group.notes
-      refute html =~ pistol_shot_group.notes
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :pistol})
-
-      refute html =~ rifle_shot_group.notes
-      refute html =~ shotgun_shot_group.notes
-      assert html =~ pistol_shot_group.notes
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_type"]/)
-        |> render_change(ammo_type: %{type: :all})
-
-      assert html =~ rifle_shot_group.notes
-      assert html =~ shotgun_shot_group.notes
-      assert html =~ pistol_shot_group.notes
-    end
-
     test "can search for shot_group", %{conn: conn, shot_group: shot_group} do
       {:ok, index_live, html} = live(conn, Routes.range_index_path(conn, :index))
 

test/cannery_web/live/tag_live_test.exs

@@ -10,14 +10,14 @@ defmodule CanneryWeb.TagLiveTest do
   @moduletag :tag_live_test
 
   @create_attrs %{
-    "bg_color" => "#100000",
+    "bg_color" => "some bg-color",
     "name" => "some name",
-    "text_color" => "#000000"
+    "text_color" => "some text-color"
   }
   @update_attrs %{
-    "bg_color" => "#100001",
+    "bg_color" => "some updated bg-color",
     "name" => "some updated name",
-    "text_color" => "#000001"
+    "text_color" => "some updated text-color"
   }
 
   # @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 =~ "#100000"
+      assert html =~ "some bg-color"
     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 =~ "#100001"
+      assert html =~ "some updated bg-color"
     end
 
     test "deletes tag in listing", %{conn: conn, tag: tag} do

test/support/conn_case.ex

@@ -26,7 +26,7 @@ defmodule CanneryWeb.ConnCase do
       import Plug.Conn
       import Phoenix.ConnTest
       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      import Cannery.{DataCase, Fixtures}
+      import Cannery.Fixtures
       import CanneryWeb.ConnCase
 
       alias CanneryWeb.Router.Helpers, as: Routes

test/support/data_case.ex

@@ -48,15 +48,4 @@ defmodule Cannery.DataCase do
       end)
     end)
   end
-
-  @doc """
-  Generates a random string of any length, default of 12
-  """
-  @spec random_string(length :: non_neg_integer()) :: String.t()
-  def random_string(length \\ 12) do
-    :crypto.strong_rand_bytes(length) |> Base.url_encode64() |> binary_part(0, length)
-  end
-
-  def unique_user_email, do: "user#{System.unique_integer()}@example.com"
-  def valid_user_password, do: "hello world!"
 end

test/support/fixtures.ex

@@ -3,8 +3,6 @@ defmodule Cannery.Fixtures do
   This module defines test helpers for creating entities
   """
 
-  import Cannery.DataCase
-
   alias Cannery.{
     Accounts,
     Accounts.User,
@@ -19,6 +17,9 @@ defmodule Cannery.Fixtures do
     Repo
   }
 
+  def unique_user_email, do: "user#{System.unique_integer()}@example.com"
+  def valid_user_password, do: "hello world!"
+
   @spec user_fixture() :: User.t()
   @spec user_fixture(attrs :: map()) :: User.t()
   def user_fixture(attrs \\ %{}) do
@@ -78,7 +79,7 @@ defmodule Cannery.Fixtures do
     |> Enum.into(%{
       "count" => 20,
       "date" => ~N[2022-02-13 03:17:00],
-      "notes" => random_string()
+      "notes" => "some notes"
     })
     |> Cannery.ActivityLog.create_shot_group(user, ammo_group)
     |> unwrap_ok_tuple()
@@ -91,7 +92,7 @@ defmodule Cannery.Fixtures do
   @spec container_fixture(attrs :: map(), User.t()) :: Container.t()
   def container_fixture(attrs \\ %{}, %User{} = user) do
     attrs
-    |> Enum.into(%{"name" => random_string(), "type" => "Ammo can"})
+    |> Enum.into(%{"name" => "My container", "type" => "Ammo can"})
     |> Containers.create_container(user)
     |> unwrap_ok_tuple()
   end
@@ -103,7 +104,7 @@ defmodule Cannery.Fixtures do
   @spec ammo_type_fixture(attrs :: map(), User.t()) :: AmmoType.t()
   def ammo_type_fixture(attrs \\ %{}, %User{} = user) do
     attrs
-    |> Enum.into(%{"name" => random_string(), "type" => "rifle"})
+    |> Enum.into(%{"name" => "ammo_type"})
     |> Ammo.create_ammo_type(user)
     |> unwrap_ok_tuple()
   end
@@ -148,9 +149,9 @@ defmodule Cannery.Fixtures do
   def tag_fixture(attrs \\ %{}, %User{} = user) do
     attrs
     |> Enum.into(%{
-      "bg_color" => "#100000",
-      "name" => random_string(),
-      "text_color" => "#000000"
+      "bg_color" => "some bg-color",
+      "name" => "some name",
+      "text_color" => "some text-color"
     })
     |> Containers.create_tag(user)
     |> unwrap_ok_tuple()