rename ammo groups to packs

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: [ammo_groups: _error], valid?: false} = changeset} ->
-              ammo_groups_error = changeset |> changeset_errors(:ammo_groups) |> Enum.join(", ")
+            {:error, %{action: :delete, errors: [packs: _error], valid?: false} = changeset} ->
+              packs_error = changeset |> changeset_errors(:packs) |> Enum.join(", ")
 
               prompt =
                 dgettext(
                   "errors",
                   "Could not delete %{name}: %{error}",
                   name: changeset |> Changeset.get_field(:name, "container"),
-                  error: ammo_groups_error
+                  error: packs_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: [ammo_groups: _error], valid?: false} = changeset} ->
-          ammo_groups_error = changeset |> changeset_errors(:ammo_groups) |> Enum.join(", ")
+        {:error, %{action: :delete, errors: [packs: _error], valid?: false} = changeset} ->
+          packs_error = changeset |> changeset_errors(:packs) |> Enum.join(", ")
 
           prompt =
             dgettext("errors", "Could not delete %{name}: %{error}",
               name: changeset |> Changeset.get_field(:name, "container"),
-              error: ammo_groups_error
+              error: packs_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)
-    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)
+    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)
 
     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),
-      ammo_groups_count: Ammo.get_ammo_groups_count_for_container!(container, current_user),
-      ammo_groups: ammo_groups,
+      packs_count: Ammo.get_packs_count_for_container!(container, current_user),
+      packs: packs,
       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:") %>
-    <%= @ammo_groups_count %>
+    <%= @packs_count %>
   </span>
 
   <span class="rounded-lg title text-lg">
@@ -118,16 +118,16 @@
   </div>
 
   <div class="w-full p-4">
-    <%= if @ammo_groups |> Enum.empty?() do %>
+    <%= if @packs |> 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.AmmoGroupTableComponent}
+          module={CanneryWeb.Components.PackTableComponent}
           id="ammo-type-show-table"
-          ammo_groups={@ammo_groups}
+          packs={@packs}
           current_user={@current_user}
           show_used={false}
         >
@@ -140,11 +140,11 @@
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
           <.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)}
+            :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)}
             current_user={@current_user}
           />
         </div>