CHANGELOG.md

@@ -1,7 +1,5 @@
 # v0.9.1
-- Rename ammo type's "type" to "class" to avoid confusion
-- Fixes ammo type search
-- Fixes shot records table disappearing after selecting an empty ammo class
+- Rename ammo_type's type to class to avoid confusion
 - Code quality improvements
 
 # v0.9.0
@@ -78,8 +76,8 @@
 - Add shading to table component
 - Fix chart to sum by day
 - Fix whitespace when copying invite url
-- Make ammo type show page also display packs as table
-- Make container show page also display packs as table
+- Make ammo type show page also display ammo groups as table
+- Make container show page also display ammo groups as table
 - Display CPR for ammo packs
 - Add original count for ammo packs
 - Add ammo pack CPR and original count to json export

CONTRIBUTING.md

@@ -17,8 +17,8 @@ If you're multilingual, this project can use your translations! Visit
   functions as short as possible while keeping variable names descriptive! For
   instance, use inline `do:` blocks for short functions and make your aliases as
   short as possible without introducing ambiguity.
-  - I.e. since there's only one `Pack` in the app, please alias
-    `Pack.t()` instead of using `Cannery.Ammo.Pack.t()`
+  - I.e. since there's only one `AmmoGroup` in the app, please alias
+    `AmmoGroup.t()` instead of using `Cannery.Ammo.AmmoGroup.t()`
 - Use pipelines when possible. If only calling a single method, a pipeline isn't
   strictly necessary but still encouraged for future modification.
 - Please add typespecs to your functions! Even your private functions may be

lib/cannery/activity_log.ex

@@ -4,7 +4,7 @@ defmodule Cannery.ActivityLog do
   """
 
   import Ecto.Query, warn: false
-  alias Cannery.Ammo.{AmmoType, Pack}
+  alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Repo}
   alias Ecto.{Multi, Queryable}
 
@@ -29,9 +29,9 @@ defmodule Cannery.ActivityLog do
   def list_shot_groups(search \\ nil, type, %{id: user_id}) do
     from(sg in ShotGroup,
       as: :sg,
-      left_join: ag in Pack,
+      left_join: ag in AmmoGroup,
       as: :ag,
-      on: sg.pack_id == ag.id,
+      on: sg.ammo_group_id == ag.id,
       left_join: at in AmmoType,
       as: :at,
       on: ag.ammo_type_id == at.id,
@@ -92,33 +92,14 @@ defmodule Cannery.ActivityLog do
 
   defp list_shot_groups_filter_type(query, _all), do: query
 
-  @doc """
-  Returns a count of shot records.
-
-  ## Examples
-
-      iex> get_shot_record_count!(%User{id: 123})
-      3
-
-  """
-  @spec get_shot_record_count!(User.t()) :: integer()
-  def get_shot_record_count!(%User{id: user_id}) do
-    Repo.one(
-      from sg in ShotGroup,
-        where: sg.user_id == ^user_id,
-        select: count(sg.id),
-        distinct: true
-    ) || 0
-  end
-
-  @spec list_shot_groups_for_pack(Pack.t(), User.t()) :: [ShotGroup.t()]
-  def list_shot_groups_for_pack(
-        %Pack{id: pack_id, user_id: user_id},
+  @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},
         %User{id: user_id}
       ) do
     Repo.all(
       from sg in ShotGroup,
-        where: sg.pack_id == ^pack_id,
+        where: sg.ammo_group_id == ^ammo_group_id,
         where: sg.user_id == ^user_id
     )
   end
@@ -159,31 +140,31 @@ defmodule Cannery.ActivityLog do
       {:error, %Ecto.Changeset{}}
 
   """
-  @spec create_shot_group(attrs :: map(), User.t(), Pack.t()) ::
+  @spec create_shot_group(attrs :: map(), User.t(), AmmoGroup.t()) ::
           {:ok, ShotGroup.t()} | {:error, ShotGroup.changeset() | nil}
-  def create_shot_group(attrs, user, pack) do
+  def create_shot_group(attrs, user, ammo_group) do
     Multi.new()
     |> Multi.insert(
       :create_shot_group,
-      %ShotGroup{} |> ShotGroup.create_changeset(user, pack, attrs)
+      %ShotGroup{} |> ShotGroup.create_changeset(user, ammo_group, attrs)
     )
     |> Multi.run(
-      :pack,
-      fn _repo, %{create_shot_group: %{pack_id: pack_id, user_id: user_id}} ->
-        pack =
+      :ammo_group,
+      fn _repo, %{create_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        ammo_group =
           Repo.one(
-            from ag in Pack,
-              where: ag.id == ^pack_id,
+            from ag in AmmoGroup,
+              where: ag.id == ^ammo_group_id,
               where: ag.user_id == ^user_id
           )
 
-        {:ok, pack}
+        {:ok, ammo_group}
       end
     )
     |> Multi.update(
-      :update_pack,
-      fn %{create_shot_group: %{count: shot_group_count}, pack: %{count: pack_count}} ->
-        pack |> Pack.range_changeset(%{"count" => pack_count - shot_group_count})
+      :update_ammo_group,
+      fn %{create_shot_group: %{count: shot_group_count}, ammo_group: %{count: ammo_group_count}} ->
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => ammo_group_count - shot_group_count})
       end
     )
     |> Repo.transaction()
@@ -219,20 +200,21 @@ defmodule Cannery.ActivityLog do
       shot_group |> ShotGroup.update_changeset(user, attrs)
     )
     |> Multi.run(
-      :pack,
-      fn repo, %{update_shot_group: %{pack_id: pack_id, user_id: user_id}} ->
-        {:ok, repo.one(from ag in Pack, where: ag.id == ^pack_id and ag.user_id == ^user_id)}
+      :ammo_group,
+      fn repo, %{update_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
       end
     )
     |> Multi.update(
-      :update_pack,
+      :update_ammo_group,
       fn %{
            update_shot_group: %{count: new_count},
-           pack: %{count: pack_count} = pack
+           ammo_group: %{count: ammo_group_count} = ammo_group
          } ->
         shot_diff_to_add = new_count - count
-        new_pack_count = pack_count - shot_diff_to_add
-        pack |> Pack.range_changeset(%{"count" => new_pack_count})
+        new_ammo_group_count = ammo_group_count - shot_diff_to_add
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => new_ammo_group_count})
       end
     )
     |> Repo.transaction()
@@ -264,19 +246,20 @@ defmodule Cannery.ActivityLog do
     Multi.new()
     |> Multi.delete(:delete_shot_group, shot_group)
     |> Multi.run(
-      :pack,
-      fn repo, %{delete_shot_group: %{pack_id: pack_id, user_id: user_id}} ->
-        {:ok, repo.one(from ag in Pack, where: ag.id == ^pack_id and ag.user_id == ^user_id)}
+      :ammo_group,
+      fn repo, %{delete_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
       end
     )
     |> Multi.update(
-      :update_pack,
+      :update_ammo_group,
       fn %{
            delete_shot_group: %{count: count},
-           pack: %{count: pack_count} = pack
+           ammo_group: %{count: ammo_group_count} = ammo_group
          } ->
-        new_pack_count = pack_count + count
-        pack |> Pack.range_changeset(%{"count" => new_pack_count})
+        new_ammo_group_count = ammo_group_count + count
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => new_ammo_group_count})
       end
     )
     |> Repo.transaction()
@@ -288,60 +271,60 @@ defmodule Cannery.ActivityLog do
   end
 
   @doc """
-  Returns the number of shot rounds for a pack
+  Returns the number of shot rounds for an ammo group
   """
-  @spec get_used_count(Pack.t(), User.t()) :: non_neg_integer()
-  def get_used_count(%Pack{id: pack_id} = pack, user) do
-    [pack]
+  @spec get_used_count(AmmoGroup.t(), User.t()) :: non_neg_integer()
+  def get_used_count(%AmmoGroup{id: ammo_group_id} = ammo_group, user) do
+    [ammo_group]
     |> get_used_counts(user)
-    |> Map.get(pack_id, 0)
+    |> Map.get(ammo_group_id, 0)
   end
 
   @doc """
-  Returns the number of shot rounds for multiple packs
+  Returns the number of shot rounds for multiple ammo groups
   """
-  @spec get_used_counts([Pack.t()], User.t()) ::
-          %{optional(Pack.id()) => non_neg_integer()}
-  def get_used_counts(packs, %User{id: user_id}) do
-    pack_ids =
-      packs
-      |> Enum.map(fn %{id: pack_id} -> pack_id end)
+  @spec get_used_counts([AmmoGroup.t()], User.t()) ::
+          %{optional(AmmoGroup.id()) => non_neg_integer()}
+  def get_used_counts(ammo_groups, %User{id: user_id}) do
+    ammo_group_ids =
+      ammo_groups
+      |> Enum.map(fn %{id: ammo_group_id} -> ammo_group_id end)
 
     Repo.all(
       from sg in ShotGroup,
-        where: sg.pack_id in ^pack_ids,
+        where: sg.ammo_group_id in ^ammo_group_ids,
         where: sg.user_id == ^user_id,
-        group_by: sg.pack_id,
-        select: {sg.pack_id, sum(sg.count)}
+        group_by: sg.ammo_group_id,
+        select: {sg.ammo_group_id, sum(sg.count)}
     )
     |> Map.new()
   end
 
   @doc """
-  Returns the last entered shot group date for a pack
+  Returns the last entered shot group date for an ammo group
   """
-  @spec get_last_used_date(Pack.t(), User.t()) :: Date.t() | nil
-  def get_last_used_date(%Pack{id: pack_id} = pack, user) do
-    [pack]
+  @spec get_last_used_date(AmmoGroup.t(), User.t()) :: Date.t() | nil
+  def get_last_used_date(%AmmoGroup{id: ammo_group_id} = ammo_group, user) do
+    [ammo_group]
     |> get_last_used_dates(user)
-    |> Map.get(pack_id)
+    |> Map.get(ammo_group_id)
   end
 
   @doc """
-  Returns the last entered shot group date for a pack
+  Returns the last entered shot group date for an ammo group
   """
-  @spec get_last_used_dates([Pack.t()], User.t()) :: %{optional(Pack.id()) => Date.t()}
-  def get_last_used_dates(packs, %User{id: user_id}) do
-    pack_ids =
-      packs
-      |> Enum.map(fn %Pack{id: pack_id, user_id: ^user_id} -> pack_id end)
+  @spec get_last_used_dates([AmmoGroup.t()], User.t()) :: %{optional(AmmoGroup.id()) => Date.t()}
+  def get_last_used_dates(ammo_groups, %User{id: user_id}) do
+    ammo_group_ids =
+      ammo_groups
+      |> Enum.map(fn %AmmoGroup{id: ammo_group_id, user_id: ^user_id} -> ammo_group_id end)
 
     Repo.all(
       from sg in ShotGroup,
-        where: sg.pack_id in ^pack_ids,
+        where: sg.ammo_group_id in ^ammo_group_ids,
         where: sg.user_id == ^user_id,
-        group_by: sg.pack_id,
-        select: {sg.pack_id, max(sg.date)}
+        group_by: sg.ammo_group_id,
+        select: {sg.ammo_group_id, max(sg.date)}
     )
     |> Map.new()
   end
@@ -384,9 +367,9 @@ defmodule Cannery.ActivityLog do
       |> Enum.map(fn %AmmoType{id: ammo_type_id, user_id: ^user_id} -> ammo_type_id end)
 
     Repo.all(
-      from ag in Pack,
+      from ag in AmmoGroup,
         left_join: sg in ShotGroup,
-        on: ag.id == sg.pack_id,
+        on: ag.id == sg.ammo_group_id,
         where: ag.ammo_type_id in ^ammo_type_ids,
         where: not (sg.count |> is_nil()),
         group_by: ag.ammo_type_id,

lib/cannery/activity_log/shot_group.ex

@@ -6,7 +6,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
   use Ecto.Schema
   import CanneryWeb.Gettext
   import Ecto.Changeset
-  alias Cannery.{Accounts.User, Ammo, Ammo.Pack}
+  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup}
   alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
@@ -15,7 +15,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
              :count,
              :date,
              :notes,
-             :pack_id
+             :ammo_group_id
            ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -25,7 +25,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
     field :notes, :string
 
     field :user_id, :binary_id
-    field :pack_id, :binary_id
+    field :ammo_group_id, :binary_id
 
     timestamps()
   end
@@ -35,7 +35,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
           count: integer,
           notes: String.t() | nil,
           date: Date.t() | nil,
-          pack_id: Pack.id(),
+          ammo_group_id: AmmoGroup.id(),
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
@@ -48,44 +48,46 @@ defmodule Cannery.ActivityLog.ShotGroup do
   @spec create_changeset(
           new_shot_group(),
           User.t() | any(),
-          Pack.t() | any(),
+          AmmoGroup.t() | any(),
           attrs :: map()
         ) :: changeset()
   def create_changeset(
         shot_group,
         %User{id: user_id},
-        %Pack{id: pack_id, user_id: user_id} = pack,
+        %AmmoGroup{id: ammo_group_id, user_id: user_id} = ammo_group,
         attrs
       ) do
     shot_group
     |> change(user_id: user_id)
-    |> change(pack_id: pack_id)
+    |> change(ammo_group_id: ammo_group_id)
     |> cast(attrs, [:count, :notes, :date])
     |> validate_length(:notes, max: 255)
-    |> validate_create_shot_group_count(pack)
-    |> validate_required([:date, :pack_id, :user_id])
+    |> validate_create_shot_group_count(ammo_group)
+    |> validate_required([:date, :ammo_group_id, :user_id])
   end
 
-  def create_changeset(shot_group, _invalid_user, _invalid_pack, attrs) 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([:pack_id, :user_id])
+    |> validate_required([:ammo_group_id, :user_id])
     |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo pack"))
   end
 
-  defp validate_create_shot_group_count(changeset, %Pack{count: pack_count}) do
+  defp validate_create_shot_group_count(changeset, %AmmoGroup{count: ammo_group_count}) do
     case changeset |> Changeset.get_field(:count) do
       nil ->
         changeset |> Changeset.add_error(:ammo_left, dgettext("errors", "can't be blank"))
 
-      count when count > pack_count ->
+      count when count > ammo_group_count ->
         changeset
         |> Changeset.add_error(:ammo_left, dgettext("errors", "Ammo left must be at least 0"))
 
       count when count <= 0 ->
         error =
-          dgettext("errors", "Ammo left can be at most %{count} rounds", count: pack_count - 1)
+          dgettext("errors", "Ammo left can be at most %{count} rounds",
+            count: ammo_group_count - 1
+          )
 
         changeset |> Changeset.add_error(:ammo_left, error)
 
@@ -107,16 +109,17 @@ defmodule Cannery.ActivityLog.ShotGroup do
 
   defp validate_update_shot_group_count(
          changeset,
-         %__MODULE__{pack_id: pack_id, count: count},
+         %__MODULE__{ammo_group_id: ammo_group_id, count: count},
          user
        ) do
-    %{count: pack_count} = Ammo.get_pack!(pack_id, user)
+    %{count: ammo_group_count} = Ammo.get_ammo_group!(ammo_group_id, user)
 
     new_shot_group_count = changeset |> Changeset.get_field(:count)
     shot_diff_to_add = new_shot_group_count - count
 
-    if shot_diff_to_add > pack_count do
-      error = dgettext("errors", "Count can be at most %{count} shots", count: pack_count + count)
+    if shot_diff_to_add > ammo_group_count do
+      error =
+        dgettext("errors", "Count can be at most %{count} shots", count: ammo_group_count + count)
 
       changeset |> Changeset.add_error(:count, error)
     else

lib/cannery/ammo/ammo_group.ex

@@ -1,4 +1,4 @@
-defmodule Cannery.Ammo.Pack do
+defmodule Cannery.Ammo.AmmoGroup do
   @moduledoc """
   A group of a certain ammunition type.
 
@@ -25,7 +25,7 @@ defmodule Cannery.Ammo.Pack do
            ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
-  schema "packs" do
+  schema "ammo_groups" do
     field :count, :integer
     field :notes, :string
     field :price_paid, :float
@@ -53,27 +53,27 @@ defmodule Cannery.Ammo.Pack do
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_pack :: %__MODULE__{}
+  @type new_ammo_group :: %__MODULE__{}
   @type id :: UUID.t()
-  @type changeset :: Changeset.t(t() | new_pack())
+  @type changeset :: Changeset.t(t() | new_ammo_group())
 
   @doc false
   @spec create_changeset(
-          new_pack(),
+          new_ammo_group(),
           AmmoType.t() | nil,
           Container.t() | nil,
           User.t(),
           attrs :: map()
         ) :: changeset()
   def create_changeset(
-        pack,
+        ammo_group,
         %AmmoType{id: ammo_type_id},
         %Container{id: container_id, user_id: user_id},
         %User{id: user_id},
         attrs
       )
       when is_binary(ammo_type_id) and is_binary(container_id) and is_binary(user_id) do
-    pack
+    ammo_group
     |> change(ammo_type_id: ammo_type_id)
     |> change(user_id: user_id)
     |> change(container_id: container_id)
@@ -85,17 +85,17 @@ defmodule Cannery.Ammo.Pack do
   @doc """
   Invalid changeset, used to prompt user to select ammo type and container
   """
-  def create_changeset(pack, _invalid_ammo_type, _invalid_container, _invalid_user, attrs) do
-    pack
+  def create_changeset(ammo_group, _invalid_ammo_type, _invalid_container, _invalid_user, attrs) do
+    ammo_group
     |> cast(attrs, [:ammo_type_id, :container_id])
     |> validate_required([:ammo_type_id, :container_id])
     |> add_error(:invalid, dgettext("errors", "Please select an ammo type and container"))
   end
 
   @doc false
-  @spec update_changeset(t() | new_pack(), attrs :: map(), User.t()) :: changeset()
-  def update_changeset(pack, attrs, user) do
-    pack
+  @spec update_changeset(t() | new_ammo_group(), attrs :: map(), User.t()) :: changeset()
+  def update_changeset(ammo_group, attrs, user) do
+    ammo_group
     |> cast(attrs, [:count, :price_paid, :notes, :staged, :purchased_on, :container_id])
     |> validate_number(:count, greater_than_or_equal_to: 0)
     |> validate_container_id(user)
@@ -113,12 +113,12 @@ defmodule Cannery.Ammo.Pack do
   end
 
   @doc """
-  This range changeset is used when "using up" packs, and allows for
+  This range changeset is used when "using up" ammo groups, and allows for
   updating the count to 0
   """
-  @spec range_changeset(t() | new_pack(), attrs :: map()) :: changeset()
-  def range_changeset(pack, attrs) do
-    pack
+  @spec range_changeset(t() | new_ammo_group(), attrs :: map()) :: changeset()
+  def range_changeset(ammo_group, attrs) do
+    ammo_group
     |> cast(attrs, [:count, :staged])
     |> validate_required([:count, :staged])
   end

lib/cannery/ammo/ammo_type.ex

@@ -8,7 +8,7 @@ defmodule Cannery.Ammo.AmmoType do
   use Ecto.Schema
   import Ecto.Changeset
   alias Cannery.Accounts.User
-  alias Cannery.Ammo.Pack
+  alias Cannery.Ammo.AmmoGroup
   alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
@@ -83,7 +83,7 @@ defmodule Cannery.Ammo.AmmoType do
     field :dram_equivalent, :string
 
     field :user_id, :binary_id
-    has_many :packs, Pack
+    has_many :ammo_groups, AmmoGroup
 
     timestamps()
   end
@@ -123,7 +123,7 @@ defmodule Cannery.Ammo.AmmoType do
           manufacturer: String.t() | nil,
           upc: String.t() | nil,
           user_id: User.id(),
-          packs: [Pack.t()] | nil,
+          ammo_groups: [AmmoGroup.t()] | nil,
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }

lib/cannery/containers.ex

@@ -5,7 +5,7 @@ defmodule Cannery.Containers do
 
   import CanneryWeb.Gettext
   import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, Ammo.Pack, Repo}
+  alias Cannery.{Accounts.User, Ammo.AmmoGroup, Repo}
   alias Cannery.Containers.{Container, ContainerTag, Tag}
   alias Ecto.Changeset
 
@@ -203,7 +203,7 @@ defmodule Cannery.Containers do
           {:ok, Container.t()} | {:error, Container.changeset()}
   def delete_container(%Container{user_id: user_id} = container, %User{id: user_id}) do
     Repo.one(
-      from ag in Pack,
+      from ag in AmmoGroup,
         where: ag.container_id == ^container.id,
         select: count(ag.id)
     )
@@ -221,7 +221,7 @@ defmodule Cannery.Containers do
 
         container
         |> Container.update_changeset(%{})
-        |> Changeset.add_error(:packs, error)
+        |> Changeset.add_error(:ammo_groups, error)
         |> Changeset.apply_action(:delete)
     end
   end

lib/cannery_web/components/add_shot_group_component.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, ActivityLog, ActivityLog.ShotGroup, Ammo.Pack}
+  alias Cannery.{Accounts.User, ActivityLog, ActivityLog.ShotGroup, Ammo.AmmoGroup}
   alias Ecto.Changeset
   alias Phoenix.LiveView.{JS, Socket}
 
@@ -12,15 +12,15 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
   @spec update(
           %{
             required(:current_user) => User.t(),
-            required(:pack) => Pack.t(),
+            required(:ammo_group) => AmmoGroup.t(),
             optional(any()) => any()
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{pack: pack, current_user: current_user} = assigns, socket) do
+  def update(%{ammo_group: ammo_group, current_user: current_user} = assigns, socket) do
     changeset =
       %ShotGroup{date: Date.utc_today()}
-      |> ShotGroup.create_changeset(current_user, pack, %{})
+      |> ShotGroup.create_changeset(current_user, ammo_group, %{})
 
     {:ok, socket |> assign(assigns) |> assign(:changeset, changeset)}
   end
@@ -29,11 +29,11 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
   def handle_event(
         "validate",
         %{"shot_group" => shot_group_params},
-        %{assigns: %{pack: pack, current_user: current_user}} = socket
+        %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
-    params = shot_group_params |> process_params(pack)
+    params = shot_group_params |> process_params(ammo_group)
 
-    changeset = %ShotGroup{} |> ShotGroup.create_changeset(current_user, pack, params)
+    changeset = %ShotGroup{} |> ShotGroup.create_changeset(current_user, ammo_group, params)
 
     changeset =
       case changeset |> Changeset.apply_action(:validate) do
@@ -48,13 +48,13 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
         "save",
         %{"shot_group" => shot_group_params},
         %{
-          assigns: %{pack: pack, current_user: current_user, return_to: return_to}
+          assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}
         } = socket
       ) do
     socket =
       shot_group_params
-      |> process_params(pack)
-      |> ActivityLog.create_shot_group(current_user, pack)
+      |> process_params(ammo_group)
+      |> ActivityLog.create_shot_group(current_user, ammo_group)
       |> case do
         {:ok, _shot_group} ->
           prompt = dgettext("prompts", "Shots recorded successfully")
@@ -68,7 +68,7 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
   end
 
   # calculate count from shots left
-  defp process_params(params, %Pack{count: count}) do
+  defp process_params(params, %AmmoGroup{count: count}) do
     shot_group_count =
       if params |> Map.get("ammo_left", "") == "" do
         nil

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -22,7 +22,7 @@
     <%= label(f, :ammo_left, gettext("Rounds left"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :ammo_left,
       min: 0,
-      max: @pack.count - 1,
+      max: @ammo_group.count - 1,
       placeholder: gettext("Rounds left"),
       class: "input input-primary"
     ) %>

lib/cannery_web/components/ammo_group_table_component.ex

@@ -1,9 +1,9 @@
-defmodule CanneryWeb.Components.PackTableComponent do
+defmodule CanneryWeb.Components.AmmoGroupTableComponent do
   @moduledoc """
-  A component that displays a list of packs
+  A component that displays a list of ammo groups
   """
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Ammo.Pack, ComparableDate}
+  alias Cannery.{Accounts.User, Ammo.AmmoGroup, ComparableDate}
   alias Cannery.{ActivityLog, Ammo, Containers}
   alias CanneryWeb.Components.TableComponent
   alias Ecto.UUID
@@ -14,7 +14,7 @@ defmodule CanneryWeb.Components.PackTableComponent do
           %{
             required(:id) => UUID.t(),
             required(:current_user) => User.t(),
-            required(:packs) => [Pack.t()],
+            required(:ammo_groups) => [AmmoGroup.t()],
             required(:show_used) => boolean(),
             optional(:ammo_type) => Rendered.t(),
             optional(:range) => Rendered.t(),
@@ -25,7 +25,8 @@ defmodule CanneryWeb.Components.PackTableComponent do
           Socket.t()
         ) :: {:ok, Socket.t()}
   def update(
-        %{id: _id, packs: _pack, current_user: _current_user, show_used: _show_used} = assigns,
+        %{id: _id, ammo_groups: _ammo_group, current_user: _current_user, show_used: _show_used} =
+          assigns,
         socket
       ) do
     socket =
@@ -35,15 +36,15 @@ defmodule CanneryWeb.Components.PackTableComponent do
       |> assign_new(:range, fn -> [] end)
       |> assign_new(:container, fn -> [] end)
       |> assign_new(:actions, fn -> [] end)
-      |> display_packs()
+      |> display_ammo_groups()
 
     {:ok, socket}
   end
 
-  defp display_packs(
+  defp display_ammo_groups(
          %{
            assigns: %{
-             packs: packs,
+             ammo_groups: ammo_groups,
              current_user: current_user,
              ammo_type: ammo_type,
              range: range,
@@ -97,7 +98,7 @@ defmodule CanneryWeb.Components.PackTableComponent do
       )
 
     containers =
-      packs
+      ammo_groups
       |> Enum.map(fn %{container_id: container_id} -> container_id end)
       |> Containers.get_containers(current_user)
 
@@ -107,18 +108,18 @@ defmodule CanneryWeb.Components.PackTableComponent do
       columns: columns,
       container: container,
       containers: containers,
-      original_counts: Ammo.get_original_counts(packs, current_user),
-      cprs: Ammo.get_cprs(packs, current_user),
-      last_used_dates: ActivityLog.get_last_used_dates(packs, current_user),
-      percentages_remaining: Ammo.get_percentages_remaining(packs, current_user),
+      original_counts: Ammo.get_original_counts(ammo_groups, current_user),
+      cprs: Ammo.get_cprs(ammo_groups, current_user),
+      last_used_dates: ActivityLog.get_last_used_dates(ammo_groups, current_user),
+      percentages_remaining: Ammo.get_percentages_remaining(ammo_groups, current_user),
       actions: actions,
       range: range
     }
 
     rows =
-      packs
-      |> Enum.map(fn pack ->
-        pack |> get_row_data_for_pack(extra_data)
+      ammo_groups
+      |> Enum.map(fn ammo_group ->
+        ammo_group |> get_row_data_for_ammo_group(extra_data)
       end)
 
     socket |> assign(columns: columns, rows: rows)
@@ -133,15 +134,15 @@ defmodule CanneryWeb.Components.PackTableComponent do
     """
   end
 
-  @spec get_row_data_for_pack(Pack.t(), additional_data :: map()) :: map()
-  defp get_row_data_for_pack(pack, %{columns: columns} = additional_data) do
+  @spec get_row_data_for_ammo_group(AmmoGroup.t(), additional_data :: map()) :: map()
+  defp get_row_data_for_ammo_group(ammo_group, %{columns: columns} = additional_data) do
     columns
     |> Map.new(fn %{key: key} ->
-      {key, get_value_for_key(key, pack, additional_data)}
+      {key, get_value_for_key(key, ammo_group, additional_data)}
     end)
   end
 
-  @spec get_value_for_key(atom(), Pack.t(), additional_data :: map()) ::
+  @spec get_value_for_key(atom(), AmmoGroup.t(), additional_data :: map()) ::
           any() | {any(), Rendered.t()}
   defp get_value_for_key(
          :ammo_type,
@@ -169,9 +170,9 @@ defmodule CanneryWeb.Components.PackTableComponent do
      """}
   end
 
-  defp get_value_for_key(:used_up_on, %{id: pack_id}, %{last_used_dates: last_used_dates}) do
-    last_used_date = last_used_dates |> Map.get(pack_id)
-    assigns = %{id: pack_id, last_used_date: last_used_date}
+  defp get_value_for_key(:used_up_on, %{id: ammo_group_id}, %{last_used_dates: last_used_dates}) do
+    last_used_date = last_used_dates |> Map.get(ammo_group_id)
+    assigns = %{id: ammo_group_id, last_used_date: last_used_date}
 
     {last_used_date,
      ~H"""
@@ -183,29 +184,29 @@ defmodule CanneryWeb.Components.PackTableComponent do
      """}
   end
 
-  defp get_value_for_key(:range, %{staged: staged} = pack, %{range: range}) do
-    assigns = %{range: range, pack: pack}
+  defp get_value_for_key(:range, %{staged: staged} = ammo_group, %{range: range}) do
+    assigns = %{range: range, ammo_group: ammo_group}
 
     {staged,
      ~H"""
-     <%= render_slot(@range, @pack) %>
+     <%= render_slot(@range, @ammo_group) %>
      """}
   end
 
   defp get_value_for_key(
          :remaining,
-         %{id: pack_id},
+         %{id: ammo_group_id},
          %{percentages_remaining: percentages_remaining}
        ) do
-    percentage = Map.fetch!(percentages_remaining, pack_id)
+    percentage = Map.fetch!(percentages_remaining, ammo_group_id)
     {percentage, gettext("%{percentage}%", percentage: percentage)}
   end
 
-  defp get_value_for_key(:actions, pack, %{actions: actions}) do
-    assigns = %{actions: actions, pack: pack}
+  defp get_value_for_key(:actions, ammo_group, %{actions: actions}) do
+    assigns = %{actions: actions, ammo_group: ammo_group}
 
     ~H"""
-    <%= render_slot(@actions, @pack) %>
+    <%= render_slot(@actions, @ammo_group) %>
     """
   end
 
@@ -213,7 +214,7 @@ defmodule CanneryWeb.Components.PackTableComponent do
 
   defp get_value_for_key(
          :container,
-         %{container_id: container_id} = pack,
+         %{container_id: container_id} = ammo_group,
          %{container: container_block, containers: containers}
        ) do
     container = %{name: container_name} = Map.fetch!(containers, container_id)
@@ -221,35 +222,35 @@ defmodule CanneryWeb.Components.PackTableComponent do
     assigns = %{
       container: container,
       container_block: container_block,
-      pack: pack
+      ammo_group: ammo_group
     }
 
     {container_name,
      ~H"""
-     <%= render_slot(@container_block, {@pack, @container}) %>
+     <%= render_slot(@container_block, {@ammo_group, @container}) %>
      """}
   end
 
   defp get_value_for_key(
          :original_count,
-         %{id: pack_id},
+         %{id: ammo_group_id},
          %{original_counts: original_counts}
        ) do
-    Map.fetch!(original_counts, pack_id)
+    Map.fetch!(original_counts, ammo_group_id)
   end
 
   defp get_value_for_key(:cpr, %{price_paid: nil}, _additional_data),
     do: {0, gettext("No cost information")}
 
-  defp get_value_for_key(:cpr, %{id: pack_id}, %{cprs: cprs}) do
-    amount = Map.fetch!(cprs, pack_id)
+  defp get_value_for_key(:cpr, %{id: ammo_group_id}, %{cprs: cprs}) do
+    amount = Map.fetch!(cprs, ammo_group_id)
     {amount, gettext("$%{amount}", amount: display_currency(amount))}
   end
 
   defp get_value_for_key(:count, %{count: count}, _additional_data),
     do: if(count == 0, do: {0, gettext("Empty")}, else: count)
 
-  defp get_value_for_key(key, pack, _additional_data), do: pack |> Map.get(key)
+  defp get_value_for_key(key, ammo_group, _additional_data), do: ammo_group |> Map.get(key)
 
   @spec display_currency(float()) :: String.t()
   defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)

lib/cannery_web/components/ammo_type_table_component.ex

@@ -147,13 +147,13 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
       })
       |> TableComponent.maybe_compose_columns(filtered_columns)
       |> TableComponent.maybe_compose_columns(
-        %{label: gettext("Class"), key: :class, type: :atom},
+        %{label: gettext("Class"), key: :type, type: :atom},
         class in [:all, nil]
       )
       |> TableComponent.maybe_compose_columns(%{label: gettext("Name"), key: :name, type: :name})
 
     round_counts = ammo_types |> Ammo.get_round_count_for_ammo_types(current_user)
-    packs_count = ammo_types |> Ammo.get_packs_count_for_types(current_user)
+    packs_count = ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user)
     average_costs = ammo_types |> Ammo.get_average_cost_for_ammo_types(current_user)
 
     [used_counts, historical_round_counts, historical_pack_counts, used_pack_counts] =
@@ -161,8 +161,8 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
         [
           ammo_types |> ActivityLog.get_used_count_for_ammo_types(current_user),
           ammo_types |> Ammo.get_historical_count_for_ammo_types(current_user),
-          ammo_types |> Ammo.get_packs_count_for_types(current_user, true),
-          ammo_types |> Ammo.get_used_packs_count_for_types(current_user)
+          ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user, true),
+          ammo_types |> Ammo.get_used_ammo_groups_count_for_types(current_user)
         ]
       else
         [nil, nil, nil, nil]

lib/cannery_web/components/container_table_component.ex

@@ -71,7 +71,7 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
       current_user: current_user,
       tag_actions: tag_actions,
       actions: actions,
-      pack_count: Ammo.get_packs_count_for_containers(containers, current_user),
+      pack_count: Ammo.get_ammo_groups_count_for_containers(containers, current_user),
       round_count: Ammo.get_round_count_for_containers(containers, current_user)
     }
 

lib/cannery_web/components/core_components.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.CoreComponents do
   use Phoenix.Component
   import CanneryWeb.{Gettext, ViewHelpers}
   alias Cannery.{Accounts, Accounts.Invite, Accounts.User}
-  alias Cannery.{Ammo, Ammo.Pack}
+  alias Cannery.{Ammo, Ammo.AmmoGroup}
   alias Cannery.{Containers.Container, Containers.Tag}
   alias CanneryWeb.{Endpoint, HomeLive}
   alias CanneryWeb.Router.Helpers, as: Routes
@@ -86,7 +86,7 @@ defmodule CanneryWeb.CoreComponents do
 
   def simple_tag_card(assigns)
 
-  attr :pack, Pack, required: true
+  attr :ammo_group, AmmoGroup, required: true
   attr :current_user, User, required: true
   attr :original_count, :integer, default: nil
   attr :cpr, :integer, default: nil
@@ -94,7 +94,7 @@ defmodule CanneryWeb.CoreComponents do
   attr :container, Container, default: nil
   slot(:inner_block)
 
-  def pack_card(assigns)
+  def ammo_group_card(assigns)
 
   @spec display_currency(float()) :: String.t()
   defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)

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

@@ -1,45 +1,48 @@
 <div
-  id={"pack-#{@pack.id}"}
+  id={"ammo_group-#{@ammo_group.id}"}
   class="mx-4 my-2 px-8 py-4
     flex flex-col justify-center items-center
     border border-gray-400 rounded-lg shadow-lg hover:shadow-md
     transition-all duration-300 ease-in-out"
 >
-  <.link navigate={Routes.pack_show_path(Endpoint, :show, @pack)} class="mb-2 link">
+  <.link navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="mb-2 link">
     <h1 class="title text-xl title-primary-500">
-      <%= @pack.ammo_type.name %>
+      <%= @ammo_group.ammo_type.name %>
     </h1>
   </.link>
 
   <div class="flex flex-col justify-center items-center">
     <span class="rounded-lg title text-lg">
       <%= gettext("Count:") %>
-      <%= if @pack.count == 0, do: gettext("Empty"), else: @pack.count %>
+      <%= if @ammo_group.count == 0, do: gettext("Empty"), else: @ammo_group.count %>
     </span>
 
-    <span :if={@original_count && @original_count != @pack.count} class="rounded-lg title text-lg">
+    <span
+      :if={@original_count && @original_count != @ammo_group.count}
+      class="rounded-lg title text-lg"
+    >
       <%= gettext("Original Count:") %>
       <%= @original_count %>
     </span>
 
-    <span :if={@pack.notes} class="rounded-lg title text-lg">
+    <span :if={@ammo_group.notes} class="rounded-lg title text-lg">
       <%= gettext("Notes:") %>
-      <%= @pack.notes %>
+      <%= @ammo_group.notes %>
     </span>
 
-    <span :if={@pack.purchased_on} class="rounded-lg title text-lg">
+    <span :if={@ammo_group.purchased_on} class="rounded-lg title text-lg">
       <%= gettext("Purchased on:") %>
-      <.date id={"#{@pack.id}-purchased-on"} date={@pack.purchased_on} />
+      <.date id={"#{@ammo_group.id}-purchased-on"} date={@ammo_group.purchased_on} />
     </span>
 
     <span :if={@last_used_date} class="rounded-lg title text-lg">
       <%= gettext("Last used on:") %>
-      <.date id={"#{@pack.id}-last-used-on"} date={@last_used_date} />
+      <.date id={"#{@ammo_group.id}-last-used-on"} date={@last_used_date} />
     </span>
 
-    <span :if={@pack.price_paid} class="rounded-lg title text-lg">
+    <span :if={@ammo_group.price_paid} class="rounded-lg title text-lg">
       <%= gettext("Price paid:") %>
-      <%= gettext("$%{amount}", amount: display_currency(@pack.price_paid)) %>
+      <%= gettext("$%{amount}", amount: display_currency(@ammo_group.price_paid)) %>
     </span>
 
     <span :if={@cpr} class="rounded-lg title text-lg">

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

@@ -27,10 +27,10 @@
       <%= @container.location %>
     </span>
 
-    <%= if @container |> Ammo.get_packs_count_for_container!(@current_user) != 0 do %>
+    <%= if @container |> Ammo.get_ammo_groups_count_for_container!(@current_user) != 0 do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Packs:") %>
-        <%= @container |> Ammo.get_packs_count_for_container!(@current_user) %>
+        <%= @container |> Ammo.get_ammo_groups_count_for_container!(@current_user) %>
       </span>
 
       <span class="rounded-lg title text-lg">

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

@@ -52,7 +52,7 @@
         </li>
         <li class="mx-2 my-1">
           <.link
-            navigate={Routes.pack_index_path(Endpoint, :index)}
+            navigate={Routes.ammo_group_index_path(Endpoint, :index)}
             class="text-white hover:underline"
           >
             <%= gettext("Ammo") %>

lib/cannery_web/components/move_ammo_group_component.ex

@@ -1,10 +1,10 @@
-defmodule CanneryWeb.Components.MovePackComponent do
+defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
   @moduledoc """
-  Livecomponent that can move a pack to another container
+  Livecomponent that can move an ammo group to another container
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Ammo, Ammo.Pack, Containers, Containers.Container}
+  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers, Containers.Container}
   alias CanneryWeb.Endpoint
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
@@ -13,16 +13,17 @@ defmodule CanneryWeb.Components.MovePackComponent do
   @spec update(
           %{
             required(:current_user) => User.t(),
-            required(:pack) => Pack.t(),
+            required(:ammo_group) => AmmoGroup.t(),
             optional(any()) => any()
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
   def update(
-        %{pack: %{container_id: container_id} = pack, current_user: current_user} = assigns,
+        %{ammo_group: %{container_id: container_id} = ammo_group, current_user: current_user} =
+          assigns,
         socket
       ) do
-    changeset = pack |> Pack.update_changeset(%{}, current_user)
+    changeset = ammo_group |> AmmoGroup.update_changeset(%{}, current_user)
 
     containers =
       Containers.list_containers(current_user)
@@ -40,15 +41,16 @@ defmodule CanneryWeb.Components.MovePackComponent do
   def handle_event(
         "move",
         %{"container_id" => container_id},
-        %{assigns: %{pack: pack, current_user: current_user, return_to: return_to}} = socket
+        %{assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}} =
+          socket
       ) do
     %{name: container_name} = Containers.get_container!(container_id, current_user)
 
     socket =
-      pack
-      |> Ammo.update_pack(%{"container_id" => container_id}, current_user)
+      ammo_group
+      |> Ammo.update_ammo_group(%{"container_id" => container_id}, current_user)
       |> case do
-        {:ok, _pack} ->
+        {:ok, _ammo_group} ->
           prompt = dgettext("prompts", "Ammo moved to %{name} successfully", name: container_name)
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
@@ -90,7 +92,7 @@ defmodule CanneryWeb.Components.MovePackComponent do
       <% else %>
         <.live_component
           module={CanneryWeb.Components.TableComponent}
-          id="move_pack_table"
+          id="move_ammo_group_table"
           columns={@columns}
           rows={@rows}
         />

lib/cannery_web/components/shot_group_table_component.ex

@@ -45,12 +45,12 @@ defmodule CanneryWeb.Components.ShotGroupTableComponent do
       %{label: gettext("Actions"), key: :actions, sortable: false}
     ]
 
-    packs =
+    ammo_groups =
       shot_groups
-      |> Enum.map(fn %{pack_id: pack_id} -> pack_id end)
-      |> Ammo.get_packs(current_user)
+      |> Enum.map(fn %{ammo_group_id: ammo_group_id} -> ammo_group_id end)
+      |> Ammo.get_ammo_groups(current_user)
 
-    extra_data = %{current_user: current_user, actions: actions, packs: packs}
+    extra_data = %{current_user: current_user, actions: actions, ammo_groups: ammo_groups}
 
     rows =
       shot_groups
@@ -90,13 +90,13 @@ defmodule CanneryWeb.Components.ShotGroupTableComponent do
     end)
   end
 
-  defp get_row_value(:name, %{pack_id: pack_id}, %{packs: packs}) do
-    assigns = %{pack: pack = Map.fetch!(packs, pack_id)}
+  defp get_row_value(:name, %{ammo_group_id: ammo_group_id}, %{ammo_groups: ammo_groups}) do
+    assigns = %{ammo_group: ammo_group = Map.fetch!(ammo_groups, ammo_group_id)}
 
-    {pack.ammo_type.name,
+    {ammo_group.ammo_type.name,
      ~H"""
-     <.link navigate={Routes.pack_show_path(Endpoint, :show, @pack)} class="link">
-       <%= @pack.ammo_type.name %>
+     <.link navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="link">
+       <%= @ammo_group.ammo_type.name %>
      </.link>
      """}
   end

lib/cannery_web/controllers/export_controller.ex

@@ -6,9 +6,10 @@ defmodule CanneryWeb.ExportController do
     ammo_types = Ammo.list_ammo_types(current_user, :all)
     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)
-    pack_counts = ammo_types |> Ammo.get_packs_count_for_types(current_user)
+    ammo_group_counts = ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user)
 
-    total_pack_counts = ammo_types |> Ammo.get_packs_count_for_types(current_user, true)
+    total_ammo_group_counts =
+      ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user, true)
 
     average_costs = ammo_types |> Ammo.get_average_cost_for_ammo_types(current_user)
 
@@ -22,28 +23,28 @@ defmodule CanneryWeb.ExportController do
           "average_cost" => Map.get(average_costs, ammo_type_id),
           "round_count" => Map.get(round_counts, ammo_type_id, 0),
           "used_count" => Map.get(used_counts, ammo_type_id, 0),
-          "pack_count" => Map.get(pack_counts, ammo_type_id, 0),
-          "total_pack_count" => Map.get(total_pack_counts, ammo_type_id, 0)
+          "ammo_group_count" => Map.get(ammo_group_counts, ammo_type_id, 0),
+          "total_ammo_group_count" => Map.get(total_ammo_group_counts, ammo_type_id, 0)
         })
       end)
 
-    packs = Ammo.list_packs(nil, :all, current_user, true)
-    used_counts = packs |> ActivityLog.get_used_counts(current_user)
-    original_counts = packs |> Ammo.get_original_counts(current_user)
-    cprs = packs |> Ammo.get_cprs(current_user)
-    percentages_remaining = packs |> Ammo.get_percentages_remaining(current_user)
+    ammo_groups = Ammo.list_ammo_groups(nil, :all, current_user, true)
+    used_counts = ammo_groups |> ActivityLog.get_used_counts(current_user)
+    original_counts = ammo_groups |> Ammo.get_original_counts(current_user)
+    cprs = ammo_groups |> Ammo.get_cprs(current_user)
+    percentages_remaining = ammo_groups |> Ammo.get_percentages_remaining(current_user)
 
-    packs =
-      packs
-      |> Enum.map(fn %{id: pack_id} = pack ->
-        pack
+    ammo_groups =
+      ammo_groups
+      |> Enum.map(fn %{id: ammo_group_id} = ammo_group ->
+        ammo_group
         |> Jason.encode!()
         |> Jason.decode!()
         |> Map.merge(%{
-          "used_count" => Map.get(used_counts, pack_id),
-          "percentage_remaining" => Map.fetch!(percentages_remaining, pack_id),
-          "original_count" => Map.get(original_counts, pack_id),
-          "cpr" => Map.get(cprs, pack_id)
+          "used_count" => Map.get(used_counts, ammo_group_id),
+          "percentage_remaining" => Map.fetch!(percentages_remaining, ammo_group_id),
+          "original_count" => Map.get(original_counts, ammo_group_id),
+          "cpr" => Map.get(cprs, ammo_group_id)
         })
       end)
 
@@ -52,14 +53,14 @@ defmodule CanneryWeb.ExportController do
     containers =
       Containers.list_containers(current_user)
       |> Enum.map(fn container ->
-        pack_count = container |> Ammo.get_packs_count_for_container!(current_user)
+        ammo_group_count = container |> Ammo.get_ammo_groups_count_for_container!(current_user)
         round_count = container |> Ammo.get_round_count_for_container!(current_user)
 
         container
         |> Jason.encode!()
         |> Jason.decode!()
         |> Map.merge(%{
-          "pack_count" => pack_count,
+          "ammo_group_count" => ammo_group_count,
           "round_count" => round_count
         })
       end)
@@ -67,7 +68,7 @@ defmodule CanneryWeb.ExportController do
     json(conn, %{
       user: current_user,
       ammo_types: ammo_types,
-      packs: packs,
+      ammo_groups: ammo_groups,
       shot_groups: shot_groups,
       containers: containers
     })

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -1,22 +1,22 @@
-defmodule CanneryWeb.PackLive.FormComponent do
+defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create an Cannery.Ammo.Pack
+  Livecomponent that can update or create an Cannery.Ammo.AmmoGroup
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.Ammo.{AmmoType, Pack}
+  alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Cannery.{Accounts.User, Ammo, Containers, Containers.Container}
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
-  @pack_create_limit 10_000
+  @ammo_group_create_limit 10_000
 
   @impl true
   @spec update(
-          %{:pack => Pack.t(), :current_user => User.t(), optional(any) => any},
+          %{:ammo_group => AmmoGroup.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{pack: _pack} = assigns, socket) do
+  def update(%{ammo_group: _ammo_group} = assigns, socket) do
     socket |> assign(assigns) |> update()
   end
 
@@ -25,7 +25,7 @@ defmodule CanneryWeb.PackLive.FormComponent do
     %{assigns: %{ammo_types: ammo_types, containers: containers}} =
       socket =
       socket
-      |> assign(:pack_create_limit, @pack_create_limit)
+      |> assign(:ammo_group_create_limit, @ammo_group_create_limit)
       |> assign(:ammo_types, Ammo.list_ammo_types(current_user, :all))
       |> assign_new(:containers, fn -> Containers.list_containers(current_user) end)
 
@@ -43,16 +43,16 @@ defmodule CanneryWeb.PackLive.FormComponent do
   end
 
   @impl true
-  def handle_event("validate", %{"pack" => pack_params}, socket) do
-    {:noreply, socket |> assign_changeset(pack_params, :validate)}
+  def handle_event("validate", %{"ammo_group" => ammo_group_params}, socket) do
+    {:noreply, socket |> assign_changeset(ammo_group_params, :validate)}
   end
 
   def handle_event(
         "save",
-        %{"pack" => pack_params},
+        %{"ammo_group" => ammo_group_params},
         %{assigns: %{action: action}} = socket
       ) do
-    save_pack(socket, action, pack_params)
+    save_ammo_group(socket, action, ammo_group_params)
   end
 
   # HTML Helpers
@@ -70,8 +70,8 @@ defmodule CanneryWeb.PackLive.FormComponent do
   # Save Helpers
 
   defp assign_changeset(
-         %{assigns: %{action: action, pack: pack, current_user: user}} = socket,
-         pack_params,
+         %{assigns: %{action: action, ammo_group: ammo_group, current_user: user}} = socket,
+         ammo_group_params,
          changeset_action \\ nil
        ) do
     default_action =
@@ -83,12 +83,12 @@ defmodule CanneryWeb.PackLive.FormComponent do
     changeset =
       case default_action do
         :insert ->
-          ammo_type = maybe_get_ammo_type(pack_params, user)
-          container = maybe_get_container(pack_params, user)
-          pack |> Pack.create_changeset(ammo_type, container, user, pack_params)
+          ammo_type = maybe_get_ammo_type(ammo_group_params, user)
+          container = maybe_get_container(ammo_group_params, user)
+          ammo_group |> AmmoGroup.create_changeset(ammo_type, container, user, ammo_group_params)
 
         :update ->
-          pack |> Pack.update_changeset(pack_params, user)
+          ammo_group |> AmmoGroup.update_changeset(ammo_group_params, user)
       end
 
     changeset =
@@ -114,14 +114,15 @@ defmodule CanneryWeb.PackLive.FormComponent do
 
   defp maybe_get_ammo_type(_params_not_found, _user), do: nil
 
-  defp save_pack(
-         %{assigns: %{pack: pack, current_user: current_user, return_to: return_to}} = socket,
+  defp save_ammo_group(
+         %{assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}} =
+           socket,
          :edit,
-         pack_params
+         ammo_group_params
        ) do
     socket =
-      case Ammo.update_pack(pack, pack_params, current_user) do
-        {:ok, _pack} ->
+      case Ammo.update_ammo_group(ammo_group, ammo_group_params, current_user) do
+        {:ok, _ammo_group} ->
           prompt = dgettext("prompts", "Ammo updated successfully")
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
@@ -132,24 +133,24 @@ defmodule CanneryWeb.PackLive.FormComponent do
     {:noreply, socket}
   end
 
-  defp save_pack(
+  defp save_ammo_group(
          %{assigns: %{changeset: changeset}} = socket,
          action,
-         %{"multiplier" => multiplier_str} = pack_params
+         %{"multiplier" => multiplier_str} = ammo_group_params
        )
        when action in [:new, :clone] do
     socket =
       case multiplier_str |> Integer.parse() do
         {multiplier, _remainder}
-        when multiplier >= 1 and multiplier <= @pack_create_limit ->
-          socket |> create_multiple(pack_params, multiplier)
+        when multiplier >= 1 and multiplier <= @ammo_group_create_limit ->
+          socket |> create_multiple(ammo_group_params, multiplier)
 
         {multiplier, _remainder} ->
           error_msg =
             dgettext(
               "errors",
               "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}",
-              max: @pack_create_limit,
+              max: @ammo_group_create_limit,
               multiplier: multiplier
             )
 
@@ -175,11 +176,11 @@ defmodule CanneryWeb.PackLive.FormComponent do
 
   defp create_multiple(
          %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
-         pack_params,
+         ammo_group_params,
          multiplier
        ) do
-    case Ammo.create_packs(pack_params, multiplier, current_user) do
-      {:ok, {count, _packs}} ->
+    case Ammo.create_ammo_groups(ammo_group_params, multiplier, current_user) do
+      {:ok, {count, _ammo_groups}} ->
         prompt =
           dngettext(
             "prompts",

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

@@ -6,7 +6,7 @@
   <.form
     :let={f}
     for={@changeset}
-    id="pack-form"
+    id="ammo_group-form"
     phx-target={@myself}
     phx-change="validate"
     phx-submit="save"
@@ -68,7 +68,7 @@
 
         <%= label(f, :multiplier, gettext("Copies"), class: "title text-lg text-primary-600") %>
         <%= number_input(f, :multiplier,
-          max: @pack_create_limit,
+          max: @ammo_group_create_limit,
           class: "text-center input input-primary",
           value: 1,
           phx_update: "ignore"

lib/cannery_web/live/ammo_group_live/index.ex

@@ -1,28 +1,28 @@
-defmodule CanneryWeb.PackLive.Index do
+defmodule CanneryWeb.AmmoGroupLive.Index do
   @moduledoc """
-  Liveview to show a Cannery.Ammo.Pack index
+  Liveview to show a Cannery.Ammo.AmmoGroup index
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{Ammo, Ammo.Pack, Containers}
+  alias Cannery.{Ammo, Ammo.AmmoGroup, Containers}
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
     socket =
       socket
       |> assign(class: :all, show_used: false, search: search)
-      |> display_packs()
+      |> display_ammo_groups()
 
     {:ok, socket}
   end
 
   def mount(_params, _session, socket) do
-    {:ok, socket |> assign(class: :all, show_used: false, search: nil) |> display_packs()}
+    {:ok, socket |> assign(class: :all, show_used: false, search: nil) |> display_ammo_groups()}
   end
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, apply_action(socket, live_action, params) |> display_packs()}
+    {:noreply, apply_action(socket, live_action, params) |> display_ammo_groups()}
   end
 
   defp apply_action(
@@ -33,7 +33,7 @@ defmodule CanneryWeb.PackLive.Index do
     socket
     |> assign(
       page_title: gettext("Record shots"),
-      pack: Ammo.get_pack!(id, current_user)
+      ammo_group: Ammo.get_ammo_group!(id, current_user)
     )
   end
 
@@ -41,7 +41,7 @@ defmodule CanneryWeb.PackLive.Index do
     socket
     |> assign(
       page_title: gettext("Move ammo"),
-      pack: Ammo.get_pack!(id, current_user)
+      ammo_group: Ammo.get_ammo_group!(id, current_user)
     )
   end
 
@@ -49,7 +49,7 @@ defmodule CanneryWeb.PackLive.Index do
     socket
     |> assign(
       page_title: gettext("Edit ammo"),
-      pack: Ammo.get_pack!(id, current_user)
+      ammo_group: Ammo.get_ammo_group!(id, current_user)
     )
   end
 
@@ -57,7 +57,7 @@ defmodule CanneryWeb.PackLive.Index do
     socket
     |> assign(
       page_title: dgettext("actions", "Add Ammo"),
-      pack: %{Ammo.get_pack!(id, current_user) | id: nil}
+      ammo_group: %{Ammo.get_ammo_group!(id, current_user) | id: nil}
     )
   end
 
@@ -65,7 +65,7 @@ defmodule CanneryWeb.PackLive.Index do
     socket
     |> assign(
       page_title: dgettext("actions", "Add Ammo"),
-      pack: %Pack{}
+      ammo_group: %AmmoGroup{}
     )
   end
 
@@ -74,7 +74,7 @@ defmodule CanneryWeb.PackLive.Index do
     |> assign(
       page_title: gettext("Ammo"),
       search: nil,
-      pack: nil
+      ammo_group: nil
     )
   end
 
@@ -83,62 +83,64 @@ defmodule CanneryWeb.PackLive.Index do
     |> assign(
       page_title: gettext("Ammo"),
       search: search,
-      pack: nil
+      ammo_group: nil
     )
   end
 
   @impl true
   def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
-    Ammo.get_pack!(id, current_user) |> Ammo.delete_pack!(current_user)
+    Ammo.get_ammo_group!(id, current_user) |> Ammo.delete_ammo_group!(current_user)
 
     prompt = dgettext("prompts", "Ammo deleted succesfully")
 
-    {:noreply, socket |> put_flash(:info, prompt) |> display_packs()}
+    {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_groups()}
   end
 
   def handle_event(
         "toggle_staged",
-        %{"pack_id" => id},
+        %{"ammo_group_id" => id},
         %{assigns: %{current_user: current_user}} = socket
       ) do
-    pack = Ammo.get_pack!(id, current_user)
+    ammo_group = Ammo.get_ammo_group!(id, current_user)
 
-    {:ok, _pack} = pack |> Ammo.update_pack(%{"staged" => !pack.staged}, current_user)
+    {:ok, _ammo_group} =
+      ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
-    {:noreply, socket |> display_packs()}
+    {:noreply, socket |> display_ammo_groups()}
   end
 
   def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
-    {:noreply, socket |> assign(:show_used, !show_used) |> display_packs()}
+    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_groups()}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.pack_index_path(Endpoint, :index))}
+    {:noreply, socket |> push_patch(to: Routes.ammo_group_index_path(Endpoint, :index))}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    socket = socket |> push_patch(to: Routes.pack_index_path(Endpoint, :search, search_term))
+    socket =
+      socket |> push_patch(to: Routes.ammo_group_index_path(Endpoint, :search, search_term))
 
     {:noreply, socket}
   end
 
   def handle_event("change_class", %{"ammo_type" => %{"class" => "rifle"}}, socket) do
-    {:noreply, socket |> assign(:class, :rifle) |> display_packs()}
+    {:noreply, socket |> assign(:class, :rifle) |> display_ammo_groups()}
   end
 
   def handle_event("change_class", %{"ammo_type" => %{"class" => "shotgun"}}, socket) do
-    {:noreply, socket |> assign(:class, :shotgun) |> display_packs()}
+    {:noreply, socket |> assign(:class, :shotgun) |> display_ammo_groups()}
   end
 
   def handle_event("change_class", %{"ammo_type" => %{"class" => "pistol"}}, socket) do
-    {:noreply, socket |> assign(:class, :pistol) |> display_packs()}
+    {:noreply, socket |> assign(:class, :pistol) |> display_ammo_groups()}
   end
 
   def handle_event("change_class", %{"ammo_type" => %{"class" => _all}}, socket) do
-    {:noreply, socket |> assign(:class, :all) |> display_packs()}
+    {:noreply, socket |> assign(:class, :all) |> display_ammo_groups()}
   end
 
-  defp display_packs(
+  defp display_ammo_groups(
          %{
            assigns: %{
              class: class,
@@ -148,19 +150,19 @@ defmodule CanneryWeb.PackLive.Index do
            }
          } = socket
        ) do
-    # get total number of packs to determine whether to display onboarding
+    # get total number of ammo groups to determine whether to display onboarding
     # prompts
-    packs_count = Ammo.get_packs_count!(current_user, true)
-    packs = Ammo.list_packs(search, class, current_user, show_used)
+    ammo_groups_count = Ammo.get_ammo_groups_count!(current_user, true)
+    ammo_groups = Ammo.list_ammo_groups(search, class, current_user, show_used)
     ammo_types_count = Ammo.get_ammo_types_count!(current_user)
     containers_count = Containers.get_containers_count!(current_user)
 
     socket
     |> assign(
-      packs: packs,
+      ammo_groups: ammo_groups,
       ammo_types_count: ammo_types_count,
       containers_count: containers_count,
-      packs_count: packs_count
+      ammo_groups_count: ammo_groups_count
     )
   end
 end

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

@@ -24,17 +24,17 @@
           <%= dgettext("actions", "add an ammo type first") %>
         </.link>
       </div>
-    <% @packs_count == 0 -> %>
+    <% @ammo_groups_count == 0 -> %>
       <h2 class="title text-xl text-primary-600">
         <%= gettext("No ammo") %>
         <%= display_emoji("😔") %>
       </h2>
 
-      <.link patch={Routes.pack_index_path(Endpoint, :new)} class="btn btn-primary">
+      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
         <%= dgettext("actions", "Add your first box!") %>
       </.link>
     <% true -> %>
-      <.link patch={Routes.pack_index_path(Endpoint, :new)} class="btn btn-primary">
+      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
         <%= dgettext("actions", "Add Ammo") %>
       </.link>
 
@@ -89,16 +89,16 @@
         </.toggle_button>
       </div>
 
-      <%= if @packs |> Enum.empty?() do %>
+      <%= if @ammo_groups |> Enum.empty?() do %>
         <h2 class="title text-xl text-primary-600">
           <%= gettext("No Ammo") %>
           <%= display_emoji("😔") %>
         </h2>
       <% else %>
         <.live_component
-          module={CanneryWeb.Components.PackTableComponent}
+          module={CanneryWeb.Components.AmmoGroupTableComponent}
           id="ammo-group-index-table"
-          packs={@packs}
+          ammo_groups={@ammo_groups}
           current_user={@current_user}
           show_used={@show_used}
         >
@@ -107,28 +107,28 @@
               <%= ammo_type_name %>
             </.link>
           </:ammo_type>
-          <:range :let={pack}>
+          <:range :let={ammo_group}>
             <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
               <button
                 type="button"
                 class="mx-2 my-1 text-sm btn btn-primary"
                 phx-click="toggle_staged"
-                phx-value-pack_id={pack.id}
+                phx-value-ammo_group_id={ammo_group.id}
               >
-                <%= if pack.staged,
+                <%= if ammo_group.staged,
                   do: dgettext("actions", "Unstage"),
                   else: dgettext("actions", "Stage") %>
               </button>
 
               <.link
-                patch={Routes.pack_index_path(Endpoint, :add_shot_group, pack)}
+                patch={Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group)}
                 class="mx-2 my-1 text-sm btn btn-primary"
               >
                 <%= dgettext("actions", "Record shots") %>
               </.link>
             </div>
           </:range>
-          <:container :let={{pack, %{name: container_name} = container}}>
+          <:container :let={{ammo_group, %{name: container_name} = container}}>
             <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
               <.link
                 navigate={Routes.container_show_path(Endpoint, :show, container)}
@@ -138,41 +138,45 @@
               </.link>
 
               <.link
-                patch={Routes.pack_index_path(Endpoint, :move, pack)}
+                patch={Routes.ammo_group_index_path(Endpoint, :move, ammo_group)}
                 class="mx-2 my-1 text-sm btn btn-primary"
               >
                 <%= dgettext("actions", "Move ammo") %>
               </.link>
             </div>
           </:container>
-          <:actions :let={%{count: pack_count} = pack}>
+          <:actions :let={%{count: ammo_group_count} = ammo_group}>
             <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
               <.link
-                navigate={Routes.pack_show_path(Endpoint, :show, pack)}
+                navigate={Routes.ammo_group_show_path(Endpoint, :show, ammo_group)}
                 class="text-primary-600 link"
                 aria-label={
-                  dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
+                  dgettext("actions", "View ammo group of %{ammo_group_count} bullets",
+                    ammo_group_count: ammo_group_count
+                  )
                 }
               >
                 <i class="fa-fw fa-lg fas fa-eye"></i>
               </.link>
 
               <.link
-                patch={Routes.pack_index_path(Endpoint, :edit, pack)}
+                patch={Routes.ammo_group_index_path(Endpoint, :edit, ammo_group)}
                 class="text-primary-600 link"
                 aria-label={
-                  dgettext("actions", "Edit pack of %{pack_count} bullets", pack_count: pack_count)
+                  dgettext("actions", "Edit ammo group of %{ammo_group_count} bullets",
+                    ammo_group_count: ammo_group_count
+                  )
                 }
               >
                 <i class="fa-fw fa-lg fas fa-edit"></i>
               </.link>
 
               <.link
-                patch={Routes.pack_index_path(Endpoint, :clone, pack)}
+                patch={Routes.ammo_group_index_path(Endpoint, :clone, ammo_group)}
                 class="text-primary-600 link"
                 aria-label={
-                  dgettext("actions", "Clone pack of %{pack_count} bullets",
-                    pack_count: pack_count
+                  dgettext("actions", "Clone ammo group of %{ammo_group_count} bullets",
+                    ammo_group_count: ammo_group_count
                   )
                 }
               >
@@ -183,11 +187,11 @@
                 href="#"
                 class="text-primary-600 link"
                 phx-click="delete"
-                phx-value-id={pack.id}
+                phx-value-id={ammo_group.id}
                 data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
                 aria-label={
-                  dgettext("actions", "Delete pack of %{pack_count} bullets",
-                    pack_count: pack_count
+                  dgettext("actions", "Delete ammo group of %{ammo_group_count} bullets",
+                    ammo_group_count: ammo_group_count
                   )
                 }
               >
@@ -202,38 +206,38 @@
 
 <%= case @live_action do %>
   <% create when create in [:new, :edit, :clone] -> %>
-    <.modal return_to={Routes.pack_index_path(Endpoint, :index)}>
+    <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
-        module={CanneryWeb.PackLive.FormComponent}
-        id={@pack.id || :new}
+        module={CanneryWeb.AmmoGroupLive.FormComponent}
+        id={@ammo_group.id || :new}
         title={@page_title}
         action={@live_action}
-        pack={@pack}
-        return_to={Routes.pack_index_path(Endpoint, :index)}
+        ammo_group={@ammo_group}
+        return_to={Routes.ammo_group_index_path(Endpoint, :index)}
         current_user={@current_user}
       />
     </.modal>
   <% :add_shot_group -> %>
-    <.modal return_to={Routes.pack_index_path(Endpoint, :index)}>
+    <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
         module={CanneryWeb.Components.AddShotGroupComponent}
         id={:new}
         title={@page_title}
         action={@live_action}
-        pack={@pack}
-        return_to={Routes.pack_index_path(Endpoint, :index)}
+        ammo_group={@ammo_group}
+        return_to={Routes.ammo_group_index_path(Endpoint, :index)}
         current_user={@current_user}
       />
     </.modal>
   <% :move -> %>
-    <.modal return_to={Routes.pack_index_path(Endpoint, :index)}>
+    <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
-        module={CanneryWeb.Components.MovePackComponent}
-        id={@pack.id}
+        module={CanneryWeb.Components.MoveAmmoGroupComponent}
+        id={@ammo_group.id}
         title={@page_title}
         action={@live_action}
-        pack={@pack}
-        return_to={Routes.pack_index_path(Endpoint, :index)}
+        ammo_group={@ammo_group}
+        return_to={Routes.ammo_group_index_path(Endpoint, :index)}
         current_user={@current_user}
       />
     </.modal>

lib/cannery_web/live/ammo_group_live/show.ex

@@ -1,11 +1,11 @@
-defmodule CanneryWeb.PackLive.Show do
+defmodule CanneryWeb.AmmoGroupLive.Show do
   @moduledoc """
-  Liveview for showing and editing an Cannery.Ammo.Pack
+  Liveview for showing and editing an Cannery.Ammo.AmmoGroup
   """
 
   use CanneryWeb, :live_view
   alias Cannery.{ActivityLog, ActivityLog.ShotGroup}
-  alias Cannery.{Ammo, Ammo.Pack}
+  alias Cannery.{Ammo, Ammo.AmmoGroup}
   alias Cannery.{ComparableDate, Containers}
   alias CanneryWeb.Endpoint
   alias Phoenix.LiveView.Socket
@@ -24,7 +24,7 @@ defmodule CanneryWeb.PackLive.Show do
     socket =
       socket
       |> assign(page_title: page_title(live_action), shot_group: shot_group)
-      |> display_pack(id)
+      |> display_ammo_group(id)
 
     {:noreply, socket}
   end
@@ -33,7 +33,7 @@ defmodule CanneryWeb.PackLive.Show do
     socket =
       socket
       |> assign(page_title: page_title(live_action))
-      |> display_pack(id)
+      |> display_ammo_group(id)
 
     {:noreply, socket}
   end
@@ -48,12 +48,12 @@ defmodule CanneryWeb.PackLive.Show do
   def handle_event(
         "delete",
         _params,
-        %{assigns: %{pack: pack, current_user: current_user}} = socket
+        %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
-    pack |> Ammo.delete_pack!(current_user)
+    ammo_group |> Ammo.delete_ammo_group!(current_user)
 
     prompt = dgettext("prompts", "Ammo deleted succesfully")
-    redirect_to = Routes.pack_index_path(socket, :index)
+    redirect_to = Routes.ammo_group_index_path(socket, :index)
 
     {:noreply, socket |> put_flash(:info, prompt) |> push_navigate(to: redirect_to)}
   end
@@ -61,30 +61,31 @@ defmodule CanneryWeb.PackLive.Show do
   def handle_event(
         "toggle_staged",
         _params,
-        %{assigns: %{pack: pack, current_user: current_user}} = socket
+        %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
-    {:ok, pack} = pack |> Ammo.update_pack(%{"staged" => !pack.staged}, current_user)
+    {:ok, ammo_group} =
+      ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
-    {:noreply, socket |> display_pack(pack)}
+    {:noreply, socket |> display_ammo_group(ammo_group)}
   end
 
   def handle_event(
         "delete_shot_group",
         %{"id" => id},
-        %{assigns: %{pack: %{id: pack_id}, current_user: current_user}} = socket
+        %{assigns: %{ammo_group: %{id: ammo_group_id}, current_user: current_user}} = socket
       ) do
     {:ok, _} =
       ActivityLog.get_shot_group!(id, current_user)
       |> ActivityLog.delete_shot_group(current_user)
 
     prompt = dgettext("prompts", "Shot records deleted succesfully")
-    {:noreply, socket |> put_flash(:info, prompt) |> display_pack(pack_id)}
+    {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_group(ammo_group_id)}
   end
 
-  @spec display_pack(Socket.t(), Pack.t() | Pack.id()) :: Socket.t()
-  defp display_pack(
+  @spec display_ammo_group(Socket.t(), AmmoGroup.t() | AmmoGroup.id()) :: Socket.t()
+  defp display_ammo_group(
          %{assigns: %{current_user: current_user}} = socket,
-         %Pack{container_id: container_id} = pack
+         %AmmoGroup{container_id: container_id} = ammo_group
        ) do
     columns = [
       %{label: gettext("Rounds shot"), key: :count},
@@ -93,19 +94,19 @@ defmodule CanneryWeb.PackLive.Show do
       %{label: gettext("Actions"), key: :actions, sortable: false}
     ]
 
-    shot_groups = ActivityLog.list_shot_groups_for_pack(pack, current_user)
+    shot_groups = ActivityLog.list_shot_groups_for_ammo_group(ammo_group, current_user)
 
     rows =
       shot_groups
       |> Enum.map(fn shot_group ->
-        pack |> get_table_row_for_shot_group(shot_group, columns)
+        ammo_group |> get_table_row_for_shot_group(shot_group, columns)
       end)
 
     socket
     |> assign(
-      pack: pack,
-      original_count: Ammo.get_original_count(pack, current_user),
-      percentage_remaining: Ammo.get_percentage_remaining(pack, current_user),
+      ammo_group: ammo_group,
+      original_count: Ammo.get_original_count(ammo_group, current_user),
+      percentage_remaining: Ammo.get_percentage_remaining(ammo_group, current_user),
       container: container_id && Containers.get_container!(container_id, current_user),
       shot_groups: shot_groups,
       columns: columns,
@@ -113,15 +114,15 @@ defmodule CanneryWeb.PackLive.Show do
     )
   end
 
-  defp display_pack(%{assigns: %{current_user: current_user}} = socket, id),
-    do: display_pack(socket, Ammo.get_pack!(id, current_user))
+  defp display_ammo_group(%{assigns: %{current_user: current_user}} = socket, id),
+    do: display_ammo_group(socket, Ammo.get_ammo_group!(id, current_user))
 
   @spec display_currency(float()) :: String.t()
   defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
 
-  @spec get_table_row_for_shot_group(Pack.t(), ShotGroup.t(), [map()]) :: map()
-  defp get_table_row_for_shot_group(pack, %{id: id, date: date} = shot_group, columns) do
-    assigns = %{pack: pack, shot_group: shot_group}
+  @spec get_table_row_for_shot_group(AmmoGroup.t(), ShotGroup.t(), [map()]) :: map()
+  defp get_table_row_for_shot_group(ammo_group, %{id: id, date: date} = shot_group, columns) do
+    assigns = %{ammo_group: ammo_group, shot_group: shot_group}
 
     columns
     |> Map.new(fn %{key: key} ->
@@ -139,7 +140,7 @@ defmodule CanneryWeb.PackLive.Show do
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
               <.link
-                patch={Routes.pack_show_path(Endpoint, :edit_shot_group, @pack, @shot_group)}
+                patch={Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, @shot_group)}
                 class="text-primary-600 link"
                 aria-label={
                   dgettext("actions", "Edit shot group of %{shot_group_count} shots",

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

@@ -1,12 +1,12 @@
 <div class="mx-auto space-y-4 max-w-3xl flex flex-col justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
-    <%= @pack.ammo_type.name %>
+    <%= @ammo_group.ammo_type.name %>
   </h1>
 
   <div class="space-y-2 flex flex-col justify-center items-center">
     <span class="rounded-lg title text-lg">
       <%= gettext("Count:") %>
-      <%= @pack.count %>
+      <%= @ammo_group.count %>
     </span>
 
     <span class="rounded-lg title text-lg">
@@ -19,28 +19,28 @@
       <%= gettext("%{percentage}%", percentage: @percentage_remaining) %>
     </span>
 
-    <%= if @pack.notes do %>
+    <%= if @ammo_group.notes do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Notes:") %>
-        <%= @pack.notes %>
+        <%= @ammo_group.notes %>
       </span>
     <% end %>
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Purchased on:") %>
-      <.date id={"#{@pack.id}-purchased-on"} date={@pack.purchased_on} />
+      <.date id={"#{@ammo_group.id}-purchased-on"} date={@ammo_group.purchased_on} />
     </span>
 
-    <%= if @pack.price_paid do %>
+    <%= if @ammo_group.price_paid do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Original cost:") %>
-        <%= gettext("$%{amount}", amount: display_currency(@pack.price_paid)) %>
+        <%= gettext("$%{amount}", amount: display_currency(@ammo_group.price_paid)) %>
       </span>
 
       <span class="rounded-lg title text-lg">
         <%= gettext("Current value:") %>
         <%= gettext("$%{amount}",
-          amount: display_currency(@pack.price_paid * @percentage_remaining / 100)
+          amount: display_currency(@ammo_group.price_paid * @percentage_remaining / 100)
         ) %>
       </span>
     <% end %>
@@ -49,17 +49,19 @@
   <div class="flex flex-col justify-center items-center">
     <div class="flex flex-wrap justify-center items-center text-primary-600">
       <.link
-        navigate={Routes.ammo_type_show_path(Endpoint, :show, @pack.ammo_type)}
+        navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)}
         class="mx-4 my-2 btn btn-primary"
       >
         <%= dgettext("actions", "View in Catalog") %>
       </.link>
 
       <.link
-        patch={Routes.pack_show_path(Endpoint, :edit, @pack)}
+        patch={Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group)}
         class="mx-4 my-2 text-primary-600 link"
         aria-label={
-          dgettext("actions", "Edit pack of %{pack_count} bullets", pack_count: @pack.count)
+          dgettext("actions", "Edit ammo group of %{ammo_group_count} bullets",
+            ammo_group_count: @ammo_group.count
+          )
         }
       >
         <i class="fa-fw fa-lg fas fa-edit"></i>
@@ -71,7 +73,9 @@
         phx-click="delete"
         data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
         aria-label={
-          dgettext("actions", "Delete pack of %{pack_count} bullets", pack_count: @pack.count)
+          dgettext("actions", "Delete ammo group of %{ammo_group_count} bullets",
+            ammo_group_count: @ammo_group.count
+          )
         }
       >
         <i class="fa-fw fa-lg fas fa-trash"></i>
@@ -80,17 +84,20 @@
 
     <div class="flex flex-wrap justify-center items-center text-primary-600">
       <button type="button" class="mx-4 my-2 btn btn-primary" phx-click="toggle_staged">
-        <%= if @pack.staged,
+        <%= if @ammo_group.staged,
           do: dgettext("actions", "Unstage from range"),
           else: dgettext("actions", "Stage for range") %>
       </button>
 
-      <.link patch={Routes.pack_show_path(Endpoint, :move, @pack)} class="btn btn-primary">
+      <.link
+        patch={Routes.ammo_group_show_path(Endpoint, :move, @ammo_group)}
+        class="btn btn-primary"
+      >
         <%= dgettext("actions", "Move ammo") %>
       </.link>
 
       <.link
-        patch={Routes.pack_show_path(Endpoint, :add_shot_group, @pack)}
+        patch={Routes.ammo_group_show_path(Endpoint, :add_shot_group, @ammo_group)}
         class="mx-4 my-2 btn btn-primary"
       >
         <%= dgettext("actions", "Record shots") %>
@@ -121,7 +128,7 @@
 
     <.live_component
       module={CanneryWeb.Components.TableComponent}
-      id="pack_shot_groups_table"
+      id="ammo_group_shot_groups_table"
       columns={@columns}
       rows={@rows}
     />
@@ -130,50 +137,50 @@
 
 <%= case @live_action do %>
   <% :edit -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component
-        module={CanneryWeb.PackLive.FormComponent}
-        id={@pack.id}
+        module={CanneryWeb.AmmoGroupLive.FormComponent}
+        id={@ammo_group.id}
         title={@page_title}
         action={@live_action}
-        pack={@pack}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        ammo_group={@ammo_group}
+        return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
         current_user={@current_user}
       />
     </.modal>
   <% :edit_shot_group -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component
         module={CanneryWeb.RangeLive.FormComponent}
         id={@shot_group.id}
         title={@page_title}
         action={@live_action}
         shot_group={@shot_group}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
         current_user={@current_user}
       />
     </.modal>
   <% :add_shot_group -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component
         module={CanneryWeb.Components.AddShotGroupComponent}
         id={:new}
         title={@page_title}
         action={@live_action}
-        pack={@pack}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        ammo_group={@ammo_group}
+        return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
         current_user={@current_user}
       />
     </.modal>
   <% :move -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component
-        module={CanneryWeb.Components.MovePackComponent}
-        id={@pack.id}
+        module={CanneryWeb.Components.MoveAmmoGroupComponent}
+        id={@ammo_group.id}
         title={@page_title}
         action={@live_action}
-        pack={@pack}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        ammo_group={@ammo_group}
+        return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
         current_user={@current_user}
       />
     </.modal>

lib/cannery_web/live/ammo_type_live/show.ex

@@ -55,7 +55,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
         ammo_type |> Map.get(field) != default_value
       end)
 
-    packs = ammo_type |> Ammo.list_packs_for_type(current_user, show_used)
+    ammo_groups = ammo_type |> Ammo.list_ammo_groups_for_type(current_user, show_used)
 
     [
       original_counts,
@@ -66,9 +66,9 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     ] =
       if show_used do
         [
-          packs |> Ammo.get_original_counts(current_user),
-          ammo_type |> Ammo.get_used_packs_count_for_type(current_user),
-          ammo_type |> Ammo.get_packs_count_for_type(current_user, true),
+          ammo_groups |> Ammo.get_original_counts(current_user),
+          ammo_type |> Ammo.get_used_ammo_groups_count_for_type(current_user),
+          ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true),
           ammo_type |> ActivityLog.get_used_count_for_ammo_type(current_user),
           ammo_type |> Ammo.get_historical_count_for_ammo_type(current_user)
         ]
@@ -83,7 +83,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
       end
 
     containers =
-      packs
+      ammo_groups
       |> Enum.map(fn %{container_id: container_id} -> container_id end)
       |> Containers.get_containers(current_user)
 
@@ -91,16 +91,16 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     |> assign(
       page_title: page_title,
       ammo_type: ammo_type,
-      packs: packs,
+      ammo_groups: ammo_groups,
       containers: containers,
-      cprs: packs |> Ammo.get_cprs(current_user),
-      last_used_dates: packs |> ActivityLog.get_last_used_dates(current_user),
+      cprs: ammo_groups |> Ammo.get_cprs(current_user),
+      last_used_dates: ammo_groups |> ActivityLog.get_last_used_dates(current_user),
       avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type(current_user),
       rounds: ammo_type |> Ammo.get_round_count_for_ammo_type(current_user),
       original_counts: original_counts,
       used_rounds: used_rounds,
       historical_round_count: historical_round_count,
-      packs_count: ammo_type |> Ammo.get_packs_count_for_type(current_user),
+      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),

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

@@ -175,7 +175,7 @@
   </div>
 
   <div class="w-full p-4">
-    <%= if @packs |> Enum.empty?() do %>
+    <%= if @ammo_groups |> Enum.empty?() do %>
       <h2 class="px-4 title text-lg text-primary-600">
         <%= gettext("No ammo for this type") %>
         <%= display_emoji("😔") %>
@@ -183,13 +183,13 @@
     <% else %>
       <%= if @view_table do %>
         <.live_component
-          module={CanneryWeb.Components.PackTableComponent}
+          module={CanneryWeb.Components.AmmoGroupTableComponent}
           id="ammo-type-show-table"
-          packs={@packs}
+          ammo_groups={@ammo_groups}
           current_user={@current_user}
           show_used={@show_used}
         >
-          <:container :let={{_pack, %{name: container_name} = container}}>
+          <:container :let={{_ammo_group, %{name: container_name} = container}}>
             <.link
               navigate={Routes.container_show_path(Endpoint, :show, container)}
               class="mx-2 my-1 link"
@@ -197,13 +197,15 @@
               <%= container_name %>
             </.link>
           </:container>
-          <:actions :let={%{count: pack_count} = pack}>
+          <:actions :let={%{count: ammo_group_count} = ammo_group}>
             <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
               <.link
-                navigate={Routes.pack_show_path(Endpoint, :show, pack)}
+                navigate={Routes.ammo_group_show_path(Endpoint, :show, ammo_group)}
                 class="text-primary-600 link"
                 aria-label={
-                  dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
+                  dgettext("actions", "View ammo group of %{ammo_group_count} bullets",
+                    ammo_group_count: ammo_group_count
+                  )
                 }
               >
                 <i class="fa-fw fa-lg fas fa-eye"></i>
@@ -213,12 +215,12 @@
         </.live_component>
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
-          <.pack_card
-            :for={%{id: pack_id, container_id: container_id} = pack <- @packs}
-            pack={pack}
-            original_count={@original_counts && Map.fetch!(@original_counts, pack_id)}
-            cpr={Map.get(@cprs, pack_id)}
-            last_used_date={Map.get(@last_used_dates, pack_id)}
+          <.ammo_group_card
+            :for={%{id: ammo_group_id, container_id: container_id} = ammo_group <- @ammo_groups}
+            ammo_group={ammo_group}
+            original_count={@original_counts && Map.fetch!(@original_counts, ammo_group_id)}
+            cpr={Map.get(@cprs, ammo_group_id)}
+            last_used_date={Map.get(@last_used_dates, ammo_group_id)}
             current_user={@current_user}
             container={Map.fetch!(@containers, container_id)}
           />

lib/cannery_web/live/container_live/index.ex

@@ -79,15 +79,15 @@ defmodule CanneryWeb.ContainerLive.Index do
               prompt = dgettext("prompts", "%{name} has been deleted", name: container_name)
               socket |> put_flash(:info, prompt) |> display_containers()
 
-            {:error, %{action: :delete, errors: [packs: _error], valid?: false} = changeset} ->
-              packs_error = changeset |> changeset_errors(:packs) |> Enum.join(", ")
+            {:error, %{action: :delete, errors: [ammo_groups: _error], valid?: false} = changeset} ->
+              ammo_groups_error = changeset |> changeset_errors(:ammo_groups) |> Enum.join(", ")
 
               prompt =
                 dgettext(
                   "errors",
                   "Could not delete %{name}: %{error}",
                   name: changeset |> Changeset.get_field(:name, "container"),
-                  error: packs_error
+                  error: ammo_groups_error
                 )
 
               socket |> put_flash(:error, prompt)

lib/cannery_web/live/container_live/show.ex

@@ -64,13 +64,13 @@ defmodule CanneryWeb.ContainerLive.Show do
           |> put_flash(:info, prompt)
           |> push_navigate(to: Routes.container_index_path(socket, :index))
 
-        {:error, %{action: :delete, errors: [packs: _error], valid?: false} = changeset} ->
-          packs_error = changeset |> changeset_errors(:packs) |> Enum.join(", ")
+        {:error, %{action: :delete, errors: [ammo_groups: _error], valid?: false} = changeset} ->
+          ammo_groups_error = changeset |> changeset_errors(:ammo_groups) |> Enum.join(", ")
 
           prompt =
             dgettext("errors", "Could not delete %{name}: %{error}",
               name: changeset |> Changeset.get_field(:name, "container"),
-              error: packs_error
+              error: ammo_groups_error
             )
 
           socket |> put_flash(:error, prompt)
@@ -109,10 +109,10 @@ defmodule CanneryWeb.ContainerLive.Show do
          current_user
        ) do
     %{name: container_name} = container = Containers.get_container!(id, current_user)
-    packs = Ammo.list_packs_for_container(container, class, current_user)
-    original_counts = packs |> Ammo.get_original_counts(current_user)
-    cprs = packs |> Ammo.get_cprs(current_user)
-    last_used_dates = packs |> ActivityLog.get_last_used_dates(current_user)
+    ammo_groups = Ammo.list_ammo_groups_for_container(container, class, current_user)
+    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)
 
     page_title =
       case live_action do
@@ -125,8 +125,8 @@ defmodule CanneryWeb.ContainerLive.Show do
     |> assign(
       container: container,
       round_count: Ammo.get_round_count_for_container!(container, current_user),
-      packs_count: Ammo.get_packs_count_for_container!(container, current_user),
-      packs: packs,
+      ammo_groups_count: Ammo.get_ammo_groups_count_for_container!(container, current_user),
+      ammo_groups: ammo_groups,
       original_counts: original_counts,
       cprs: cprs,
       last_used_dates: last_used_dates,

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

@@ -20,7 +20,7 @@
 
   <span class="rounded-lg title text-lg">
     <%= gettext("Packs:") %>
-    <%= @packs_count %>
+    <%= @ammo_groups_count %>
   </span>
 
   <span class="rounded-lg title text-lg">
@@ -118,16 +118,16 @@
   </div>
 
   <div class="w-full p-4">
-    <%= if @packs |> Enum.empty?() do %>
+    <%= if @ammo_groups |> Enum.empty?() do %>
       <h2 class="mx-4 title text-lg text-primary-600 text-center">
         <%= gettext("No ammo in this container") %>
       </h2>
     <% else %>
       <%= if @view_table do %>
         <.live_component
-          module={CanneryWeb.Components.PackTableComponent}
+          module={CanneryWeb.Components.AmmoGroupTableComponent}
           id="ammo-type-show-table"
-          packs={@packs}
+          ammo_groups={@ammo_groups}
           current_user={@current_user}
           show_used={false}
         >
@@ -139,12 +139,12 @@
         </.live_component>
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
-          <.pack_card
-            :for={%{id: pack_id} = pack <- @packs}
-            pack={pack}
-            original_count={Map.fetch!(@original_counts, pack_id)}
-            cpr={Map.get(@cprs, pack_id)}
-            last_used_date={Map.get(@last_used_dates, pack_id)}
+          <.ammo_group_card
+            :for={%{id: ammo_group_id} = ammo_group <- @ammo_groups}
+            ammo_group={ammo_group}
+            original_count={Map.fetch!(@original_counts, ammo_group_id)}
+            cpr={Map.get(@cprs, ammo_group_id)}
+            last_used_date={Map.get(@last_used_dates, ammo_group_id)}
             current_user={@current_user}
           />
         </div>

lib/cannery_web/live/range_live/form_component.ex

@@ -4,33 +4,33 @@ defmodule CanneryWeb.RangeLive.FormComponent do
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, ActivityLog, ActivityLog.ShotGroup, Ammo, Ammo.Pack}
+  alias Cannery.{Accounts.User, ActivityLog, ActivityLog.ShotGroup, Ammo, Ammo.AmmoGroup}
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
   @impl true
-  def mount(socket), do: {:ok, socket |> assign(:pack, nil)}
+  def mount(socket), do: {:ok, socket |> assign(:ammo_group, nil)}
 
   @impl true
   @spec update(
           %{
             required(:shot_group) => ShotGroup.t(),
             required(:current_user) => User.t(),
-            optional(:pack) => Pack.t(),
+            optional(:ammo_group) => AmmoGroup.t(),
             optional(any()) => any()
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
   def update(
         %{
-          shot_group: %ShotGroup{pack_id: pack_id},
+          shot_group: %ShotGroup{ammo_group_id: ammo_group_id},
           current_user: current_user
         } = assigns,
         socket
       )
-      when is_binary(pack_id) do
-    pack = Ammo.get_pack!(pack_id, current_user)
-    {:ok, socket |> assign(assigns) |> assign(:pack, pack) |> assign_changeset(%{})}
+      when is_binary(ammo_group_id) do
+    ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
+    {:ok, socket |> assign(assigns) |> assign(:ammo_group, ammo_group) |> assign_changeset(%{})}
   end
 
   def update(%{shot_group: %ShotGroup{}} = assigns, socket) do
@@ -66,7 +66,7 @@ defmodule CanneryWeb.RangeLive.FormComponent do
            assigns: %{
              action: live_action,
              current_user: user,
-             pack: pack,
+             ammo_group: ammo_group,
              shot_group: shot_group
            }
          } = socket,
@@ -81,7 +81,7 @@ defmodule CanneryWeb.RangeLive.FormComponent do
 
     changeset =
       case default_action do
-        :insert -> shot_group |> ShotGroup.create_changeset(user, pack, shot_group_params)
+        :insert -> shot_group |> ShotGroup.create_changeset(user, ammo_group, shot_group_params)
         :update -> shot_group |> ShotGroup.update_changeset(user, shot_group_params)
       end
 

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

@@ -22,7 +22,7 @@
     <%= label(f, :count, gettext("Shots fired"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :count,
       min: 1,
-      max: @shot_group.count + @pack.count,
+      max: @shot_group.count + @ammo_group.count,
       class: "input input-primary col-span-2"
     ) %>
     <%= error_tag(f, :count, "col-span-3") %>

lib/cannery_web/live/range_live/index.ex

@@ -1,6 +1,6 @@
 defmodule CanneryWeb.RangeLive.Index do
   @moduledoc """
-  Main page for range day mode, where `Pack`s can be used up.
+  Main page for range day mode, where `AmmoGroup`s can be used up.
   """
 
   use CanneryWeb, :live_view
@@ -30,7 +30,7 @@ defmodule CanneryWeb.RangeLive.Index do
     socket
     |> assign(
       page_title: gettext("Record Shots"),
-      pack: Ammo.get_pack!(id, current_user)
+      ammo_group: Ammo.get_ammo_group!(id, current_user)
     )
   end
 
@@ -82,12 +82,13 @@ defmodule CanneryWeb.RangeLive.Index do
 
   def handle_event(
         "toggle_staged",
-        %{"pack_id" => pack_id},
+        %{"ammo_group_id" => ammo_group_id},
         %{assigns: %{current_user: current_user}} = socket
       ) do
-    pack = Ammo.get_pack!(pack_id, current_user)
+    ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
 
-    {:ok, _pack} = pack |> Ammo.update_pack(%{"staged" => !pack.staged}, current_user)
+    {:ok, _ammo_group} =
+      ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
     prompt = dgettext("prompts", "Ammo unstaged succesfully")
     {:noreply, socket |> put_flash(:info, prompt) |> display_shot_groups()}
@@ -122,22 +123,20 @@ defmodule CanneryWeb.RangeLive.Index do
          %{assigns: %{class: class, search: search, current_user: current_user}} = socket
        ) do
     shot_groups = ActivityLog.list_shot_groups(search, class, current_user)
-    packs = Ammo.list_staged_packs(current_user)
+    ammo_groups = Ammo.list_staged_ammo_groups(current_user)
     chart_data = shot_groups |> get_chart_data_for_shot_group()
-    original_counts = packs |> Ammo.get_original_counts(current_user)
-    cprs = packs |> Ammo.get_cprs(current_user)
-    last_used_dates = packs |> ActivityLog.get_last_used_dates(current_user)
-    shot_record_count = ActivityLog.get_shot_record_count!(current_user)
+    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)
 
     socket
     |> assign(
-      packs: packs,
+      ammo_groups: ammo_groups,
       original_counts: original_counts,
       cprs: cprs,
       last_used_dates: last_used_dates,
       chart_data: chart_data,
-      shot_groups: shot_groups,
-      shot_record_count: shot_record_count
+      shot_groups: shot_groups
     )
   end
 

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

@@ -3,54 +3,54 @@
     <%= gettext("Range day") %>
   </h1>
 
-  <%= if @packs |> Enum.empty?() do %>
+  <%= if @ammo_groups |> Enum.empty?() do %>
     <h1 class="title text-xl text-primary-600">
       <%= gettext("No ammo staged") %>
       <%= display_emoji("😔") %>
     </h1>
 
-    <.link navigate={Routes.pack_index_path(Endpoint, :index)} class="btn btn-primary">
+    <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
       <%= dgettext("actions", "Why not get some ready to shoot?") %>
     </.link>
   <% else %>
-    <.link navigate={Routes.pack_index_path(Endpoint, :index)} class="btn btn-primary">
+    <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
       <%= dgettext("actions", "Stage ammo") %>
     </.link>
 
     <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-      <.pack_card
-        :for={%{id: pack_id} = pack <- @packs}
-        pack={pack}
-        original_count={Map.fetch!(@original_counts, pack_id)}
-        cpr={Map.get(@cprs, pack_id)}
-        last_used_date={Map.get(@last_used_dates, pack_id)}
+      <.ammo_group_card
+        :for={%{id: ammo_group_id} = ammo_group <- @ammo_groups}
+        ammo_group={ammo_group}
+        original_count={Map.fetch!(@original_counts, ammo_group_id)}
+        cpr={Map.get(@cprs, ammo_group_id)}
+        last_used_date={Map.get(@last_used_dates, ammo_group_id)}
         current_user={@current_user}
       >
         <button
           type="button"
           class="btn btn-primary"
           phx-click="toggle_staged"
-          phx-value-pack_id={pack.id}
+          phx-value-ammo_group_id={ammo_group.id}
           data-confirm={"#{dgettext("prompts", "Are you sure you want to unstage this ammo?")}"}
         >
-          <%= if pack.staged,
+          <%= if ammo_group.staged,
             do: dgettext("actions", "Unstage from range"),
             else: dgettext("actions", "Stage for range") %>
         </button>
 
         <.link
-          patch={Routes.range_index_path(Endpoint, :add_shot_group, pack)}
+          patch={Routes.range_index_path(Endpoint, :add_shot_group, ammo_group)}
           class="btn btn-primary"
         >
           <%= dgettext("actions", "Record shots") %>
         </.link>
-      </.pack_card>
+      </.ammo_group_card>
     </div>
   <% end %>
 
   <hr class="hr" />
 
-  <%= if @shot_record_count == 0 do %>
+  <%= if @shot_groups |> Enum.empty?() and @search |> is_nil() do %>
     <h1 class="title text-xl text-primary-600">
       <%= gettext("No shots recorded") %>
       <%= display_emoji("😔") %>
@@ -186,7 +186,7 @@
         id={:new}
         title={@page_title}
         action={@live_action}
-        pack={@pack}
+        ammo_group={@ammo_group}
         return_to={Routes.range_index_path(Endpoint, :index)}
         current_user={@current_user}
       />

lib/cannery_web/router.ex

@@ -89,19 +89,19 @@ defmodule CanneryWeb.Router do
     live "/container/edit/:id", ContainerLive.Show, :edit
     live "/container/edit_tags/:id", ContainerLive.Show, :edit_tags
 
-    live "/ammo", PackLive.Index, :index
-    live "/ammo/new", PackLive.Index, :new
-    live "/ammo/edit/:id", PackLive.Index, :edit
-    live "/ammo/clone/:id", PackLive.Index, :clone
-    live "/ammo/add_shot_group/:id", PackLive.Index, :add_shot_group
-    live "/ammo/move/:id", PackLive.Index, :move
-    live "/ammo/search/:search", PackLive.Index, :search
+    live "/ammo", AmmoGroupLive.Index, :index
+    live "/ammo/new", AmmoGroupLive.Index, :new
+    live "/ammo/edit/:id", AmmoGroupLive.Index, :edit
+    live "/ammo/clone/:id", AmmoGroupLive.Index, :clone
+    live "/ammo/add_shot_group/:id", AmmoGroupLive.Index, :add_shot_group
+    live "/ammo/move/:id", AmmoGroupLive.Index, :move
+    live "/ammo/search/:search", AmmoGroupLive.Index, :search
 
-    live "/ammo/show/:id", PackLive.Show, :show
-    live "/ammo/show/edit/:id", PackLive.Show, :edit
-    live "/ammo/show/add_shot_group/:id", PackLive.Show, :add_shot_group
-    live "/ammo/show/move/:id", PackLive.Show, :move
-    live "/ammo/show/:id/edit/:shot_group_id", PackLive.Show, :edit_shot_group
+    live "/ammo/show/:id", AmmoGroupLive.Show, :show
+    live "/ammo/show/edit/:id", AmmoGroupLive.Show, :edit
+    live "/ammo/show/add_shot_group/:id", AmmoGroupLive.Show, :add_shot_group
+    live "/ammo/show/move/:id", AmmoGroupLive.Show, :move
+    live "/ammo/show/:id/edit/:shot_group_id", AmmoGroupLive.Show, :edit_shot_group
 
     live "/range", RangeLive.Index, :index
     live "/range/edit/:id", RangeLive.Index, :edit

priv/gettext/actions.pot

@@ -10,14 +10,14 @@
 msgid ""
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:59
-#: lib/cannery_web/live/pack_live/index.ex:67
-#: lib/cannery_web/live/pack_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.ex:59
+#: lib/cannery_web/live/ammo_group_live/index.ex:67
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -121,10 +121,10 @@ msgid "Reset password"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:84
 #: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
@@ -156,19 +156,19 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:127
+#: 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
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
@@ -178,12 +178,12 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:77
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:77
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
@@ -198,19 +198,19 @@ msgstr ""
 msgid "Change language"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:78
-#: lib/cannery_web/live/pack_live/index.html.heex:144
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -220,13 +220,13 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
 #: lib/cannery_web/live/range_live/index.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
@@ -300,12 +300,18 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:166
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
+#, elixir-autogen, elixir-format
+msgid "Edit ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
 #: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
@@ -315,7 +321,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
@@ -326,7 +332,7 @@ msgstr ""
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -336,25 +342,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:178
 #, elixir-autogen, elixir-format
-msgid "Clone pack of %{pack_count} bullets"
+msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:193
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format
-msgid "Delete pack of %{pack_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/pack_live/index.html.heex:164
-#: lib/cannery_web/live/pack_live/show.html.heex:62
-#, elixir-autogen, elixir-format
-msgid "Edit pack of %{pack_count} bullets"
+msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:206
-#: lib/cannery_web/live/pack_live/index.html.heex:154
 #, elixir-autogen, elixir-format
-msgid "View pack of %{pack_count} bullets"
+msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -23,14 +23,14 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery_web/live/pack_live/index.ex:59
-#: lib/cannery_web/live/pack_live/index.ex:67
-#: lib/cannery_web/live/pack_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.ex:59
+#: lib/cannery_web/live/ammo_group_live/index.ex:67
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "Munition hinzufügen"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "Fügen Sie ihre erste Box hinzu!"
@@ -134,10 +134,10 @@ msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:84
 #: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
@@ -169,19 +169,19 @@ 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/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:127
+#: 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
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr "Einen weiteren Behälter hinzufügen!"
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr "Markieren"
@@ -191,12 +191,12 @@ msgstr "Markieren"
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:77
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:77
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Erstellen"
@@ -211,19 +211,19 @@ msgstr "Sprache wechseln"
 msgid "Change language"
 msgstr "Sprache wechseln"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:78
-#: lib/cannery_web/live/pack_live/index.html.heex:144
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -233,13 +233,13 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
@@ -289,7 +289,7 @@ msgstr ""
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
 #: lib/cannery_web/live/range_live/index.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
@@ -313,12 +313,18 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:166
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
+#, elixir-autogen, elixir-format
+msgid "Edit ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
 #: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
@@ -328,7 +334,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Munition markieren"
@@ -339,7 +345,7 @@ msgstr "Munition markieren"
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -349,25 +355,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:178
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Clone pack of %{pack_count} bullets"
+msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:193
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Delete pack of %{pack_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/pack_live/index.html.heex:164
-#: lib/cannery_web/live/pack_live/show.html.heex:62
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit pack of %{pack_count} bullets"
+msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:206
-#: lib/cannery_web/live/pack_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
-msgid "View pack of %{pack_count} bullets"
+msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -31,15 +31,15 @@ msgstr "Admins:"
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/live/pack_live/index.ex:75
-#: lib/cannery_web/live/pack_live/index.ex:84
-#: lib/cannery_web/live/pack_live/index.html.heex:3
+#: lib/cannery_web/live/ammo_group_live/index.ex:75
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Ammo"
 msgstr "Munition"
 
-#: lib/cannery_web/components/pack_table_component.ex:95
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/components/ammo_group_table_component.ex:96
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr "Munitionsarten"
@@ -90,9 +90,9 @@ msgstr "Patrone"
 msgid "Case material"
 msgstr "Gehäusematerial"
 
-#: lib/cannery_web/components/move_pack_component.ex:65
-#: lib/cannery_web/components/pack_table_component.ex:73
-#: lib/cannery_web/live/pack_live/form_component.html.heex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:74
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr "Behälter"
@@ -111,14 +111,14 @@ msgstr "Behälter"
 msgid "Corrosive"
 msgstr "Korrosiv"
 
-#: lib/cannery_web/components/pack_table_component.ex:91
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr "Anzahl"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:16
-#: lib/cannery_web/live/pack_live/show.html.heex:8
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr "Anzahl:"
@@ -196,7 +196,7 @@ msgid "Keep me logged in for 60 days"
 msgstr "Für 60 Tage eingeloggt bleiben"
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -262,7 +262,7 @@ msgstr "Neue Einladung"
 msgid "New Tag"
 msgstr "Neuer Tag"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr "Keine Munition"
@@ -292,15 +292,15 @@ msgstr "Keine Tags"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
 #: lib/cannery_web/components/shot_group_table_component.ex:43
-#: lib/cannery_web/live/pack_live/form_component.html.heex:50
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Bemerkungen"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:26
-#: lib/cannery_web/live/pack_live/show.html.heex:24
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
 msgstr "Bemerkungen:"
@@ -316,13 +316,13 @@ msgstr "Auf dem Bücherregal"
 msgid "Pressure"
 msgstr "Druck"
 
-#: lib/cannery_web/components/pack_table_component.ex:81
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/components/ammo_group_table_component.ex:82
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr "Kaufpreis"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:41
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr "Kaufpreis:"
@@ -366,7 +366,7 @@ msgstr "Einfach:"
 msgid "Steel"
 msgstr "Stahl"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr "Gelagert in"
@@ -402,7 +402,7 @@ msgid "Tracer"
 msgstr "Leuchtspur"
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -434,8 +434,8 @@ msgstr "Ihre Daten bleiben bei Ihnen, Punkt"
 msgid "No tags for this container"
 msgstr "Keine Tags für diesen Behälter"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:78
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
-#: lib/cannery_web/components/pack_table_component.ex:77
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Schießplatz"
@@ -447,7 +447,7 @@ msgstr "Range Day"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -464,12 +464,12 @@ msgid "No ammo staged"
 msgstr "Keine Munition selektiert"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/pack_live/index.ex:35
+#: lib/cannery_web/live/ammo_group_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 #: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
@@ -493,7 +493,7 @@ msgid "Rounds left"
 msgstr "Patronen verbleibend"
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
 #: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
@@ -505,12 +505,12 @@ msgstr "Patronen abgefeuert"
 msgid "Shot Records"
 msgstr "Schießkladde"
 
-#: lib/cannery_web/live/pack_live/index.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr "Munition verschieben"
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr "Kein weiterer Behälter"
@@ -520,14 +520,14 @@ msgstr "Kein weiterer Behälter"
 msgid "Shot log"
 msgstr "Schießkladde"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:164
+#: lib/cannery_web/components/ammo_group_table_component.ex:247
 #: lib/cannery_web/components/ammo_type_table_component.ex:261
-#: lib/cannery_web/components/core_components/pack_card.html.heex:42
-#: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:163
-#: lib/cannery_web/components/pack_table_component.ex:246
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:152
-#: lib/cannery_web/live/pack_live/show.html.heex:37
-#: lib/cannery_web/live/pack_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr "$%{amount}"
@@ -614,40 +614,40 @@ msgstr "Editiere %{name} Tags"
 msgid "Rounds:"
 msgstr "Patronen:"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:161
+#: lib/cannery_web/components/ammo_group_table_component.ex:243
 #: lib/cannery_web/components/ammo_type_table_component.ex:260
-#: lib/cannery_web/components/pack_table_component.ex:160
-#: lib/cannery_web/components/pack_table_component.ex:242
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "Keine Preisinformationen"
 
-#: lib/cannery_web/components/pack_table_component.ex:83
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% verbleibend"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr "Derzeitiger Wert:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Original cost:"
 msgstr "Originalpreis:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:13
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Original count:"
 msgstr "Ursprüngliche Anzahl:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:18
 #, elixir-autogen, elixir-format
 msgid "Percentage left:"
 msgstr "Prozent verbleibend:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr "Patronen verbraucht"
@@ -677,13 +677,13 @@ msgstr "Registrieren"
 msgid "Reset your password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 #: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr "Kopien"
@@ -742,12 +742,12 @@ msgstr "Quellcode ansehen"
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr "Munitionstyp bearbeiten"
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr "Munition verschieben"
@@ -757,12 +757,12 @@ msgstr "Munition verschieben"
 msgid "No ammo in this container"
 msgstr "Keine Munitionsgruppe in diesem Behälter"
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr "Zeige Munitionsarten"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
@@ -790,25 +790,25 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:51
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr "Behälter"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:87
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:166
-#: lib/cannery_web/live/pack_live/index.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:201
-#: lib/cannery_web/live/pack_live/show.html.heex:19
+#: lib/cannery_web/components/ammo_group_table_component.ex:202
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr "Patronen abgefeuert"
@@ -989,28 +989,28 @@ msgstr ""
 msgid "Edit %{ammo_type_name}"
 msgstr "%{name} bearbeiten"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:250
+#: lib/cannery_web/components/ammo_group_table_component.ex:251
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:81
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:46
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:87
+#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr "Ursprüngliche Anzahl:"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:21
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:24
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count:"
 msgstr "Ursprüngliche Anzahl:"
@@ -1020,34 +1020,34 @@ msgstr "Ursprüngliche Anzahl:"
 msgid "Home"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:63
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:36
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:181
+#: lib/cannery_web/components/ammo_group_table_component.ex:182
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:68
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/components/ammo_group_table_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:31
-#: lib/cannery_web/live/pack_live/show.html.heex:30
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:51
+#: lib/cannery_web/live/ammo_group_live/index.ex:51
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit ammo"
 msgstr "Munitionstyp bearbeiten"
@@ -1063,7 +1063,7 @@ msgstr "Keine Munitionsarten"
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
@@ -1218,12 +1218,12 @@ msgstr ""
 msgid "Really great weather"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
-#: lib/cannery_web/components/pack_table_component.ex:59
+#: lib/cannery_web/components/move_ammo_group_component.ex:70
 #: lib/cannery_web/components/shot_group_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/ammo_group_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -1238,7 +1238,7 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "Current Count"
 msgstr ""
@@ -1249,9 +1249,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:35
 #: lib/cannery_web/live/container_live/show.html.heex:103
-#: lib/cannery_web/live/pack_live/index.html.heex:58
 #: lib/cannery_web/live/range_live/index.html.heex:92
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1323,7 +1323,7 @@ msgstr ""
 msgid "Load grains:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo"
 msgstr "Keine Munition"
@@ -1333,11 +1333,11 @@ msgstr "Keine Munition"
 msgid "None specified"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:61
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:38
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #: lib/cannery_web/live/container_live/show.html.heex:106
-#: lib/cannery_web/live/pack_live/index.html.heex:61
 #: lib/cannery_web/live/range_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Pistol"
@@ -1358,11 +1358,11 @@ msgstr "Zündertyp"
 msgid "Projectile"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:36
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #: lib/cannery_web/live/container_live/show.html.heex:104
-#: lib/cannery_web/live/pack_live/index.html.heex:59
 #: lib/cannery_web/live/range_live/index.html.heex:93
 #, elixir-autogen, elixir-format
 msgid "Rifle"
@@ -1412,11 +1412,11 @@ msgstr ""
 msgid "Shot type:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:60
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #: lib/cannery_web/live/container_live/show.html.heex:105
-#: lib/cannery_web/live/pack_live/index.html.heex:60
 #: lib/cannery_web/live/range_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
@@ -1456,11 +1456,11 @@ msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:150
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:29
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #: lib/cannery_web/live/container_live/show.html.heex:97
-#: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Class"

priv/gettext/de/LC_MESSAGES/errors.po

@@ -161,12 +161,12 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr "Tag konnte nicht gelöscht werden"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:160
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "Konnte die Anzahl der Kopien nicht verstehen"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:150
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/pack.ex:92
+#: lib/cannery/ammo/ammo_group.ex:92
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr "Anzahl muss weniger als %{count} betragen"

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -73,8 +73,8 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:191
+#: 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?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
@@ -129,10 +129,10 @@ 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/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/pack_live/form_component.html.heex:85
 #: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
@@ -176,13 +176,13 @@ msgstr "Schüsse erfolgreich dokumentiert"
 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/pack_live/show.ex:158
+#: lib/cannery_web/live/ammo_group_live/show.ex:159
 #: lib/cannery_web/live/range_live/index.html.heex:152
 #, 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?"
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/ammo_group_live/show.ex:81
 #: lib/cannery_web/live/range_live/index.ex:79
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -198,7 +198,7 @@ msgstr "Schießkladde erfolgreich aktualisiert"
 msgid "%{email} confirmed successfully."
 msgstr "%{email} erfolgreich bestätigt."
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_ammo_group_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition erfolgreich zu %{name} verschoben"
@@ -213,13 +213,13 @@ msgstr "Der Zwischenablage hinzugefügt"
 msgid "%{name} removed successfully"
 msgstr "%{name} erfolgreich entfernt"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:10
-#: lib/cannery_web/live/pack_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Sie müssen"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Erstellen..."
@@ -234,23 +234,23 @@ msgstr "Möchten Sie die Sprache wechseln?"
 msgid "Language updated successfully."
 msgstr "Spracheinstellung gespeichert."
 
-#: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr "Munitionsgruppe erfolgreich gelöscht"
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:93
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr "Munition erfolgreich demarkiert"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:125
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo updated successfully"
 msgstr "Munitionsgruppe erfolgreich aktualisiert"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:184
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:185
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"

priv/gettext/default.pot

@@ -27,15 +27,15 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/live/pack_live/index.ex:75
-#: lib/cannery_web/live/pack_live/index.ex:84
-#: lib/cannery_web/live/pack_live/index.html.heex:3
+#: lib/cannery_web/live/ammo_group_live/index.ex:75
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:95
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/components/ammo_group_table_component.ex:96
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr ""
@@ -86,9 +86,9 @@ msgstr ""
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:65
-#: lib/cannery_web/components/pack_table_component.ex:73
-#: lib/cannery_web/live/pack_live/form_component.html.heex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:74
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -107,14 +107,14 @@ msgstr ""
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:16
-#: lib/cannery_web/live/pack_live/show.html.heex:8
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr ""
@@ -192,7 +192,7 @@ msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -258,7 +258,7 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr ""
@@ -288,15 +288,15 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
 #: lib/cannery_web/components/shot_group_table_component.ex:43
-#: lib/cannery_web/live/pack_live/form_component.html.heex:50
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:26
-#: lib/cannery_web/live/pack_live/show.html.heex:24
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
 msgstr ""
@@ -312,13 +312,13 @@ msgstr ""
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:81
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/components/ammo_group_table_component.ex:82
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:41
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
 msgid "Steel"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -428,8 +428,8 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:78
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
-#: lib/cannery_web/components/pack_table_component.ex:77
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -441,7 +441,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -458,12 +458,12 @@ msgid "No ammo staged"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/pack_live/index.ex:35
+#: lib/cannery_web/live/ammo_group_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 #: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
@@ -487,7 +487,7 @@ msgid "Rounds left"
 msgstr ""
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
 #: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
@@ -499,12 +499,12 @@ msgstr ""
 msgid "Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr ""
@@ -514,14 +514,14 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:164
+#: lib/cannery_web/components/ammo_group_table_component.ex:247
 #: lib/cannery_web/components/ammo_type_table_component.ex:261
-#: lib/cannery_web/components/core_components/pack_card.html.heex:42
-#: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:163
-#: lib/cannery_web/components/pack_table_component.ex:246
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:152
-#: lib/cannery_web/live/pack_live/show.html.heex:37
-#: lib/cannery_web/live/pack_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr ""
@@ -608,40 +608,40 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:161
+#: lib/cannery_web/components/ammo_group_table_component.ex:243
 #: lib/cannery_web/components/ammo_type_table_component.ex:260
-#: lib/cannery_web/components/pack_table_component.ex:160
-#: lib/cannery_web/components/pack_table_component.ex:242
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:83
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Original cost:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:13
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Original count:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:18
 #, elixir-autogen, elixir-format
 msgid "Percentage left:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr ""
@@ -671,13 +671,13 @@ msgstr ""
 msgid "Reset your password"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 #: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr ""
@@ -736,12 +736,12 @@ msgstr ""
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move Ammo"
 msgstr ""
@@ -751,12 +751,12 @@ msgstr ""
 msgid "No ammo in this container"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format
 msgid "Show Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "This ammo is not in a container"
 msgstr ""
@@ -784,25 +784,25 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:51
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:87
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:166
-#: lib/cannery_web/live/pack_live/index.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:201
-#: lib/cannery_web/live/pack_live/show.html.heex:19
+#: lib/cannery_web/components/ammo_group_table_component.ex:202
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -983,28 +983,28 @@ msgstr ""
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:250
+#: lib/cannery_web/components/ammo_group_table_component.ex:251
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:81
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:46
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:87
+#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #, elixir-autogen, elixir-format
 msgid "Original Count"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:21
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Original Count:"
 msgstr ""
@@ -1014,34 +1014,34 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:63
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:36
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:181
+#: lib/cannery_web/components/ammo_group_table_component.ex:182
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:68
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/components/ammo_group_table_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:31
-#: lib/cannery_web/live/pack_live/show.html.heex:30
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:51
+#: lib/cannery_web/live/ammo_group_live/index.ex:51
 #, elixir-autogen, elixir-format
 msgid "Edit ammo"
 msgstr ""
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:81
 #, elixir-autogen, elixir-format
 msgid "Search ammo"
 msgstr ""
@@ -1201,12 +1201,12 @@ msgstr ""
 msgid "Really great weather"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
-#: lib/cannery_web/components/pack_table_component.ex:59
+#: lib/cannery_web/components/move_ammo_group_component.ex:70
 #: lib/cannery_web/components/shot_group_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/ammo_group_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "Current Count"
 msgstr ""
@@ -1232,9 +1232,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:35
 #: lib/cannery_web/live/container_live/show.html.heex:103
-#: lib/cannery_web/live/pack_live/index.html.heex:58
 #: lib/cannery_web/live/range_live/index.html.heex:92
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1306,7 +1306,7 @@ msgstr ""
 msgid "Load grains:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "No ammo"
 msgstr ""
@@ -1316,11 +1316,11 @@ msgstr ""
 msgid "None specified"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:61
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:38
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #: lib/cannery_web/live/container_live/show.html.heex:106
-#: lib/cannery_web/live/pack_live/index.html.heex:61
 #: lib/cannery_web/live/range_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Pistol"
@@ -1341,11 +1341,11 @@ msgstr ""
 msgid "Projectile"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:36
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #: lib/cannery_web/live/container_live/show.html.heex:104
-#: lib/cannery_web/live/pack_live/index.html.heex:59
 #: lib/cannery_web/live/range_live/index.html.heex:93
 #, elixir-autogen, elixir-format
 msgid "Rifle"
@@ -1395,11 +1395,11 @@ msgstr ""
 msgid "Shot type:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:60
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #: lib/cannery_web/live/container_live/show.html.heex:105
-#: lib/cannery_web/live/pack_live/index.html.heex:60
 #: lib/cannery_web/live/range_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
@@ -1439,11 +1439,11 @@ msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:150
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:29
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #: lib/cannery_web/live/container_live/show.html.heex:97
-#: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Class"

priv/gettext/en/LC_MESSAGES/actions.po

@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/cannery_web/live/pack_live/index.ex:59
-#: lib/cannery_web/live/pack_live/index.ex:67
-#: lib/cannery_web/live/pack_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.ex:59
+#: lib/cannery_web/live/ammo_group_live/index.ex:67
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -121,10 +121,10 @@ msgid "Reset password"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:84
 #: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
@@ -156,19 +156,19 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:127
+#: 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
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
@@ -178,12 +178,12 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:77
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:77
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Create"
 msgstr ""
@@ -198,19 +198,19 @@ msgstr ""
 msgid "Change language"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:78
-#: lib/cannery_web/live/pack_live/index.html.heex:144
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -220,13 +220,13 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
 #: lib/cannery_web/live/range_live/index.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
@@ -300,12 +300,18 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:166
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
+#, elixir-autogen, elixir-format
+msgid "Edit ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
 #: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
@@ -315,7 +321,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr ""
@@ -326,7 +332,7 @@ msgstr ""
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -336,25 +342,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:178
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Clone pack of %{pack_count} bullets"
+msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:193
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Delete pack of %{pack_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/pack_live/index.html.heex:164
-#: lib/cannery_web/live/pack_live/show.html.heex:62
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit pack of %{pack_count} bullets"
+msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:206
-#: lib/cannery_web/live/pack_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
-msgid "View pack of %{pack_count} bullets"
+msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -27,15 +27,15 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/live/pack_live/index.ex:75
-#: lib/cannery_web/live/pack_live/index.ex:84
-#: lib/cannery_web/live/pack_live/index.html.heex:3
+#: lib/cannery_web/live/ammo_group_live/index.ex:75
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:95
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/components/ammo_group_table_component.ex:96
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr ""
@@ -86,9 +86,9 @@ msgstr ""
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:65
-#: lib/cannery_web/components/pack_table_component.ex:73
-#: lib/cannery_web/live/pack_live/form_component.html.heex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:74
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -107,14 +107,14 @@ msgstr ""
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:16
-#: lib/cannery_web/live/pack_live/show.html.heex:8
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr ""
@@ -192,7 +192,7 @@ msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -258,7 +258,7 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr ""
@@ -288,15 +288,15 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
 #: lib/cannery_web/components/shot_group_table_component.ex:43
-#: lib/cannery_web/live/pack_live/form_component.html.heex:50
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:26
-#: lib/cannery_web/live/pack_live/show.html.heex:24
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
 msgstr ""
@@ -312,13 +312,13 @@ msgstr ""
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:81
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/components/ammo_group_table_component.ex:82
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:41
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
 msgid "Steel"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -428,8 +428,8 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:78
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
-#: lib/cannery_web/components/pack_table_component.ex:77
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -441,7 +441,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -458,12 +458,12 @@ msgid "No ammo staged"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/pack_live/index.ex:35
+#: lib/cannery_web/live/ammo_group_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 #: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
@@ -487,7 +487,7 @@ msgid "Rounds left"
 msgstr ""
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
 #: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
@@ -499,12 +499,12 @@ msgstr ""
 msgid "Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr ""
@@ -514,14 +514,14 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:164
+#: lib/cannery_web/components/ammo_group_table_component.ex:247
 #: lib/cannery_web/components/ammo_type_table_component.ex:261
-#: lib/cannery_web/components/core_components/pack_card.html.heex:42
-#: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:163
-#: lib/cannery_web/components/pack_table_component.ex:246
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:152
-#: lib/cannery_web/live/pack_live/show.html.heex:37
-#: lib/cannery_web/live/pack_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr ""
@@ -608,40 +608,40 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:161
+#: lib/cannery_web/components/ammo_group_table_component.ex:243
 #: lib/cannery_web/components/ammo_type_table_component.ex:260
-#: lib/cannery_web/components/pack_table_component.ex:160
-#: lib/cannery_web/components/pack_table_component.ex:242
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:83
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Original cost:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:13
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Original count:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:18
 #, elixir-autogen, elixir-format
 msgid "Percentage left:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds used"
 msgstr ""
@@ -671,13 +671,13 @@ msgstr ""
 msgid "Reset your password"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 #: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Record Shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr ""
@@ -736,12 +736,12 @@ msgstr ""
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr ""
@@ -751,12 +751,12 @@ msgstr ""
 msgid "No ammo in this container"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr ""
@@ -784,25 +784,25 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:51
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:87
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:166
-#: lib/cannery_web/live/pack_live/index.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:201
-#: lib/cannery_web/live/pack_live/show.html.heex:19
+#: lib/cannery_web/components/ammo_group_table_component.ex:202
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -983,28 +983,28 @@ msgstr ""
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:250
+#: lib/cannery_web/components/ammo_group_table_component.ex:251
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:81
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:46
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:87
+#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:21
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:24
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count:"
 msgstr ""
@@ -1014,34 +1014,34 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:63
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:36
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:181
+#: lib/cannery_web/components/ammo_group_table_component.ex:182
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:68
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/components/ammo_group_table_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:31
-#: lib/cannery_web/live/pack_live/show.html.heex:30
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:51
+#: lib/cannery_web/live/ammo_group_live/index.ex:51
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit ammo"
 msgstr ""
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
@@ -1201,12 +1201,12 @@ msgstr ""
 msgid "Really great weather"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
-#: lib/cannery_web/components/pack_table_component.ex:59
+#: lib/cannery_web/components/move_ammo_group_component.ex:70
 #: lib/cannery_web/components/shot_group_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/ammo_group_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "Current Count"
 msgstr ""
@@ -1232,9 +1232,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:35
 #: lib/cannery_web/live/container_live/show.html.heex:103
-#: lib/cannery_web/live/pack_live/index.html.heex:58
 #: lib/cannery_web/live/range_live/index.html.heex:92
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1306,7 +1306,7 @@ msgstr ""
 msgid "Load grains:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo"
 msgstr ""
@@ -1316,11 +1316,11 @@ msgstr ""
 msgid "None specified"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:61
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:38
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #: lib/cannery_web/live/container_live/show.html.heex:106
-#: lib/cannery_web/live/pack_live/index.html.heex:61
 #: lib/cannery_web/live/range_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Pistol"
@@ -1341,11 +1341,11 @@ msgstr ""
 msgid "Projectile"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:36
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #: lib/cannery_web/live/container_live/show.html.heex:104
-#: lib/cannery_web/live/pack_live/index.html.heex:59
 #: lib/cannery_web/live/range_live/index.html.heex:93
 #, elixir-autogen, elixir-format
 msgid "Rifle"
@@ -1395,11 +1395,11 @@ msgstr ""
 msgid "Shot type:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:60
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #: lib/cannery_web/live/container_live/show.html.heex:105
-#: lib/cannery_web/live/pack_live/index.html.heex:60
 #: lib/cannery_web/live/range_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
@@ -1439,11 +1439,11 @@ msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:150
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:29
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #: lib/cannery_web/live/container_live/show.html.heex:97
-#: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Class"

priv/gettext/en/LC_MESSAGES/errors.po

@@ -146,12 +146,12 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:160
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:150
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/pack.ex:92
+#: lib/cannery/ammo/ammo_group.ex:92
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -58,8 +58,8 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:191
+#: 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?"
 msgstr ""
@@ -110,10 +110,10 @@ msgid "Please check your email to verify your account"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:59
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:85
 #: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
@@ -155,13 +155,13 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:158
+#: lib/cannery_web/live/ammo_group_live/show.ex:159
 #: lib/cannery_web/live/range_live/index.html.heex:152
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/ammo_group_live/show.ex:81
 #: lib/cannery_web/live/range_live/index.ex:79
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -177,7 +177,7 @@ msgstr ""
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_ammo_group_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
@@ -192,13 +192,13 @@ msgstr ""
 msgid "%{name} removed successfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:10
-#: lib/cannery_web/live/pack_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:78
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Creating..."
 msgstr ""
@@ -213,23 +213,23 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:93
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:125
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo updated successfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:184
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:185
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"

priv/gettext/errors.pot

@@ -145,12 +145,12 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:160
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:150
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/pack.ex:92
+#: lib/cannery/ammo/ammo_group.ex:92
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format
 msgid "Count can be at most %{count} shots"
 msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -23,14 +23,14 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery_web/live/pack_live/index.ex:59
-#: lib/cannery_web/live/pack_live/index.ex:67
-#: lib/cannery_web/live/pack_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.ex:59
+#: lib/cannery_web/live/ammo_group_live/index.ex:67
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "Añadir Munición"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "¡Añade tu primera caja!"
@@ -134,10 +134,10 @@ msgid "Reset password"
 msgstr "Resetear contraseña"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:84
 #: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
@@ -169,19 +169,19 @@ msgstr "Preparar munición"
 msgid "Why not get some ready to shoot?"
 msgstr "¿Por qué no preparar parte para disparar?"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:127
+#: 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
 msgid "Record shots"
 msgstr "Tiros récord"
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr "¡Añade otro contenedor!"
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr "Seleccionar"
@@ -191,12 +191,12 @@ msgstr "Seleccionar"
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "añade primero un contenedor"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:77
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:77
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Crear"
@@ -211,19 +211,19 @@ msgstr "Cambiar Lenguaje"
 msgid "Change language"
 msgstr "Cambiar lenguaje"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr "Ver en Catalogo"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr "añade primero un tipo de munición"
 
-#: lib/cannery_web/components/move_pack_component.ex:78
-#: lib/cannery_web/live/pack_live/index.html.heex:144
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr "Mover munición"
@@ -233,13 +233,13 @@ msgstr "Mover munición"
 msgid "Set Unlimited"
 msgstr "Activar ilimitados"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr "Preparar para el campo de tiro"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
@@ -289,7 +289,7 @@ msgstr ""
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
 #: lib/cannery_web/live/range_live/index.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
@@ -313,12 +313,18 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:166
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
+#, elixir-autogen, elixir-format
+msgid "Edit ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
 #: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
@@ -328,7 +334,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Preparar munición"
@@ -339,7 +345,7 @@ msgstr "Preparar munición"
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -349,25 +355,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:178
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Clone pack of %{pack_count} bullets"
+msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:193
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Delete pack of %{pack_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/pack_live/index.html.heex:164
-#: lib/cannery_web/live/pack_live/show.html.heex:62
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit pack of %{pack_count} bullets"
+msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:206
-#: lib/cannery_web/live/pack_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
-msgid "View pack of %{pack_count} bullets"
+msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/es/LC_MESSAGES/default.po

@@ -31,15 +31,15 @@ msgstr "Aministradores:"
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/live/pack_live/index.ex:75
-#: lib/cannery_web/live/pack_live/index.ex:84
-#: lib/cannery_web/live/pack_live/index.html.heex:3
+#: lib/cannery_web/live/ammo_group_live/index.ex:75
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Ammo"
 msgstr "Munición"
 
-#: lib/cannery_web/components/pack_table_component.ex:95
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/components/ammo_group_table_component.ex:96
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr "Tipo de munición"
@@ -90,9 +90,9 @@ msgstr "Cartucho"
 msgid "Case material"
 msgstr "Material del casquillo"
 
-#: lib/cannery_web/components/move_pack_component.ex:65
-#: lib/cannery_web/components/pack_table_component.ex:73
-#: lib/cannery_web/live/pack_live/form_component.html.heex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:74
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr "Contenedor"
@@ -111,14 +111,14 @@ msgstr "Contenedores"
 msgid "Corrosive"
 msgstr "Corrosiva"
 
-#: lib/cannery_web/components/pack_table_component.ex:91
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr "Cantidad"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:16
-#: lib/cannery_web/live/pack_live/show.html.heex:8
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr "Cantidad:"
@@ -196,7 +196,7 @@ msgid "Keep me logged in for 60 days"
 msgstr "Mantener registrado durante 60 días"
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -262,7 +262,7 @@ msgstr "Nueva Invitación"
 msgid "New Tag"
 msgstr "Nueva Etiqueta"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr "Sin Munición"
@@ -292,15 +292,15 @@ msgstr "Sin etiquetas"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
 #: lib/cannery_web/components/shot_group_table_component.ex:43
-#: lib/cannery_web/live/pack_live/form_component.html.heex:50
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notas"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:26
-#: lib/cannery_web/live/pack_live/show.html.heex:24
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
 msgstr "Notas:"
@@ -316,13 +316,13 @@ msgstr "En la estantería"
 msgid "Pressure"
 msgstr "Presión"
 
-#: lib/cannery_web/components/pack_table_component.ex:81
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/components/ammo_group_table_component.ex:82
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr "Precio pagado"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:41
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr "Precio pagado:"
@@ -366,7 +366,7 @@ msgstr "Simple:"
 msgid "Steel"
 msgstr "Acero"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr "Guardado en"
@@ -403,7 +403,7 @@ msgid "Tracer"
 msgstr "Trazadora"
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -435,8 +435,8 @@ msgstr "Tus datos se quedan contigo, sin excepciones"
 msgid "No tags for this container"
 msgstr "Contenedor sin etiquetas"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:78
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
-#: lib/cannery_web/components/pack_table_component.ex:77
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Campo de tiro"
@@ -448,7 +448,7 @@ msgstr "Día de disparar"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -465,12 +465,12 @@ msgid "No ammo staged"
 msgstr "No hay munición preparada"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/pack_live/index.ex:35
+#: lib/cannery_web/live/ammo_group_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Tiros récord"
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 #: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
@@ -494,7 +494,7 @@ msgid "Rounds left"
 msgstr "Balas restantes"
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
 #: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
@@ -506,12 +506,12 @@ msgstr "Balas disparadas"
 msgid "Shot Records"
 msgstr "Récords de Tiro"
 
-#: lib/cannery_web/live/pack_live/index.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr "Mover munición"
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr "No hay otros contenedores"
@@ -521,14 +521,14 @@ msgstr "No hay otros contenedores"
 msgid "Shot log"
 msgstr "Registro de tiros"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:164
+#: lib/cannery_web/components/ammo_group_table_component.ex:247
 #: lib/cannery_web/components/ammo_type_table_component.ex:261
-#: lib/cannery_web/components/core_components/pack_card.html.heex:42
-#: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:163
-#: lib/cannery_web/components/pack_table_component.ex:246
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:152
-#: lib/cannery_web/live/pack_live/show.html.heex:37
-#: lib/cannery_web/live/pack_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr "$%{amount}"
@@ -615,40 +615,40 @@ msgstr "Editar etiquetas de %{name}"
 msgid "Rounds:"
 msgstr "Balas:"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:161
+#: lib/cannery_web/components/ammo_group_table_component.ex:243
 #: lib/cannery_web/components/ammo_type_table_component.ex:260
-#: lib/cannery_web/components/pack_table_component.ex:160
-#: lib/cannery_web/components/pack_table_component.ex:242
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "No hay información de coste"
 
-#: lib/cannery_web/components/pack_table_component.ex:83
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% restantes"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr "Valor actual:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Original cost:"
 msgstr "Coste original:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:13
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Original count:"
 msgstr "Cantidad original:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:18
 #, elixir-autogen, elixir-format
 msgid "Percentage left:"
 msgstr "Pocentaje restante:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr "Balas usadas"
@@ -678,13 +678,13 @@ msgstr "Registrarse"
 msgid "Reset your password"
 msgstr "Reestablecer contraseña"
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 #: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr "Tiros Récord"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr "Copias"
@@ -743,12 +743,12 @@ msgstr "Ver código fuente"
 msgid "Catalog"
 msgstr "Catálogo"
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo"
 msgstr "Editar Munición"
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move Ammo"
 msgstr "Mover Munición"
@@ -758,12 +758,12 @@ msgstr "Mover Munición"
 msgid "No ammo in this container"
 msgstr "No hay munición en este contenedor"
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format
 msgid "Show Ammo"
 msgstr "Mostrar Munición"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "This ammo is not in a container"
 msgstr "Esta munición no está en un contenedor"
@@ -792,25 +792,25 @@ msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 "Deje \"Usos restantes\" en blanco para hacer las invitaciónes ilimitadas"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:51
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr "Contenedor:"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:87
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:166
-#: lib/cannery_web/live/pack_live/index.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr "Mostrar usadas"
 
-#: lib/cannery_web/components/pack_table_component.ex:201
-#: lib/cannery_web/live/pack_live/show.html.heex:19
+#: lib/cannery_web/components/ammo_group_table_component.ex:202
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr "%{percentage}%"
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr "Balas disparadas: %{count}"
@@ -991,28 +991,28 @@ msgstr ""
 msgid "Edit %{ammo_type_name}"
 msgstr "Editar %{ammo_type_name}"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:250
+#: lib/cannery_web/components/ammo_group_table_component.ex:251
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr "Vacio"
 
-#: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:81
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:46
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:87
+#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #, elixir-autogen, elixir-format
 msgid "Original Count"
 msgstr "Cantidad Original"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:21
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Original Count:"
 msgstr "Cantidad Original:"
@@ -1022,34 +1022,34 @@ msgstr "Cantidad Original:"
 msgid "Home"
 msgstr "Menu principal"
 
-#: lib/cannery_web/components/pack_table_component.ex:63
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr "Usada por última vez en"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:36
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr "Usada por última vez en:"
 
-#: lib/cannery_web/components/pack_table_component.ex:181
+#: lib/cannery_web/components/ammo_group_table_component.ex:182
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr "Nunca usada"
 
-#: lib/cannery_web/components/pack_table_component.ex:68
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/components/ammo_group_table_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr "Comprada en"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:31
-#: lib/cannery_web/live/pack_live/show.html.heex:30
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
 msgstr "Comprada en:"
 
-#: lib/cannery_web/live/pack_live/index.ex:51
+#: lib/cannery_web/live/ammo_group_live/index.ex:51
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit ammo"
 msgstr "Editar munición"
@@ -1065,7 +1065,7 @@ msgstr "Sin tipo de Munición"
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
@@ -1220,12 +1220,12 @@ msgstr ""
 msgid "Really great weather"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
-#: lib/cannery_web/components/pack_table_component.ex:59
+#: lib/cannery_web/components/move_ammo_group_component.ex:70
 #: lib/cannery_web/components/shot_group_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/ammo_group_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -1240,7 +1240,7 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "Current Count"
 msgstr ""
@@ -1251,9 +1251,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:35
 #: lib/cannery_web/live/container_live/show.html.heex:103
-#: lib/cannery_web/live/pack_live/index.html.heex:58
 #: lib/cannery_web/live/range_live/index.html.heex:92
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1325,7 +1325,7 @@ msgstr ""
 msgid "Load grains:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo"
 msgstr "Sin Munición"
@@ -1335,11 +1335,11 @@ msgstr "Sin Munición"
 msgid "None specified"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:61
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:38
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #: lib/cannery_web/live/container_live/show.html.heex:106
-#: lib/cannery_web/live/pack_live/index.html.heex:61
 #: lib/cannery_web/live/range_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Pistol"
@@ -1360,11 +1360,11 @@ msgstr "Tipo de espoleta"
 msgid "Projectile"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:36
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #: lib/cannery_web/live/container_live/show.html.heex:104
-#: lib/cannery_web/live/pack_live/index.html.heex:59
 #: lib/cannery_web/live/range_live/index.html.heex:93
 #, elixir-autogen, elixir-format
 msgid "Rifle"
@@ -1414,11 +1414,11 @@ msgstr ""
 msgid "Shot type:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:60
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #: lib/cannery_web/live/container_live/show.html.heex:105
-#: lib/cannery_web/live/pack_live/index.html.heex:60
 #: lib/cannery_web/live/range_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
@@ -1458,11 +1458,11 @@ msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:150
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:29
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #: lib/cannery_web/live/container_live/show.html.heex:97
-#: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Class"

priv/gettext/es/LC_MESSAGES/errors.po

@@ -161,12 +161,12 @@ msgstr "Debe confirmar su cuenta e iniciar sesión para acceder a esta página."
 msgid "Tag could not be removed"
 msgstr "La etiqueta no pudo ser eliminada"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:160
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "No se ha podido procesar el número de copias"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:150
 #, elixir-autogen, elixir-format
 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"
@@ -176,7 +176,7 @@ msgstr "Número inválido de copias, debe ser entre 1 y %{max}. Fue %{multiplier
 msgid "Invalid multiplier"
 msgstr "Multiplicador inválido"
 
-#: lib/cannery/ammo/pack.ex:92
+#: lib/cannery/ammo/ammo_group.ex:92
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr "Por favor escoja un tipo de munición y un contenedor"
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr "El recuento debe ser menos de %{count}"

priv/gettext/es/LC_MESSAGES/prompts.po

@@ -73,8 +73,8 @@ msgstr "Está seguro que desea eliminar %{email}? Esta acción es permanente!"
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Está seguro que desea eliminar %{name}?"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:191
+#: 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?"
 msgstr "Está seguro que desea eliminar esta munición?"
@@ -129,10 +129,10 @@ 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/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/pack_live/form_component.html.heex:85
 #: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
@@ -175,13 +175,13 @@ msgstr "Tiros registrados exitosamente"
 msgid "Are you sure you want to unstage this ammo?"
 msgstr "Está seguro que desea desmontar esta munición?"
 
-#: lib/cannery_web/live/pack_live/show.ex:158
+#: lib/cannery_web/live/ammo_group_live/show.ex:159
 #: lib/cannery_web/live/range_live/index.html.heex:152
 #, 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?"
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/ammo_group_live/show.ex:81
 #: lib/cannery_web/live/range_live/index.ex:79
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -197,7 +197,7 @@ msgstr "Récord de disparos actualizado exitosamente"
 msgid "%{email} confirmed successfully."
 msgstr "%{email} confirmado exitosamente."
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_ammo_group_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munición movida a %{name} exitosamente"
@@ -212,13 +212,13 @@ msgstr "Copiado al portapapeles"
 msgid "%{name} removed successfully"
 msgstr "%{name} eliminado exitosamente"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:10
-#: lib/cannery_web/live/pack_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Necesitará hacerlo"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Creando..."
@@ -233,23 +233,23 @@ msgstr "¿Está segure de que quiere cambiar el idioma?"
 msgid "Language updated successfully."
 msgstr "Idioma cambiado exitosamente."
 
-#: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Ammo deleted succesfully"
 msgstr "Munición borrada exitosamente"
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:93
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr "Munición descargada exitosamente"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:125
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Ammo updated successfully"
 msgstr "Munición actualizada exitosamente"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:184
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:185
 #, elixir-autogen, elixir-format
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -23,14 +23,14 @@ msgstr ""
 # # Run "mix gettext.extract" to bring this file up to
 # # date. Leave "msgstr"s empty as changing them here has no
 # # effect: edit them in PO (.po) files instead.
-#: lib/cannery_web/live/pack_live/index.ex:59
-#: lib/cannery_web/live/pack_live/index.ex:67
-#: lib/cannery_web/live/pack_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.ex:59
+#: lib/cannery_web/live/ammo_group_live/index.ex:67
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "ajouter munition"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "Ajoutez votre première caisse !"
@@ -134,10 +134,10 @@ msgid "Reset password"
 msgstr "Réinitialisé le mot de passe"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:84
 #: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
@@ -169,19 +169,19 @@ 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/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:127
+#: 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
 msgid "Record shots"
 msgstr "Enregistrer des tirs"
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr "Ajoutez un autre conteneur !"
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr "Sélectionner"
@@ -191,12 +191,12 @@ msgstr "Sélectionner"
 msgid "Copy to clipboard"
 msgstr "Copier dans le presse-papier"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "ajouter un conteneur en premier"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:77
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:77
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Créer"
@@ -211,19 +211,19 @@ msgstr "Changer la langue"
 msgid "Change language"
 msgstr "Changer la langue"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr "Voir en catalogue"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr "Ajoutez d'abord un type de munitions"
 
-#: lib/cannery_web/components/move_pack_component.ex:78
-#: lib/cannery_web/live/pack_live/index.html.heex:144
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -233,13 +233,13 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
@@ -289,7 +289,7 @@ msgstr ""
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
 #: lib/cannery_web/live/range_live/index.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
@@ -313,12 +313,18 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:166
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
+#, elixir-autogen, elixir-format
+msgid "Edit ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
 #: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
@@ -328,7 +334,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Munition préparée"
@@ -339,7 +345,7 @@ msgstr "Munition préparée"
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -349,25 +355,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:178
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Clone pack of %{pack_count} bullets"
+msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:193
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Delete pack of %{pack_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/pack_live/index.html.heex:164
-#: lib/cannery_web/live/pack_live/show.html.heex:62
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit pack of %{pack_count} bullets"
+msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:206
-#: lib/cannery_web/live/pack_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
-msgid "View pack of %{pack_count} bullets"
+msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/fr/LC_MESSAGES/default.po

@@ -31,15 +31,15 @@ msgstr "Administrateur·ices :"
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/live/pack_live/index.ex:75
-#: lib/cannery_web/live/pack_live/index.ex:84
-#: lib/cannery_web/live/pack_live/index.html.heex:3
+#: lib/cannery_web/live/ammo_group_live/index.ex:75
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Ammo"
 msgstr "Munition"
 
-#: lib/cannery_web/components/pack_table_component.ex:95
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/components/ammo_group_table_component.ex:96
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr "Type de munition"
@@ -90,9 +90,9 @@ msgstr "Cartouche"
 msgid "Case material"
 msgstr "Matériau de la caisse"
 
-#: lib/cannery_web/components/move_pack_component.ex:65
-#: lib/cannery_web/components/pack_table_component.ex:73
-#: lib/cannery_web/live/pack_live/form_component.html.heex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:74
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr "Conteneur"
@@ -111,14 +111,14 @@ msgstr "Conteneurs"
 msgid "Corrosive"
 msgstr "Corrosive"
 
-#: lib/cannery_web/components/pack_table_component.ex:91
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr "Quantité"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:16
-#: lib/cannery_web/live/pack_live/show.html.heex:8
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr "Quantité :"
@@ -196,7 +196,7 @@ msgid "Keep me logged in for 60 days"
 msgstr "Me garder authentifié durant 60 jours"
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -262,7 +262,7 @@ msgstr "Nouvelle invitation"
 msgid "New Tag"
 msgstr "Nouveau tag"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr "Aucune munition"
@@ -292,15 +292,15 @@ msgstr "Aucun tag"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
 #: lib/cannery_web/components/shot_group_table_component.ex:43
-#: lib/cannery_web/live/pack_live/form_component.html.heex:50
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notes"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:26
-#: lib/cannery_web/live/pack_live/show.html.heex:24
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
 msgstr "Notes :"
@@ -316,13 +316,13 @@ msgstr "Sur l’étagère"
 msgid "Pressure"
 msgstr "Pression"
 
-#: lib/cannery_web/components/pack_table_component.ex:81
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/components/ammo_group_table_component.ex:82
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr "Prix payé"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:41
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr "Prix payé :"
@@ -366,7 +366,7 @@ msgstr "Simple :"
 msgid "Steel"
 msgstr "Acier"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr "Est stocké dans"
@@ -404,7 +404,7 @@ msgid "Tracer"
 msgstr "Traceuse"
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -436,8 +436,8 @@ msgstr "Vos données restent avec vous, point final"
 msgid "No tags for this container"
 msgstr "Aucun tag pour ce conteneur"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:78
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
-#: lib/cannery_web/components/pack_table_component.ex:77
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Portée"
@@ -449,7 +449,7 @@ msgstr "Journée de stand"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -466,12 +466,12 @@ msgid "No ammo staged"
 msgstr "Aucune munition sélectionnée"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/pack_live/index.ex:35
+#: lib/cannery_web/live/ammo_group_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Tirs enregistrés"
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 #: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
@@ -495,7 +495,7 @@ msgid "Rounds left"
 msgstr "Cartouches restantes"
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
 #: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
@@ -507,12 +507,12 @@ msgstr "Cartouches tirées"
 msgid "Shot Records"
 msgstr "Enregistrements de tir"
 
-#: lib/cannery_web/live/pack_live/index.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr "Déplacer munition"
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr "Aucun autre conteneur"
@@ -522,14 +522,14 @@ msgstr "Aucun autre conteneur"
 msgid "Shot log"
 msgstr "Évènements de tir"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:164
+#: lib/cannery_web/components/ammo_group_table_component.ex:247
 #: lib/cannery_web/components/ammo_type_table_component.ex:261
-#: lib/cannery_web/components/core_components/pack_card.html.heex:42
-#: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:163
-#: lib/cannery_web/components/pack_table_component.ex:246
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:152
-#: lib/cannery_web/live/pack_live/show.html.heex:37
-#: lib/cannery_web/live/pack_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr "%{amount} $"
@@ -616,40 +616,40 @@ msgstr "Éditer les tags de %{name}"
 msgid "Rounds:"
 msgstr "Cartouches :"
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:161
+#: lib/cannery_web/components/ammo_group_table_component.ex:243
 #: lib/cannery_web/components/ammo_type_table_component.ex:260
-#: lib/cannery_web/components/pack_table_component.ex:160
-#: lib/cannery_web/components/pack_table_component.ex:242
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "Aucune information de prix"
 
-#: lib/cannery_web/components/pack_table_component.ex:83
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr "% restante"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr "Valeur actuelle :"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Original cost:"
 msgstr "Coût original :"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:13
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Original count:"
 msgstr "Nombre original :"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:18
 #, elixir-autogen, elixir-format
 msgid "Percentage left:"
 msgstr "Pourcentage restant :"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr "Cartouches utilisées"
@@ -679,13 +679,13 @@ msgstr "S’enregistrer"
 msgid "Reset your password"
 msgstr "Réinitialiser votre mot de passe"
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 #: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr "Enregistrer des tirs"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr "Exemplaires"
@@ -744,12 +744,12 @@ msgstr "Voir le code source"
 msgid "Catalog"
 msgstr "Catalogue"
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr "Éditer le type de munition"
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr "Déplacer munition"
@@ -759,12 +759,12 @@ msgstr "Déplacer munition"
 msgid "No ammo in this container"
 msgstr "Aucun groupe de munition pour ce conteneur"
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr "Montrer le type de munition"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr "Ce groupe de munition n’est pas dans un conteneur"
@@ -793,25 +793,25 @@ msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 "Laissez \"Utilisations restantes\" vide pour rendre l'invitation illimitée"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:51
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr "Conteneur"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:87
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:166
-#: lib/cannery_web/live/pack_live/index.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:201
-#: lib/cannery_web/live/pack_live/show.html.heex:19
+#: lib/cannery_web/components/ammo_group_table_component.ex:202
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr "Cartouches tirées"
@@ -992,28 +992,28 @@ msgstr ""
 msgid "Edit %{ammo_type_name}"
 msgstr "Éditer %{name}"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:250
+#: lib/cannery_web/components/ammo_group_table_component.ex:251
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:81
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:46
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:87
+#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr "Nombre original :"
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:21
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:24
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count:"
 msgstr "Nombre original :"
@@ -1023,34 +1023,34 @@ msgstr "Nombre original :"
 msgid "Home"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:63
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:36
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:181
+#: lib/cannery_web/components/ammo_group_table_component.ex:182
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:68
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/components/ammo_group_table_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:31
-#: lib/cannery_web/live/pack_live/show.html.heex:30
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:51
+#: lib/cannery_web/live/ammo_group_live/index.ex:51
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit ammo"
 msgstr "Éditer le type de munition"
@@ -1066,7 +1066,7 @@ msgstr "Aucun type de munition"
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
@@ -1221,12 +1221,12 @@ msgstr ""
 msgid "Really great weather"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
-#: lib/cannery_web/components/pack_table_component.ex:59
+#: lib/cannery_web/components/move_ammo_group_component.ex:70
 #: lib/cannery_web/components/shot_group_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/ammo_group_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -1241,7 +1241,7 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "Current Count"
 msgstr ""
@@ -1252,9 +1252,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:35
 #: lib/cannery_web/live/container_live/show.html.heex:103
-#: lib/cannery_web/live/pack_live/index.html.heex:58
 #: lib/cannery_web/live/range_live/index.html.heex:92
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1326,7 +1326,7 @@ msgstr ""
 msgid "Load grains:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo"
 msgstr "Aucune munition"
@@ -1336,11 +1336,11 @@ msgstr "Aucune munition"
 msgid "None specified"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:61
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:38
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #: lib/cannery_web/live/container_live/show.html.heex:106
-#: lib/cannery_web/live/pack_live/index.html.heex:61
 #: lib/cannery_web/live/range_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Pistol"
@@ -1361,11 +1361,11 @@ msgstr "Type d’amorce"
 msgid "Projectile"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:36
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #: lib/cannery_web/live/container_live/show.html.heex:104
-#: lib/cannery_web/live/pack_live/index.html.heex:59
 #: lib/cannery_web/live/range_live/index.html.heex:93
 #, elixir-autogen, elixir-format
 msgid "Rifle"
@@ -1415,11 +1415,11 @@ msgstr ""
 msgid "Shot type:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:60
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #: lib/cannery_web/live/container_live/show.html.heex:105
-#: lib/cannery_web/live/pack_live/index.html.heex:60
 #: lib/cannery_web/live/range_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
@@ -1459,11 +1459,11 @@ msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:150
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:29
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #: lib/cannery_web/live/container_live/show.html.heex:97
-#: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Class"

priv/gettext/fr/LC_MESSAGES/errors.po

@@ -162,12 +162,12 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr "Le tag n’a pas pu être retiré"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:160
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "Impossible d'analyser le nombre de copies"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:150
 #, elixir-autogen, elixir-format
 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}"
@@ -177,7 +177,7 @@ msgstr "Nombre de copies invalide, doit être 1 et %{max}. Été %{multiplier}"
 msgid "Invalid multiplier"
 msgstr "Multiplicateur invalide"
 
-#: lib/cannery/ammo/pack.ex:92
+#: lib/cannery/ammo/ammo_group.ex:92
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr "Veuillez choisir un type de munitions et un conteneur"
@@ -202,7 +202,7 @@ msgstr ""
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr "La quantité doit être inférieur à %{count}"

priv/gettext/fr/LC_MESSAGES/prompts.po

@@ -74,8 +74,8 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Êtes-vous certain·e de supprimer %{name} ?"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:191
+#: 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?"
 msgstr "Êtes-vous certain·e de supprimer cette munition ?"
@@ -130,10 +130,10 @@ 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/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/pack_live/form_component.html.heex:85
 #: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
@@ -177,13 +177,13 @@ msgstr "Tirs enregistré avec succès"
 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/pack_live/show.ex:158
+#: lib/cannery_web/live/ammo_group_live/show.ex:159
 #: lib/cannery_web/live/range_live/index.html.heex:152
 #, 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 ?"
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/ammo_group_live/show.ex:81
 #: lib/cannery_web/live/range_live/index.ex:79
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -199,7 +199,7 @@ msgstr "Enregistrements de tir mis à jour avec succès"
 msgid "%{email} confirmed successfully."
 msgstr "%{email} confirmé avec succès."
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_ammo_group_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition déplacée à %{name} avec succès"
@@ -214,13 +214,13 @@ msgstr "Copié dans le presse-papier"
 msgid "%{name} removed successfully"
 msgstr "%{name} retiré avec succès"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:10
-#: lib/cannery_web/live/pack_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Vous aurez besoin de"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Création en cours…"
@@ -235,23 +235,23 @@ msgstr "Êtes-vous certain·e de vouloir changer votre langue ?"
 msgid "Language updated successfully."
 msgstr "Langue mise à jour avec succès."
 
-#: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr "Groupe de munition supprimé avec succès"
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:93
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr "Groupe de munition désélectionner avec succès"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:125
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo updated successfully"
 msgstr "Groupe de munition mis à jour avec succès"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:184
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:185
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"

priv/gettext/ga/LC_MESSAGES/actions.po

@@ -21,14 +21,14 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery_web/live/pack_live/index.ex:59
-#: lib/cannery_web/live/pack_live/index.ex:67
-#: lib/cannery_web/live/pack_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.ex:59
+#: lib/cannery_web/live/ammo_group_live/index.ex:67
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -132,10 +132,10 @@ msgid "Reset password"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:84
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:84
 #: lib/cannery_web/live/range_live/form_component.html.heex:45
 #: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
@@ -167,19 +167,19 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:127
+#: 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
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
@@ -189,12 +189,12 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:14
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:77
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:77
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
@@ -209,19 +209,19 @@ msgstr ""
 msgid "Change language"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:24
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:78
-#: lib/cannery_web/live/pack_live/index.html.heex:144
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:144
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -231,13 +231,13 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
@@ -287,7 +287,7 @@ msgstr ""
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
 #: lib/cannery_web/live/range_live/index.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
@@ -311,12 +311,18 @@ msgstr ""
 msgid "Edit %{tag_name}"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:166
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
+#, elixir-autogen, elixir-format
+msgid "Edit ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
 #: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
@@ -326,7 +332,7 @@ msgstr ""
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr ""
@@ -337,7 +343,7 @@ msgstr ""
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
@@ -347,25 +353,19 @@ msgstr ""
 msgid "View %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:178
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Clone pack of %{pack_count} bullets"
+msgid "Clone ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:193
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Delete pack of %{pack_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/pack_live/index.html.heex:164
-#: lib/cannery_web/live/pack_live/show.html.heex:62
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit pack of %{pack_count} bullets"
+msgid "Delete ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:206
-#: lib/cannery_web/live/pack_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
-msgid "View pack of %{pack_count} bullets"
+msgid "View ammo group of %{ammo_group_count} bullets"
 msgstr ""

priv/gettext/ga/LC_MESSAGES/default.po

@@ -29,15 +29,15 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/live/pack_live/index.ex:75
-#: lib/cannery_web/live/pack_live/index.ex:84
-#: lib/cannery_web/live/pack_live/index.html.heex:3
+#: lib/cannery_web/live/ammo_group_live/index.ex:75
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:95
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/components/ammo_group_table_component.ex:96
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Ammo type"
 msgstr ""
@@ -88,9 +88,9 @@ msgstr ""
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:65
-#: lib/cannery_web/components/pack_table_component.ex:73
-#: lib/cannery_web/live/pack_live/form_component.html.heex:59
+#: lib/cannery_web/components/ammo_group_table_component.ex:74
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -109,14 +109,14 @@ msgstr ""
 msgid "Corrosive"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:16
-#: lib/cannery_web/live/pack_live/show.html.heex:8
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr ""
@@ -194,7 +194,7 @@ msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -260,7 +260,7 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr ""
@@ -290,15 +290,15 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:38
 #: lib/cannery_web/components/shot_group_table_component.ex:43
-#: lib/cannery_web/live/pack_live/form_component.html.heex:50
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:26
-#: lib/cannery_web/live/pack_live/show.html.heex:24
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
 msgstr ""
@@ -314,13 +314,13 @@ msgstr ""
 msgid "Pressure"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:81
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/components/ammo_group_table_component.ex:82
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:41
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
 msgid "Steel"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""
@@ -398,7 +398,7 @@ msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Type"
@@ -430,8 +430,8 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:78
 #: lib/cannery_web/components/core_components/topbar.html.heex:66
-#: lib/cannery_web/components/pack_table_component.ex:77
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -443,7 +443,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:49
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -460,12 +460,12 @@ msgid "No ammo staged"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/pack_live/index.ex:35
+#: lib/cannery_web/live/ammo_group_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 #: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
@@ -489,7 +489,7 @@ msgid "Rounds left"
 msgstr ""
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
 #: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
@@ -501,12 +501,12 @@ msgstr ""
 msgid "Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:43
+#: lib/cannery_web/live/ammo_group_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr ""
@@ -516,14 +516,14 @@ msgstr ""
 msgid "Shot log"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:164
+#: lib/cannery_web/components/ammo_group_table_component.ex:247
 #: lib/cannery_web/components/ammo_type_table_component.ex:261
-#: lib/cannery_web/components/core_components/pack_card.html.heex:42
-#: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:163
-#: lib/cannery_web/components/pack_table_component.ex:246
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:152
-#: lib/cannery_web/live/pack_live/show.html.heex:37
-#: lib/cannery_web/live/pack_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
 msgstr ""
@@ -610,40 +610,40 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:161
+#: lib/cannery_web/components/ammo_group_table_component.ex:243
 #: lib/cannery_web/components/ammo_type_table_component.ex:260
-#: lib/cannery_web/components/pack_table_component.ex:160
-#: lib/cannery_web/components/pack_table_component.ex:242
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:83
+#: lib/cannery_web/components/ammo_group_table_component.ex:84
 #, elixir-autogen, elixir-format
 msgid "% left"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Original cost:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:13
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Original count:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:18
 #, elixir-autogen, elixir-format
 msgid "Percentage left:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr ""
@@ -673,13 +673,13 @@ msgstr ""
 msgid "Reset your password"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 #: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr ""
@@ -738,12 +738,12 @@ msgstr ""
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move Ammo"
 msgstr ""
@@ -753,12 +753,12 @@ msgstr ""
 msgid "No ammo in this container"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format
 msgid "Show Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "This ammo is not in a container"
 msgstr ""
@@ -786,25 +786,25 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:51
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:87
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:166
-#: lib/cannery_web/live/pack_live/index.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:201
-#: lib/cannery_web/live/pack_live/show.html.heex:19
+#: lib/cannery_web/components/ammo_group_table_component.ex:202
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -985,28 +985,28 @@ msgstr ""
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:250
+#: lib/cannery_web/components/ammo_group_table_component.ex:251
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/components/ammo_group_table_component.ex:81
 #, elixir-autogen, elixir-format
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:46
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:87
+#: lib/cannery_web/components/ammo_group_table_component.ex:88
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:21
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:24
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count:"
 msgstr ""
@@ -1016,34 +1016,34 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:63
+#: lib/cannery_web/components/ammo_group_table_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:36
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:181
+#: lib/cannery_web/components/ammo_group_table_component.ex:182
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:68
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/components/ammo_group_table_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/pack_card.html.heex:31
-#: lib/cannery_web/live/pack_live/show.html.heex:30
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:51
+#: lib/cannery_web/live/ammo_group_live/index.ex:51
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit ammo"
 msgstr ""
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
@@ -1212,12 +1212,12 @@ msgstr ""
 msgid "Really great weather"
 msgstr ""
 
+#: lib/cannery_web/components/ammo_group_table_component.ex:60
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
-#: lib/cannery_web/components/pack_table_component.ex:59
+#: lib/cannery_web/components/move_ammo_group_component.ex:70
 #: lib/cannery_web/components/shot_group_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/ammo_group_live/show.ex:94
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -1232,7 +1232,7 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:91
+#: lib/cannery_web/components/ammo_group_table_component.ex:92
 #, elixir-autogen, elixir-format
 msgid "Current Count"
 msgstr ""
@@ -1243,9 +1243,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:35
 #: lib/cannery_web/live/container_live/show.html.heex:103
-#: lib/cannery_web/live/pack_live/index.html.heex:58
 #: lib/cannery_web/live/range_live/index.html.heex:92
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1317,7 +1317,7 @@ msgstr ""
 msgid "Load grains:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo"
 msgstr ""
@@ -1327,11 +1327,11 @@ msgstr ""
 msgid "None specified"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:61
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:38
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #: lib/cannery_web/live/container_live/show.html.heex:106
-#: lib/cannery_web/live/pack_live/index.html.heex:61
 #: lib/cannery_web/live/range_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Pistol"
@@ -1352,11 +1352,11 @@ msgstr ""
 msgid "Projectile"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:36
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #: lib/cannery_web/live/container_live/show.html.heex:104
-#: lib/cannery_web/live/pack_live/index.html.heex:59
 #: lib/cannery_web/live/range_live/index.html.heex:93
 #, elixir-autogen, elixir-format
 msgid "Rifle"
@@ -1406,11 +1406,11 @@ msgstr ""
 msgid "Shot type:"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:60
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #: lib/cannery_web/live/container_live/show.html.heex:105
-#: lib/cannery_web/live/pack_live/index.html.heex:60
 #: lib/cannery_web/live/range_live/index.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
@@ -1450,11 +1450,11 @@ msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:150
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:29
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 #: lib/cannery_web/live/container_live/show.html.heex:97
-#: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Class"

priv/gettext/ga/LC_MESSAGES/errors.po

@@ -161,12 +161,12 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:160
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:150
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
@@ -176,7 +176,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/pack.ex:92
+#: lib/cannery/ammo/ammo_group.ex:92
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:119
+#: lib/cannery/activity_log/shot_group.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr ""

priv/gettext/ga/LC_MESSAGES/prompts.po

@@ -69,8 +69,8 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:191
+#: 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?"
 msgstr ""
@@ -121,10 +121,10 @@ msgid "Please check your email to verify your account"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:59
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:85
 #: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
@@ -166,13 +166,13 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:158
+#: lib/cannery_web/live/ammo_group_live/show.ex:159
 #: lib/cannery_web/live/range_live/index.html.heex:152
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/ammo_group_live/show.ex:81
 #: lib/cannery_web/live/range_live/index.ex:79
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -188,7 +188,7 @@ msgstr ""
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_ammo_group_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
@@ -203,13 +203,13 @@ msgstr ""
 msgid "%{name} removed successfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:10
-#: lib/cannery_web/live/pack_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr ""
@@ -224,23 +224,23 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Ammo deleted succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:93
 #, elixir-autogen, elixir-format
 msgid "Ammo unstaged succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:125
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Ammo updated successfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:184
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:185
 #, elixir-autogen, elixir-format
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"

priv/gettext/prompts.pot

@@ -58,8 +58,8 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:191
+#: 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?"
 msgstr ""
@@ -110,10 +110,10 @@ msgid "Please check your email to verify your account"
 msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:59
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:85
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex: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/pack_live/form_component.html.heex:85
 #: lib/cannery_web/live/range_live/form_component.html.heex:47
 #: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
@@ -155,13 +155,13 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:158
+#: lib/cannery_web/live/ammo_group_live/show.ex:159
 #: lib/cannery_web/live/range_live/index.html.heex:152
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/ammo_group_live/show.ex:81
 #: lib/cannery_web/live/range_live/index.ex:79
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -177,7 +177,7 @@ msgstr ""
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_ammo_group_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
@@ -192,13 +192,13 @@ msgstr ""
 msgid "%{name} removed successfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:10
-#: lib/cannery_web/live/pack_live/index.html.heex:20
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:10
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr ""
@@ -213,23 +213,23 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/index.ex:94
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Ammo deleted succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:93
 #, elixir-autogen, elixir-format
 msgid "Ammo unstaged succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:125
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Ammo updated successfully"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:184
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:185
 #, elixir-autogen, elixir-format
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"

priv/repo/migrations/20230329025816_rename_type_to_class.exs

@@ -1,117 +1,7 @@
 defmodule Cannery.Repo.Migrations.RenameTypeToClass do
   use Ecto.Migration
 
-  def up do
-    drop index(:ammo_types, [:type])
-
-    flush()
-
+  def change do
     rename table(:ammo_types), :type, to: :class
-
-    alter table(:ammo_types) do
-      remove_if_exists :search, :tsvector
-    end
-
-    flush()
-
-    create index(:ammo_types, [:class])
-
-    execute """
-    ALTER TABLE ammo_types
-      ADD 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("class", '')), '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', immutable_to_string("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') ||
-        setweight(to_tsvector('english', coalesce("manufacturer", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("upc", '')), 'D')
-      ) STORED
-    """
-  end
-
-  def down do
-    drop index(:ammo_types, [:class])
-
-    flush()
-
-    rename table(:ammo_types), :class, to: :type
-
-    alter table(:ammo_types) do
-      remove_if_exists :search, :tsvector
-    end
-
-    flush()
-
-    create index(:ammo_types, [:type])
-
-    execute """
-    ALTER TABLE ammo_types
-      ADD 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', immutable_to_string("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') ||
-        setweight(to_tsvector('english', coalesce("manufacturer", '')), 'D') ||
-        setweight(to_tsvector('english', coalesce("upc", '')), 'D')
-      ) STORED
-    """
   end
 end

priv/repo/migrations/20230329041109_rename_ammo_groups_to_packs.exs

@@ -1,51 +0,0 @@
-defmodule Cannery.Repo.Migrations.RenameAmmoGroupsToPacks do
-  use Ecto.Migration
-
-  def up do
-    drop index(:ammo_groups, [:user_id], where: "count = 0", name: :empty_ammo_groups_index)
-    drop index(:ammo_groups, [:user_id, :ammo_type_id])
-    drop index(:ammo_groups, [:user_id, :container_id])
-    drop index(:ammo_groups, [:ammo_type_id])
-    drop index(:ammo_groups, [:container_id])
-    drop index(:ammo_groups, [:user_id])
-
-    flush()
-
-    rename table(:ammo_groups), to: table(:packs)
-
-    flush()
-
-    create index(:packs, [:user_id], where: "count = 0", name: :empty_packs_index)
-    create index(:packs, [:user_id, :ammo_type_id])
-    create index(:packs, [:user_id, :container_id])
-    create index(:packs, [:ammo_type_id])
-    create index(:packs, [:container_id])
-    create index(:packs, [:user_id])
-
-    rename table(:shot_groups), :ammo_group_id, to: :pack_id
-  end
-
-  def down do
-    drop index(:packs, [:user_id], where: "count = 0", name: :empty_packs_index)
-    drop index(:packs, [:user_id, :ammo_type_id])
-    drop index(:packs, [:user_id, :container_id])
-    drop index(:packs, [:ammo_type_id])
-    drop index(:packs, [:container_id])
-    drop index(:packs, [:user_id])
-
-    flush()
-
-    rename table(:packs), to: table(:ammo_groups)
-
-    flush()
-
-    create index(:ammo_groups, [:user_id], where: "count = 0", name: :empty_ammo_groups_index)
-    create index(:ammo_groups, [:user_id, :ammo_type_id])
-    create index(:ammo_groups, [:user_id, :container_id])
-    create index(:ammo_groups, [:ammo_type_id])
-    create index(:ammo_groups, [:container_id])
-    create index(:ammo_groups, [:user_id])
-
-    rename table(:shot_groups), :pack_id, to: :ammo_group_id
-  end
-end

test/cannery/activity_log_test.exs

@@ -15,44 +15,24 @@ defmodule Cannery.ActivityLogTest do
       container = container_fixture(current_user)
       ammo_type = ammo_type_fixture(current_user)
 
-      {1, [%{id: pack_id} = pack]} =
-        pack_fixture(%{count: 25}, ammo_type, container, current_user)
+      {1, [%{id: ammo_group_id} = ammo_group]} =
+        ammo_group_fixture(%{count: 25}, ammo_type, container, current_user)
 
       shot_group =
         %{count: 5, date: ~N[2022-02-13 03:17:00], notes: "some notes"}
-        |> shot_group_fixture(current_user, pack)
+        |> shot_group_fixture(current_user, ammo_group)
 
-      pack = pack_id |> Ammo.get_pack!(current_user)
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
 
       [
         current_user: current_user,
         container: container,
         ammo_type: ammo_type,
-        pack: pack,
+        ammo_group: ammo_group,
         shot_group: shot_group
       ]
     end
 
-    test "get_shot_record_count!/1 returns the correct amount of shot records",
-         %{pack: pack, current_user: current_user} do
-      assert ActivityLog.get_shot_record_count!(current_user) == 1
-
-      shot_group_fixture(%{count: 1, date: ~N[2022-02-13 03:17:00]}, current_user, pack)
-      assert ActivityLog.get_shot_record_count!(current_user) == 2
-
-      shot_group_fixture(%{count: 1, date: ~N[2022-02-13 03:17:00]}, current_user, pack)
-      assert ActivityLog.get_shot_record_count!(current_user) == 3
-
-      other_user = user_fixture()
-      assert ActivityLog.get_shot_record_count!(other_user) == 0
-
-      container = container_fixture(other_user)
-      ammo_type = ammo_type_fixture(other_user)
-      {1, [pack]} = pack_fixture(%{count: 25}, ammo_type, container, other_user)
-      shot_group_fixture(%{count: 1, date: ~N[2022-02-13 03:17:00]}, other_user, pack)
-      assert ActivityLog.get_shot_record_count!(other_user) == 1
-    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
@@ -68,59 +48,60 @@ defmodule Cannery.ActivityLogTest do
     end
 
     test "create_shot_group/3 with valid data creates a shot_group",
-         %{current_user: current_user, pack: pack} do
+         %{current_user: current_user, ammo_group: ammo_group} do
       valid_attrs = %{count: 10, date: ~D[2022-02-13], notes: "some notes"}
 
       assert {:ok, %ShotGroup{} = shot_group} =
-               ActivityLog.create_shot_group(valid_attrs, current_user, pack)
+               ActivityLog.create_shot_group(valid_attrs, current_user, ammo_group)
 
       assert shot_group.count == 10
       assert shot_group.date == ~D[2022-02-13]
       assert shot_group.notes == "some notes"
     end
 
-    test "create_shot_group/3 removes corresponding count from pack",
+    test "create_shot_group/3 removes corresponding count from ammo group",
          %{
            current_user: current_user,
-           pack: %{id: pack_id, count: org_count} = pack
+           ammo_group: %{id: ammo_group_id, count: org_count} = ammo_group
          } do
       valid_attrs = %{count: 10, date: ~D[2022-02-13], notes: "some notes"}
 
       assert {:ok, %ShotGroup{} = shot_group} =
-               ActivityLog.create_shot_group(valid_attrs, current_user, pack)
+               ActivityLog.create_shot_group(valid_attrs, current_user, ammo_group)
 
-      %{count: new_count} = pack_id |> Ammo.get_pack!(current_user)
+      %{count: new_count} = ammo_group_id |> Ammo.get_ammo_group!(current_user)
 
       assert org_count - shot_group.count == new_count
       assert new_count == 10
     end
 
-    test "create_shot_group/3 does not remove more tha pack amount",
-         %{current_user: current_user, pack: %{id: pack_id} = pack} do
+    test "create_shot_group/3 does not remove more than ammo group amount",
+         %{current_user: current_user, ammo_group: %{id: ammo_group_id} = ammo_group} do
       valid_attrs = %{count: 20, date: ~D[2022-02-13], notes: "some notes"}
 
-      assert {:ok, %ShotGroup{}} = ActivityLog.create_shot_group(valid_attrs, current_user, pack)
+      assert {:ok, %ShotGroup{}} =
+               ActivityLog.create_shot_group(valid_attrs, current_user, ammo_group)
 
-      pack = pack_id |> Ammo.get_pack!(current_user)
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
 
-      assert pack.count == 0
+      assert ammo_group.count == 0
 
       assert {:error, %Ecto.Changeset{}} =
-               ActivityLog.create_shot_group(%{count: 1}, current_user, pack)
+               ActivityLog.create_shot_group(%{count: 1}, current_user, ammo_group)
     end
 
     test "create_shot_group/3 with invalid data returns error changeset",
-         %{current_user: current_user, pack: pack} do
+         %{current_user: current_user, ammo_group: ammo_group} do
       invalid_params = %{count: nil, date: nil, notes: nil}
 
       assert {:error, %Ecto.Changeset{}} =
-               ActivityLog.create_shot_group(invalid_params, current_user, pack)
+               ActivityLog.create_shot_group(invalid_params, current_user, ammo_group)
     end
 
-    test "update_shot_group/3 with valid data updates the shot_group and pack",
+    test "update_shot_group/3 with valid data updates the shot_group and ammo_group",
          %{
            shot_group: shot_group,
-           pack: %{id: pack_id},
+           ammo_group: %{id: ammo_group_id},
            current_user: current_user
          } do
       assert {:ok, %ShotGroup{} = shot_group} =
@@ -134,10 +115,10 @@ defmodule Cannery.ActivityLogTest do
                  current_user
                )
 
-      pack = pack_id |> Ammo.get_pack!(current_user)
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
 
       assert shot_group.count == 10
-      assert pack.count == 15
+      assert ammo_group.count == 15
       assert shot_group.date == ~D[2022-02-13]
       assert shot_group.notes == "some updated notes"
 
@@ -152,10 +133,10 @@ defmodule Cannery.ActivityLogTest do
                  current_user
                )
 
-      pack = pack_id |> Ammo.get_pack!(current_user)
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
 
       assert shot_group.count == 25
-      assert pack.count == 0
+      assert ammo_group.count == 0
     end
 
     test "update_shot_group/3 with invalid data returns error changeset",
@@ -178,10 +159,10 @@ defmodule Cannery.ActivityLogTest do
     end
 
     test "delete_shot_group/2 deletes the shot_group and adds value back",
-         %{shot_group: shot_group, current_user: current_user, pack: %{id: pack_id}} do
+         %{shot_group: shot_group, current_user: current_user, ammo_group: %{id: ammo_group_id}} do
       assert {:ok, %ShotGroup{}} = ActivityLog.delete_shot_group(shot_group, current_user)
 
-      assert %{count: 25} = pack_id |> Ammo.get_pack!(current_user)
+      assert %{count: 25} = ammo_group_id |> Ammo.get_ammo_group!(current_user)
 
       assert_raise Ecto.NoResultsError, fn ->
         ActivityLog.get_shot_group!(shot_group.id, current_user)
@@ -189,123 +170,123 @@ defmodule Cannery.ActivityLogTest do
     end
 
     test "get_used_count/2 returns accurate used count", %{
-      pack: pack,
+      ammo_group: ammo_group,
       ammo_type: ammo_type,
       container: container,
       current_user: current_user
     } do
-      {1, [another_pack]} = pack_fixture(ammo_type, container, current_user)
-      assert 0 = another_pack |> ActivityLog.get_used_count(current_user)
-      assert 5 = pack |> ActivityLog.get_used_count(current_user)
+      {1, [another_ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
+      assert 0 = another_ammo_group |> ActivityLog.get_used_count(current_user)
+      assert 5 = ammo_group |> ActivityLog.get_used_count(current_user)
 
-      shot_group_fixture(%{count: 15}, current_user, pack)
-      assert 20 = pack |> ActivityLog.get_used_count(current_user)
+      shot_group_fixture(%{count: 15}, current_user, ammo_group)
+      assert 20 = ammo_group |> ActivityLog.get_used_count(current_user)
 
-      shot_group_fixture(%{count: 10}, current_user, pack)
-      assert 30 = pack |> ActivityLog.get_used_count(current_user)
+      shot_group_fixture(%{count: 10}, current_user, ammo_group)
+      assert 30 = ammo_group |> ActivityLog.get_used_count(current_user)
 
-      {1, [another_pack]} = pack_fixture(ammo_type, container, current_user)
-      assert 0 = another_pack |> ActivityLog.get_used_count(current_user)
+      {1, [another_ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
+      assert 0 = another_ammo_group |> ActivityLog.get_used_count(current_user)
     end
 
     test "get_used_counts/2 returns accurate used counts", %{
-      pack: %{id: pack_id} = pack,
+      ammo_group: %{id: ammo_group_id} = ammo_group,
       ammo_type: ammo_type,
       container: container,
       current_user: current_user
     } do
-      {1, [%{id: another_pack_id} = another_pack]} =
-        pack_fixture(ammo_type, container, current_user)
+      {1, [%{id: another_ammo_group_id} = another_ammo_group]} =
+        ammo_group_fixture(ammo_type, container, current_user)
 
-      assert %{pack_id => 5} ==
-               [pack, another_pack] |> ActivityLog.get_used_counts(current_user)
+      assert %{ammo_group_id => 5} ==
+               [ammo_group, another_ammo_group] |> ActivityLog.get_used_counts(current_user)
 
-      shot_group_fixture(%{count: 5}, current_user, another_pack)
-      used_counts = [pack, another_pack] |> ActivityLog.get_used_counts(current_user)
-      assert %{^pack_id => 5} = used_counts
-      assert %{^another_pack_id => 5} = used_counts
+      shot_group_fixture(%{count: 5}, current_user, another_ammo_group)
+      used_counts = [ammo_group, another_ammo_group] |> ActivityLog.get_used_counts(current_user)
+      assert %{^ammo_group_id => 5} = used_counts
+      assert %{^another_ammo_group_id => 5} = used_counts
 
-      shot_group_fixture(%{count: 15}, current_user, pack)
-      used_counts = [pack, another_pack] |> ActivityLog.get_used_counts(current_user)
-      assert %{^pack_id => 20} = used_counts
-      assert %{^another_pack_id => 5} = used_counts
+      shot_group_fixture(%{count: 15}, current_user, ammo_group)
+      used_counts = [ammo_group, another_ammo_group] |> ActivityLog.get_used_counts(current_user)
+      assert %{^ammo_group_id => 20} = used_counts
+      assert %{^another_ammo_group_id => 5} = used_counts
 
-      shot_group_fixture(%{count: 10}, current_user, pack)
-      used_counts = [pack, another_pack] |> ActivityLog.get_used_counts(current_user)
-      assert %{^pack_id => 30} = used_counts
-      assert %{^another_pack_id => 5} = used_counts
+      shot_group_fixture(%{count: 10}, current_user, ammo_group)
+      used_counts = [ammo_group, another_ammo_group] |> ActivityLog.get_used_counts(current_user)
+      assert %{^ammo_group_id => 30} = used_counts
+      assert %{^another_ammo_group_id => 5} = used_counts
     end
 
     test "get_last_used_date/2 returns accurate used count", %{
-      pack: pack,
+      ammo_group: ammo_group,
       ammo_type: ammo_type,
       container: container,
       shot_group: %{date: date},
       current_user: current_user
     } do
-      {1, [another_pack]} = pack_fixture(ammo_type, container, current_user)
-      assert another_pack |> ActivityLog.get_last_used_date(current_user) |> is_nil()
-      assert ^date = pack |> ActivityLog.get_last_used_date(current_user)
+      {1, [another_ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
+      assert another_ammo_group |> ActivityLog.get_last_used_date(current_user) |> is_nil()
+      assert ^date = ammo_group |> ActivityLog.get_last_used_date(current_user)
 
-      %{date: date} = shot_group_fixture(%{date: ~D[2022-11-10]}, current_user, pack)
-      assert ^date = pack |> ActivityLog.get_last_used_date(current_user)
+      %{date: date} = shot_group_fixture(%{date: ~D[2022-11-10]}, current_user, ammo_group)
+      assert ^date = ammo_group |> ActivityLog.get_last_used_date(current_user)
 
-      %{date: date} = shot_group_fixture(%{date: ~D[2022-11-11]}, current_user, pack)
-      assert ^date = pack |> ActivityLog.get_last_used_date(current_user)
+      %{date: date} = shot_group_fixture(%{date: ~D[2022-11-11]}, current_user, ammo_group)
+      assert ^date = ammo_group |> ActivityLog.get_last_used_date(current_user)
     end
 
     test "get_last_used_dates/2 returns accurate used counts", %{
-      pack: %{id: pack_id} = pack,
+      ammo_group: %{id: ammo_group_id} = ammo_group,
       ammo_type: ammo_type,
       container: container,
       shot_group: %{date: date},
       current_user: current_user
     } do
-      {1, [%{id: another_pack_id} = another_pack]} =
-        pack_fixture(ammo_type, container, current_user)
+      {1, [%{id: another_ammo_group_id} = another_ammo_group]} =
+        ammo_group_fixture(ammo_type, container, current_user)
 
       # unset date
-      assert %{pack_id => date} ==
-               [pack, another_pack] |> ActivityLog.get_last_used_dates(current_user)
+      assert %{ammo_group_id => date} ==
+               [ammo_group, another_ammo_group] |> ActivityLog.get_last_used_dates(current_user)
 
-      shot_group_fixture(%{date: ~D[2022-11-09]}, current_user, another_pack)
+      shot_group_fixture(%{date: ~D[2022-11-09]}, current_user, another_ammo_group)
 
       # setting initial date
       last_used_shot_groups =
-        [pack, another_pack] |> ActivityLog.get_last_used_dates(current_user)
+        [ammo_group, another_ammo_group] |> ActivityLog.get_last_used_dates(current_user)
 
-      assert %{^pack_id => ^date} = last_used_shot_groups
-      assert %{^another_pack_id => ~D[2022-11-09]} = last_used_shot_groups
+      assert %{^ammo_group_id => ^date} = last_used_shot_groups
+      assert %{^another_ammo_group_id => ~D[2022-11-09]} = last_used_shot_groups
 
       # setting another date
-      shot_group_fixture(%{date: ~D[2022-11-10]}, current_user, pack)
+      shot_group_fixture(%{date: ~D[2022-11-10]}, current_user, ammo_group)
 
       last_used_shot_groups =
-        [pack, another_pack] |> ActivityLog.get_last_used_dates(current_user)
+        [ammo_group, another_ammo_group] |> ActivityLog.get_last_used_dates(current_user)
 
-      assert %{^pack_id => ~D[2022-11-10]} = last_used_shot_groups
-      assert %{^another_pack_id => ~D[2022-11-09]} = last_used_shot_groups
+      assert %{^ammo_group_id => ~D[2022-11-10]} = last_used_shot_groups
+      assert %{^another_ammo_group_id => ~D[2022-11-09]} = last_used_shot_groups
 
       # setting yet another date
-      shot_group_fixture(%{date: ~D[2022-11-11]}, current_user, pack)
+      shot_group_fixture(%{date: ~D[2022-11-11]}, current_user, ammo_group)
 
       last_used_shot_groups =
-        [pack, another_pack] |> ActivityLog.get_last_used_dates(current_user)
+        [ammo_group, another_ammo_group] |> ActivityLog.get_last_used_dates(current_user)
 
-      assert %{^pack_id => ~D[2022-11-11]} = last_used_shot_groups
-      assert %{^another_pack_id => ~D[2022-11-09]} = last_used_shot_groups
+      assert %{^ammo_group_id => ~D[2022-11-11]} = last_used_shot_groups
+      assert %{^another_ammo_group_id => ~D[2022-11-09]} = last_used_shot_groups
     end
 
     test "get_used_count_for_ammo_type/2 gets accurate used round count for ammo type",
-         %{ammo_type: ammo_type, pack: pack, current_user: current_user} do
+         %{ammo_type: ammo_type, ammo_group: ammo_group, current_user: current_user} do
       another_ammo_type = ammo_type_fixture(current_user)
       assert 0 = another_ammo_type |> ActivityLog.get_used_count_for_ammo_type(current_user)
       assert 5 = ammo_type |> ActivityLog.get_used_count_for_ammo_type(current_user)
 
-      shot_group_fixture(%{count: 5}, current_user, pack)
+      shot_group_fixture(%{count: 5}, current_user, ammo_group)
       assert 10 = ammo_type |> ActivityLog.get_used_count_for_ammo_type(current_user)
 
-      shot_group_fixture(%{count: 1}, current_user, pack)
+      shot_group_fixture(%{count: 1}, current_user, ammo_group)
       assert 11 = ammo_type |> ActivityLog.get_used_count_for_ammo_type(current_user)
     end
 
@@ -316,14 +297,14 @@ defmodule Cannery.ActivityLogTest do
     } do
       # testing unused ammo type
       %{id: another_ammo_type_id} = another_ammo_type = ammo_type_fixture(current_user)
-      {1, [pack]} = pack_fixture(another_ammo_type, container, current_user)
+      {1, [ammo_group]} = ammo_group_fixture(another_ammo_type, container, current_user)
 
       assert %{ammo_type_id => 5} ==
                [ammo_type, another_ammo_type]
                |> ActivityLog.get_used_count_for_ammo_types(current_user)
 
-      # use generated pack
-      shot_group_fixture(%{count: 5}, current_user, pack)
+      # use generated ammo group
+      shot_group_fixture(%{count: 5}, current_user, ammo_group)
 
       used_counts =
         [ammo_type, another_ammo_type] |> ActivityLog.get_used_count_for_ammo_types(current_user)
@@ -331,8 +312,8 @@ defmodule Cannery.ActivityLogTest do
       assert %{^ammo_type_id => 5} = used_counts
       assert %{^another_ammo_type_id => 5} = used_counts
 
-      # use generated pack again
-      shot_group_fixture(%{count: 1}, current_user, pack)
+      # use generated ammo group again
+      shot_group_fixture(%{count: 1}, current_user, ammo_group)
 
       used_counts =
         [ammo_type, another_ammo_type] |> ActivityLog.get_used_count_for_ammo_types(current_user)
@@ -347,13 +328,13 @@ defmodule Cannery.ActivityLogTest do
       current_user = user_fixture()
       container = container_fixture(current_user)
       ammo_type = ammo_type_fixture(current_user)
-      {1, [pack]} = pack_fixture(ammo_type, container, current_user)
+      {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
 
       [
         current_user: current_user,
         container: container,
         ammo_type: ammo_type,
-        pack: pack
+        ammo_group: ammo_group
       ]
     end
 
@@ -364,21 +345,21 @@ defmodule Cannery.ActivityLogTest do
 
       for class <- ["rifle", "shotgun", "pistol"] do
         other_ammo_type = ammo_type_fixture(%{class: class}, other_user)
-        {1, [other_pack]} = pack_fixture(other_ammo_type, other_container, other_user)
-        shot_group_fixture(other_user, other_pack)
+        {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(%{class: :rifle}, current_user)
-      {1, [rifle_pack]} = pack_fixture(rifle_ammo_type, container, current_user)
-      rifle_shot_group = shot_group_fixture(current_user, rifle_pack)
+      {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(%{class: :shotgun}, current_user)
-      {1, [shotgun_pack]} = pack_fixture(shotgun_ammo_type, container, current_user)
-      shotgun_shot_group = shot_group_fixture(current_user, shotgun_pack)
+      {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(%{class: :pistol}, current_user)
-      {1, [pistol_pack]} = pack_fixture(pistol_ammo_type, container, current_user)
-      pistol_shot_group = shot_group_fixture(current_user, pistol_pack)
+      {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)
@@ -399,35 +380,37 @@ defmodule Cannery.ActivityLogTest do
 
     test "list_shot_groups/3 returns relevant shot_groups for a search", %{
       ammo_type: ammo_type,
-      pack: pack,
+      ammo_group: ammo_group,
       container: container,
       current_user: current_user
     } do
-      shot_group_a = shot_group_fixture(%{notes: "amazing"}, current_user, pack)
+      shot_group_a = shot_group_fixture(%{notes: "amazing"}, current_user, ammo_group)
 
-      {1, [another_pack]} =
-        pack_fixture(%{notes: "stupendous"}, ammo_type, container, current_user)
+      {1, [another_ammo_group]} =
+        ammo_group_fixture(%{notes: "stupendous"}, ammo_type, container, current_user)
 
-      shot_group_b = shot_group_fixture(current_user, another_pack)
+      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_pack]} = pack_fixture(another_ammo_type, container, 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_pack)
+      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_pack]} = pack_fixture(another_ammo_type, another_container, another_user)
+      {1, [another_ammo_group]} =
+        ammo_group_fixture(another_ammo_type, another_container, another_user)
 
-      _shouldnt_return = shot_group_fixture(another_user, another_pack)
+      _shouldnt_return = shot_group_fixture(another_user, another_ammo_group)
 
       # notes
       assert ActivityLog.list_shot_groups("amazing", :all, current_user) == [shot_group_a]
 
-      # pack attributes
+      # ammo group attributes
       assert ActivityLog.list_shot_groups("stupendous", :all, current_user) == [shot_group_b]
 
       # ammo type attributes

test/cannery_web/controllers/export_controller_test.exs

@@ -15,13 +15,13 @@ defmodule CanneryWeb.ExportControllerTest do
     container = container_fixture(current_user)
     tag = tag_fixture(current_user)
     Containers.add_tag!(container, tag, current_user)
-    {1, [pack]} = pack_fixture(ammo_type, container, current_user)
-    shot_group = shot_group_fixture(current_user, pack)
-    pack = pack |> Repo.reload!()
+    {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
+    shot_group = shot_group_fixture(current_user, ammo_group)
+    ammo_group = ammo_group |> Repo.reload!()
 
     %{
       ammo_type: ammo_type,
-      pack: pack,
+      ammo_group: ammo_group,
       container: container,
       shot_group: shot_group,
       tag: tag
@@ -36,24 +36,24 @@ defmodule CanneryWeb.ExportControllerTest do
       current_user: current_user,
       container: container,
       ammo_type: ammo_type,
-      pack: pack,
+      ammo_group: ammo_group,
       shot_group: shot_group,
       tag: tag
     } do
       conn = get(conn, Routes.export_path(conn, :export, :json))
 
-      ideal_pack = %{
-        "ammo_type_id" => pack.ammo_type_id,
-        "container_id" => pack.container_id,
-        "count" => pack.count,
-        "id" => pack.id,
-        "notes" => pack.notes,
-        "price_paid" => pack.price_paid,
-        "staged" => pack.staged,
-        "used_count" => pack |> ActivityLog.get_used_count(current_user),
-        "original_count" => pack |> Ammo.get_original_count(current_user),
-        "cpr" => pack |> Ammo.get_cpr(current_user),
-        "percentage_remaining" => pack |> Ammo.get_percentage_remaining(current_user)
+      ideal_ammo_group = %{
+        "ammo_type_id" => ammo_group.ammo_type_id,
+        "container_id" => ammo_group.container_id,
+        "count" => ammo_group.count,
+        "id" => ammo_group.id,
+        "notes" => ammo_group.notes,
+        "price_paid" => ammo_group.price_paid,
+        "staged" => ammo_group.staged,
+        "used_count" => ammo_group |> ActivityLog.get_used_count(current_user),
+        "original_count" => ammo_group |> Ammo.get_original_count(current_user),
+        "cpr" => ammo_group |> Ammo.get_cpr(current_user),
+        "percentage_remaining" => ammo_group |> Ammo.get_percentage_remaining(current_user)
       }
 
       ideal_ammo_type = %{
@@ -82,8 +82,9 @@ defmodule CanneryWeb.ExportControllerTest do
         "average_cost" => ammo_type |> Ammo.get_average_cost_for_ammo_type(current_user),
         "round_count" => ammo_type |> Ammo.get_round_count_for_ammo_type(current_user),
         "used_count" => ammo_type |> ActivityLog.get_used_count_for_ammo_type(current_user),
-        "pack_count" => ammo_type |> Ammo.get_packs_count_for_type(current_user),
-        "total_pack_count" => ammo_type |> Ammo.get_packs_count_for_type(current_user, true)
+        "ammo_group_count" => ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user),
+        "total_ammo_group_count" =>
+          ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
       }
 
       ideal_container = %{
@@ -100,12 +101,13 @@ defmodule CanneryWeb.ExportControllerTest do
           }
         ],
         "type" => container.type,
-        "pack_count" => container |> Ammo.get_packs_count_for_container!(current_user),
+        "ammo_group_count" =>
+          container |> Ammo.get_ammo_groups_count_for_container!(current_user),
         "round_count" => container |> Ammo.get_round_count_for_container!(current_user)
       }
 
       ideal_shot_group = %{
-        "pack_id" => shot_group.pack_id,
+        "ammo_group_id" => shot_group.ammo_group_id,
         "count" => shot_group.count,
         "date" => to_string(shot_group.date),
         "id" => shot_group.id,
@@ -124,7 +126,7 @@ defmodule CanneryWeb.ExportControllerTest do
       }
 
       json_resp = conn |> json_response(200)
-      assert %{"packs" => [^ideal_pack]} = json_resp
+      assert %{"ammo_groups" => [^ideal_ammo_group]} = json_resp
       assert %{"ammo_types" => [^ideal_ammo_type]} = json_resp
       assert %{"containers" => [^ideal_container]} = json_resp
       assert %{"shot_groups" => [^ideal_shot_group]} = json_resp

test/cannery_web/live/ammo_group_live_test.exs

@@ -0,0 +1,461 @@
+defmodule CanneryWeb.AmmoGroupLiveTest do
+  @moduledoc """
+  Tests ammo group live pages
+  """
+
+  use CanneryWeb.ConnCase
+  import Phoenix.LiveViewTest
+  alias Cannery.{Ammo, Repo}
+
+  @moduletag :ammo_group_live_test
+  @create_attrs %{count: 42, notes: "some notes", price_paid: 120.5}
+  @update_attrs %{count: 43, notes: "some updated notes", price_paid: 456.7}
+  @invalid_attrs %{count: nil, notes: nil, price_paid: nil}
+  @ammo_group_create_limit 10_000
+  @shot_group_create_attrs %{ammo_left: 5, notes: "some notes"}
+  @shot_group_update_attrs %{
+    count: 5,
+    date: ~N[2022-02-13 03:17:00],
+    notes: "some updated notes"
+  }
+  @shot_group_invalid_attrs %{ammo_left: nil, count: nil, notes: nil}
+  @empty_attrs %{
+    price_paid: 50,
+    count: 20
+  }
+  @shot_group_attrs %{
+    price_paid: 50,
+    count: 20
+  }
+
+  defp create_ammo_group(%{current_user: current_user}) do
+    ammo_type = ammo_type_fixture(current_user)
+    container = container_fixture(current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@create_attrs, ammo_type, container, current_user)
+    [ammo_type: ammo_type, ammo_group: ammo_group, container: container]
+  end
+
+  defp create_shot_group(%{current_user: current_user, ammo_group: ammo_group}) do
+    shot_group = shot_group_fixture(@shot_group_update_attrs, current_user, ammo_group)
+    ammo_group = ammo_group |> Repo.reload!()
+    [ammo_group: ammo_group, shot_group: shot_group]
+  end
+
+  defp create_empty_ammo_group(%{
+         current_user: current_user,
+         ammo_type: ammo_type,
+         container: container
+       }) do
+    {1, [ammo_group]} = ammo_group_fixture(@empty_attrs, ammo_type, container, current_user)
+    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
+    ammo_group = ammo_group |> Repo.reload!()
+    [empty_ammo_group: ammo_group, shot_group: shot_group]
+  end
+
+  describe "Index of ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_group]
+
+    test "lists all ammo_groups", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, _index_live, html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+      ammo_group = ammo_group |> Repo.preload(:ammo_type)
+      assert html =~ "Ammo"
+      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(%{class: :rifle}, current_user)
+      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_type, container, current_user)
+      shotgun_type = ammo_type_fixture(%{class: :shotgun}, current_user)
+      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_type, container, current_user)
+      pistol_type = ammo_type_fixture(%{class: :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_class"]/)
+        |> render_change(ammo_type: %{class: :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_class"]/)
+        |> render_change(ammo_type: %{class: :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_class"]/)
+        |> render_change(ammo_type: %{class: :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_class"]/)
+        |> render_change(ammo_type: %{class: :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))
+
+      ammo_group = ammo_group |> Repo.preload(:ammo_type)
+
+      assert html =~ ammo_group.ammo_type.name
+
+      assert index_live
+             |> form(~s/form[phx-change="search"]/)
+             |> render_change(search: %{search_term: ammo_group.ammo_type.name}) =~
+               ammo_group.ammo_type.name
+
+      assert_patch(
+        index_live,
+        Routes.ammo_group_index_path(conn, :search, ammo_group.ammo_type.name)
+      )
+
+      refute index_live
+             |> form(~s/form[phx-change="search"]/)
+             |> render_change(search: %{search_term: "something_else"}) =~
+               ammo_group.ammo_type.name
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :search, "something_else"))
+
+      assert index_live
+             |> form(~s/form[phx-change="search"]/)
+             |> render_change(search: %{search_term: ""}) =~ ammo_group.ammo_type.name
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :index))
+    end
+
+    test "saves a single new ammo_group", %{conn: conn} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live |> element("a", "Add Ammo") |> render_click() =~ "Add Ammo"
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_change(ammo_group: @invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form")
+        |> render_submit(ammo_group: @create_attrs)
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ "Ammo added successfully"
+      assert html =~ "\n42\n"
+    end
+
+    test "saves multiple new ammo_groups", %{conn: conn, current_user: current_user} do
+      multiplier = 25
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live |> element("a", "Add Ammo") |> render_click() =~ "Add Ammo"
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_change(ammo_group: @invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form")
+        |> render_submit(ammo_group: @create_attrs |> Map.put(:multiplier, multiplier))
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ "Ammo added successfully"
+      assert Ammo.list_ammo_groups(nil, :all, current_user) |> Enum.count() == multiplier + 1
+    end
+
+    test "does not save invalid number of new ammo_groups", %{conn: conn} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live |> element("a", "Add Ammo") |> render_click() =~ "Add Ammo"
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_change(ammo_group: @invalid_attrs) =~ "can't be blank"
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_submit(ammo_group: @create_attrs |> Map.put(:multiplier, "0")) =~
+               "Invalid number of copies, must be between 1 and #{@ammo_group_create_limit}. Was 0"
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_submit(
+               ammo_group: @create_attrs |> Map.put(:multiplier, @ammo_group_create_limit + 1)
+             ) =~
+               "Invalid number of copies, must be between 1 and #{@ammo_group_create_limit}. Was #{@ammo_group_create_limit + 1}"
+    end
+
+    test "updates ammo_group in listing", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live
+             |> element(~s/a[aria-label="Edit ammo group of #{ammo_group.count} bullets"]/)
+             |> render_click() =~ "Edit ammo"
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :edit, ammo_group))
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_change(ammo_group: @invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form")
+        |> render_submit(ammo_group: @update_attrs)
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ "Ammo updated successfully"
+      assert html =~ "\n43\n"
+    end
+
+    test "clones ammo_group in listing", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      html =
+        index_live
+        |> element(~s/a[aria-label="Clone ammo group of #{ammo_group.count} bullets"]/)
+        |> render_click()
+
+      assert html =~ "Add Ammo"
+      assert html =~ "$#{display_currency(120.5)}"
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :clone, ammo_group))
+
+      {:ok, _index_live, html} =
+        index_live
+        |> form("#ammo_group-form")
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ "Ammo added successfully"
+      assert html =~ "\n42\n"
+      assert html =~ "$#{display_currency(120.5)}"
+    end
+
+    test "checks validity when cloning", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      html =
+        index_live
+        |> element(~s/a[aria-label="Clone ammo group of #{ammo_group.count} bullets"]/)
+        |> render_click()
+
+      assert html =~ "Add Ammo"
+      assert html =~ "$#{display_currency(120.5)}"
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :clone, ammo_group))
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_change(ammo_group: @invalid_attrs) =~ "can't be blank"
+    end
+
+    test "clones ammo_group in listing with updates", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      html =
+        index_live
+        |> element(~s/a[aria-label="Clone ammo group of #{ammo_group.count} bullets"]/)
+        |> render_click()
+
+      assert html =~ "Add Ammo"
+      assert html =~ "$#{display_currency(120.5)}"
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :clone, ammo_group))
+
+      assert index_live
+             |> form("#ammo_group-form")
+             |> render_change(ammo_group: @invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form")
+        |> render_submit(ammo_group: @create_attrs |> Map.put(:count, 43))
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ "Ammo added successfully"
+      assert html =~ "\n43\n"
+      assert html =~ "$#{display_currency(120.5)}"
+    end
+
+    test "deletes ammo_group in listing", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live
+             |> element(~s/a[aria-label="Delete ammo group of #{ammo_group.count} bullets"]/)
+             |> render_click()
+
+      refute has_element?(index_live, "#ammo_group-#{ammo_group.id}")
+    end
+
+    test "saves new shot_group", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live |> element("a", "Record shots") |> render_click() =~ "Record shots"
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :add_shot_group, ammo_group))
+
+      assert index_live
+             |> form("#shot-group-form")
+             |> render_change(shot_group: @shot_group_invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#shot-group-form")
+        |> render_submit(shot_group: @shot_group_create_attrs)
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ "Shots recorded successfully"
+    end
+
+    @spec display_currency(float()) :: String.t()
+    defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
+  end
+
+  describe "Index of empty ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_group, :create_empty_ammo_group]
+
+    test "hides empty ammo groups by default", %{
+      conn: conn,
+      empty_ammo_group: ammo_group,
+      current_user: current_user
+    } do
+      {:ok, show_live, html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ "Show used"
+      refute html =~ "$#{display_currency(50.00)}"
+
+      percentage = ammo_group |> Ammo.get_percentage_remaining(current_user)
+      refute html =~ "\n#{"#{percentage}%"}\n"
+
+      html =
+        show_live
+        |> element(~s/input[type="checkbox"][aria-labelledby="toggle_show_used-label"}]/)
+        |> render_click()
+
+      assert html =~ "$#{display_currency(50.00)}"
+      percentage = ammo_group |> Ammo.get_percentage_remaining(current_user)
+      assert html =~ "\n#{"#{percentage}%"}\n"
+    end
+  end
+
+  describe "Show ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_group]
+
+    test "displays ammo_group", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, _show_live, html} = live(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
+      ammo_group = ammo_group |> Repo.preload(:ammo_type)
+      assert html =~ "Show Ammo"
+      assert html =~ ammo_group.ammo_type.name
+    end
+
+    test "updates ammo_group within modal", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, show_live, _html} = live(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
+
+      assert show_live
+             |> element(~s/a[aria-label="Edit ammo group of #{ammo_group.count} bullets"]/)
+             |> render_click() =~ "Edit Ammo"
+
+      assert_patch(show_live, Routes.ammo_group_show_path(conn, :edit, ammo_group))
+
+      assert show_live
+             |> form("#ammo_group-form")
+             |> render_change(ammo_group: @invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        show_live
+        |> form("#ammo_group-form")
+        |> render_submit(ammo_group: @update_attrs)
+        |> follow_redirect(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
+
+      assert html =~ "Ammo updated successfully"
+      assert html =~ "some updated notes"
+    end
+
+    test "saves new shot_group", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
+
+      assert index_live |> element("a", "Record shots") |> render_click() =~ "Record shots"
+      assert_patch(index_live, Routes.ammo_group_show_path(conn, :add_shot_group, ammo_group))
+
+      assert index_live
+             |> form("#shot-group-form")
+             |> render_change(shot_group: @shot_group_invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#shot-group-form")
+        |> render_submit(shot_group: @shot_group_create_attrs)
+        |> follow_redirect(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
+
+      assert html =~ "Shots recorded successfully"
+    end
+  end
+
+  describe "Show ammo group with shot group" do
+    setup [:register_and_log_in_user, :create_ammo_group, :create_shot_group]
+
+    test "updates shot_group in listing",
+         %{conn: conn, ammo_group: ammo_group, shot_group: shot_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_show_path(conn, :edit, ammo_group))
+
+      assert index_live
+             |> element(~s/a[aria-label="Edit shot group of #{shot_group.count} shots"]/)
+             |> render_click() =~ "Edit Shot Records"
+
+      assert_patch(
+        index_live,
+        Routes.ammo_group_show_path(conn, :edit_shot_group, ammo_group, shot_group)
+      )
+
+      assert index_live
+             |> form("#shot-group-form")
+             |> render_change(shot_group: @shot_group_invalid_attrs) =~ "can't be blank"
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#shot-group-form")
+        |> render_submit(shot_group: @shot_group_update_attrs)
+        |> follow_redirect(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
+
+      assert html =~ "Shot records updated successfully"
+      assert html =~ "some updated notes"
+    end
+
+    test "deletes shot_group in listing",
+         %{conn: conn, ammo_group: ammo_group, shot_group: shot_group} do
+      {:ok, index_live, _html} =
+        live(conn, Routes.ammo_group_show_path(conn, :edit_shot_group, ammo_group, shot_group))
+
+      assert index_live
+             |> element(~s/a[aria-label="Delete shot record of #{shot_group.count} shots"]/)
+             |> render_click()
+
+      refute has_element?(index_live, "#shot_group-#{shot_group.id}")
+    end
+  end
+end

test/cannery_web/live/ammo_type_live_test.exs

@@ -33,8 +33,8 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     name: nil,
     grains: nil
   }
-  @pack_attrs %{
-    notes: "some pack",
+  @ammo_group_attrs %{
+    notes: "some ammo group",
     count: 20
   }
   @shot_group_attrs %{
@@ -46,18 +46,18 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     [ammo_type: ammo_type_fixture(@create_attrs, current_user)]
   end
 
-  defp create_pack(%{ammo_type: ammo_type, current_user: current_user}) do
+  defp create_ammo_group(%{ammo_type: ammo_type, current_user: current_user}) do
     container = container_fixture(current_user)
-    {1, [pack]} = pack_fixture(@pack_attrs, ammo_type, container, current_user)
-    [pack: pack, container: container]
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
+    [ammo_group: ammo_group, container: container]
   end
 
-  defp create_empty_pack(%{ammo_type: ammo_type, current_user: current_user}) do
+  defp create_empty_ammo_group(%{ammo_type: ammo_type, current_user: current_user}) do
     container = container_fixture(current_user)
-    {1, [pack]} = pack_fixture(@pack_attrs, ammo_type, container, current_user)
-    shot_group = shot_group_fixture(@shot_group_attrs, current_user, pack)
-    pack = pack |> Repo.reload!()
-    [pack: pack, container: container, shot_group: shot_group]
+    {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_group: ammo_group, container: container, shot_group: shot_group]
   end
 
   describe "Index" do
@@ -248,11 +248,11 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     end
   end
 
-  describe "Index with pack" do
-    setup [:register_and_log_in_user, :create_ammo_type, :create_pack]
+  describe "Index with ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_type, :create_ammo_group]
 
-    test "shows used packs on toggle",
-         %{conn: conn, pack: pack, current_user: current_user} do
+    test "shows used ammo groups on toggle",
+         %{conn: conn, ammo_group: ammo_group, current_user: current_user} do
       {:ok, index_live, html} = live(conn, Routes.ammo_type_index_path(conn, :index))
 
       assert html =~ "Show used"
@@ -275,7 +275,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ "\n0\n"
       assert html =~ "\n1\n"
 
-      shot_group_fixture(%{count: 5}, current_user, pack)
+      shot_group_fixture(%{count: 5}, current_user, ammo_group)
 
       {:ok, index_live, _html} = live(conn, Routes.ammo_type_index_path(conn, :index))
 
@@ -327,10 +327,10 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     end
   end
 
-  describe "Show ammo type with pack" do
-    setup [:register_and_log_in_user, :create_ammo_type, :create_pack]
+  describe "Show ammo type with ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_type, :create_ammo_group]
 
-    test "displays pack", %{
+    test "displays ammo group", %{
       conn: conn,
       ammo_type: %{name: ammo_type_name} = ammo_type,
       container: %{name: container_name}
@@ -342,7 +342,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ container_name
     end
 
-    test "displays pack in table",
+    test "displays ammo group in table",
          %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
       {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
@@ -356,10 +356,10 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     end
   end
 
-  describe "Show ammo type with empty pack" do
-    setup [:register_and_log_in_user, :create_ammo_type, :create_empty_pack]
+  describe "Show ammo type with empty ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_type, :create_empty_ammo_group]
 
-    test "displays empty packs on toggle",
+    test "displays empty ammo groups on toggle",
          %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
       {:ok, show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
       assert html =~ "Show used"
@@ -375,7 +375,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ container_name
     end
 
-    test "displays empty packs in table on toggle",
+    test "displays empty ammo groups in table on toggle",
          %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
       {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 

test/cannery_web/live/container_live_test.exs

@@ -30,8 +30,8 @@ defmodule CanneryWeb.ContainerLiveTest do
     name: "some name",
     grains: 120
   }
-  @pack_attrs %{
-    notes: "some pack",
+  @ammo_group_attrs %{
+    notes: "some ammo group",
     count: 20
   }
 
@@ -40,11 +40,11 @@ defmodule CanneryWeb.ContainerLiveTest do
     [container: container]
   end
 
-  defp create_pack(%{container: container, current_user: current_user}) do
+  defp create_ammo_group(%{container: container, current_user: current_user}) do
     ammo_type = ammo_type_fixture(@ammo_type_attrs, current_user)
-    {1, [pack]} = pack_fixture(@pack_attrs, ammo_type, container, current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
 
-    [ammo_type: ammo_type, pack: pack]
+    [ammo_type: ammo_type, ammo_group: ammo_group]
   end
 
   describe "Index" do
@@ -246,62 +246,62 @@ defmodule CanneryWeb.ContainerLiveTest do
     test "can sort by type",
          %{conn: conn, container: container, current_user: current_user} do
       rifle_type = ammo_type_fixture(%{class: :rifle}, current_user)
-      {1, [rifle_pack]} = pack_fixture(rifle_type, container, current_user)
+      {1, [rifle_ammo_group]} = ammo_group_fixture(rifle_type, container, current_user)
       shotgun_type = ammo_type_fixture(%{class: :shotgun}, current_user)
-      {1, [shotgun_pack]} = pack_fixture(shotgun_type, container, current_user)
+      {1, [shotgun_ammo_group]} = ammo_group_fixture(shotgun_type, container, current_user)
       pistol_type = ammo_type_fixture(%{class: :pistol}, current_user)
-      {1, [pistol_pack]} = pack_fixture(pistol_type, container, 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_pack.ammo_type.name
-      assert html =~ shotgun_pack.ammo_type.name
-      assert html =~ pistol_pack.ammo_type.name
+      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_class"]/)
         |> render_change(ammo_type: %{class: :rifle})
 
-      assert html =~ rifle_pack.ammo_type.name
-      refute html =~ shotgun_pack.ammo_type.name
-      refute html =~ pistol_pack.ammo_type.name
+      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_class"]/)
         |> render_change(ammo_type: %{class: :shotgun})
 
-      refute html =~ rifle_pack.ammo_type.name
-      assert html =~ shotgun_pack.ammo_type.name
-      refute html =~ pistol_pack.ammo_type.name
+      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_class"]/)
         |> render_change(ammo_type: %{class: :pistol})
 
-      refute html =~ rifle_pack.ammo_type.name
-      refute html =~ shotgun_pack.ammo_type.name
-      assert html =~ pistol_pack.ammo_type.name
+      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_class"]/)
         |> render_change(ammo_type: %{class: :all})
 
-      assert html =~ rifle_pack.ammo_type.name
-      assert html =~ shotgun_pack.ammo_type.name
-      assert html =~ pistol_pack.ammo_type.name
+      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 pack" do
-    setup [:register_and_log_in_user, :create_container, :create_pack]
+  describe "Show with ammo group" do
+    setup [:register_and_log_in_user, :create_container, :create_ammo_group]
 
-    test "displays pack",
+    test "displays ammo group",
          %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
       {:ok, _show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
 
@@ -309,7 +309,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       assert html =~ "\n20\n"
     end
 
-    test "displays pack in table",
+    test "displays ammo group in table",
          %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
       {:ok, show_live, _html} = live(conn, Routes.container_show_path(conn, :show, container))
 

test/cannery_web/live/pack_live_test.exs

@@ -1,459 +0,0 @@
-defmodule CanneryWeb.PackLiveTest do
-  @moduledoc """
-  Tests pack live pages
-  """
-
-  use CanneryWeb.ConnCase
-  import Phoenix.LiveViewTest
-  alias Cannery.{Ammo, Repo}
-
-  @moduletag :pack_live_test
-  @create_attrs %{count: 42, notes: "some notes", price_paid: 120.5}
-  @update_attrs %{count: 43, notes: "some updated notes", price_paid: 456.7}
-  @invalid_attrs %{count: nil, notes: nil, price_paid: nil}
-  @pack_create_limit 10_000
-  @shot_group_create_attrs %{ammo_left: 5, notes: "some notes"}
-  @shot_group_update_attrs %{
-    count: 5,
-    date: ~N[2022-02-13 03:17:00],
-    notes: "some updated notes"
-  }
-  @shot_group_invalid_attrs %{ammo_left: nil, count: nil, notes: nil}
-  @empty_attrs %{
-    price_paid: 50,
-    count: 20
-  }
-  @shot_group_attrs %{
-    price_paid: 50,
-    count: 20
-  }
-
-  defp create_pack(%{current_user: current_user}) do
-    ammo_type = ammo_type_fixture(current_user)
-    container = container_fixture(current_user)
-    {1, [pack]} = pack_fixture(@create_attrs, ammo_type, container, current_user)
-    [ammo_type: ammo_type, pack: pack, container: container]
-  end
-
-  defp create_shot_group(%{current_user: current_user, pack: pack}) do
-    shot_group = shot_group_fixture(@shot_group_update_attrs, current_user, pack)
-    pack = pack |> Repo.reload!()
-    [pack: pack, shot_group: shot_group]
-  end
-
-  defp create_empty_pack(%{
-         current_user: current_user,
-         ammo_type: ammo_type,
-         container: container
-       }) do
-    {1, [pack]} = pack_fixture(@empty_attrs, ammo_type, container, current_user)
-    shot_group = shot_group_fixture(@shot_group_attrs, current_user, pack)
-    pack = pack |> Repo.reload!()
-    [empty_pack: pack, shot_group: shot_group]
-  end
-
-  describe "Index of pack" do
-    setup [:register_and_log_in_user, :create_pack]
-
-    test "lists all packs", %{conn: conn, pack: pack} do
-      {:ok, _index_live, html} = live(conn, Routes.pack_index_path(conn, :index))
-      pack = pack |> Repo.preload(:ammo_type)
-      assert html =~ "Ammo"
-      assert html =~ pack.ammo_type.name
-    end
-
-    test "can sort by type",
-         %{conn: conn, container: container, current_user: current_user} do
-      rifle_type = ammo_type_fixture(%{class: :rifle}, current_user)
-      {1, [rifle_pack]} = pack_fixture(rifle_type, container, current_user)
-      shotgun_type = ammo_type_fixture(%{class: :shotgun}, current_user)
-      {1, [shotgun_pack]} = pack_fixture(shotgun_type, container, current_user)
-      pistol_type = ammo_type_fixture(%{class: :pistol}, current_user)
-      {1, [pistol_pack]} = pack_fixture(pistol_type, container, current_user)
-
-      {:ok, index_live, html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "All"
-
-      assert html =~ rifle_pack.ammo_type.name
-      assert html =~ shotgun_pack.ammo_type.name
-      assert html =~ pistol_pack.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_class"]/)
-        |> render_change(ammo_type: %{class: :rifle})
-
-      assert html =~ rifle_pack.ammo_type.name
-      refute html =~ shotgun_pack.ammo_type.name
-      refute html =~ pistol_pack.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_class"]/)
-        |> render_change(ammo_type: %{class: :shotgun})
-
-      refute html =~ rifle_pack.ammo_type.name
-      assert html =~ shotgun_pack.ammo_type.name
-      refute html =~ pistol_pack.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_class"]/)
-        |> render_change(ammo_type: %{class: :pistol})
-
-      refute html =~ rifle_pack.ammo_type.name
-      refute html =~ shotgun_pack.ammo_type.name
-      assert html =~ pistol_pack.ammo_type.name
-
-      html =
-        index_live
-        |> form(~s/form[phx-change="change_class"]/)
-        |> render_change(ammo_type: %{class: :all})
-
-      assert html =~ rifle_pack.ammo_type.name
-      assert html =~ shotgun_pack.ammo_type.name
-      assert html =~ pistol_pack.ammo_type.name
-    end
-
-    test "can search for packs", %{conn: conn, pack: pack} do
-      {:ok, index_live, html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      pack = pack |> Repo.preload(:ammo_type)
-
-      assert html =~ pack.ammo_type.name
-
-      assert index_live
-             |> form(~s/form[phx-change="search"]/)
-             |> render_change(search: %{search_term: pack.ammo_type.name}) =~
-               pack.ammo_type.name
-
-      assert_patch(
-        index_live,
-        Routes.pack_index_path(conn, :search, pack.ammo_type.name)
-      )
-
-      refute index_live
-             |> form(~s/form[phx-change="search"]/)
-             |> render_change(search: %{search_term: "something_else"}) =~
-               pack.ammo_type.name
-
-      assert_patch(index_live, Routes.pack_index_path(conn, :search, "something_else"))
-
-      assert index_live
-             |> form(~s/form[phx-change="search"]/)
-             |> render_change(search: %{search_term: ""}) =~ pack.ammo_type.name
-
-      assert_patch(index_live, Routes.pack_index_path(conn, :index))
-    end
-
-    test "saves a single new pack", %{conn: conn} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert index_live |> element("a", "Add Ammo") |> render_click() =~ "Add Ammo"
-      assert_patch(index_live, Routes.pack_index_path(conn, :new))
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_change(pack: @invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#pack-form")
-        |> render_submit(pack: @create_attrs)
-        |> follow_redirect(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "Ammo added successfully"
-      assert html =~ "\n42\n"
-    end
-
-    test "saves multiple new packs", %{conn: conn, current_user: current_user} do
-      multiplier = 25
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert index_live |> element("a", "Add Ammo") |> render_click() =~ "Add Ammo"
-      assert_patch(index_live, Routes.pack_index_path(conn, :new))
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_change(pack: @invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#pack-form")
-        |> render_submit(pack: @create_attrs |> Map.put(:multiplier, multiplier))
-        |> follow_redirect(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "Ammo added successfully"
-      assert Ammo.list_packs(nil, :all, current_user) |> Enum.count() == multiplier + 1
-    end
-
-    test "does not save invalid number of new packs", %{conn: conn} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert index_live |> element("a", "Add Ammo") |> render_click() =~ "Add Ammo"
-      assert_patch(index_live, Routes.pack_index_path(conn, :new))
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_change(pack: @invalid_attrs) =~ "can't be blank"
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_submit(pack: @create_attrs |> Map.put(:multiplier, "0")) =~
-               "Invalid number of copies, must be between 1 and #{@pack_create_limit}. Was 0"
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_submit(pack: @create_attrs |> Map.put(:multiplier, @pack_create_limit + 1)) =~
-               "Invalid number of copies, must be between 1 and #{@pack_create_limit}. Was #{@pack_create_limit + 1}"
-    end
-
-    test "updates pack in listing", %{conn: conn, pack: pack} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert index_live
-             |> element(~s/a[aria-label="Edit pack of #{pack.count} bullets"]/)
-             |> render_click() =~ "Edit ammo"
-
-      assert_patch(index_live, Routes.pack_index_path(conn, :edit, pack))
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_change(pack: @invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#pack-form")
-        |> render_submit(pack: @update_attrs)
-        |> follow_redirect(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "Ammo updated successfully"
-      assert html =~ "\n43\n"
-    end
-
-    test "clones pack in listing", %{conn: conn, pack: pack} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      html =
-        index_live
-        |> element(~s/a[aria-label="Clone pack of #{pack.count} bullets"]/)
-        |> render_click()
-
-      assert html =~ "Add Ammo"
-      assert html =~ "$#{display_currency(120.5)}"
-
-      assert_patch(index_live, Routes.pack_index_path(conn, :clone, pack))
-
-      {:ok, _index_live, html} =
-        index_live
-        |> form("#pack-form")
-        |> render_submit()
-        |> follow_redirect(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "Ammo added successfully"
-      assert html =~ "\n42\n"
-      assert html =~ "$#{display_currency(120.5)}"
-    end
-
-    test "checks validity when cloning", %{conn: conn, pack: pack} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      html =
-        index_live
-        |> element(~s/a[aria-label="Clone pack of #{pack.count} bullets"]/)
-        |> render_click()
-
-      assert html =~ "Add Ammo"
-      assert html =~ "$#{display_currency(120.5)}"
-
-      assert_patch(index_live, Routes.pack_index_path(conn, :clone, pack))
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_change(pack: @invalid_attrs) =~ "can't be blank"
-    end
-
-    test "clones pack in listing with updates", %{conn: conn, pack: pack} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      html =
-        index_live
-        |> element(~s/a[aria-label="Clone pack of #{pack.count} bullets"]/)
-        |> render_click()
-
-      assert html =~ "Add Ammo"
-      assert html =~ "$#{display_currency(120.5)}"
-      assert_patch(index_live, Routes.pack_index_path(conn, :clone, pack))
-
-      assert index_live
-             |> form("#pack-form")
-             |> render_change(pack: @invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#pack-form")
-        |> render_submit(pack: @create_attrs |> Map.put(:count, 43))
-        |> follow_redirect(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "Ammo added successfully"
-      assert html =~ "\n43\n"
-      assert html =~ "$#{display_currency(120.5)}"
-    end
-
-    test "deletes pack in listing", %{conn: conn, pack: pack} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert index_live
-             |> element(~s/a[aria-label="Delete pack of #{pack.count} bullets"]/)
-             |> render_click()
-
-      refute has_element?(index_live, "#pack-#{pack.id}")
-    end
-
-    test "saves new shot_group", %{conn: conn, pack: pack} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert index_live |> element("a", "Record shots") |> render_click() =~ "Record shots"
-      assert_patch(index_live, Routes.pack_index_path(conn, :add_shot_group, pack))
-
-      assert index_live
-             |> form("#shot-group-form")
-             |> render_change(shot_group: @shot_group_invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#shot-group-form")
-        |> render_submit(shot_group: @shot_group_create_attrs)
-        |> follow_redirect(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "Shots recorded successfully"
-    end
-
-    @spec display_currency(float()) :: String.t()
-    defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
-  end
-
-  describe "Index of empty pack" do
-    setup [:register_and_log_in_user, :create_pack, :create_empty_pack]
-
-    test "hides empty packs by default", %{
-      conn: conn,
-      empty_pack: pack,
-      current_user: current_user
-    } do
-      {:ok, show_live, html} = live(conn, Routes.pack_index_path(conn, :index))
-
-      assert html =~ "Show used"
-      refute html =~ "$#{display_currency(50.00)}"
-
-      percentage = pack |> Ammo.get_percentage_remaining(current_user)
-      refute html =~ "\n#{"#{percentage}%"}\n"
-
-      html =
-        show_live
-        |> element(~s/input[type="checkbox"][aria-labelledby="toggle_show_used-label"}]/)
-        |> render_click()
-
-      assert html =~ "$#{display_currency(50.00)}"
-      percentage = pack |> Ammo.get_percentage_remaining(current_user)
-      assert html =~ "\n#{"#{percentage}%"}\n"
-    end
-  end
-
-  describe "Show pack" do
-    setup [:register_and_log_in_user, :create_pack]
-
-    test "displays pack", %{conn: conn, pack: pack} do
-      {:ok, _show_live, html} = live(conn, Routes.pack_show_path(conn, :show, pack))
-      pack = pack |> Repo.preload(:ammo_type)
-      assert html =~ "Show Ammo"
-      assert html =~ pack.ammo_type.name
-    end
-
-    test "updates pack within modal", %{conn: conn, pack: pack} do
-      {:ok, show_live, _html} = live(conn, Routes.pack_show_path(conn, :show, pack))
-
-      assert show_live
-             |> element(~s/a[aria-label="Edit pack of #{pack.count} bullets"]/)
-             |> render_click() =~ "Edit Ammo"
-
-      assert_patch(show_live, Routes.pack_show_path(conn, :edit, pack))
-
-      assert show_live
-             |> form("#pack-form")
-             |> render_change(pack: @invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        show_live
-        |> form("#pack-form")
-        |> render_submit(pack: @update_attrs)
-        |> follow_redirect(conn, Routes.pack_show_path(conn, :show, pack))
-
-      assert html =~ "Ammo updated successfully"
-      assert html =~ "some updated notes"
-    end
-
-    test "saves new shot_group", %{conn: conn, pack: pack} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_show_path(conn, :show, pack))
-
-      assert index_live |> element("a", "Record shots") |> render_click() =~ "Record shots"
-      assert_patch(index_live, Routes.pack_show_path(conn, :add_shot_group, pack))
-
-      assert index_live
-             |> form("#shot-group-form")
-             |> render_change(shot_group: @shot_group_invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#shot-group-form")
-        |> render_submit(shot_group: @shot_group_create_attrs)
-        |> follow_redirect(conn, Routes.pack_show_path(conn, :show, pack))
-
-      assert html =~ "Shots recorded successfully"
-    end
-  end
-
-  describe "Show pack with shot group" do
-    setup [:register_and_log_in_user, :create_pack, :create_shot_group]
-
-    test "updates shot_group in listing",
-         %{conn: conn, pack: pack, shot_group: shot_group} do
-      {:ok, index_live, _html} = live(conn, Routes.pack_show_path(conn, :edit, pack))
-
-      assert index_live
-             |> element(~s/a[aria-label="Edit shot group of #{shot_group.count} shots"]/)
-             |> render_click() =~ "Edit Shot Records"
-
-      assert_patch(
-        index_live,
-        Routes.pack_show_path(conn, :edit_shot_group, pack, shot_group)
-      )
-
-      assert index_live
-             |> form("#shot-group-form")
-             |> render_change(shot_group: @shot_group_invalid_attrs) =~ "can't be blank"
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#shot-group-form")
-        |> render_submit(shot_group: @shot_group_update_attrs)
-        |> follow_redirect(conn, Routes.pack_show_path(conn, :show, pack))
-
-      assert html =~ "Shot records updated successfully"
-      assert html =~ "some updated notes"
-    end
-
-    test "deletes shot_group in listing",
-         %{conn: conn, pack: pack, shot_group: shot_group} do
-      {:ok, index_live, _html} =
-        live(conn, Routes.pack_show_path(conn, :edit_shot_group, pack, shot_group))
-
-      assert index_live
-             |> element(~s/a[aria-label="Delete shot record of #{shot_group.count} shots"]/)
-             |> render_click()
-
-      refute has_element?(index_live, "#shot_group-#{shot_group.id}")
-    end
-  end
-end

test/cannery_web/live/range_live_test.exs

@@ -16,16 +16,16 @@ defmodule CanneryWeb.RangeLiveTest do
     container = container_fixture(%{staged: true}, current_user)
     ammo_type = ammo_type_fixture(current_user)
 
-    {1, [pack]} = pack_fixture(%{staged: true}, ammo_type, container, current_user)
+    {1, [ammo_group]} = ammo_group_fixture(%{staged: true}, ammo_type, container, current_user)
 
     shot_group =
       %{count: 5, date: ~N[2022-02-13 03:17:00], notes: "some notes"}
-      |> shot_group_fixture(current_user, pack)
+      |> shot_group_fixture(current_user, ammo_group)
 
     [
       container: container,
       ammo_type: ammo_type,
-      pack: pack,
+      ammo_group: ammo_group,
       shot_group: shot_group
     ]
   end
@@ -43,19 +43,21 @@ defmodule CanneryWeb.RangeLiveTest do
     test "can sort by type",
          %{conn: conn, container: container, current_user: current_user} do
       rifle_ammo_type = ammo_type_fixture(%{class: :rifle}, current_user)
-      {1, [rifle_pack]} = pack_fixture(rifle_ammo_type, container, 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_pack)
+      rifle_shot_group = shot_group_fixture(%{notes: "group_one"}, current_user, rifle_ammo_group)
 
       shotgun_ammo_type = ammo_type_fixture(%{class: :shotgun}, current_user)
-      {1, [shotgun_pack]} = pack_fixture(shotgun_ammo_type, container, 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_pack)
+      shotgun_shot_group =
+        shot_group_fixture(%{notes: "group_two"}, current_user, shotgun_ammo_group)
 
       pistol_ammo_type = ammo_type_fixture(%{class: :pistol}, current_user)
-      {1, [pistol_pack]} = pack_fixture(pistol_ammo_type, container, 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_pack)
+      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))
 
@@ -126,11 +128,11 @@ defmodule CanneryWeb.RangeLiveTest do
       assert_patch(index_live, Routes.range_index_path(conn, :index))
     end
 
-    test "saves new shot_group", %{conn: conn, pack: pack} do
+    test "saves new shot_group", %{conn: conn, ammo_group: ammo_group} do
       {:ok, index_live, _html} = live(conn, Routes.range_index_path(conn, :index))
 
       assert index_live |> element("a", "Record shots") |> render_click() =~ "Record shots"
-      assert_patch(index_live, Routes.range_index_path(conn, :add_shot_group, pack))
+      assert_patch(index_live, Routes.range_index_path(conn, :add_shot_group, ammo_group))
 
       assert index_live
              |> form("#shot-group-form")

test/support/fixtures.ex

@@ -10,8 +10,8 @@ defmodule Cannery.Fixtures do
     Accounts.User,
     ActivityLog.ShotGroup,
     Ammo,
+    Ammo.AmmoGroup,
     Ammo.AmmoType,
-    Ammo.Pack,
     Containers,
     Containers.Container,
     Containers.Tag,
@@ -71,16 +71,16 @@ defmodule Cannery.Fixtures do
   @doc """
   Generate a ShotGroup
   """
-  @spec shot_group_fixture(User.t(), Pack.t()) :: ShotGroup.t()
-  @spec shot_group_fixture(attrs :: map(), User.t(), Pack.t()) :: ShotGroup.t()
-  def shot_group_fixture(attrs \\ %{}, %User{} = user, %Pack{} = pack) do
+  @spec shot_group_fixture(User.t(), AmmoGroup.t()) :: ShotGroup.t()
+  @spec shot_group_fixture(attrs :: map(), User.t(), AmmoGroup.t()) :: ShotGroup.t()
+  def shot_group_fixture(attrs \\ %{}, %User{} = user, %AmmoGroup{} = ammo_group) do
     attrs
     |> Enum.into(%{
       count: 20,
       date: ~N[2022-02-13 03:17:00],
       notes: random_string()
     })
-    |> Cannery.ActivityLog.create_shot_group(user, pack)
+    |> Cannery.ActivityLog.create_shot_group(user, ammo_group)
     |> unwrap_ok_tuple()
   end
 
@@ -91,12 +91,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",
-      location: random_string(),
-      desc: random_string()
-    })
+    |> Enum.into(%{name: random_string(), type: "Ammo can"})
     |> Containers.create_container(user)
     |> unwrap_ok_tuple()
   end
@@ -108,59 +103,26 @@ 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(),
-      class: :rifle,
-      desc: random_string(),
-      bullet_type: random_string(),
-      bullet_core: random_string(),
-      cartridge: random_string(),
-      caliber: random_string(),
-      case_material: random_string(),
-      jacket_type: random_string(),
-      muzzle_velocity: 3,
-      powder_type: random_string(),
-      powder_grains_per_charge: 5,
-      grains: 7,
-      pressure: random_string(),
-      primer_type: random_string(),
-      firing_type: random_string(),
-      wadding: random_string(),
-      shot_type: random_string(),
-      shot_material: random_string(),
-      shot_size: random_string(),
-      unfired_length: random_string(),
-      brass_height: random_string(),
-      chamber_size: random_string(),
-      load_grains: 9,
-      shot_charge_weight: random_string(),
-      dram_equivalent: random_string(),
-      tracer: false,
-      incendiary: false,
-      blank: false,
-      corrosive: false,
-      manufacturer: random_string(),
-      upc: random_string()
-    })
+    |> Enum.into(%{name: random_string(), class: :rifle})
     |> Ammo.create_ammo_type(user)
     |> unwrap_ok_tuple()
   end
 
   @doc """
-  Generate a Pack
+  Generate a AmmoGroup
   """
-  @spec pack_fixture(AmmoType.t(), Container.t(), User.t()) ::
-          {count :: non_neg_integer(), [Pack.t()]}
-  @spec pack_fixture(attrs :: map(), AmmoType.t(), Container.t(), User.t()) ::
-          {count :: non_neg_integer(), [Pack.t()]}
-  @spec pack_fixture(
+  @spec ammo_group_fixture(AmmoType.t(), Container.t(), User.t()) ::
+          {count :: non_neg_integer(), [AmmoGroup.t()]}
+  @spec ammo_group_fixture(attrs :: map(), AmmoType.t(), Container.t(), User.t()) ::
+          {count :: non_neg_integer(), [AmmoGroup.t()]}
+  @spec ammo_group_fixture(
           attrs :: map(),
           multiplier :: non_neg_integer(),
           AmmoType.t(),
           Container.t(),
           User.t()
-        ) :: {count :: non_neg_integer(), [Pack.t()]}
-  def pack_fixture(
+        ) :: {count :: non_neg_integer(), [AmmoGroup.t()]}
+  def ammo_group_fixture(
         attrs \\ %{},
         multiplier \\ 1,
         %AmmoType{id: ammo_type_id},
@@ -174,7 +136,7 @@ defmodule Cannery.Fixtures do
       count: 20,
       purchased_on: Date.utc_today()
     })
-    |> Ammo.create_packs(multiplier, user)
+    |> Ammo.create_ammo_groups(multiplier, user)
     |> unwrap_ok_tuple()
   end