bump to 0.7.1

Currently translated at 90.4% (38 of 42 strings)

Translation: cannery/actions
Translate-URL: https://weblate.bubbletea.dev/projects/cannery/actions/es/

.drone.yml

@@ -29,7 +29,7 @@ steps:
   - npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
   - npm run --prefix ./assets deploy
   - mix do phx.digest, gettext.extract
-  - mix test
+  - mix test.all
 
 - name: build and publish stable
   image: thegeeklab/drone-docker-buildx
@@ -38,7 +38,7 @@ steps:
     repo: shibaobun/cannery
     purge: true
     compress: true
-    platforms: linux/amd64,linux/arm64,linux/arm/v7
+    platforms: linux/amd64,linux/arm/v7
     username:
       from_secret: docker_username
     password:
@@ -55,7 +55,7 @@ steps:
     repo: shibaobun/cannery
     purge: true
     compress: true
-    platforms: linux/amd64,linux/arm64,linux/arm/v7
+    platforms: linux/amd64,linux/arm/v7
     username:
       from_secret: docker_username
     password:

.tool-versions

@@ -1,3 +1,3 @@
 elixir 1.14.1-otp-25
 erlang 25.1.2
-nodejs 16.13.2
+nodejs 18.12.1

CHANGELOG.md

@@ -1,4 +1,24 @@
-# v0.5.5
+# v0.7.1
+- Fix table component alignment and styling
+- Fix toggle button styling
+- Miscellanous code improvements
+- Improve container index table
+- Fix bug with ammo not updating after deleting shot group
+- Replace ammo "added on" with "purchased on"
+- Miscellaneous wording improvements
+- Update translations
+
+# v0.7.0
+- Add shading to table component
+- Fix chart to sum by day
+- Fix whitespace when copying invite url
+- Make ammo type show page also display ammo groups as table
+- Make container show page also display ammo groups as table
+- Display CPR for ammo packs
+- Add original count for ammo packs
+- Add ammo pack CPR and original count to json export
+
+# v0.6.0
 - Update translations
 - Display used-up date on used-up ammo
 - Make ammo index page a bit more compact
@@ -7,10 +27,18 @@
 - Make ammo type show page a bit more compact
 - Make ammo type show page include container names for each ammo
 - Make ammo type show page filter used-up ammo
+- Make container index page optionally display a table
 - Make container show page a bit more compact
 - Make container show page filter used-up ammo
 - Forgot to add the logo as the favicon whoops
-- Update project dependencies, use Elixir v1.14.1
+- Add graph to range page
+- Add JSON export of data
+- Add ammo cloning
+- Add ammo type cloning
+- Add container cloning
+- Fix bug with moving ammo packs between containers
+- Add button to set rounds left to 0 when creating a shot group
+- Update project dependencies
 
 # v0.5.4
 - Rename "Ammo" tab to "Catalog", and "Manage" tab is now "Ammo"

assets/js/app.js

@@ -26,6 +26,7 @@ import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
 import topbar from '../vendor/topbar'
 import MaintainAttrs from './maintain_attrs'
+import ShotLogChart from './shot_log_chart'
 import Alpine from 'alpinejs'
 
 const csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute('content')
@@ -36,7 +37,7 @@ const liveSocket = new LiveSocket('/live', Socket, {
     }
   },
   params: { _csrf_token: csrfToken },
-  hooks: { MaintainAttrs }
+  hooks: { MaintainAttrs, ShotLogChart }
 })
 
 // alpine.js
@@ -66,3 +67,8 @@ window.addEventListener('cannery:clipcopy', (event) => {
     window.alert('Sorry, your browser does not support clipboard copy.')
   }
 })
+
+// Set input value to 0
+window.addEventListener('cannery:set-zero', (event) => {
+  event.target.value = 0
+})

assets/js/shot_log_chart.js

@@ -0,0 +1,85 @@
+import { Chart, Title, Tooltip, Legend, LineController, LineElement, PointElement, TimeScale, LinearScale } from 'chart.js'
+import 'chartjs-adapter-date-fns'
+Chart.register(Title, Tooltip, Legend, LineController, LineElement, PointElement, TimeScale, LinearScale)
+
+export default {
+  initalizeChart (el) {
+    const data = JSON.parse(el.dataset.chartData)
+
+    this.el.chart = new Chart(el, {
+      type: 'line',
+      data: {
+        datasets: [{
+          label: el.dataset.label,
+          data: data.map(({ date, count, label }) => ({
+            label,
+            x: date,
+            y: count
+          })),
+          backgroundColor: `${el.dataset.color}77`,
+          borderColor: el.dataset.color,
+          fill: true,
+          borderWidth: 3,
+          pointBorderWidth: 1
+        }]
+      },
+      options: {
+        elements: {
+          point: {
+            radius: 9,
+            hoverRadius: 12
+          }
+        },
+        plugins: {
+          legend: {
+            position: 'bottom',
+            labels: {
+              padding: 20
+            }
+          },
+          tooltip: {
+            displayColors: false,
+            callbacks: {
+              title: (contexts) => contexts.map(({ raw: { x } }) => Intl.DateTimeFormat([], { timeZone: 'Etc/UTC', dateStyle: 'short' }).format(new Date(x))),
+              label: ({ raw: { label } }) => label
+            }
+          }
+        },
+        scales: {
+          y: {
+            beginAtZero: true,
+            stacked: true,
+            grace: '15%',
+            ticks: {
+              padding: 15
+            }
+          },
+          x: {
+            type: 'time',
+            time: {
+              unit: 'day'
+            }
+          }
+        },
+        transitions: {
+          show: {
+            animations: {
+              x: {
+                from: 0
+              }
+            }
+          },
+          hide: {
+            animations: {
+              x: {
+                to: 0
+              }
+            }
+          }
+        }
+      }
+    })
+  },
+  mounted () { this.initalizeChart(this.el) },
+  updated () { this.initalizeChart(this.el) }
+}

assets/package-lock.json

@@ -8,6 +8,9 @@
       "dependencies": {
         "@fortawesome/fontawesome-free": "^6.1.1",
         "alpinejs": "^3.10.2",
+        "chart.js": "^3.9.1",
+        "chartjs-adapter-date-fns": "^2.0.0",
+        "date-fns": "^2.29.3",
         "phoenix": "file:../deps/phoenix",
         "phoenix_html": "file:../deps/phoenix_html",
         "phoenix_live_view": "file:../deps/phoenix_live_view",
@@ -35,17 +38,21 @@
         "webpack": "^5.72.0",
         "webpack-cli": "^4.9.2",
         "webpack-dev-server": "^4.9.0"
+      },
+      "engines": {
+        "node": "18.12.1",
+        "npm": "8.19.2"
       }
     },
     "../deps/phoenix": {
-      "version": "1.6.8",
+      "version": "1.6.15",
       "license": "MIT"
     },
     "../deps/phoenix_html": {
       "version": "3.2.0"
     },
     "../deps/phoenix_live_view": {
-      "version": "0.17.9",
+      "version": "0.18.2",
       "license": "MIT"
     },
     "node_modules/@ampproject/remapping": {
@@ -3162,6 +3169,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/chart.js": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
+      "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w=="
+    },
+    "node_modules/chartjs-adapter-date-fns": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-2.0.0.tgz",
+      "integrity": "sha512-rmZINGLe+9IiiEB0kb57vH3UugAtYw33anRiw5kS2Tu87agpetDDoouquycWc9pRsKtQo5j+vLsYHyr8etAvFw==",
+      "peerDependencies": {
+        "chart.js": "^3.0.0"
+      }
+    },
     "node_modules/chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -3846,6 +3866,18 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/date-fns": {
+      "version": "2.29.3",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+      "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -12533,6 +12565,17 @@
         "supports-color": "^5.3.0"
       }
     },
+    "chart.js": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
+      "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w=="
+    },
+    "chartjs-adapter-date-fns": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-2.0.0.tgz",
+      "integrity": "sha512-rmZINGLe+9IiiEB0kb57vH3UugAtYw33anRiw5kS2Tu87agpetDDoouquycWc9pRsKtQo5j+vLsYHyr8etAvFw==",
+      "requires": {}
+    },
     "chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -13021,6 +13064,11 @@
         "css-tree": "^1.1.2"
       }
     },
+    "date-fns": {
+      "version": "2.29.3",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+      "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="
+    },
     "debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",

assets/package.json

@@ -2,6 +2,10 @@
   "repository": {},
   "description": " ",
   "license": "MIT",
+  "engines": {
+    "node": "18.12.1",
+    "npm": "8.19.2"
+  },
   "scripts": {
     "deploy": "NODE_ENV=production webpack --mode production",
     "watch": "webpack --mode development --watch --watch-options-stdin",
@@ -11,6 +15,9 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.1.1",
     "alpinejs": "^3.10.2",
+    "chart.js": "^3.9.1",
+    "chartjs-adapter-date-fns": "^2.0.0",
+    "date-fns": "^2.29.3",
     "phoenix": "file:../deps/phoenix",
     "phoenix_html": "file:../deps/phoenix_html",
     "phoenix_live_view": "file:../deps/phoenix_live_view",

lib/cannery/accounts/user.ex

@@ -9,6 +9,14 @@ defmodule Cannery.Accounts.User do
   alias Ecto.{Changeset, UUID}
   alias Cannery.{Accounts.User, Invites.Invite}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :email,
+             :confirmed_at,
+             :role,
+             :locale
+           ]}
   @derive {Inspect, except: [:password]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id

lib/cannery/activity_log/shot_group.ex

@@ -9,6 +9,14 @@ defmodule Cannery.ActivityLog.ShotGroup do
   alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup, Repo}
   alias Ecto.{Changeset, UUID}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :count,
+             :date,
+             :notes,
+             :ammo_group_id
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "shot_groups" do
@@ -58,7 +66,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
     |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
     |> validate_create_shot_group_count(ammo_group)
-    |> validate_required([:count, :ammo_group_id, :user_id])
+    |> validate_required([:count, :date, :ammo_group_id, :user_id])
   end
 
   def create_changeset(shot_group, _invalid_user, _invalid_ammo_group, attrs) do
@@ -66,7 +74,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
     |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
     |> validate_required([:count, :ammo_group_id, :user_id])
-    |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo group"))
+    |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo pack"))
   end
 
   defp validate_create_shot_group_count(changeset, %AmmoGroup{count: ammo_group_count}) do
@@ -90,7 +98,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
     shot_group
     |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
-    |> validate_required([:count])
+    |> validate_required([:count, :date])
     |> validate_update_shot_group_count(shot_group, user)
   end
 

lib/cannery/ammo.ex

@@ -101,7 +101,7 @@ defmodule Cannery.Ammo do
   ## Examples
 
       iex> get_round_count_for_ammo_type(123, %User{id: 123})
-      %AmmoType{}
+      35
 
       iex> get_round_count_for_ammo_type(456, %User{id: 123})
       ** (Ecto.NoResultsError)
@@ -127,7 +127,7 @@ defmodule Cannery.Ammo do
   ## Examples
 
       iex> get_used_count_for_ammo_type(123, %User{id: 123})
-      %AmmoType{}
+      35
 
       iex> get_used_count_for_ammo_type(456, %User{id: 123})
       ** (Ecto.NoResultsError)
@@ -146,6 +146,29 @@ defmodule Cannery.Ammo do
     ) || 0
   end
 
+  @doc """
+  Gets the total number of ammo ever bought for an ammo type
+
+  Raises `Ecto.NoResultsError` if the Ammo type does not exist.
+
+  ## Examples
+
+      iex> get_historical_count_for_ammo_type(123, %User{id: 123})
+      %AmmoType{}
+
+      iex> get_historical_count_for_ammo_type(456, %User{id: 123})
+      ** (Ecto.NoResultsError)
+
+  """
+  @spec get_historical_count_for_ammo_type(AmmoType.t(), User.t()) :: non_neg_integer()
+  def get_historical_count_for_ammo_type(
+        %AmmoType{user_id: user_id} = ammo_type,
+        %User{id: user_id} = user
+      ) do
+    get_round_count_for_ammo_type(ammo_type, user) +
+      get_used_count_for_ammo_type(ammo_type, user)
+  end
+
   @doc """
   Creates a ammo_type.
 
@@ -305,9 +328,12 @@ defmodule Cannery.Ammo do
 
   ## Examples
 
-      iex> get_ammo_groups_count_for_type(%User{id: 123})
+      iex> get_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123})
       3
 
+      iex> get_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123}, true)
+      5
+
   """
   @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
   @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
@@ -343,6 +369,30 @@ defmodule Cannery.Ammo do
     ) || 0
   end
 
+  @doc """
+  Returns the count of used ammo_groups for an ammo type.
+
+  ## Examples
+
+      iex> get_used_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123})
+      3
+
+  """
+  @spec get_used_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
+  def get_used_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id}
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: ag.count == 0,
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
   @doc """
   Returns the list of ammo_groups for a user.
 
@@ -456,11 +506,35 @@ defmodule Cannery.Ammo do
     ammo_group = ammo_group |> Repo.preload(:shot_groups)
 
     shot_group_sum =
-      ammo_group.shot_groups |> Enum.map(fn %{count: count} -> count end) |> Enum.sum()
+      ammo_group.shot_groups
+      |> Enum.map(fn %{count: count} -> count end)
+      |> Enum.sum()
 
     round(count / (count + shot_group_sum) * 100)
   end
 
+  @doc """
+  Gets the original count for an ammo group
+  """
+  @spec get_original_count(AmmoGroup.t()) :: non_neg_integer()
+  def get_original_count(%AmmoGroup{count: count} = ammo_group) do
+    count + get_used_count(ammo_group)
+  end
+
+  @doc """
+  Calculates the CPR for a single ammo group
+  """
+  @spec get_cpr(AmmoGroup.t()) :: nil | float()
+  def get_cpr(%AmmoGroup{price_paid: nil}), do: nil
+
+  def get_cpr(%AmmoGroup{price_paid: price_paid} = ammo_group),
+    do: calculate_cpr(price_paid, get_original_count(ammo_group))
+
+  @spec calculate_cpr(price_paid :: float() | nil, count :: integer()) :: float() | nil
+  defp calculate_cpr(nil, _count), do: nil
+  defp calculate_cpr(_price_paid, 0), do: nil
+  defp calculate_cpr(price_paid, total_count), do: price_paid / total_count
+
   @doc """
   Creates multiple ammo_groups at once.
 
@@ -555,8 +629,12 @@ defmodule Cannery.Ammo do
   """
   @spec update_ammo_group(AmmoGroup.t(), attrs :: map(), User.t()) ::
           {:ok, AmmoGroup.t()} | {:error, Changeset.t(AmmoGroup.t())}
-  def update_ammo_group(%AmmoGroup{user_id: user_id} = ammo_group, attrs, %User{id: user_id}),
-    do: ammo_group |> AmmoGroup.update_changeset(attrs) |> Repo.update()
+  def update_ammo_group(
+        %AmmoGroup{user_id: user_id} = ammo_group,
+        attrs,
+        %User{id: user_id} = user
+      ),
+      do: ammo_group |> AmmoGroup.update_changeset(attrs, user) |> Repo.update()
 
   @doc """
   Deletes a ammo_group.

lib/cannery/ammo/ammo_group.ex

@@ -10,9 +10,19 @@ defmodule Cannery.Ammo.AmmoGroup do
   import CanneryWeb.Gettext
   import Ecto.Changeset
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Containers.Container}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Containers, Containers.Container}
   alias Ecto.{Changeset, UUID}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :count,
+             :notes,
+             :price_paid,
+             :staged,
+             :ammo_type_id,
+             :container_id
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "ammo_groups" do
@@ -20,6 +30,7 @@ defmodule Cannery.Ammo.AmmoGroup do
     field :notes, :string
     field :price_paid, :float
     field :staged, :boolean, default: false
+    field :purchased_on, :date
 
     belongs_to :ammo_type, AmmoType
     belongs_to :container, Container
@@ -36,6 +47,7 @@ defmodule Cannery.Ammo.AmmoGroup do
           notes: String.t() | nil,
           price_paid: float() | nil,
           staged: boolean(),
+          purchased_on: Date.t(),
           ammo_type: AmmoType.t() | nil,
           ammo_type_id: AmmoType.id(),
           container: Container.t() | nil,
@@ -69,9 +81,9 @@ defmodule Cannery.Ammo.AmmoGroup do
     |> change(ammo_type_id: ammo_type_id)
     |> change(user_id: user_id)
     |> change(container_id: container_id)
-    |> cast(attrs, [:count, :price_paid, :notes, :staged])
+    |> cast(attrs, [:count, :price_paid, :notes, :staged, :purchased_on])
     |> validate_number(:count, greater_than: 0)
-    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
+    |> validate_required([:count, :staged, :purchased_on, :ammo_type_id, :container_id, :user_id])
   end
 
   @doc """
@@ -85,13 +97,24 @@ defmodule Cannery.Ammo.AmmoGroup do
   end
 
   @doc false
-  @spec update_changeset(t() | new_ammo_group(), attrs :: map()) ::
+  @spec update_changeset(t() | new_ammo_group(), attrs :: map(), User.t()) ::
           Changeset.t(t() | new_ammo_group())
-  def update_changeset(ammo_group, attrs) do
+  def update_changeset(ammo_group, attrs, user) do
     ammo_group
-    |> cast(attrs, [:count, :price_paid, :notes, :staged])
+    |> cast(attrs, [:count, :price_paid, :notes, :staged, :purchased_on, :container_id])
     |> validate_number(:count, greater_than_or_equal_to: 0)
-    |> validate_required([:count, :staged])
+    |> validate_container_id(user)
+    |> validate_required([:count, :staged, :purchased_on, :container_id])
+  end
+
+  defp validate_container_id(changeset, user) do
+    container_id = changeset |> Changeset.get_field(:container_id)
+
+    if container_id do
+      Containers.get_container!(container_id, user)
+    end
+
+    changeset
   end
 
   @doc """

lib/cannery/ammo/ammo_type.ex

@@ -11,6 +11,31 @@ defmodule Cannery.Ammo.AmmoType do
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Ecto.{Changeset, UUID}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :name,
+             :desc,
+             :bullet_type,
+             :bullet_core,
+             :cartridge,
+             :caliber,
+             :case_material,
+             :jacket_type,
+             :muzzle_velocity,
+             :powder_type,
+             :powder_grains_per_charge,
+             :grains,
+             :pressure,
+             :primer_type,
+             :firing_type,
+             :tracer,
+             :incendiary,
+             :blank,
+             :corrosive,
+             :manufacturer,
+             :upc
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "ammo_types" do

lib/cannery/containers/container.ex

@@ -9,6 +9,15 @@ defmodule Cannery.Containers.Container do
   alias Cannery.Containers.{Container, ContainerTag}
   alias Cannery.{Accounts.User, Ammo.AmmoGroup, Tags.Tag}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :name,
+             :desc,
+             :location,
+             :type,
+             :tags
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "containers" do

lib/cannery/tags.ex

@@ -120,18 +120,4 @@ defmodule Cannery.Tags do
   """
   @spec delete_tag!(Tag.t(), User.t()) :: Tag.t()
   def delete_tag!(%Tag{user_id: user_id} = tag, %User{id: user_id}), do: tag |> Repo.delete!()
-
-  @doc """
-  Get a random tag bg_color in `#ffffff` hex format
-
-  ## Examples
-
-      iex> random_color()
-      "#cc0066"
-  """
-  @spec random_bg_color() :: <<_::7>>
-  def random_bg_color do
-    ["#cc0066", "#ff6699", "#6666ff", "#0066cc", "#00cc66", "#669900", "#ff9900", "#996633"]
-    |> Enum.random()
-  end
 end

lib/cannery/tags/tag.ex

@@ -9,6 +9,13 @@ defmodule Cannery.Tags.Tag do
   alias Ecto.{Changeset, UUID}
   alias Cannery.{Accounts.User, Tags.Tag}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :name,
+             :bg_color,
+             :text_color
+           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "tags" do

lib/cannery_web/components/add_shot_group_component.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
 
   use CanneryWeb, :live_component
   alias Cannery.{Accounts.User, ActivityLog, ActivityLog.ShotGroup, Ammo.AmmoGroup}
-  alias Phoenix.LiveView.Socket
+  alias Phoenix.LiveView.{JS, Socket}
 
   @impl true
   @spec update(

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -22,9 +22,16 @@
     <%= number_input(f, :ammo_left,
       min: 0,
       max: @ammo_group.count - 1,
-      placeholder: 0,
-      class: "input input-primary col-span-2"
+      placeholder: gettext("Rounds left"),
+      class: "input input-primary"
     ) %>
+    <button
+      type="button"
+      class="mx-2 my-1 text-sm btn btn-primary"
+      phx-click={JS.dispatch("cannery:set-zero", to: "#shot-group-form_ammo_left")}
+    >
+      <%= gettext("Used up!") %>
+    </button>
     <%= error_tag(f, :ammo_left, "col-span-3") %>
 
     <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
@@ -35,7 +42,7 @@
     ) %>
     <%= error_tag(f, :notes, "col-span-3") %>
 
-    <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %>
+    <%= label(f, :date, gettext("Date"), class: "title text-lg text-primary-600") %>
     <%= date_input(f, :date,
       class: "input input-primary col-span-2",
       phx_update: "ignore",

lib/cannery_web/components/ammo_group_card.ex

@@ -4,15 +4,20 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.{Ammo, Repo}
+  alias Cannery.{Ammo, Ammo.AmmoGroup, Repo}
   alias CanneryWeb.Endpoint
 
+  attr :ammo_group, AmmoGroup, required: true
+  attr :show_container, :boolean, default: false
+  slot(:inner_block)
+
   def ammo_group_card(%{ammo_group: ammo_group} = assigns) do
     assigns =
       %{show_container: show_container} = assigns |> assign_new(:show_container, fn -> false end)
 
     preloads = if show_container, do: [:ammo_type, :container], else: [:ammo_type]
     ammo_group = ammo_group |> Repo.preload(preloads)
+
     assigns = assigns |> assign(:ammo_group, ammo_group)
 
     ~H"""
@@ -22,7 +27,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             border border-gray-400 rounded-lg shadow-lg hover:shadow-md
             transition-all duration-300 ease-in-out"
     >
-      <.link patch={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} 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">
           <%= @ammo_group.ammo_type.name %>
         </h1>
@@ -31,9 +36,16 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
       <div class="flex flex-col justify-center items-center">
         <span class="rounded-lg title text-lg">
           <%= gettext("Count:") %>
-          <%= if @ammo_group.count == 0, do: "Empty", else: @ammo_group.count %>
+          <%= if @ammo_group.count == 0, do: gettext("Empty"), else: @ammo_group.count %>
         </span>
 
+        <%= if @ammo_group |> Ammo.get_original_count() != @ammo_group.count do %>
+          <span class="rounded-lg title text-lg">
+            <%= gettext("Original Count:") %>
+            <%= @ammo_group |> Ammo.get_original_count() %>
+          </span>
+        <% end %>
+
         <%= if @ammo_group.notes do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Notes:") %>
@@ -42,13 +54,13 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
         <% end %>
 
         <span class="rounded-lg title text-lg">
-          <%= gettext("Added on:") %>
-          <%= @ammo_group.inserted_at |> display_datetime() %>
+          <%= gettext("Purchased on:") %>
+          <%= @ammo_group.purchased_on |> display_date() %>
         </span>
 
-        <%= if @ammo_group.count == 0 do %>
+        <%= if @ammo_group |> Ammo.get_last_used_shot_group() do %>
           <span class="rounded-lg title text-lg">
-            <%= gettext("Used up on:") %>
+            <%= gettext("Last used on:") %>
             <%= @ammo_group |> Ammo.get_last_used_shot_group() |> Map.get(:date) |> display_date() %>
           </span>
         <% end %>
@@ -60,6 +72,13 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
               amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
             ) %>
           </span>
+
+          <span class="rounded-lg title text-lg">
+            <%= gettext("CPR:") %>
+            <%= gettext("$%{amount}",
+              amount: @ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
+            ) %>
+          </span>
         <% end %>
 
         <%= if @show_container and @ammo_group.container do %>
@@ -67,7 +86,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             <%= gettext("Container:") %>
 
             <.link
-              patch={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
+              navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
               class="link"
             >
               <%= @ammo_group.container.name %>

lib/cannery_web/components/ammo_group_table_component.ex

@@ -0,0 +1,233 @@
+defmodule CanneryWeb.Components.AmmoGroupTableComponent do
+  @moduledoc """
+  A component that displays a list of ammo groups
+  """
+  use CanneryWeb, :live_component
+  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Repo}
+  alias Ecto.UUID
+  alias Phoenix.LiveView.{Rendered, Socket}
+
+  @impl true
+  @spec update(
+          %{
+            required(:id) => UUID.t(),
+            required(:current_user) => User.t(),
+            required(:ammo_groups) => [AmmoGroup.t()],
+            optional(:ammo_type) => Rendered.t(),
+            optional(:range) => Rendered.t(),
+            optional(:container) => Rendered.t(),
+            optional(:actions) => Rendered.t(),
+            optional(any()) => any()
+          },
+          Socket.t()
+        ) :: {:ok, Socket.t()}
+  def update(%{id: _id, ammo_groups: _ammo_group, current_user: _current_user} = assigns, socket) do
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign_new(:ammo_type, fn -> [] end)
+      |> assign_new(:range, fn -> [] end)
+      |> assign_new(:container, fn -> [] end)
+      |> assign_new(:actions, fn -> [] end)
+      |> display_ammo_groups()
+
+    {:ok, socket}
+  end
+
+  defp display_ammo_groups(
+         %{
+           assigns: %{
+             ammo_groups: ammo_groups,
+             current_user: current_user,
+             ammo_type: ammo_type,
+             range: range,
+             container: container,
+             actions: actions
+           }
+         } = socket
+       ) do
+    columns =
+      if actions == [] do
+        []
+      else
+        [%{label: nil, key: :actions, sortable: false}]
+      end
+
+    columns = [
+      %{label: gettext("Purchased on"), key: :purchased_on},
+      %{label: gettext("Last used on"), key: :used_up_on} | columns
+    ]
+
+    columns =
+      if container == [] do
+        columns
+      else
+        [%{label: gettext("Container"), key: :container} | columns]
+      end
+
+    columns =
+      if range == [] do
+        columns
+      else
+        [%{label: gettext("Range"), key: :range} | columns]
+      end
+
+    columns = [
+      %{label: gettext("Count"), key: :count},
+      %{label: gettext("Original Count"), key: :original_count},
+      %{label: gettext("Price paid"), key: :price_paid},
+      %{label: gettext("CPR"), key: :cpr},
+      %{label: gettext("% left"), key: :remaining},
+      %{label: gettext("Notes"), key: :notes}
+      | columns
+    ]
+
+    columns =
+      if ammo_type == [] do
+        columns
+      else
+        [%{label: gettext("Ammo type"), key: :ammo_type} | columns]
+      end
+
+    rows =
+      ammo_groups
+      |> Repo.preload([:ammo_type, :container])
+      |> Enum.map(fn ammo_group ->
+        ammo_group
+        |> get_row_data_for_ammo_group(%{
+          current_user: current_user,
+          ammo_type: ammo_type,
+          columns: columns,
+          container: container,
+          actions: actions,
+          range: range
+        })
+      end)
+
+    socket |> assign(columns: columns, rows: rows)
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div id={@id} class="w-full">
+      <.live_component
+        module={CanneryWeb.Components.TableComponent}
+        id={"table-#{@id}"}
+        columns={@columns}
+        rows={@rows}
+      />
+    </div>
+    """
+  end
+
+  @spec get_row_data_for_ammo_group(AmmoGroup.t(), additional_data :: map()) :: map()
+  defp get_row_data_for_ammo_group(ammo_group, %{columns: columns} = additional_data) do
+    ammo_group = ammo_group |> Repo.preload([:ammo_type, :container])
+
+    columns
+    |> Map.new(fn %{key: key} ->
+      {key, get_value_for_key(key, ammo_group, additional_data)}
+    end)
+  end
+
+  @spec get_value_for_key(atom(), AmmoGroup.t(), additional_data :: map()) ::
+          any() | {any(), Rendered.t()}
+  defp get_value_for_key(
+         :ammo_type,
+         %{ammo_type: %{name: ammo_type_name} = ammo_type},
+         %{ammo_type: ammo_type_block}
+       ) do
+    assigns = %{ammo_type: ammo_type, ammo_type_block: ammo_type_block}
+
+    {ammo_type_name,
+     ~H"""
+     <%= render_slot(@ammo_type_block, @ammo_type) %>
+     """}
+  end
+
+  defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data), do: {"", nil}
+
+  defp get_value_for_key(:price_paid, %{price_paid: price_paid}, _additional_data),
+    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
+
+  defp get_value_for_key(:purchased_on, %{purchased_on: purchased_on}, _additional_data) do
+    assigns = %{purchased_on: purchased_on}
+
+    {purchased_on,
+     ~H"""
+     <%= @purchased_on |> display_date() %>
+     """}
+  end
+
+  defp get_value_for_key(:used_up_on, ammo_group, _additional_data) do
+    last_shot_group_date =
+      case ammo_group |> Ammo.get_last_used_shot_group() do
+        %{date: last_shot_group_date} -> last_shot_group_date
+        _no_shot_groups -> nil
+      end
+
+    assigns = %{last_shot_group_date: last_shot_group_date}
+
+    {last_shot_group_date,
+     ~H"""
+     <%= if @last_shot_group_date do %>
+       <%= @last_shot_group_date |> display_date() %>
+     <% else %>
+       <%= gettext("Never used") %>
+     <% end %>
+     """}
+  end
+
+  defp get_value_for_key(:range, %{staged: staged} = ammo_group, %{range: range}) do
+    assigns = %{range: range, ammo_group: ammo_group}
+
+    {staged,
+     ~H"""
+     <%= render_slot(@range, @ammo_group) %>
+     """}
+  end
+
+  defp get_value_for_key(:remaining, ammo_group, _additional_data),
+    do: gettext("%{percentage}%", percentage: ammo_group |> Ammo.get_percentage_remaining())
+
+  defp get_value_for_key(:actions, ammo_group, %{actions: actions}) do
+    assigns = %{actions: actions, ammo_group: ammo_group}
+
+    ~H"""
+    <%= render_slot(@actions, @ammo_group) %>
+    """
+  end
+
+  defp get_value_for_key(:container, %{container: nil}, _additional_data), do: {nil, nil}
+
+  defp get_value_for_key(
+         :container,
+         %{container: %{name: container_name}} = ammo_group,
+         %{container: container}
+       ) do
+    assigns = %{container: container, ammo_group: ammo_group}
+
+    {container_name,
+     ~H"""
+     <%= render_slot(@container, @ammo_group) %>
+     """}
+  end
+
+  defp get_value_for_key(:original_count, ammo_group, _additional_data),
+    do: ammo_group |> Ammo.get_original_count()
+
+  defp get_value_for_key(:cpr, %{price_paid: nil}, _additional_data),
+    do: gettext("No cost information")
+
+  defp get_value_for_key(:cpr, ammo_group, _additional_data) do
+    gettext("$%{amount}",
+      amount: ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
+    )
+  end
+
+  defp get_value_for_key(:count, %{count: count}, _additional_data),
+    do: if(count == 0, do: gettext("Empty"), else: count)
+
+  defp get_value_for_key(key, ammo_group, _additional_data), do: ammo_group |> Map.get(key)
+end

lib/cannery_web/components/container_card.ex

@@ -5,11 +5,20 @@ defmodule CanneryWeb.Components.ContainerCard do
 
   use CanneryWeb, :component
   import CanneryWeb.Components.TagCard
-  alias Cannery.{Containers, Repo}
+  alias Cannery.{Containers, Containers.Container, Repo}
   alias CanneryWeb.Endpoint
+  alias Phoenix.LiveView.Rendered
 
+  attr :container, Container, required: true
+  slot(:tag_actions)
+  slot(:inner_block)
+
+  @spec container_card(assigns :: map()) :: Rendered.t()
   def container_card(%{container: container} = assigns) do
-    assigns = assigns |> Map.put(:container, container |> Repo.preload([:tags, :ammo_groups]))
+    assigns =
+      assigns
+      |> assign(container: container |> Repo.preload([:tags, :ammo_groups]))
+      |> assign_new(:tag_actions, fn -> [] end)
 
     ~H"""
     <div
@@ -63,9 +72,7 @@ defmodule CanneryWeb.Components.ContainerCard do
             <% end %>
           <% end %>
 
-          <%= if assigns |> Map.has_key?(:tag_actions) do %>
-            <%= render_slot(@tag_actions) %>
-          <% end %>
+          <%= render_slot(@tag_actions) %>
         </div>
       </div>
 

lib/cannery_web/components/invite_card.ex

@@ -4,13 +4,23 @@ defmodule CanneryWeb.Components.InviteCard do
   """
 
   use CanneryWeb, :component
+  alias Cannery.Invites.Invite
   alias CanneryWeb.Endpoint
 
+  attr :invite, Invite, required: true
+  slot(:inner_block)
+  slot(:code_actions)
+
   def invite_card(assigns) do
+    assigns = assigns |> assign_new(:code_actions, fn -> [] end)
+
     ~H"""
-    <div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
+    <div
+      id={"invite-#{@invite.id}"}
+      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
       border border-gray-400 rounded-lg shadow-lg hover:shadow-md
-      transition-all duration-300 ease-in-out">
+      transition-all duration-300 ease-in-out"
+    >
       <h1 class="title text-xl">
         <%= @invite.name %>
       </h1>
@@ -30,13 +40,9 @@ defmodule CanneryWeb.Components.InviteCard do
         <code
           id={"code-#{@invite.id}"}
           class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
-        >
-          <%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %>
-        </code>
-
-        <%= if @code_actions do %>
-          <%= render_slot(@code_actions) %>
-        <% end %>
+          phx-no-format
+        ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
+        <%= render_slot(@code_actions) %>
       </div>
 
       <%= if @inner_block do %>

lib/cannery_web/components/move_ammo_group_component.ex

@@ -22,7 +22,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           assigns,
         socket
       ) do
-    changeset = ammo_group |> AmmoGroup.update_changeset(%{})
+    changeset = ammo_group |> AmmoGroup.update_changeset(%{}, current_user)
 
     containers =
       Containers.list_containers(current_user)
@@ -77,7 +77,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
     ~H"""
     <div class="w-full flex flex-col space-y-8 justify-center items-center">
       <h2 class="mb-8 text-center title text-xl text-primary-600">
-        <%= gettext("Move ammo") %>
+        <%= dgettext("actions", "Move ammo") %>
       </h2>
 
       <%= if @containers |> Enum.empty?() do %>
@@ -86,7 +86,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           <%= display_emoji("😔") %>
         </h2>
 
-        <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+        <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
           <%= dgettext("actions", "Add another container!") %>
         </.link>
       <% else %>
@@ -106,7 +106,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
     containers
     |> Enum.map(fn container ->
       columns
-      |> Enum.into(%{}, fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
+      |> Map.new(fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
     end)
   end
 

lib/cannery_web/components/table_component.ex

@@ -21,6 +21,7 @@ defmodule CanneryWeb.Components.TableComponent do
 
   use CanneryWeb, :live_component
   alias Phoenix.LiveView.Socket
+  require Integer
 
   @impl true
   @spec update(
@@ -30,24 +31,48 @@ defmodule CanneryWeb.Components.TableComponent do
                 required(:label) => String.t() | nil,
                 required(:key) => atom() | nil,
                 optional(:class) => String.t(),
+                optional(:row_class) => String.t(),
+                optional(:alternate_row_class) => String.t(),
                 optional(:sortable) => false
               }),
             required(:rows) =>
               list(%{
                 (key :: atom()) => any() | {custom_sort_value :: String.t(), value :: any()}
               }),
+            optional(:inital_key) => atom(),
+            optional(:initial_sort_mode) => atom(),
             optional(any()) => any()
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
   def update(%{columns: columns, rows: rows} = assigns, socket) do
-    initial_key = columns |> List.first() |> Map.get(:key)
-    rows = rows |> Enum.sort_by(fn row -> row |> Map.get(initial_key) end, :asc)
+    initial_key =
+      if assigns |> Map.has_key?(:initial_key) do
+        assigns.initial_key
+      else
+        columns |> List.first(%{}) |> Map.get(:key)
+      end
+
+    initial_sort_mode =
+      if assigns |> Map.has_key?(:initial_sort_mode) do
+        assigns.initial_sort_mode
+      else
+        :asc
+      end
+
+    rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode)
 
     socket =
       socket
       |> assign(assigns)
-      |> assign(columns: columns, rows: rows, last_sort_key: initial_key, sort_mode: :asc)
+      |> assign(
+        columns: columns,
+        rows: rows,
+        last_sort_key: initial_key,
+        sort_mode: initial_sort_mode
+      )
+      |> assign_new(:row_class, fn -> "bg-white" end)
+      |> assign_new(:alternate_row_class, fn -> "bg-gray-200" end)
 
     {:ok, socket}
   end

lib/cannery_web/components/table_component.html.heex

@@ -1,4 +1,4 @@
-<div id={@id} class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+<div id={@id} class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-white">
   <table class="min-w-full table-auto text-center bg-white">
     <thead class="border-b border-primary-600">
       <tr>
@@ -6,26 +6,27 @@
           <%= if column |> Map.get(:sortable, true) do %>
             <th class={"p-2 #{column[:class]}"}>
               <span
-                class="cursor-pointer"
+                class="cursor-pointer flex justify-center items-center space-x-2"
                 phx-click="sort_by"
                 phx-value-sort-key={key}
                 phx-target={@myself}
               >
-                <span class="underline"><%= label %></span>
+                <i class="w-0 float-right fas fa-sm fa-chevron-up opacity-0"></i>
+                <span class={if @last_sort_key == key, do: "underline"}><%= label %></span>
                 <%= if @last_sort_key == key do %>
                   <%= case @sort_mode do %>
                     <% :asc -> %>
-                      <i class="fas fa-sm fa-chevron-down"></i>
+                      <i class="w-0 float-right fas fa-sm fa-chevron-down"></i>
                     <% :desc -> %>
-                      <i class="fas fa-sm fa-chevron-up"></i>
+                      <i class="w-0 float-right fas fa-sm fa-chevron-up"></i>
                   <% end %>
                 <% else %>
-                  <i class="fas fa-sm fa-chevron-up opacity-0"></i>
+                  <i class="w-0 float-right fas fa-sm fa-chevron-up opacity-0"></i>
                 <% end %>
               </span>
             </th>
           <% else %>
-            <th class={"p-2 #{column[:class]}"}>
+            <th class={"p-2 cursor-not-allowed #{column[:class]}"}>
               <%= label %>
             </th>
           <% end %>
@@ -33,8 +34,8 @@
       </tr>
     </thead>
     <tbody>
-      <%= for values <- @rows do %>
-        <tr>
+      <%= for {values, i} <- @rows |> Enum.with_index() do %>
+        <tr class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}>
           <%= for %{key: key} = value <- @columns do %>
             <td class={"p-2 #{value[:class]}"}>
               <%= case values |> Map.get(key) do %>

lib/cannery_web/components/tag_card.ex

@@ -4,6 +4,10 @@ defmodule CanneryWeb.Components.TagCard do
   """
 
   use CanneryWeb, :component
+  alias Cannery.Tags.Tag
+
+  attr :tag, Tag, required: true
+  slot(:inner_block, required: true)
 
   def tag_card(assigns) do
     ~H"""
@@ -19,6 +23,8 @@ defmodule CanneryWeb.Components.TagCard do
     """
   end
 
+  attr :tag, Tag, required: true
+
   def simple_tag_card(assigns) do
     ~H"""
     <h1

lib/cannery_web/components/topbar.ex

@@ -17,7 +17,7 @@ defmodule CanneryWeb.Components.Topbar do
       <div class="flex flex-col sm:flex-row justify-between items-center">
         <div class="mb-4 sm:mb-0 sm:mr-8 flex flex-row justify-start items-center space-x-2">
           <.link
-            patch={Routes.live_path(Endpoint, HomeLive)}
+            navigate={Routes.live_path(Endpoint, HomeLive)}
             class="inline mx-2 my-1 leading-5 text-xl text-white"
           >
             <img
@@ -43,7 +43,7 @@ defmodule CanneryWeb.Components.Topbar do
           <%= if @current_user do %>
             <li class="mx-2 my-1">
               <.link
-                patch={Routes.tag_index_path(Endpoint, :index)}
+                navigate={Routes.tag_index_path(Endpoint, :index)}
                 class="text-primary-600 text-white hover:underline"
               >
                 <%= gettext("Tags") %>
@@ -51,7 +51,7 @@ defmodule CanneryWeb.Components.Topbar do
             </li>
             <li class="mx-2 my-1">
               <.link
-                patch={Routes.container_index_path(Endpoint, :index)}
+                navigate={Routes.container_index_path(Endpoint, :index)}
                 class="text-primary-600 text-white hover:underline"
               >
                 <%= gettext("Containers") %>
@@ -59,7 +59,7 @@ defmodule CanneryWeb.Components.Topbar do
             </li>
             <li class="mx-2 my-1">
               <.link
-                patch={Routes.ammo_type_index_path(Endpoint, :index)}
+                navigate={Routes.ammo_type_index_path(Endpoint, :index)}
                 class="text-primary-600 text-white hover:underline"
               >
                 <%= gettext("Catalog") %>
@@ -67,7 +67,7 @@ defmodule CanneryWeb.Components.Topbar do
             </li>
             <li class="mx-2 my-1">
               <.link
-                patch={Routes.ammo_group_index_path(Endpoint, :index)}
+                navigate={Routes.ammo_group_index_path(Endpoint, :index)}
                 class="text-primary-600 text-white hover:underline"
               >
                 <%= gettext("Ammo") %>
@@ -75,7 +75,7 @@ defmodule CanneryWeb.Components.Topbar do
             </li>
             <li class="mx-2 my-1">
               <.link
-                patch={Routes.range_index_path(Endpoint, :index)}
+                navigate={Routes.range_index_path(Endpoint, :index)}
                 class="text-primary-600 text-white hover:underline"
               >
                 <%= gettext("Range") %>
@@ -84,7 +84,7 @@ defmodule CanneryWeb.Components.Topbar do
             <%= if @current_user.role == :admin do %>
               <li class="mx-2 my-1">
                 <.link
-                  patch={Routes.invite_index_path(Endpoint, :index)}
+                  navigate={Routes.invite_index_path(Endpoint, :index)}
                   class="text-primary-600 text-white hover:underline"
                 >
                   <%= gettext("Invites") %>
@@ -93,7 +93,7 @@ defmodule CanneryWeb.Components.Topbar do
             <% end %>
             <li class="mx-2 my-1">
               <.link
-                patch={Routes.user_settings_path(Endpoint, :edit)}
+                navigate={Routes.user_settings_path(Endpoint, :edit)}
                 class="text-primary-600 text-white hover:underline truncate"
               >
                 <%= @current_user.email %>
@@ -111,7 +111,7 @@ defmodule CanneryWeb.Components.Topbar do
             <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
               <li class="mx-2 my-1">
                 <.link
-                  patch={Routes.live_dashboard_path(Endpoint, :home)}
+                  navigate={Routes.live_dashboard_path(Endpoint, :home)}
                   class="text-primary-600 text-white hover:underline"
                 >
                   <i class="fas fa-gauge"></i>
@@ -122,7 +122,7 @@ defmodule CanneryWeb.Components.Topbar do
             <%= if Accounts.allow_registration?() do %>
               <li class="mx-2 my-1">
                 <.link
-                  patch={Routes.user_registration_path(Endpoint, :new)}
+                  navigate={Routes.user_registration_path(Endpoint, :new)}
                   class="text-primary-600 text-white hover:underline truncate"
                 >
                   <%= dgettext("actions", "Register") %>
@@ -131,7 +131,7 @@ defmodule CanneryWeb.Components.Topbar do
             <% end %>
             <li class="mx-2 my-1">
               <.link
-                patch={Routes.user_session_path(Endpoint, :new)}
+                navigate={Routes.user_session_path(Endpoint, :new)}
                 class="text-primary-600 text-white hover:underline truncate"
               >
                 <%= dgettext("actions", "Log in") %>

lib/cannery_web/components/user_card.ex

@@ -4,6 +4,10 @@ defmodule CanneryWeb.Components.UserCard do
   """
 
   use CanneryWeb, :component
+  alias Cannery.Accounts.User
+
+  attr :user, User, required: true
+  slot(:inner_block, required: true)
 
   def user_card(assigns) do
     ~H"""

lib/cannery_web/controllers/export_controller.ex

@@ -0,0 +1,69 @@
+defmodule CanneryWeb.ExportController do
+  use CanneryWeb, :controller
+  alias Cannery.{ActivityLog, Ammo, Containers}
+
+  def export(%{assigns: %{current_user: current_user}} = conn, %{"mode" => "json"}) do
+    ammo_types =
+      Ammo.list_ammo_types(current_user)
+      |> Enum.map(fn ammo_type ->
+        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 |> Ammo.get_used_count_for_ammo_type(current_user)
+        ammo_group_count = ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
+
+        ammo_type
+        |> Jason.encode!()
+        |> Jason.decode!()
+        |> Map.merge(%{
+          "average_cost" => average_cost,
+          "round_count" => round_count,
+          "used_count" => used_count,
+          "ammo_group_count" => ammo_group_count
+        })
+      end)
+
+    ammo_groups =
+      Ammo.list_ammo_groups(current_user, true)
+      |> Enum.map(fn ammo_group ->
+        cpr = ammo_group |> Ammo.get_cpr()
+        used_count = ammo_group |> Ammo.get_used_count()
+        original_count = ammo_group |> Ammo.get_original_count()
+        percentage_remaining = ammo_group |> Ammo.get_percentage_remaining()
+
+        ammo_group
+        |> Jason.encode!()
+        |> Jason.decode!()
+        |> Map.merge(%{
+          "used_count" => used_count,
+          "percentage_remaining" => percentage_remaining,
+          "original_count" => original_count,
+          "cpr" => cpr
+        })
+      end)
+
+    shot_groups = ActivityLog.list_shot_groups(current_user)
+
+    containers =
+      Containers.list_containers(current_user)
+      |> Enum.map(fn container ->
+        ammo_group_count = container |> Containers.get_container_ammo_group_count!()
+        round_count = container |> Containers.get_container_rounds!()
+
+        container
+        |> Jason.encode!()
+        |> Jason.decode!()
+        |> Map.merge(%{
+          "ammo_group_count" => ammo_group_count,
+          "round_count" => round_count
+        })
+      end)
+
+    json(conn, %{
+      user: current_user,
+      ammo_types: ammo_types,
+      ammo_groups: ammo_groups,
+      shot_groups: shot_groups,
+      containers: containers
+    })
+  end
+end

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -73,14 +73,14 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
          ammo_group_params
        ) do
     changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
+      cond do
+        action in [:new, :clone] -> :insert
+        action == :edit -> :update
       end
 
     changeset =
-      case action do
-        :new ->
+      cond do
+        action in [:new, :clone] ->
           ammo_type =
             if ammo_group_params |> Map.has_key?("ammo_type_id"),
               do: ammo_group_params |> Map.get("ammo_type_id") |> Ammo.get_ammo_type!(user),
@@ -93,8 +93,8 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
           ammo_group |> AmmoGroup.create_changeset(ammo_type, container, user, ammo_group_params)
 
-        :edit ->
-          ammo_group |> AmmoGroup.update_changeset(ammo_group_params)
+        action == :edit ->
+          ammo_group |> AmmoGroup.update_changeset(ammo_group_params, user)
       end
 
     changeset =
@@ -127,9 +127,10 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
   defp save_ammo_group(
          %{assigns: %{changeset: changeset}} = socket,
-         :new,
+         action,
          %{"multiplier" => multiplier_str} = ammo_group_params
-       ) do
+       )
+       when action in [:new, :clone] do
     socket =
       case multiplier_str |> Integer.parse() do
         {multiplier, _remainder}

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

@@ -38,6 +38,14 @@
     ) %>
     <%= error_tag(f, :price_paid, "col-span-3 text-center") %>
 
+    <%= label(f, :purchased_on, gettext("Purchased on"), class: "title text-lg text-primary-600") %>
+    <%= date_input(f, :purchased_on,
+      class: "input input-primary col-span-2",
+      phx_update: "ignore",
+      value: @changeset |> Changeset.get_field(:purchased_on) || Date.utc_today()
+    ) %>
+    <%= error_tag(f, :purchased_on, "col-span-3 text-center") %>
+
     <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :notes,
       class: "text-center col-span-2 input input-primary",
@@ -51,8 +59,8 @@
     ) %>
     <%= error_tag(f, :container_id, "col-span-3 text-center") %>
 
-    <%= case @action do %>
-      <% :new -> %>
+    <%= cond do %>
+      <% @action in [:new, :clone] -> %>
         <hr class="hr col-span-3" />
 
         <%= label(f, :multiplier, gettext("Copies"), class: "title text-lg text-primary-600") %>
@@ -69,7 +77,7 @@
         ) %>
 
         <%= error_tag(f, :multiplier, "col-span-3 text-center") %>
-      <% :edit -> %>
+      <% @action == :edit -> %>
         <%= submit(dgettext("actions", "Save"),
           phx_disable_with: dgettext("prompts", "Saving..."),
           class: "mx-auto col-span-3 btn btn-primary"

lib/cannery_web/live/ammo_group_live/index.ex

@@ -9,12 +9,12 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket |> assign(show_used: false) |> display_ammo_groups()}
+    {:ok, socket |> assign(show_used: false)}
   end
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, apply_action(socket, live_action, params)}
+    {:noreply, apply_action(socket, live_action, params) |> display_ammo_groups()}
   end
 
   defp apply_action(
@@ -29,16 +29,22 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :move, %{"id" => id}) do
     socket
-    |> assign(:page_title, gettext("Move Ammo group"))
+    |> assign(:page_title, gettext("Move ammo"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
     socket
-    |> assign(:page_title, gettext("Edit Ammo group"))
+    |> assign(:page_title, gettext("Edit ammo"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
   end
 
+  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :clone, %{"id" => id}) do
+    socket
+    |> assign(:page_title, dgettext("actions", "Add Ammo"))
+    |> assign(:ammo_group, %{Ammo.get_ammo_group!(id, current_user) | id: nil})
+  end
+
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, dgettext("actions", "Add Ammo"))
@@ -46,14 +52,16 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
   end
 
   defp apply_action(socket, :index, _params) do
-    socket |> assign(:page_title, gettext("Ammo groups")) |> assign(:ammo_group, nil)
+    socket
+    |> assign(:page_title, gettext("Ammo"))
+    |> assign(:ammo_group, nil)
   end
 
   @impl true
   def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
     Ammo.get_ammo_group!(id, current_user) |> Ammo.delete_ammo_group!(current_user)
 
-    prompt = dgettext("prompts", "Ammo group deleted succesfully")
+    prompt = dgettext("prompts", "Ammo deleted succesfully")
 
     {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_groups()}
   end
@@ -81,180 +89,17 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
          %{assigns: %{current_user: current_user, show_used: show_used}} = socket
        ) do
     ammo_groups =
-      Ammo.list_ammo_groups(current_user, show_used) |> Repo.preload([:ammo_type, :container])
+      Ammo.list_ammo_groups(current_user, show_used)
+      |> Repo.preload([:ammo_type, :container], force: true)
 
     ammo_types_count = Ammo.get_ammo_types_count!(current_user)
     containers_count = Containers.get_containers_count!(current_user)
 
-    columns = [
-      %{label: gettext("Ammo type"), key: :ammo_type},
-      %{label: gettext("Count"), key: :count},
-      %{label: gettext("Price paid"), key: :price_paid},
-      %{label: gettext("% left"), key: :remaining},
-      %{label: gettext("Range"), key: :range},
-      %{label: gettext("Container"), key: :container},
-      %{label: gettext("Added on"), key: :added_on}
-    ]
-
-    columns =
-      if show_used do
-        columns ++ [%{label: gettext("Used up on"), key: :used_up_on}]
-      else
-        columns
-      end
-
-    columns = columns ++ [%{label: nil, key: :actions, sortable: false}]
-
-    rows =
-      ammo_groups
-      |> Enum.map(fn ammo_group -> ammo_group |> get_row_data_for_ammo_group(columns) end)
-
     socket
     |> assign(
       ammo_groups: ammo_groups,
       ammo_types_count: ammo_types_count,
-      containers_count: containers_count,
-      columns: columns,
-      rows: rows
+      containers_count: containers_count
     )
   end
-
-  @spec get_row_data_for_ammo_group(AmmoGroup.t(), [map()]) :: [map()]
-  defp get_row_data_for_ammo_group(ammo_group, columns) do
-    ammo_group = ammo_group |> Repo.preload([:ammo_type, :container])
-
-    columns
-    |> Enum.into(%{}, fn %{key: key} -> {key, get_value_for_key(key, ammo_group)} end)
-  end
-
-  @spec get_value_for_key(atom(), AmmoGroup.t()) :: any()
-  defp get_value_for_key(:ammo_type, %{ammo_type: ammo_type}) do
-    assigns = %{ammo_type: ammo_type}
-
-    {ammo_type.name,
-     ~H"""
-     <.link patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} class="link">
-       <%= @ammo_type.name %>
-     </.link>
-     """}
-  end
-
-  defp get_value_for_key(:price_paid, %{price_paid: nil}), do: {"a", nil}
-
-  defp get_value_for_key(:price_paid, %{price_paid: price_paid}),
-    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
-
-  defp get_value_for_key(:added_on, %{inserted_at: inserted_at}) do
-    assigns = %{inserted_at: inserted_at}
-
-    {inserted_at,
-     ~H"""
-     <%= @inserted_at |> display_datetime() %>
-     """}
-  end
-
-  defp get_value_for_key(:used_up_on, ammo_group) do
-    last_shot_group_date =
-      case ammo_group |> Ammo.get_last_used_shot_group() do
-        %{date: last_shot_group_date} -> last_shot_group_date
-        _no_shot_groups -> nil
-      end
-
-    assigns = %{last_shot_group_date: last_shot_group_date}
-
-    {last_shot_group_date,
-     ~H"""
-     <%= @last_shot_group_date |> display_date() %>
-     """}
-  end
-
-  defp get_value_for_key(:range, %{staged: staged} = ammo_group) do
-    assigns = %{ammo_group: ammo_group}
-
-    {staged,
-     ~H"""
-     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
-       <button
-         type="button"
-         class="mx-2 my-1 text-sm btn btn-primary"
-         phx-click="toggle_staged"
-         phx-value-ammo_group_id={@ammo_group.id}
-       >
-         <%= if @ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
-       </button>
-
-       <.link
-         patch={Routes.ammo_group_index_path(Endpoint, :add_shot_group, @ammo_group)}
-         class="mx-2 my-1 text-sm btn btn-primary"
-       >
-         <%= dgettext("actions", "Record shots") %>
-       </.link>
-     </div>
-     """}
-  end
-
-  defp get_value_for_key(:remaining, ammo_group),
-    do: "#{ammo_group |> Ammo.get_percentage_remaining()}%"
-
-  defp get_value_for_key(:actions, ammo_group) do
-    assigns = %{ammo_group: ammo_group}
-
-    ~H"""
-    <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
-      <.link
-        patch={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
-        class="text-primary-600 link"
-        data-qa={"view-#{@ammo_group.id}"}
-      >
-        <i class="fa-fw fa-lg fas fa-eye"></i>
-      </.link>
-
-      <.link
-        patch={Routes.ammo_group_index_path(Endpoint, :edit, @ammo_group)}
-        class="text-primary-600 link"
-        data-qa={"edit-#{@ammo_group.id}"}
-      >
-        <i class="fa-fw fa-lg fas fa-edit"></i>
-      </.link>
-
-      <.link
-        href="#"
-        class="text-primary-600 link"
-        phx-click="delete"
-        phx-value-id={@ammo_group.id}
-        data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
-        data-qa={"delete-#{@ammo_group.id}"}
-      >
-        <i class="fa-fw fa-lg fas fa-trash"></i>
-      </.link>
-    </div>
-    """
-  end
-
-  defp get_value_for_key(:container, %{container: nil}), do: {nil, nil}
-
-  defp get_value_for_key(:container, %{container: %{name: container_name}} = ammo_group) do
-    assigns = %{ammo_group: ammo_group}
-
-    {container_name,
-     ~H"""
-     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
-       <.link
-         patch={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
-         class="mx-2 my-1 link"
-       >
-         <%= @ammo_group.container.name %>
-       </.link>
-
-       <.link
-         patch={Routes.ammo_group_index_path(Endpoint, :move, @ammo_group)}
-         class="mx-2 my-1 text-sm btn btn-primary"
-       >
-         <%= gettext("Move ammo") %>
-       </.link>
-     </div>
-     """}
-  end
-
-  defp get_value_for_key(key, ammo_group), do: ammo_group |> Map.get(key)
 end

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

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

lib/cannery_web/live/ammo_group_live/show.ex

@@ -30,7 +30,12 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
 
   @impl true
   def handle_params(%{"id" => id}, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, socket |> assign(page_title: page_title(live_action)) |> display_ammo_group(id)}
+    socket =
+      socket
+      |> assign(page_title: page_title(live_action))
+      |> display_ammo_group(id)
+
+    {:noreply, socket}
   end
 
   defp page_title(:add_shot_group), do: gettext("Record Shots")
@@ -69,14 +74,14 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   def handle_event(
         "delete_shot_group",
         %{"id" => id},
-        %{assigns: %{ammo_group: ammo_group, 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_ammo_group(ammo_group)}
+    {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_group(ammo_group_id)}
   end
 
   @spec display_ammo_group(Socket.t(), AmmoGroup.t() | AmmoGroup.id()) :: Socket.t()
@@ -102,12 +107,12 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   defp display_ammo_group(%{assigns: %{current_user: current_user}} = socket, id),
     do: display_ammo_group(socket, Ammo.get_ammo_group!(id, current_user))
 
-  @spec get_table_row_for_shot_group(AmmoGroup.t(), ShotGroup.t(), [map()]) :: [map()]
+  @spec get_table_row_for_shot_group(AmmoGroup.t(), ShotGroup.t(), [map()]) :: map()
   defp get_table_row_for_shot_group(ammo_group, %{date: date} = shot_group, columns) do
     assigns = %{ammo_group: ammo_group, shot_group: shot_group}
 
     columns
-    |> Enum.into(%{}, fn %{key: key} ->
+    |> Map.new(fn %{key: key} ->
       value =
         case key do
           :date ->

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

@@ -11,12 +11,12 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Original count:") %>
-      <%= @ammo_group.count + Ammo.get_used_count(@ammo_group) %>
+      <%= Ammo.get_original_count(@ammo_group) %>
     </span>
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Percentage left:") %>
-      <%= "#{@ammo_group |> Ammo.get_percentage_remaining()}%" %>
+      <%= gettext("%{percentage}%", percentage: @ammo_group |> Ammo.get_percentage_remaining()) %>
     </span>
 
     <%= if @ammo_group.notes do %>
@@ -27,8 +27,8 @@
     <% end %>
 
     <span class="rounded-lg title text-lg">
-      <%= gettext("Added on:") %>
-      <%= @ammo_group.inserted_at |> display_datetime() %>
+      <%= gettext("Purchased on:") %>
+      <%= @ammo_group.purchased_on |> display_date() %>
     </span>
 
     <%= if @ammo_group.price_paid do %>
@@ -53,7 +53,7 @@
   <div class="flex flex-col justify-center items-center">
     <div class="flex flex-wrap justify-center items-center text-primary-600">
       <.link
-        patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)}
+        navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)}
         class="mx-4 my-2 btn btn-primary"
         data-qa="details"
       >
@@ -82,8 +82,8 @@
     <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 @ammo_group.staged,
-          do: gettext("Unstage from range"),
-          else: gettext("Stage for range") %>
+          do: dgettext("actions", "Unstage from range"),
+          else: dgettext("actions", "Stage for range") %>
       </button>
 
       <.link

lib/cannery_web/live/ammo_type_live/form_component.ex

@@ -35,15 +35,15 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
          ammo_type_params
        ) do
     changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
+      cond do
+        action in [:new, :clone] -> :insert
+        action == :edit -> :update
       end
 
     changeset =
-      case action do
-        :new -> ammo_type |> AmmoType.create_changeset(user, ammo_type_params)
-        :edit -> ammo_type |> AmmoType.update_changeset(ammo_type_params)
+      cond do
+        action in [:new, :clone] -> ammo_type |> AmmoType.create_changeset(user, ammo_type_params)
+        action == :edit -> ammo_type |> AmmoType.update_changeset(ammo_type_params)
       end
 
     changeset =
@@ -76,9 +76,10 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
 
   defp save_ammo_type(
          %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
-         :new,
+         action,
          ammo_type_params
-       ) do
+       )
+       when action in [:new, :clone] do
     socket =
       case Ammo.create_ammo_type(ammo_type_params, current_user) do
         {:ok, %{name: ammo_type_name}} ->

lib/cannery_web/live/ammo_type_live/index.ex

@@ -10,7 +10,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket |> list_ammo_types()}
+    {:ok, socket |> assign(:show_used, false) |> list_ammo_types()}
   end
 
   @impl true
@@ -24,6 +24,12 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     |> assign(:ammo_type, Ammo.get_ammo_type!(id, current_user))
   end
 
+  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :clone, %{"id" => id}) do
+    socket
+    |> assign(:page_title, gettext("New Ammo type"))
+    |> assign(:ammo_type, %{Ammo.get_ammo_type!(id, current_user) | id: nil})
+  end
+
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, gettext("New Ammo type"))
@@ -43,7 +49,12 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     {:noreply, socket |> put_flash(:info, prompt) |> list_ammo_types()}
   end
 
-  defp list_ammo_types(%{assigns: %{current_user: current_user}} = socket) do
+  @impl true
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> list_ammo_types()}
+  end
+
+  defp list_ammo_types(%{assigns: %{current_user: current_user, show_used: show_used}} = socket) do
     ammo_types = Ammo.list_ammo_types(current_user)
 
     columns =
@@ -83,9 +94,47 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
         end)
       end)
       |> Kernel.++([
-        %{label: gettext("Total # of rounds"), key: :round_count, type: :round_count},
-        %{label: gettext("Total # of ammo"), key: :ammo_count, type: :ammo_count},
-        %{label: gettext("Average Price paid"), key: :avg_price_paid, type: :avg_price_paid},
+        %{label: gettext("Rounds"), key: :round_count, type: :round_count}
+      ])
+      |> Kernel.++(
+        if show_used do
+          [
+            %{
+              label: gettext("Used rounds"),
+              key: :used_round_count,
+              type: :used_round_count
+            },
+            %{
+              label: gettext("Total ever rounds"),
+              key: :historical_round_count,
+              type: :historical_round_count
+            }
+          ]
+        else
+          []
+        end
+      )
+      |> Kernel.++([%{label: gettext("Packs"), key: :ammo_count, type: :ammo_count}])
+      |> Kernel.++(
+        if show_used do
+          [
+            %{
+              label: gettext("Used packs"),
+              key: :used_ammo_count,
+              type: :used_ammo_count
+            },
+            %{
+              label: gettext("Total ever packs"),
+              key: :historical_ammo_count,
+              type: :historical_ammo_count
+            }
+          ]
+        else
+          []
+        end
+      )
+      |> Kernel.++([
+        %{label: gettext("Average CPR"), key: :avg_price_paid, type: :avg_price_paid},
         %{label: nil, key: "actions", type: :actions, sortable: false}
       ])
 
@@ -98,7 +147,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
   defp get_ammo_type_values(ammo_type, columns, current_user) do
     columns
-    |> Enum.into(%{}, fn %{key: key, type: type} ->
+    |> Map.new(fn %{key: key, type: type} ->
       {key, get_ammo_type_value(type, key, ammo_type, current_user)}
     end)
   end
@@ -109,6 +158,18 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
   defp get_ammo_type_value(:round_count, _key, ammo_type, current_user),
     do: ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
 
+  defp get_ammo_type_value(:historical_round_count, _key, ammo_type, current_user),
+    do: ammo_type |> Ammo.get_historical_count_for_ammo_type(current_user)
+
+  defp get_ammo_type_value(:used_round_count, _key, ammo_type, current_user),
+    do: ammo_type |> Ammo.get_used_count_for_ammo_type(current_user)
+
+  defp get_ammo_type_value(:historical_ammo_count, _key, ammo_type, current_user),
+    do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
+
+  defp get_ammo_type_value(:used_ammo_count, _key, ammo_type, current_user),
+    do: ammo_type |> Ammo.get_used_ammo_groups_count_for_type(current_user)
+
   defp get_ammo_type_value(:ammo_count, _key, ammo_type, current_user),
     do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user)
 
@@ -124,7 +185,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
     ~H"""
     <.link
-      patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
+      navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
       class="link"
       data-qa={"view-name-#{@ammo_type.id}"}
     >
@@ -139,7 +200,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     ~H"""
     <div class="px-4 py-2 space-x-4 flex justify-center items-center">
       <.link
-        patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
+        navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
         class="text-primary-600 link"
         data-qa={"view-#{@ammo_type.id}"}
       >
@@ -154,6 +215,14 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
         <i class="fa-fw fa-lg fas fa-edit"></i>
       </.link>
 
+      <.link
+        patch={Routes.ammo_type_index_path(Endpoint, :clone, @ammo_type)}
+        class="text-primary-600 link"
+        data-qa={"clone-#{@ammo_type.id}"}
+      >
+        <i class="fa-fw fa-lg fas fa-copy"></i>
+      </.link>
+
       <.link
         href="#"
         class="text-primary-600 link"

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

@@ -5,7 +5,7 @@
 
   <%= if @rows |> Enum.empty?() do %>
     <h2 class="title text-xl text-primary-600">
-      <%= gettext("No Ammo Types") %>
+      <%= gettext("No Ammo types") %>
       <%= display_emoji("😔") %>
     </h2>
 
@@ -17,6 +17,14 @@
       <%= dgettext("actions", "New Ammo type") %>
     </.link>
 
+    <div class="flex flex-col justify-center items-center">
+      <.toggle_button action="toggle_show_used" value={@show_used}>
+        <span class="title text-lg text-primary-600">
+          <%= gettext("Show used") %>
+        </span>
+      </.toggle_button>
+    </div>
+
     <.live_component
       module={CanneryWeb.Components.TableComponent}
       id="ammo_types_index_table"
@@ -27,7 +35,7 @@
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
+<%= if @live_action in [:new, :edit, :clone] do %>
   <.modal return_to={Routes.ammo_type_index_path(Endpoint, :index)}>
     <.live_component
       module={CanneryWeb.AmmoTypeLive.FormComponent}

lib/cannery_web/live/ammo_type_live/show.ex

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

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

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

lib/cannery_web/live/container_live/form_component.ex

@@ -35,15 +35,18 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
          container_params
        ) do
     changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
+      cond do
+        action in [:new, :clone] -> :insert
+        action == :edit -> :update
       end
 
     changeset =
-      case action do
-        :new -> container |> Container.create_changeset(user, container_params)
-        :edit -> container |> Container.update_changeset(container_params)
+      cond do
+        action in [:new, :clone] ->
+          container |> Container.create_changeset(user, container_params)
+
+        action == :edit ->
+          container |> Container.update_changeset(container_params)
       end
 
     changeset =
@@ -76,9 +79,10 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
 
   defp save_container(
          %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
-         :new,
+         action,
          container_params
-       ) do
+       )
+       when action in [:new, :clone] do
     socket =
       case Containers.create_container(container_params, current_user) do
         {:ok, %{name: container_name}} ->

lib/cannery_web/live/container_live/index.ex

@@ -6,11 +6,11 @@ defmodule CanneryWeb.ContainerLive.Index do
   use CanneryWeb, :live_view
   import CanneryWeb.Components.ContainerCard
   alias Cannery.{Containers, Containers.Container, Repo}
-  alias CanneryWeb.Endpoint
+  alias CanneryWeb.{Components.TagCard, Endpoint}
   alias Ecto.Changeset
 
   @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, _session, socket), do: {:ok, socket |> assign(view_table: false)}
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
@@ -31,10 +31,29 @@ defmodule CanneryWeb.ContainerLive.Index do
     socket |> assign(:page_title, gettext("New Container")) |> assign(:container, %Container{})
   end
 
+  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :clone, %{"id" => id}) do
+    container = Containers.get_container!(id, current_user)
+
+    socket
+    |> assign(page_title: gettext("New Container"), container: %{container | id: nil})
+  end
+
   defp apply_action(socket, :index, _params) do
     socket
-    |> assign(:page_title, gettext("Containers"))
-    |> assign(:container, nil)
+    |> assign(
+      page_title: gettext("Containers"),
+      container: nil
+    )
+    |> display_containers()
+  end
+
+  defp apply_action(socket, :table, _params) do
+    socket
+    |> assign(
+      page_title: gettext("Containers"),
+      container: nil,
+      view_table: true
+    )
     |> display_containers()
   end
 
@@ -83,10 +102,148 @@ defmodule CanneryWeb.ContainerLive.Index do
     {:noreply, socket}
   end
 
+  @impl true
+  def handle_event("toggle_table", _params, %{assigns: %{view_table: view_table}} = socket) do
+    new_path =
+      if view_table,
+        do: Routes.container_index_path(Endpoint, :index),
+        else: Routes.container_index_path(Endpoint, :table)
+
+    {:noreply, socket |> assign(view_table: !view_table) |> push_patch(to: new_path)}
+  end
+
   defp display_containers(%{assigns: %{current_user: current_user}} = socket) do
     containers =
       Containers.list_containers(current_user) |> Repo.preload([:tags, :ammo_groups], force: true)
 
-    socket |> assign(containers: containers)
+    columns =
+      [
+        %{label: gettext("Name"), key: :name, type: :string},
+        %{label: gettext("Description"), key: :desc, type: :string},
+        %{label: gettext("Location"), key: :location, type: :string},
+        %{label: gettext("Type"), key: :type, type: :string},
+        %{label: gettext("Packs"), key: :packs, type: :integer},
+        %{label: gettext("Rounds"), key: :rounds, type: :string},
+        %{label: gettext("Tags"), key: :tags, type: :tags},
+        %{label: nil, key: :actions, sortable: false, type: :actions}
+      ]
+      |> Enum.filter(fn %{key: key, type: type} ->
+        # remove columns if all values match defaults
+        default_value =
+          case type do
+            :boolean -> false
+            _other_type -> nil
+          end
+
+        containers
+        |> Enum.any?(fn container ->
+          type in [:tags, :actions] or not (container |> Map.get(key) == default_value)
+        end)
+      end)
+
+    rows =
+      containers
+      |> Enum.map(fn container -> container |> get_row_data_for_container(columns) end)
+
+    socket
+    |> assign(
+      containers: containers,
+      columns: columns,
+      rows: rows
+    )
   end
+
+  @spec get_row_data_for_container(Container.t(), [map()]) :: map()
+  defp get_row_data_for_container(container, columns) do
+    container = container |> Repo.preload([:ammo_groups, :tags])
+
+    columns
+    |> Map.new(fn %{key: key} -> {key, get_value_for_key(key, container)} end)
+  end
+
+  @spec get_value_for_key(atom(), Container.t()) :: any()
+  defp get_value_for_key(:name, %{id: id, name: container_name}) do
+    assigns = %{id: id, container_name: container_name}
+
+    {container_name,
+     ~H"""
+     <div class="flex flex-wrap justify-center items-center">
+       <.link navigate={Routes.container_show_path(Endpoint, :show, @id)} class="link">
+         <%= @container_name %>
+       </.link>
+     </div>
+     """}
+  end
+
+  defp get_value_for_key(:packs, container) do
+    container |> Containers.get_container_ammo_group_count!()
+  end
+
+  defp get_value_for_key(:rounds, container) do
+    container |> Containers.get_container_rounds!()
+  end
+
+  defp get_value_for_key(:tags, container) do
+    assigns = %{container: container}
+
+    {container.tags |> Enum.map(fn %{name: name} -> name end),
+     ~H"""
+     <div class="flex flex-wrap justify-center items-center">
+       <%= unless @container.tags |> Enum.empty?() do %>
+         <%= for tag <- @container.tags do %>
+           <TagCard.simple_tag_card tag={tag} />
+         <% end %>
+       <% end %>
+
+       <div class="mx-4 my-2">
+         <.link
+           patch={Routes.container_index_path(Endpoint, :edit_tags, @container)}
+           class="text-primary-600 link"
+         >
+           <i class="fa-fw fa-lg fas fa-tags"></i>
+         </.link>
+       </div>
+     </div>
+     """}
+  end
+
+  defp get_value_for_key(:actions, container) do
+    assigns = %{container: container}
+
+    ~H"""
+    <.link
+      patch={Routes.container_index_path(Endpoint, :edit, @container)}
+      class="text-primary-600 link"
+      data-qa={"edit-#{@container.id}"}
+    >
+      <i class="fa-fw fa-lg fas fa-edit"></i>
+    </.link>
+
+    <.link
+      patch={Routes.container_index_path(Endpoint, :clone, @container)}
+      class="text-primary-600 link"
+      data-qa={"clone-#{@container.id}"}
+    >
+      <i class="fa-fw fa-lg fas fa-copy"></i>
+    </.link>
+
+    <.link
+      href="#"
+      class="text-primary-600 link"
+      phx-click="delete"
+      phx-value-id={@container.id}
+      data-confirm={
+        dgettext("prompts", "Are you sure you want to delete %{name}?", name: @container.name)
+      }
+      data-qa={"delete-#{@container.id}"}
+    >
+      <i class="fa-fw fa-lg fas fa-trash"></i>
+    </.link>
+    """
+  end
+
+  defp get_value_for_key(key, container), do: container |> Map.get(key)
+
+  def return_to(true = _view_table), do: Routes.container_index_path(Endpoint, :table)
+  def return_to(false = _view_table), do: Routes.container_index_path(Endpoint, :index)
 end

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

@@ -16,62 +16,88 @@
     <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
       <%= dgettext("actions", "New Container") %>
     </.link>
+
+    <div class="flex flex-col justify-center items-center">
+      <.toggle_button action="toggle_table" value={@view_table}>
+        <span class="title text-lg text-primary-600">
+          <%= gettext("View as table") %>
+        </span>
+      </.toggle_button>
+    </div>
   <% end %>
 
-  <div class="max-w-full flex flex-row flex-wrap justify-center items-center">
-    <%= for container <- @containers do %>
-      <.container_card container={container}>
-        <:tag_actions>
-          <div class="mx-4 my-2">
-            <.link
-              patch={Routes.container_index_path(Endpoint, :edit_tags, container)}
-              class="text-primary-600 link"
-            >
-              <i class="fa-fw fa-lg fas fa-tags"></i>
-            </.link>
-          </div>
-        </:tag_actions>
-        <.link
-          patch={Routes.container_index_path(Endpoint, :edit, container)}
-          class="text-primary-600 link"
-          data-qa={"edit-#{container.id}"}
-        >
-          <i class="fa-fw fa-lg fas fa-edit"></i>
-        </.link>
+  <div class="w-full flex flex-row flex-wrap justify-center items-center">
+    <%= if @view_table do %>
+      <.live_component
+        module={CanneryWeb.Components.TableComponent}
+        id="containers_index_table"
+        action={@live_action}
+        columns={@columns}
+        rows={@rows}
+      />
+    <% else %>
+      <%= for container <- @containers do %>
+        <.container_card container={container}>
+          <:tag_actions>
+            <div class="mx-4 my-2">
+              <.link
+                patch={Routes.container_index_path(Endpoint, :edit_tags, container)}
+                class="text-primary-600 link"
+              >
+                <i class="fa-fw fa-lg fas fa-tags"></i>
+              </.link>
+            </div>
+          </:tag_actions>
+          <.link
+            patch={Routes.container_index_path(Endpoint, :edit, container)}
+            class="text-primary-600 link"
+            data-qa={"edit-#{container.id}"}
+          >
+            <i class="fa-fw fa-lg fas fa-edit"></i>
+          </.link>
 
-        <.link
-          href="#"
-          class="text-primary-600 link"
-          phx-click="delete"
-          phx-value-id={container.id}
-          data-confirm={
-            dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name)
-          }
-          data-qa={"delete-#{container.id}"}
-        >
-          <i class="fa-fw fa-lg fas fa-trash"></i>
-        </.link>
-      </.container_card>
+          <.link
+            patch={Routes.container_index_path(Endpoint, :clone, container)}
+            class="text-primary-600 link"
+            data-qa={"clone-#{container.id}"}
+          >
+            <i class="fa-fw fa-lg fas fa-copy"></i>
+          </.link>
+
+          <.link
+            href="#"
+            class="text-primary-600 link"
+            phx-click="delete"
+            phx-value-id={container.id}
+            data-confirm={
+              dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name)
+            }
+            data-qa={"delete-#{container.id}"}
+          >
+            <i class="fa-fw fa-lg fas fa-trash"></i>
+          </.link>
+        </.container_card>
+      <% end %>
     <% end %>
   </div>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+<%= if @live_action in [:new, :edit, :clone] do %>
+  <.modal return_to={return_to(@view_table)}>
     <.live_component
       module={CanneryWeb.ContainerLive.FormComponent}
       id={@container.id || :new}
       title={@page_title}
       action={@live_action}
       container={@container}
-      return_to={Routes.container_index_path(Endpoint, :index)}
+      return_to={return_to(@view_table)}
       current_user={@current_user}
     />
   </.modal>
 <% end %>
 
 <%= if @live_action == :edit_tags do %>
-  <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+  <.modal return_to={return_to(@view_table)}>
     <.live_component
       module={CanneryWeb.ContainerLive.EditTagsComponent}
       id={@container.id}

lib/cannery_web/live/container_live/show.ex

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

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

@@ -24,12 +24,20 @@
 
   <%= unless @ammo_groups |> Enum.empty?() do %>
     <span class="rounded-lg title text-lg">
-      <%= gettext("Packs:") %>
+      <%= if @show_used do %>
+        <%= gettext("Total packs:") %>
+      <% else %>
+        <%= gettext("Packs:") %>
+      <% end %>
       <%= Enum.count(@ammo_groups) %>
     </span>
 
     <span class="rounded-lg title text-lg">
-      <%= gettext("Rounds:") %>
+      <%= if @show_used do %>
+        <%= gettext("Total rounds:") %>
+      <% else %>
+        <%= gettext("Rounds:") %>
+      <% end %>
       <%= @container |> Containers.get_container_rounds!() %>
     </span>
   <% end %>
@@ -91,25 +99,46 @@
 
   <hr class="mb-4 hr" />
 
-  <div class="flex flex-col justify-center items-center">
+  <div class="flex justify-center items-center space-x-4">
     <.toggle_button action="toggle_show_used" value={@show_used}>
       <span class="title text-lg text-primary-600">
         <%= gettext("Show used") %>
       </span>
     </.toggle_button>
+
+    <.toggle_button action="toggle_table" value={@view_table}>
+      <span class="title text-lg text-primary-600">
+        <%= gettext("View as table") %>
+      </span>
+    </.toggle_button>
   </div>
 
-  <div>
+  <div class="w-full p-4">
     <%= if @ammo_groups |> Enum.empty?() do %>
-      <h2 class="mx-8 my-4 title text-lg text-primary-600">
+      <h2 class="mx-4 title text-lg text-primary-600 text-center">
         <%= gettext("No ammo in this container") %>
       </h2>
     <% else %>
-      <div class="flex flex-wrap justify-center items-center">
-        <%= for ammo_group <- @ammo_groups do %>
-          <.ammo_group_card ammo_group={ammo_group} />
-        <% end %>
-      </div>
+      <%= if @view_table do %>
+        <.live_component
+          module={CanneryWeb.Components.AmmoGroupTableComponent}
+          id="ammo-type-show-table"
+          ammo_groups={@ammo_groups}
+          current_user={@current_user}
+        >
+          <:ammo_type :let={%{name: ammo_type_name} = ammo_type}>
+            <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link">
+              <%= ammo_type_name %>
+            </.link>
+          </:ammo_type>
+        </.live_component>
+      <% else %>
+        <div class="flex flex-wrap justify-center items-center">
+          <%= for ammo_group <- @ammo_groups do %>
+            <.ammo_group_card ammo_group={ammo_group} />
+          <% end %>
+        </div>
+      <% end %>
     <% end %>
   </div>
 </div>

lib/cannery_web/live/home_live.ex

@@ -7,32 +7,15 @@ defmodule CanneryWeb.HomeLive do
   alias Cannery.Accounts
   alias CanneryWeb.Endpoint
 
+  @version Mix.Project.config()[:version]
+
   @impl true
   def mount(_params, _session, socket) do
     admins = Accounts.list_users_by_role(:admin)
-    socket = socket |> assign(page_title: "Home", query: "", results: %{}, admins: admins)
+    socket = socket |> assign(page_title: gettext("Home"), admins: admins, version: @version)
     {:ok, socket}
   end
 
-  @impl true
-  def handle_event("suggest", %{"q" => query}, socket) do
-    {:noreply, socket |> assign(results: search(query), query: query)}
-  end
-
-  @impl true
-  def handle_event("search", %{"q" => query}, socket) do
-    case search(query) do
-      %{^query => vsn} ->
-        {:noreply, redirect(socket, external: "https://hexdocs.pm/#{query}/#{vsn}")}
-
-      _no_query ->
-        {:noreply,
-         socket
-         |> put_flash(:error, "No dependencies found matching \"#{query}\"")
-         |> assign(results: %{}, query: query)}
-    end
-  end
-
   @impl true
   def render(assigns) do
     ~H"""
@@ -138,7 +121,9 @@ defmodule CanneryWeb.HomeLive do
             target="_blank"
             rel="noopener noreferrer"
           >
-            <p>0.5.5</p>
+            <p>
+              <%= @version %>
+            </p>
             <i class="fas fa-md fa-info-circle"></i>
           </.link>
         </li>
@@ -188,16 +173,4 @@ defmodule CanneryWeb.HomeLive do
     </div>
     """
   end
-
-  defp search(query) do
-    if not CanneryWeb.Endpoint.config(:code_reloader) do
-      raise "action disabled when not in development"
-    end
-
-    for {app, desc, vsn} <- Application.started_applications(),
-        app = to_string(app),
-        String.starts_with?(app, query) and not List.starts_with?(desc, ~c"ERTS"),
-        into: %{},
-        do: {app, vsn}
-  end
 end

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

@@ -57,11 +57,11 @@
 
         <%= if invite.disabled_at |> is_nil() do %>
           <a href="#" class="btn btn-primary" phx-click="disable_invite" phx-value-id={invite.id}>
-            <%= gettext("Disable") %>
+            <%= dgettext("actions", "Disable") %>
           </a>
         <% else %>
           <a href="#" class="btn btn-primary" phx-click="enable_invite" phx-value-id={invite.id}>
-            <%= gettext("Enable") %>
+            <%= dgettext("actions", "Enable") %>
           </a>
         <% end %>
 
@@ -77,7 +77,7 @@
               )
             }
           >
-            <%= gettext("Set Unlimited") %>
+            <%= dgettext("actions", "Set Unlimited") %>
           </a>
         <% end %>
       </.invite_card>

lib/cannery_web/live/live_helpers.ex

@@ -72,10 +72,57 @@ defmodule CanneryWeb.LiveHelpers do
     """
   end
 
-  def hide_modal(js \\ %JS{}) do
+  defp hide_modal(js \\ %JS{}) do
     js
     |> JS.hide(to: "#modal", transition: "fade-out")
     |> JS.hide(to: "#modal-bg", transition: "fade-out")
     |> JS.hide(to: "#modal-content", transition: "fade-out-scale")
   end
+
+  @doc """
+  A toggle button element that can be directed to a liveview or a
+  live_component's `handle_event/3`.
+
+  ## Examples
+
+  <.toggle_button action="my_liveview_action" value={@some_value}>
+    <span>Toggle me!</span>
+  </.toggle_button>
+  <.toggle_button action="my_live_component_action" target={@myself} value={@some_value}>
+    <span>Whatever you want</span>
+  </.toggle_button>
+  """
+  def toggle_button(assigns) do
+    assigns = assigns |> assign_new(:id, fn -> assigns.action end)
+
+    ~H"""
+    <label for={@id} class="inline-flex relative items-center cursor-pointer">
+      <input
+        id={@id}
+        type="checkbox"
+        value={@value}
+        checked={@value}
+        class="sr-only peer"
+        data-qa={@id}
+        {
+          if assigns |> Map.has_key?(:target),
+            do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},
+            else: %{"phx-click" => @action, "phx-value-value" => @value}
+        }
+      />
+      <div class="w-11 h-6 bg-gray-300 rounded-full peer
+        peer-focus:ring-4 peer-focus:ring-teal-300 dark:peer-focus:ring-teal-800
+        peer-checked:bg-gray-600
+        peer-checked:after:translate-x-full peer-checked:after:border-white
+        after:content-[''] after:absolute after:top-1 after:left-[2px] after:bg-white after:border-gray-300
+        after:border after:rounded-full after:h-5 after:w-5
+        after:transition-all after:duration-250 after:ease-in-out
+        transition-colors duration-250 ease-in-out">
+      </div>
+      <span class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300">
+        <%= render_slot(@inner_block) %>
+      </span>
+    </label>
+    """
+  end
 end

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

@@ -33,7 +33,7 @@
     ) %>
     <%= error_tag(f, :notes, "col-span-3") %>
 
-    <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %>
+    <%= label(f, :date, gettext("Date"), class: "title text-lg text-primary-600") %>
     <%= date_input(f, :date, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :notes, "col-span-3") %>
 

lib/cannery_web/live/range_live/index.ex

@@ -88,23 +88,51 @@ defmodule CanneryWeb.RangeLive.Index do
       shot_groups
       |> Enum.map(fn shot_group -> shot_group |> get_row_data_for_shot_group(columns) end)
 
+    chart_data = shot_groups |> get_chart_data_for_shot_group()
+
     socket
-    |> assign(ammo_groups: ammo_groups, columns: columns, rows: rows, shot_groups: shot_groups)
+    |> assign(
+      ammo_groups: ammo_groups,
+      columns: columns,
+      rows: rows,
+      chart_data: chart_data,
+      shot_groups: shot_groups
+    )
   end
 
-  @spec get_row_data_for_shot_group(ShotGroup.t(), [map()]) :: [map()]
+  @spec get_chart_data_for_shot_group([ShotGroup.t()]) :: [map()]
+  defp get_chart_data_for_shot_group(shot_groups) do
+    shot_groups
+    |> Repo.preload(ammo_group: :ammo_type)
+    |> Enum.group_by(fn %{date: date} -> date end, fn %{count: count} -> count end)
+    |> Enum.map(fn {date, rounds} ->
+      sum = Enum.sum(rounds)
+
+      %{
+        date: date,
+        count: sum,
+        label: gettext("Rounds shot: %{count}", count: sum)
+      }
+    end)
+    |> Enum.sort_by(fn %{date: date} -> date end)
+  end
+
+  @spec get_row_data_for_shot_group(ShotGroup.t(), [map()]) :: map()
   defp get_row_data_for_shot_group(%{date: date} = shot_group, columns) do
     shot_group = shot_group |> Repo.preload(ammo_group: :ammo_type)
     assigns = %{shot_group: shot_group}
 
     columns
-    |> Enum.into(%{}, fn %{key: key} ->
+    |> Map.new(fn %{key: key} ->
       value =
         case key do
           :name ->
             {shot_group.ammo_group.ammo_type.name,
              ~H"""
-             <.link patch={Routes.ammo_group_show_path(Endpoint, :show, @shot_group.ammo_group)} class="link">
+             <.link
+               navigate={Routes.ammo_group_show_path(Endpoint, :show, @shot_group.ammo_group)}
+               class="link"
+             >
                <%= @shot_group.ammo_group.ammo_type.name %>
              </.link>
              """}

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

@@ -9,11 +9,11 @@
       <%= display_emoji("😔") %>
     </h1>
 
-    <.link patch={Routes.ammo_group_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 patch={Routes.ammo_group_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>
 
@@ -27,8 +27,8 @@
           data-confirm={"#{dgettext("prompts", "Are you sure you want to unstage this ammo?")}"}
         >
           <%= if ammo_group.staged,
-            do: gettext("Unstage from range"),
-            else: gettext("Stage for range") %>
+            do: dgettext("actions", "Unstage from range"),
+            else: dgettext("actions", "Stage for range") %>
         </button>
 
         <.link
@@ -53,11 +53,27 @@
       <%= gettext("Shot log") %>
     </h1>
 
+    <canvas
+      id="shot-log-chart"
+      phx-hook="ShotLogChart"
+      phx-update="ignore"
+      class="max-h-72"
+      data-chart-data={Jason.encode!(@chart_data)}
+      data-label={gettext("Rounds shot")}
+      data-color={random_color()}
+      aria-label={gettext("Rounds shot chart")}
+      role="img"
+    >
+      <%= dgettext("errors", "Your browser does not support the canvas element.") %>
+    </canvas>
+
     <.live_component
       module={CanneryWeb.Components.TableComponent}
       id="shot_groups_index_table"
       columns={@columns}
       rows={@rows}
+      initial_key={:date}
+      initial_sort_mode={:desc}
     />
   <% end %>
 </div>

lib/cannery_web/live/tag_live/index.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.TagLive.Index do
   use CanneryWeb, :live_view
   import CanneryWeb.Components.TagCard
   alias Cannery.{Tags, Tags.Tag}
-  alias CanneryWeb.Endpoint
+  alias CanneryWeb.{Endpoint, ViewHelpers}
 
   @impl true
   def mount(_params, _session, socket), do: {:ok, socket |> display_tags()}
@@ -25,7 +25,7 @@ defmodule CanneryWeb.TagLive.Index do
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, gettext("New Tag"))
-    |> assign(:tag, %Tag{bg_color: Tags.random_bg_color(), text_color: "#ffffff"})
+    |> assign(:tag, %Tag{bg_color: ViewHelpers.random_color(), text_color: "#ffffff"})
   end
 
   defp apply_action(socket, :index, _params) do

lib/cannery_web/router.ex

@@ -60,6 +60,7 @@ defmodule CanneryWeb.Router do
     put "/users/settings", UserSettingsController, :update
     delete "/users/settings/:id", UserSettingsController, :delete
     get "/users/settings/confirm_email/:token", UserSettingsController, :confirm_email
+    get "/export/:mode", ExportController, :export
 
     live "/tags", TagLive.Index, :index
     live "/tags/new", TagLive.Index, :new
@@ -67,27 +68,33 @@ defmodule CanneryWeb.Router do
 
     live "/catalog", AmmoTypeLive.Index, :index
     live "/catalog/new", AmmoTypeLive.Index, :new
+    live "/catalog/:id/clone", AmmoTypeLive.Index, :clone
     live "/catalog/:id/edit", AmmoTypeLive.Index, :edit
 
-    live "/catalog/:id", AmmoTypeLive.Show, :show
+    live "/catalog/:id/show", AmmoTypeLive.Show, :show
     live "/catalog/:id/show/edit", AmmoTypeLive.Show, :edit
+    live "/catalog/:id/show/table", AmmoTypeLive.Show, :table
 
     live "/containers", ContainerLive.Index, :index
+    live "/containers/table", ContainerLive.Index, :table
     live "/containers/new", ContainerLive.Index, :new
     live "/containers/:id/edit", ContainerLive.Index, :edit
+    live "/containers/:id/clone", ContainerLive.Index, :clone
     live "/containers/:id/edit_tags", ContainerLive.Index, :edit_tags
 
-    live "/containers/:id", ContainerLive.Show, :show
+    live "/containers/:id/show", ContainerLive.Show, :show
+    live "/containers/:id/show/table", ContainerLive.Show, :table
     live "/containers/:id/show/edit", ContainerLive.Show, :edit
     live "/containers/:id/show/edit_tags", ContainerLive.Show, :edit_tags
 
     live "/ammo", AmmoGroupLive.Index, :index
     live "/ammo/new", AmmoGroupLive.Index, :new
     live "/ammo/:id/edit", AmmoGroupLive.Index, :edit
+    live "/ammo/:id/clone", AmmoGroupLive.Index, :clone
     live "/ammo/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
     live "/ammo/:id/move", AmmoGroupLive.Index, :move
 
-    live "/ammo/:id", AmmoGroupLive.Show, :show
+    live "/ammo/:id/show", AmmoGroupLive.Show, :show
     live "/ammo/:id/show/edit", AmmoGroupLive.Show, :edit
     live "/ammo/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
     live "/ammo/:id/show/move", AmmoGroupLive.Show, :move

lib/cannery_web/templates/user_settings/edit.html.heex

@@ -139,12 +139,22 @@
 
   <hr class="hr" />
 
-  <.link
-    href={Routes.user_settings_path(@conn, :delete, @current_user)}
-    method={:delete}
-    class="btn btn-alert"
-    data-confirm={dgettext("prompts", "Are you sure you want to delete your account?")}
-  >
-    <%= dgettext("actions", "Delete User") %>
-  </.link>
+  <div class="flex justify-center items-center">
+    <.link
+      href={Routes.export_path(@conn, :export, :json)}
+      class="mx-4 my-2 btn btn-primary"
+      target="_blank"
+    >
+      <%= dgettext("actions", "Export Data as JSON") %>
+    </.link>
+
+    <.link
+      href={Routes.user_settings_path(@conn, :delete, @current_user)}
+      method={:delete}
+      class="mx-4 my-2 btn btn-alert"
+      data-confirm={dgettext("prompts", "Are you sure you want to delete your account?")}
+    >
+      <%= dgettext("actions", "Delete User") %>
+    </.link>
+  </div>
 </div>

lib/cannery_web/views/view_helpers.ex

@@ -77,41 +77,16 @@ defmodule CanneryWeb.ViewHelpers do
   def display_emoji(other_emoji), do: other_emoji
 
   @doc """
-  A toggle button element that can be directed to a liveview or a
-  live_component's `handle_event/3`.
+  Get a random color in `#ffffff` hex format
 
   ## Examples
 
-  <.toggle_button action="my_liveview_action" value={@some_value}>
-    <span>Toggle me!</span>
-  </.toggle_button>
-  <.toggle_button action="my_live_component_action" target={@myself} value={@some_value}>
-    <span>Whatever you want</span>
-  </.toggle_button>
+      iex> random_color()
+      "#cc0066"
   """
-  def toggle_button(assigns) do
-    assigns = assigns |> assign_new(:id, fn -> assigns.action end)
-
-    ~H"""
-    <label for={@id} class="inline-flex relative items-center cursor-pointer">
-      <input
-        type="checkbox"
-        value={@value}
-        checked={@value}
-        id={@id}
-        class="sr-only peer"
-        {
-          if assigns |> Map.has_key?(:target),
-            do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},
-            else: %{"phx-click" => @action, "phx-value-value" => @value}
-        }
-      />
-      <div class="w-11 h-6 bg-gray-200 rounded-full peer dark:bg-gray-700 peer-focus:ring-4 peer-focus:ring-teal-300 dark:peer-focus:ring-teal-800 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-1 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-teal-600">
-      </div>
-      <span class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300">
-        <%= render_slot(@inner_block) %>
-      </span>
-    </label>
-    """
+  @spec random_color() :: <<_::7>>
+  def random_color do
+    ["#cc0066", "#ff6699", "#6666ff", "#0066cc", "#00cc66", "#669900", "#ff9900", "#996633"]
+    |> Enum.random()
   end
 end

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.6.0",
+      version: "0.7.1",
       elixir: "1.14.1",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),
@@ -13,7 +13,7 @@ defmodule Cannery.MixProject do
       deps: deps(),
       dialyzer: [plt_add_apps: [:ex_unit]],
       consolidate_protocols: Mix.env() not in [:dev, :test],
-      preferred_cli_env: [test: :test],
+      preferred_cli_env: [test: :test, "test.all": :test],
       # ExDoc
       name: "Cannery",
       source_url: "https://gitea.bubbletea.dev/shibao/cannery",
@@ -86,13 +86,13 @@ defmodule Cannery.MixProject do
       setup: ["deps.get", "compile", "ecto.setup", "cmd npm install --prefix assets"],
       "ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
       "ecto.reset": ["ecto.drop", "ecto.setup"],
-      format: [
+      "format.all": [
         "cmd npm run format --prefix assets",
         "format",
         "gettext.extract --merge",
         "gettext.merge --no-fuzzy priv/gettext"
       ],
-      test: [
+      "test.all": [
         "cmd npm run test --prefix assets",
         "dialyzer",
         "credo --strict",

priv/gettext/actions.pot

@@ -11,6 +11,7 @@ msgid ""
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.ex:50
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
@@ -48,7 +49,7 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
@@ -119,8 +120,8 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:46
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
+#: lib/cannery_web/components/add_shot_group_component.html.heex:53
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:31
@@ -135,7 +136,7 @@ msgstr ""
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:72
+#: lib/cannery_web/live/container_live/show.html.heex:80
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -155,7 +156,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:79
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -187,7 +188,7 @@ msgstr ""
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
@@ -211,3 +212,40 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "Disable"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Enable"
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#, elixir-autogen, elixir-format
+msgid "Move ammo"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:80
+#, elixir-autogen, elixir-format
+msgid "Set Unlimited"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "Stage for range"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/range_live/index.html.heex:30
+#, elixir-autogen, elixir-format
+msgid "Unstage from range"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#, elixir-autogen, elixir-format
+msgid "Export Data as JSON"
+msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -24,6 +24,7 @@ msgstr ""
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.ex:50
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
@@ -61,7 +62,7 @@ msgstr "Passwort ändern"
 msgid "Create Invite"
 msgstr "Einladung erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Benutzer löschen"
@@ -132,8 +133,8 @@ msgstr "Bestätigungsmail erneut senden"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:46
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
+#: lib/cannery_web/components/add_shot_group_component.html.heex:53
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:31
@@ -148,7 +149,7 @@ msgstr "Speichern"
 msgid "Send instructions to reset password"
 msgstr "Anleitung zum Passwort zurücksetzen zusenden"
 
-#: lib/cannery_web/live/container_live/show.html.heex:72
+#: lib/cannery_web/live/container_live/show.html.heex:80
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
@@ -168,7 +169,7 @@ msgstr "Munition markieren"
 msgid "Why not get some ready to shoot?"
 msgstr "Warum nicht einige für den Schießstand auswählen?"
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:79
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -200,7 +201,7 @@ msgstr "In die Zwischenablage kopieren"
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Erstellen"
@@ -224,3 +225,40 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "Disable"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Enable"
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#, elixir-autogen, elixir-format
+msgid "Move ammo"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:80
+#, elixir-autogen, elixir-format
+msgid "Set Unlimited"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "Stage for range"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/range_live/index.html.heex:30
+#, elixir-autogen, elixir-format
+msgid "Unstage from range"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#, elixir-autogen, elixir-format
+msgid "Export Data as JSON"
+msgstr ""

priv/gettext/de/LC_MESSAGES/errors.po

@@ -28,13 +28,13 @@ msgstr ""
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/index.ex:88
+#: lib/cannery_web/live/container_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Konnte %{name} nicht löschen: %{error}"
 
-#: lib/cannery_web/live/container_live/index.ex:57
+#: lib/cannery_web/live/container_live/index.ex:76
 #, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr "Konnte Behälter nicht finden"
@@ -121,22 +121,22 @@ msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen"
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
 
-#: lib/cannery/accounts/user.ex:130
+#: lib/cannery/accounts/user.ex:138
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "hat sich nicht geändert"
 
-#: lib/cannery/accounts/user.ex:151
+#: lib/cannery/accounts/user.ex:159
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"
 
-#: lib/cannery/accounts/user.ex:188
+#: lib/cannery/accounts/user.ex:196
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "ist nicht gültig"
 
-#: lib/cannery/accounts/user.ex:84
+#: lib/cannery/accounts/user.ex:92
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
@@ -151,13 +151,13 @@ msgstr "Tag nicht gefunden"
 msgid "Tag could not be added"
 msgstr "Tag konnte nicht hinzugefügt werden"
 
-#: lib/cannery/activity_log/shot_group.ex:115
+#: lib/cannery/activity_log/shot_group.ex:123
 #, elixir-autogen, elixir-format
 msgid "Count must be at least 1"
 msgstr "Anzahl muss mindestens 1 sein"
 
-#: lib/cannery/activity_log/shot_group.ex:74
-#: lib/cannery/activity_log/shot_group.ex:111
+#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format
 msgid "Count must be less than %{count}"
 msgstr "Anzahl muss weniger als %{count} betragen"
@@ -175,29 +175,34 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr "Tag konnte nicht gelöscht werden"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:157
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "Konnte die Anzahl der Kopien nicht verstehen"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:142
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
 "%{multiplier}"
 
-#: lib/cannery/ammo.ex:535
+#: lib/cannery/ammo.ex:609
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/ammo_group.ex:84
+#: lib/cannery/ammo/ammo_group.ex:96
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:69
+#: lib/cannery_web/live/range_live/index.html.heex:67
 #, elixir-autogen, elixir-format
-msgid "Please select a valid user and ammo group"
+msgid "Your browser does not support the canvas element."
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:77
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid user and ammo pack"
 msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -23,16 +23,16 @@ 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/ammo_type_live/form_component.ex:85
-#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:86
+#: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
 #: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "%{name} erfolgreich erstellt"
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: lib/cannery_web/live/ammo_type_live/index.ex:47
+#: lib/cannery_web/live/ammo_type_live/show.ex:55
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -50,8 +50,8 @@ msgstr "%{name} erfolgreich deaktiviert"
 msgid "%{name} enabled succesfully"
 msgstr "%{name} erfolgreich aktiviert"
 
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/index.ex:81
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"
@@ -62,7 +62,7 @@ msgid "%{name} updated succesfully"
 msgstr "%{name} erfolgreich aktualisiert"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:67
-#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
 #: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
@@ -74,11 +74,6 @@ msgstr "%{name} erfolgreich aktualisiert"
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr "Eine Mail zum Bestätigen ihre Mailadresse wurde Ihnen zugesandt."
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:56
-#, elixir-autogen, elixir-format
-msgid "Ammo group deleted succesfully"
-msgstr "Munitionsgruppe erfolgreich gelöscht"
-
 #: lib/cannery_web/live/invite_live/index.html.heex:103
 #: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
@@ -87,8 +82,9 @@ msgstr ""
 "Sind Sie sicher, dass sie %{email} löschen möchten? Dies kann nicht "
 "zurückgenommen werden!"
 
-#: lib/cannery_web/live/container_live/index.html.heex:48
-#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/container_live/index.ex:236
+#: lib/cannery_web/live/container_live/index.html.heex:73
+#: lib/cannery_web/live/container_live/show.html.heex:59
 #: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
@@ -99,13 +95,13 @@ msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Sind Sie sicher, dass sie die Einladung für %{name} löschen möchten?"
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#: lib/cannery_web/templates/user_settings/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?"
@@ -159,13 +155,13 @@ msgstr "Passwort erfolgreich geändert."
 msgid "Please check your email to verify your account"
 msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto"
 
-#: lib/cannery_web/live/home_live.ex:108
+#: lib/cannery_web/live/home_live.ex:91
 #, elixir-autogen, elixir-format
 msgid "Register to setup %{name}"
 msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/components/add_shot_group_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:33
@@ -192,7 +188,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr "%{name} erfolgreich hinzugefügt"
 
-#: lib/cannery_web/live/container_live/show.ex:37
+#: lib/cannery_web/live/container_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} wurde von %{container_name} entfernt"
@@ -212,13 +208,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/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:131
+#: lib/cannery_web/live/ammo_group_live/show.ex:137
+#: lib/cannery_web/live/range_live/index.ex:159
 #, 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/ammo_group_live/show.ex:78
+#: lib/cannery_web/live/ammo_group_live/show.ex:83
 #: lib/cannery_web/live/range_live/index.ex:54
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -255,7 +251,7 @@ msgstr "%{name} erfolgreich entfernt"
 msgid "You'll need to"
 msgstr "Sie müssen"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Erstellen..."
@@ -270,7 +266,8 @@ msgstr "Möchten Sie die Sprache wechseln?"
 msgid "Language updated successfully."
 msgstr "Spracheinstellung gespeichert."
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/index.ex:64
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr "Munitionsgruppe erfolgreich gelöscht"
@@ -285,14 +282,14 @@ msgstr "Munition erfolgreich demarkiert"
 msgid "Ammo updated successfully"
 msgstr "Munitionsgruppe erfolgreich aktualisiert"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:178
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"
 msgstr[0] "Munitionsgruppe erfolgreich aktualisiert"
 msgstr[1] "Munitionsgruppe erfolgreich aktualisiert"
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/index.ex:232
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:28
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/en/LC_MESSAGES/actions.po

@@ -12,6 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.ex:50
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
@@ -49,7 +50,7 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
@@ -120,8 +121,8 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:46
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
+#: lib/cannery_web/components/add_shot_group_component.html.heex:53
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:31
@@ -136,7 +137,7 @@ msgstr ""
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:72
+#: lib/cannery_web/live/container_live/show.html.heex:80
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -156,7 +157,7 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:79
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -188,7 +189,7 @@ msgstr ""
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Create"
 msgstr ""
@@ -212,3 +213,40 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "Disable"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Enable"
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#, elixir-autogen, elixir-format
+msgid "Move ammo"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:80
+#, elixir-autogen, elixir-format
+msgid "Set Unlimited"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "Stage for range"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/range_live/index.html.heex:30
+#, elixir-autogen, elixir-format
+msgid "Unstage from range"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#, elixir-autogen, elixir-format
+msgid "Export Data as JSON"
+msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -15,13 +15,13 @@ msgstr ""
 msgid "Container must be empty before deleting"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/index.ex:88
+#: lib/cannery_web/live/container_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:57
+#: lib/cannery_web/live/container_live/index.ex:76
 #, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr ""
@@ -107,23 +107,23 @@ msgstr ""
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:130
+#: lib/cannery/accounts/user.ex:138
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:151
+#: lib/cannery/accounts/user.ex:159
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
 ## From Ecto.Changeset.put_change/3
-#: lib/cannery/accounts/user.ex:188
+#: lib/cannery/accounts/user.ex:196
 #, elixir-autogen, elixir-format, fuzzy
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:84
+#: lib/cannery/accounts/user.ex:92
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -138,13 +138,13 @@ msgstr ""
 msgid "Tag could not be added"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:115
+#: lib/cannery/activity_log/shot_group.ex:123
 #, elixir-autogen, elixir-format
 msgid "Count must be at least 1"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:74
-#: lib/cannery/activity_log/shot_group.ex:111
+#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format
 msgid "Count must be less than %{count}"
 msgstr ""
@@ -160,27 +160,32 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:157
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:142
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:535
+#: lib/cannery/ammo.ex:609
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/ammo_group.ex:84
+#: lib/cannery/ammo/ammo_group.ex:96
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:69
+#: lib/cannery_web/live/range_live/index.html.heex:67
 #, elixir-autogen, elixir-format
-msgid "Please select a valid user and ammo group"
+msgid "Your browser does not support the canvas element."
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:77
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid user and ammo pack"
 msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -11,16 +11,16 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2\n"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
-#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:86
+#: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
 #: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: lib/cannery_web/live/ammo_type_live/index.ex:47
+#: lib/cannery_web/live/ammo_type_live/show.ex:55
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -38,8 +38,8 @@ msgstr ""
 msgid "%{name} enabled succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/index.ex:81
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
@@ -50,7 +50,7 @@ msgid "%{name} updated succesfully"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:67
-#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
 #: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
@@ -62,19 +62,15 @@ msgstr ""
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:56
-#, elixir-autogen, elixir-format
-msgid "Ammo group deleted succesfully"
-msgstr ""
-
 #: lib/cannery_web/live/invite_live/index.html.heex:103
 #: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:48
-#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/container_live/index.ex:236
+#: lib/cannery_web/live/container_live/index.html.heex:73
+#: lib/cannery_web/live/container_live/show.html.heex:59
 #: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
@@ -85,13 +81,13 @@ msgstr ""
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#: lib/cannery_web/templates/user_settings/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""
@@ -141,13 +137,13 @@ msgstr ""
 msgid "Please check your email to verify your account"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.ex:108
+#: lib/cannery_web/live/home_live.ex:91
 #, elixir-autogen, elixir-format
 msgid "Register to setup %{name}"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/components/add_shot_group_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:33
@@ -172,7 +168,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:37
+#: lib/cannery_web/live/container_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
@@ -192,13 +188,13 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:131
+#: lib/cannery_web/live/ammo_group_live/show.ex:137
+#: lib/cannery_web/live/range_live/index.ex:159
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:78
+#: lib/cannery_web/live/ammo_group_live/show.ex:83
 #: lib/cannery_web/live/range_live/index.ex:54
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -235,7 +231,7 @@ msgstr ""
 msgid "You'll need to"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Creating..."
 msgstr ""
@@ -250,7 +246,8 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/index.ex:64
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr ""
@@ -265,14 +262,14 @@ msgstr ""
 msgid "Ammo updated successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:178
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/index.ex:232
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:28
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/errors.pot

@@ -15,13 +15,13 @@ msgstr ""
 msgid "Container must be empty before deleting"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/index.ex:88
+#: lib/cannery_web/live/container_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:57
+#: lib/cannery_web/live/container_live/index.ex:76
 #, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr ""
@@ -107,22 +107,22 @@ msgstr ""
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:130
+#: lib/cannery/accounts/user.ex:138
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:151
+#: lib/cannery/accounts/user.ex:159
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:188
+#: lib/cannery/accounts/user.ex:196
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:84
+#: lib/cannery/accounts/user.ex:92
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -137,13 +137,13 @@ msgstr ""
 msgid "Tag could not be added"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:115
+#: lib/cannery/activity_log/shot_group.ex:123
 #, elixir-autogen, elixir-format
 msgid "Count must be at least 1"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:74
-#: lib/cannery/activity_log/shot_group.ex:111
+#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format
 msgid "Count must be less than %{count}"
 msgstr ""
@@ -159,27 +159,32 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:157
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:142
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:535
+#: lib/cannery/ammo.ex:609
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/ammo_group.ex:84
+#: lib/cannery/ammo/ammo_group.ex:96
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:69
+#: lib/cannery_web/live/range_live/index.html.heex:67
 #, elixir-autogen, elixir-format
-msgid "Please select a valid user and ammo group"
+msgid "Your browser does not support the canvas element."
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:77
+#, elixir-autogen, elixir-format
+msgid "Please select a valid user and ammo pack"
 msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-21 19:45+0000\n"
-"PO-Revision-Date: 2022-05-22 22:52+0000\n"
-"Last-Translator: Hannah Winter <konhat@hotmail.es>\n"
+"PO-Revision-Date: 2022-11-13 21:49+0000\n"
+"Last-Translator: Brea Foga <breaardiente@gmail.com>\n"
 "Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
 "actions/es/>\n"
 "Language: es\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.12.2\n"
+"X-Generator: Weblate 4.14.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -24,6 +24,7 @@ msgstr ""
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.ex:50
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
@@ -32,17 +33,17 @@ msgstr "Añadir Munición"
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
-msgstr ""
+msgstr "¡Añade tu primera caja!"
 
 #: lib/cannery_web/live/container_live/index.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Add your first container!"
-msgstr ""
+msgstr "¡Añade tu primer contenedor!"
 
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Add your first type!"
-msgstr ""
+msgstr "¡Añade tu primer tipo!"
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
 #: lib/cannery_web/templates/user_settings/edit.html.heex:44
@@ -61,7 +62,7 @@ msgstr "Cambiar contraseña"
 msgid "Create Invite"
 msgstr "Crear Invitación"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Eliminar cuenta de Usuario"
@@ -76,7 +77,7 @@ msgstr "¿Has olvidado tu contraseña?"
 #: lib/cannery_web/live/invite_live/index.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Invite someone new!"
-msgstr ""
+msgstr "¡Invita a alguien nuevo!"
 
 #: lib/cannery_web/components/topbar.ex:137
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
@@ -87,27 +88,27 @@ msgstr ""
 #: lib/cannery_web/templates/user_session/new.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Log in"
-msgstr ""
+msgstr "Entrar"
 
 #: lib/cannery_web/live/tag_live/index.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Make your first tag!"
-msgstr ""
+msgstr "¡Aplica tu primera etiqueta!"
 
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "New Ammo type"
-msgstr ""
+msgstr "Nuevo tipo de Munición"
 
 #: lib/cannery_web/live/container_live/index.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "New Container"
-msgstr ""
+msgstr "Nuevo Contenedor"
 
 #: lib/cannery_web/live/tag_live/index.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "New Tag"
-msgstr ""
+msgstr "Nueva Etiqueta"
 
 #: lib/cannery_web/components/topbar.ex:128
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:26
@@ -118,22 +119,22 @@ msgstr ""
 #: lib/cannery_web/templates/user_session/new.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Register"
-msgstr ""
+msgstr "Registrarse"
 
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
-msgstr ""
+msgstr "Reenviar instrucciones de confirmación"
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Reset password"
-msgstr ""
+msgstr "Resetear contraseña"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:46
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
+#: lib/cannery_web/components/add_shot_group_component.html.heex:53
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:31
@@ -141,86 +142,123 @@ msgstr ""
 #: lib/cannery_web/live/tag_live/form_component.ex:91
 #, elixir-autogen, elixir-format
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr "Enviar instrucciones para reestablecer contraseña"
 
-#: lib/cannery_web/live/container_live/show.html.heex:72
+#: lib/cannery_web/live/container_live/show.html.heex:80
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
-msgstr ""
+msgstr "¿Por qué no añadir una?"
 
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Add"
-msgstr ""
+msgstr "Añadir"
 
 #: lib/cannery_web/live/range_live/index.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Stage ammo"
-msgstr ""
+msgstr "Preparar munición"
 
 #: lib/cannery_web/live/range_live/index.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "Why not get some ready to shoot?"
-msgstr ""
+msgstr "¿Por qué no preparar parte para disparar?"
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:79
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Record shots"
-msgstr ""
+msgstr "Tiros récord"
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
-msgstr ""
+msgstr "¡Añade otro contenedor!"
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Move containers"
-msgstr ""
+msgstr "Mover contenedores"
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
-msgstr ""
+msgstr "Seleccionar"
 
 #: lib/cannery_web/live/invite_live/index.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Copiar al portapapeles"
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:21
 #, elixir-autogen, elixir-format
 msgid "add a container first"
-msgstr ""
+msgstr "añade primero un contenedor"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Create"
-msgstr ""
+msgstr "Crear"
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Change Language"
-msgstr ""
+msgstr "Cambiar Lenguaje"
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
 #, elixir-autogen, elixir-format
 msgid "Change language"
-msgstr ""
+msgstr "Cambiar lenguaje"
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
-msgstr ""
+msgstr "Ver en Catalogo"
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
+msgstr "añade primero un tipo de munición"
+
+#: lib/cannery_web/live/invite_live/index.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "Disable"
+msgstr "Desactivar"
+
+#: lib/cannery_web/live/invite_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Enable"
+msgstr "Activar"
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#, elixir-autogen, elixir-format
+msgid "Move ammo"
+msgstr "Mover munición"
+
+#: lib/cannery_web/live/invite_live/index.html.heex:80
+#, elixir-autogen, elixir-format
+msgid "Set Unlimited"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "Stage for range"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/range_live/index.html.heex:30
+#, elixir-autogen, elixir-format
+msgid "Unstage from range"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#, elixir-autogen, elixir-format
+msgid "Export Data as JSON"
 msgstr ""

priv/gettext/es/LC_MESSAGES/errors.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-21 19:44+0000\n"
-"PO-Revision-Date: 2022-05-22 22:52+0000\n"
-"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"PO-Revision-Date: 2022-11-13 21:49+0000\n"
+"Last-Translator: Brea Foga <breaardiente@gmail.com>\n"
 "Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
 "errors/es/>\n"
 "Language: es\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.12.2\n"
+"X-Generator: Weblate 4.14.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -26,23 +26,23 @@ msgstr ""
 #: lib/cannery/containers.ex:140
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
-msgstr "el Contenedor debe estar vació antes de borrarlo"
+msgstr "El contenedor debe estar vacío antes de ser borrado"
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/index.ex:88
+#: lib/cannery_web/live/container_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "No se pudo eliminar %{name}: %{error}"
 
-#: lib/cannery_web/live/container_live/index.ex:57
+#: lib/cannery_web/live/container_live/index.ex:76
 #, elixir-autogen, elixir-format
 msgid "Could not find that container"
-msgstr ""
+msgstr "No se pudo encontrar el contenedor"
 
 #: lib/cannery_web/controllers/user_settings_controller.ex:84
 #, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
-msgstr ""
+msgstr "El enlace de cambio de correo es inválido o ha expirado."
 
 #: lib/cannery_web/templates/error/error.html.heex:8
 #, elixir-autogen, elixir-format
@@ -52,22 +52,22 @@ msgstr "Error"
 #: lib/cannery_web/templates/error/error.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Go back home"
-msgstr ""
+msgstr "Volver hacia atrás"
 
 #: lib/cannery_web/views/error_view.ex:11
 #, elixir-autogen, elixir-format
 msgid "Internal Server Error"
-msgstr ""
+msgstr "Error interno del servidor"
 
 #: lib/cannery_web/controllers/user_session_controller.ex:17
 #, elixir-autogen, elixir-format
 msgid "Invalid email or password"
-msgstr ""
+msgstr "Correo o contraseña incorrecta"
 
 #: lib/cannery_web/views/error_view.ex:9
 #, elixir-autogen, elixir-format
 msgid "Not found"
-msgstr ""
+msgstr "No se encontró"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
@@ -90,112 +90,117 @@ msgstr ""
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
-msgstr ""
+msgstr "Lo sentimos, la inscripción pública está desactivada"
 
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
-msgstr ""
+msgstr "Lo sentimos, esta invitación no fue encontrada o ha expirado"
 
 #: lib/cannery_web/controllers/user_settings_controller.ex:99
 #, elixir-autogen, elixir-format
 msgid "Unable to delete user"
-msgstr ""
+msgstr "No se pudo borrar el usuario"
 
 #: lib/cannery_web/views/error_view.ex:10
 #, elixir-autogen, elixir-format
 msgid "Unauthorized"
-msgstr ""
+msgstr "No autorizado"
 
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
-msgstr ""
+msgstr "El enlace de confirmación es inválido o ha expirado."
 
 #: lib/cannery_web/live/invite_live/index.ex:18
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page"
-msgstr ""
+msgstr "No está autorizado a ver esta página"
 
 #: lib/cannery_web/controllers/user_auth.ex:177
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
-msgstr ""
+msgstr "No está autorizado a ver esta página."
 
-#: lib/cannery/accounts/user.ex:130
+#: lib/cannery/accounts/user.ex:138
 #, elixir-autogen, elixir-format
 msgid "did not change"
-msgstr ""
+msgstr "no cambió"
 
-#: lib/cannery/accounts/user.ex:151
+#: lib/cannery/accounts/user.ex:159
 #, elixir-autogen, elixir-format
 msgid "does not match password"
-msgstr ""
+msgstr "no coincide con la contraseña"
 
-#: lib/cannery/accounts/user.ex:188
+#: lib/cannery/accounts/user.ex:196
 #, elixir-autogen, elixir-format
 msgid "is not valid"
-msgstr ""
+msgstr "no es válido"
 
-#: lib/cannery/accounts/user.ex:84
+#: lib/cannery/accounts/user.ex:92
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
-msgstr ""
+msgstr "debe tener el signo @ y no contener espacios"
 
 #: lib/cannery/tags.ex:40
 #, elixir-autogen, elixir-format
 msgid "Tag not found"
-msgstr ""
+msgstr "Etiqueta no encontrada"
 
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
 #, elixir-autogen, elixir-format
 msgid "Tag could not be added"
-msgstr ""
+msgstr "La etiqueta no pudo ser añadida"
 
-#: lib/cannery/activity_log/shot_group.ex:115
+#: lib/cannery/activity_log/shot_group.ex:123
 #, elixir-autogen, elixir-format
 msgid "Count must be at least 1"
-msgstr ""
+msgstr "El recuento debe dar al menos 1"
 
-#: lib/cannery/activity_log/shot_group.ex:74
-#: lib/cannery/activity_log/shot_group.ex:111
+#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format
 msgid "Count must be less than %{count}"
-msgstr ""
+msgstr "El recuento debe ser menos de %{count}"
 
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
 #, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
-msgstr ""
+msgstr "Debe confirmar su cuenta e iniciar sesión para acceder a esta página."
 
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
 #, elixir-autogen, elixir-format
 msgid "Tag could not be removed"
-msgstr ""
+msgstr "La etiqueta no pudo ser eliminada"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:157
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
-msgstr ""
+msgstr "No se pudo analizar el número de copias"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:142
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
-msgstr ""
+msgstr "Número inválido de copias, debe ser entre 1 y %{max}. Fue %{multiplier"
 
-#: lib/cannery/ammo.ex:535
+#: lib/cannery/ammo.ex:609
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
-msgstr ""
+msgstr "Multiplicador inválido"
 
-#: lib/cannery/ammo/ammo_group.ex:84
+#: lib/cannery/ammo/ammo_group.ex:96
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:69
+#: lib/cannery_web/live/range_live/index.html.heex:67
 #, elixir-autogen, elixir-format
-msgid "Please select a valid user and ammo group"
+msgid "Your browser does not support the canvas element."
+msgstr "Su navegador no es compatible con el elemento lienzo."
+
+#: lib/cannery/activity_log/shot_group.ex:77
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid user and ammo pack"
 msgstr ""

priv/gettext/es/LC_MESSAGES/prompts.po

@@ -23,16 +23,16 @@ 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/ammo_type_live/form_component.ex:85
-#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:86
+#: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
 #: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "%{name} creado exitosamente"
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: lib/cannery_web/live/ammo_type_live/index.ex:47
+#: lib/cannery_web/live/ammo_type_live/show.ex:55
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -50,8 +50,8 @@ msgstr "%{name} desactivado exitosamente"
 msgid "%{name} enabled succesfully"
 msgstr "%{name} activado exitosamente"
 
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/index.ex:81
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} ha sido borrado"
@@ -62,7 +62,7 @@ msgid "%{name} updated succesfully"
 msgstr "%{name} actualizado exitosamente"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:67
-#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
 #: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
@@ -76,19 +76,15 @@ msgstr ""
 "Un enlace para confirmar el correo electrónico ha sido enviado a la nueva "
 "dirección."
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:56
-#, elixir-autogen, elixir-format
-msgid "Ammo group deleted succesfully"
-msgstr "Grupo de Munición borrado exitosamente"
-
 #: lib/cannery_web/live/invite_live/index.html.heex:103
 #: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr "Está seguro que desea eliminar %{email}? Esta acción es permanente!"
 
-#: lib/cannery_web/live/container_live/index.html.heex:48
-#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/container_live/index.ex:236
+#: lib/cannery_web/live/container_live/index.html.heex:73
+#: lib/cannery_web/live/container_live/show.html.heex:59
 #: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
@@ -99,13 +95,13 @@ msgstr "Está seguro que desea eliminar %{name}?"
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Está seguro que quiere eliminar la invitación para %{name}?"
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Está seguro que desea eliminar esta munición?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#: lib/cannery_web/templates/user_settings/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Está seguro que desea eliminar su cuenta?"
@@ -159,13 +155,13 @@ msgstr "Contraseña cambiada exitosamente."
 msgid "Please check your email to verify your account"
 msgstr "Por favor chequea el correo para verificar tu cuenta"
 
-#: lib/cannery_web/live/home_live.ex:108
+#: lib/cannery_web/live/home_live.ex:91
 #, elixir-autogen, elixir-format
 msgid "Register to setup %{name}"
 msgstr "Regístrese para configurar %{name}"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/components/add_shot_group_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:33
@@ -191,7 +187,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr "%{name} añadido exitosamente"
 
-#: lib/cannery_web/live/container_live/show.ex:37
+#: lib/cannery_web/live/container_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "se ha removido %{tag_name} de %{container_name}"
@@ -211,13 +207,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/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:131
+#: lib/cannery_web/live/ammo_group_live/show.ex:137
+#: lib/cannery_web/live/range_live/index.ex:159
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:78
+#: lib/cannery_web/live/ammo_group_live/show.ex:83
 #: lib/cannery_web/live/range_live/index.ex:54
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -254,7 +250,7 @@ msgstr ""
 msgid "You'll need to"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr ""
@@ -269,7 +265,8 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/index.ex:64
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr ""
@@ -284,14 +281,14 @@ msgstr ""
 msgid "Ammo updated successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:178
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/index.ex:232
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:28
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -14,16 +14,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.12.1\n"
 
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## 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.
+# # This file is a PO Template file.
+# #
+# # "msgid"s here are often extracted from source code.
+# # Add new translations manually only if they're dynamic
+# # translations that can't be statically extracted.
+# #
+# # 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/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.ex:50
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:40
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
@@ -61,7 +62,7 @@ msgstr "Changer le mot de passe"
 msgid "Create Invite"
 msgstr "Créer une invitation"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Supprimer utilisateur"
@@ -132,8 +133,8 @@ msgstr "Renvoyer les instructions de confirmation"
 msgid "Reset password"
 msgstr "Réinitialisé le mot de passe"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:46
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
+#: lib/cannery_web/components/add_shot_group_component.html.heex:53
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:31
@@ -148,7 +149,7 @@ msgstr "Sauvegarder"
 msgid "Send instructions to reset password"
 msgstr "Envoyer les instructions pour réinitialiser le mot de passe"
 
-#: lib/cannery_web/live/container_live/show.html.heex:72
+#: lib/cannery_web/live/container_live/show.html.heex:80
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Pourquoi pas en ajouter un ?"
@@ -168,7 +169,7 @@ msgstr "Munition préparée"
 msgid "Why not get some ready to shoot?"
 msgstr "Pourquoi pas en préparer pour tirer ?"
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:79
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
@@ -200,7 +201,7 @@ msgstr "Copier dans le presse-papier"
 msgid "add a container first"
 msgstr "ajouter un conteneur en premier"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Créer"
@@ -218,9 +219,46 @@ msgstr "Changer la langue"
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
-msgstr ""
+msgstr "Voir en catalogue"
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
+msgstr "Ajoutez d'abord un type de munitions"
+
+#: lib/cannery_web/live/invite_live/index.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "Disable"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Enable"
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#, elixir-autogen, elixir-format
+msgid "Move ammo"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:80
+#, elixir-autogen, elixir-format
+msgid "Set Unlimited"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "Stage for range"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/range_live/index.html.heex:30
+#, elixir-autogen, elixir-format
+msgid "Unstage from range"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#, elixir-autogen, elixir-format
+msgid "Export Data as JSON"
 msgstr ""

priv/gettext/fr/LC_MESSAGES/errors.po

@@ -14,27 +14,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.12\n"
 
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## 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.
+# # This file is a PO Template file.
+# #
+# # "msgid"s here are often extracted from source code.
+# # Add new translations manually only if they're dynamic
+# # translations that can't be statically extracted.
+# #
+# # Run "mix gettext.extract" to bring this file up to
+# # date. Leave "msgstr"s empty as changing them here has no
+# # effect: edit them in PO (.po) files instead.
 #: lib/cannery/containers.ex:140
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Le conteneur doit être vide pour être supprimé"
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/index.ex:88
+#: lib/cannery_web/live/container_live/show.ex:77
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Impossible de supprimer %{name} : %{error}"
 
-#: lib/cannery_web/live/container_live/index.ex:57
+#: lib/cannery_web/live/container_live/index.ex:76
 #, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr "Impossible de trouver ce conteneur"
@@ -122,22 +122,22 @@ msgstr "Vous n’êtes pas autorisé·e à voir cette page"
 msgid "You are not authorized to view this page."
 msgstr "Vous n’êtes pas autorisé·e à voir cette page."
 
-#: lib/cannery/accounts/user.ex:130
+#: lib/cannery/accounts/user.ex:138
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "est inchangé"
 
-#: lib/cannery/accounts/user.ex:151
+#: lib/cannery/accounts/user.ex:159
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "le mot de passe ne correspond pas"
 
-#: lib/cannery/accounts/user.ex:188
+#: lib/cannery/accounts/user.ex:196
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "n’est pas valide"
 
-#: lib/cannery/accounts/user.ex:84
+#: lib/cannery/accounts/user.ex:92
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "doit contenir le symbole @ et aucune espace"
@@ -152,13 +152,13 @@ msgstr "Tag pas trouvé"
 msgid "Tag could not be added"
 msgstr "Le tag n’a pas pu être ajouté"
 
-#: lib/cannery/activity_log/shot_group.ex:115
+#: lib/cannery/activity_log/shot_group.ex:123
 #, elixir-autogen, elixir-format
 msgid "Count must be at least 1"
 msgstr "Le nombre doit être au moins égal à 1"
 
-#: lib/cannery/activity_log/shot_group.ex:74
-#: lib/cannery/activity_log/shot_group.ex:111
+#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format
 msgid "Count must be less than %{count}"
 msgstr "La quantité doit être inférieur à %{count}"
@@ -176,27 +176,32 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr "Le tag n’a pas pu être retiré"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:157
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "Impossible d'analyser le nombre de copies"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:142
 #, 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}"
 
-#: lib/cannery/ammo.ex:535
+#: lib/cannery/ammo.ex:609
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
-msgstr ""
+msgstr "Multiplicateur invalide"
 
-#: lib/cannery/ammo/ammo_group.ex:84
+#: lib/cannery/ammo/ammo_group.ex:96
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
+msgstr "Veuillez choisir un type de munitions et un conteneur"
+
+#: lib/cannery_web/live/range_live/index.html.heex:67
+#, elixir-autogen, elixir-format
+msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:69
-#, elixir-autogen, elixir-format
-msgid "Please select a valid user and ammo group"
-msgstr ""
+#: lib/cannery/activity_log/shot_group.ex:77
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid user and ammo pack"
+msgstr "Veuillez choisir un utilisateur valide et un groupe de munitions"

priv/gettext/fr/LC_MESSAGES/prompts.po

@@ -23,16 +23,16 @@ 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/ammo_type_live/form_component.ex:85
-#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:86
+#: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
 #: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "%{name} créé· avec succès"
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: lib/cannery_web/live/ammo_type_live/index.ex:47
+#: lib/cannery_web/live/ammo_type_live/show.ex:55
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -50,8 +50,8 @@ msgstr "%{name} supprimé·e avec succès"
 msgid "%{name} enabled succesfully"
 msgstr "%{name} activé·e avec succès"
 
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/index.ex:81
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} a été supprimé·e"
@@ -62,7 +62,7 @@ msgid "%{name} updated succesfully"
 msgstr "%{name} mis à jour avec succès"
 
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:67
-#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
 #: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
@@ -76,11 +76,6 @@ msgstr ""
 "Un lien pour confirmer votre changement de mél a été envoyé à la nouvelle "
 "adresse."
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:56
-#, elixir-autogen, elixir-format
-msgid "Ammo group deleted succesfully"
-msgstr "Groupe de munition supprimé avec succès"
-
 #: lib/cannery_web/live/invite_live/index.html.heex:103
 #: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
@@ -88,8 +83,9 @@ msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 "Êtes-vous certain·e de supprimer %{email} ? Cette action est définitive !"
 
-#: lib/cannery_web/live/container_live/index.html.heex:48
-#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/container_live/index.ex:236
+#: lib/cannery_web/live/container_live/index.html.heex:73
+#: lib/cannery_web/live/container_live/show.html.heex:59
 #: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
@@ -100,13 +96,13 @@ msgstr "Êtes-vous certain·e de supprimer %{name} ?"
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Êtes-vous certain·e de supprimer l’invitation pour %{name} ?"
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Êtes-vous certain·e de supprimer cette munition ?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#: lib/cannery_web/templates/user_settings/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Êtes-vous certain·e de supprimer votre compte ?"
@@ -160,13 +156,13 @@ msgstr "Mot de passe mis à jour avec succès."
 msgid "Please check your email to verify your account"
 msgstr "Veuillez vérifier votre mél pour confirmer votre compte"
 
-#: lib/cannery_web/live/home_live.ex:108
+#: lib/cannery_web/live/home_live.ex:91
 #, elixir-autogen, elixir-format
 msgid "Register to setup %{name}"
 msgstr "S’enregistrer pour mettre en place %{name}"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/components/add_shot_group_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:33
@@ -193,7 +189,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr "%{name} a été ajouté avec succès"
 
-#: lib/cannery_web/live/container_live/show.ex:37
+#: lib/cannery_web/live/container_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} a été retiré de %{container_name}"
@@ -213,13 +209,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/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:131
+#: lib/cannery_web/live/ammo_group_live/show.ex:137
+#: lib/cannery_web/live/range_live/index.ex:159
 #, 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/ammo_group_live/show.ex:78
+#: lib/cannery_web/live/ammo_group_live/show.ex:83
 #: lib/cannery_web/live/range_live/index.ex:54
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -256,7 +252,7 @@ msgstr "%{name} retiré avec succès"
 msgid "You'll need to"
 msgstr "Vous aurez besoin de"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Création en cours…"
@@ -271,7 +267,8 @@ 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/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/index.ex:64
+#: 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"
@@ -286,14 +283,14 @@ msgstr "Groupe de munition désélectionner avec succès"
 msgid "Ammo updated successfully"
 msgstr "Groupe de munition mis à jour avec succès"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:178
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"
 msgstr[0] "Groupe de munition mis à jour avec succès"
 msgstr[1] "Groupe de munition mis à jour avec succès"
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/index.ex:232
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:28
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/ga/LC_MESSAGES/actions.po

@@ -0,0 +1,262 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-06 23:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ga\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 3.7.3\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## 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/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.ex:50
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#, elixir-autogen, elixir-format
+msgid "Add Ammo"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#, elixir-autogen, elixir-format
+msgid "Add your first box!"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/index.html.heex:13
+#, elixir-autogen, elixir-format
+msgid "Add your first container!"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:13
+#, elixir-autogen, elixir-format
+msgid "Add your first type!"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:15
+#: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#, elixir-autogen, elixir-format
+msgid "Change email"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:58
+#: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#, elixir-autogen, elixir-format
+msgid "Change password"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
+msgid "Create Invite"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
+#, elixir-autogen, elixir-format
+msgid "Delete User"
+msgstr ""
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:3
+#: lib/cannery_web/templates/user_session/new.html.heex:45
+#, elixir-autogen, elixir-format
+msgid "Forgot your password?"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:13
+#, elixir-autogen, elixir-format
+msgid "Invite someone new!"
+msgstr ""
+
+#: lib/cannery_web/components/topbar.ex:137
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:30
+#: lib/cannery_web/templates/user_registration/new.html.heex:49
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:30
+#: lib/cannery_web/templates/user_session/new.html.heex:3
+#: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
+msgid "Log in"
+msgstr ""
+
+#: lib/cannery_web/live/tag_live/index.html.heex:15
+#, elixir-autogen, elixir-format
+msgid "Make your first tag!"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
+msgid "New Ammo type"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
+msgid "New Container"
+msgstr ""
+
+#: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
+msgid "New Tag"
+msgstr ""
+
+#: lib/cannery_web/components/topbar.ex:128
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
+#: lib/cannery_web/templates/user_registration/new.html.heex:3
+#: lib/cannery_web/templates/user_registration/new.html.heex:42
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
+#: lib/cannery_web/templates/user_session/new.html.heex:41
+#, elixir-autogen, elixir-format
+msgid "Register"
+msgstr ""
+
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:3
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
+msgid "Resend confirmation instructions"
+msgstr ""
+
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
+msgid "Reset password"
+msgstr ""
+
+#: lib/cannery_web/components/add_shot_group_component.html.heex:53
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
+#: lib/cannery_web/live/container_live/form_component.html.heex:50
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
+#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/tag_live/form_component.ex:91
+#, elixir-autogen, elixir-format
+msgid "Save"
+msgstr ""
+
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#, elixir-autogen, elixir-format
+msgid "Send instructions to reset password"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/show.html.heex:80
+#, elixir-autogen, elixir-format
+msgid "Why not add one?"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
+#, elixir-autogen, elixir-format
+msgid "Add"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
+msgid "Stage ammo"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:13
+#, elixir-autogen, elixir-format
+msgid "Why not get some ready to shoot?"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:79
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:101
+#: lib/cannery_web/live/range_live/index.html.heex:38
+#, elixir-autogen, elixir-format
+msgid "Record shots"
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
+#, elixir-autogen, elixir-format
+msgid "Add another container!"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:94
+#, elixir-autogen, elixir-format
+msgid "Move containers"
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
+#, elixir-autogen, elixir-format
+msgid "Select"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "Copy to clipboard"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
+#, elixir-autogen, elixir-format
+msgid "add a container first"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#, elixir-autogen, elixir-format
+msgid "Create"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#, elixir-autogen, elixir-format
+msgid "Change Language"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#, elixir-autogen, elixir-format
+msgid "Change language"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "View in Catalog"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "add an ammo type first"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "Disable"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:64
+#, elixir-autogen, elixir-format
+msgid "Enable"
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
+#, elixir-autogen, elixir-format
+msgid "Move ammo"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:80
+#, elixir-autogen, elixir-format
+msgid "Set Unlimited"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "Stage for range"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
+#: lib/cannery_web/live/range_live/index.html.heex:30
+#, elixir-autogen, elixir-format
+msgid "Unstage from range"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
+#, elixir-autogen, elixir-format
+msgid "Export Data as JSON"
+msgstr ""

priv/gettext/ga/LC_MESSAGES/emails.po

@@ -0,0 +1,107 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-06 23:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ga\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 3.7.3\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## 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/accounts/email.ex:30
+#, elixir-autogen, elixir-format
+msgid "Confirm your %{name} account"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:2
+#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.txt.eex:2
+#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.txt.eex:2
+#, elixir-autogen, elixir-format
+msgid "Hi %{email},"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#, elixir-autogen, elixir-format
+msgid "If you didn't create an account at %{url}, please ignore this."
+msgstr ""
+
+#: lib/cannery_web/templates/email/reset_password.txt.eex:8
+#: lib/cannery_web/templates/email/update_email.txt.eex:8
+#, elixir-autogen, elixir-format
+msgid "If you didn't request this change from %{url}, please ignore this."
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format
+msgid "Reset your %{name} password"
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format
+msgid "Update your %{name} email"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.html.eex:9
+#, elixir-autogen, elixir-format
+msgid "Welcome to %{name}!"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format
+msgid "Welcome to %{name}%!"
+msgstr ""
+
+#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.txt.eex:4
+#, elixir-autogen, elixir-format
+msgid "You can change your email by visiting the URL below:"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#, elixir-autogen, elixir-format
+msgid "You can confirm your account by visiting the URL below:"
+msgstr ""
+
+#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#, elixir-autogen, elixir-format
+msgid "You can reset your password by visiting the URL below:"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.html.eex:22
+#, elixir-autogen, elixir-format
+msgid "If you didn't create an account at %{name}, please ignore this."
+msgstr ""
+
+#: lib/cannery_web/templates/email/reset_password.html.eex:16
+#: lib/cannery_web/templates/email/update_email.html.eex:16
+#, elixir-autogen, elixir-format
+msgid "If you didn't request this change from %{name}, please ignore this."
+msgstr ""
+
+#: lib/cannery_web/templates/layout/email.txt.eex:9
+#, elixir-autogen, elixir-format
+msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+msgstr ""
+
+#: lib/cannery_web/templates/layout/email.html.heex:13
+#, elixir-autogen, elixir-format
+msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+msgstr ""

priv/gettext/ga/LC_MESSAGES/errors.po

@@ -0,0 +1,206 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-06 23:51+0000\n"
+"PO-Revision-Date: 2022-11-07 00:18+0000\n"
+"Last-Translator: pehoulihan <pehoulihan@gmail.com>\n"
+"Language-Team: Irish <https://weblate.bubbletea.dev/projects/cannery/errors/"
+"ga/>\n"
+"Language: ga\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :("
+"n>6 && n<11) ? 3 : 4;\n"
+"X-Generator: Weblate 4.14.1\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#: lib/cannery/containers.ex:140
+#, elixir-autogen, elixir-format
+msgid "Container must be empty before deleting"
+msgstr "Caithfidh an coimeádán a bheidh follamh roimh scriosadh"
+
+#: lib/cannery_web/live/container_live/index.ex:88
+#: lib/cannery_web/live/container_live/show.ex:77
+#, elixir-autogen, elixir-format
+msgid "Could not delete %{name}: %{error}"
+msgstr "Ní feidir %{name} a scriosadh: %{error}"
+
+#: lib/cannery_web/live/container_live/index.ex:76
+#, elixir-autogen, elixir-format
+msgid "Could not find that container"
+msgstr "Ní feidir an coimeádán sin a fáil"
+
+#: lib/cannery_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
+msgid "Email change link is invalid or it has expired."
+msgstr "Tá an nasc chun an seoladh email a athrú neamhbhailí nó as dáta."
+
+#: lib/cannery_web/templates/error/error.html.heex:8
+#, elixir-autogen, elixir-format
+msgid "Error"
+msgstr "Fadhb"
+
+#: lib/cannery_web/templates/error/error.html.heex:28
+#, elixir-autogen, elixir-format
+msgid "Go back home"
+msgstr "Dul abhaile"
+
+#: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
+msgid "Internal Server Error"
+msgstr "Fadhb freastalaí inmhéanach"
+
+#: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
+msgid "Invalid email or password"
+msgstr "Seoladh email nó pasfhocal neamhbhailí"
+
+#: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
+msgid "Not found"
+msgstr "Ní feidir é a fáil"
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:16
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
+#: lib/cannery_web/templates/user_settings/edit.html.heex:21
+#: lib/cannery_web/templates/user_settings/edit.html.heex:64
+#: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#, elixir-autogen, elixir-format
+msgid "Oops, something went wrong! Please check the errors below."
+msgstr ""
+"Ta brón orainn, tá fadbh againn! Le bhur dtoil feach ar na botún seo a "
+"leanais."
+
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, elixir-autogen, elixir-format
+msgid "Reset password link is invalid or it has expired."
+msgstr "Tá nasc an pasfhocail a athrú neamhbailí nó as dáta."
+
+#: lib/cannery_web/controllers/user_registration_controller.ex:25
+#: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
+msgid "Sorry, public registration is disabled"
+msgstr "Tá brón orainn, tá clarú póiblí bactha"
+
+#: lib/cannery_web/controllers/user_registration_controller.ex:15
+#: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
+msgid "Sorry, this invite was not found or expired"
+msgstr "Tá brón orainn, ní feidir an cuireadh seo a fáil nó tá sé as dáta"
+
+#: lib/cannery_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
+msgid "Unable to delete user"
+msgstr "Ní feidir an úsáideoir a scriosadh"
+
+#: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
+msgid "Unauthorized"
+msgstr "Níl cead agaibh"
+
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
+msgid "User confirmation link is invalid or it has expired."
+msgstr "Tá nasc an úsáideoir a deimhnigh neamhbailí nó as dáta."
+
+#: lib/cannery_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
+msgid "You are not authorized to view this page"
+msgstr "Níl cead agaibh féachaint ar an leathanach seo"
+
+#: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
+msgid "You are not authorized to view this page."
+msgstr "Níl cead agaibh féachaint ar an leathanach seo."
+
+#: lib/cannery/accounts/user.ex:138
+#, elixir-autogen, elixir-format
+msgid "did not change"
+msgstr "Níor athraigh sé"
+
+#: lib/cannery/accounts/user.ex:159
+#, elixir-autogen, elixir-format
+msgid "does not match password"
+msgstr ""
+
+#: lib/cannery/accounts/user.ex:196
+#, elixir-autogen, elixir-format
+msgid "is not valid"
+msgstr ""
+
+#: lib/cannery/accounts/user.ex:92
+#, elixir-autogen, elixir-format
+msgid "must have the @ sign and no spaces"
+msgstr ""
+
+#: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
+msgid "Tag not found"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
+msgid "Tag could not be added"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:123
+#, elixir-autogen, elixir-format
+msgid "Count must be at least 1"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:82
+#: lib/cannery/activity_log/shot_group.ex:119
+#, elixir-autogen, elixir-format
+msgid "Count must be less than %{count}"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:39
+#: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
+msgid "You must confirm your account and log in to access this page."
+msgstr ""
+
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format
+msgid "Tag could not be removed"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:157
+#, elixir-autogen, elixir-format
+msgid "Could not parse number of copies"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:142
+#, elixir-autogen, elixir-format
+msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
+msgstr ""
+
+#: lib/cannery/ammo.ex:609
+#, elixir-autogen, elixir-format
+msgid "Invalid multiplier"
+msgstr ""
+
+#: lib/cannery/ammo/ammo_group.ex:96
+#, elixir-autogen, elixir-format
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:67
+#, elixir-autogen, elixir-format
+msgid "Your browser does not support the canvas element."
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:77
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid user and ammo pack"
+msgstr ""

priv/gettext/ga/LC_MESSAGES/prompts.po

@@ -0,0 +1,286 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-06 23:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ga\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 3.7.3\n"
+
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## 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/ammo_type_live/form_component.ex:86
+#: lib/cannery_web/live/container_live/form_component.ex:89
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
+#, elixir-autogen, elixir-format
+msgid "%{name} created successfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.ex:47
+#: lib/cannery_web/live/ammo_type_live/show.ex:55
+#: lib/cannery_web/live/invite_live/index.ex:53
+#: lib/cannery_web/live/invite_live/index.ex:133
+#: lib/cannery_web/live/tag_live/index.ex:38
+#, elixir-autogen, elixir-format
+msgid "%{name} deleted succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.ex:109
+#, elixir-autogen, elixir-format
+msgid "%{name} disabled succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.ex:87
+#, elixir-autogen, elixir-format
+msgid "%{name} enabled succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/index.ex:81
+#: lib/cannery_web/live/container_live/show.ex:67
+#, elixir-autogen, elixir-format
+msgid "%{name} has been deleted"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.ex:67
+#, elixir-autogen, elixir-format
+msgid "%{name} updated succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:70
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
+#, elixir-autogen, elixir-format
+msgid "%{name} updated successfully"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_settings_controller.ex:29
+#, elixir-autogen, elixir-format
+msgid "A link to confirm your email change has been sent to the new address."
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:103
+#: lib/cannery_web/live/invite_live/index.html.heex:133
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to delete %{email}? This action is permanent!"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/index.ex:236
+#: lib/cannery_web/live/container_live/index.html.heex:73
+#: lib/cannery_web/live/container_live/show.html.heex:59
+#: lib/cannery_web/live/tag_live/index.html.heex:39
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to delete %{name}?"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:49
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to delete the invite for %{name}?"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:75
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to delete this ammo?"
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:155
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to delete your account?"
+msgstr ""
+
+#: lib/cannery_web/components/topbar.ex:106
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to log out?"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.html.heex:75
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to make %{name} unlimited?"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_settings_controller.ex:77
+#, elixir-autogen, elixir-format
+msgid "Email changed successfully."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+#, elixir-autogen, elixir-format
+msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:24
+#, elixir-autogen, elixir-format
+msgid "If your email is in our system, you will receive instructions to reset your password shortly."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
+msgid "Logged out successfully."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#, elixir-autogen, elixir-format
+msgid "Password reset successfully."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_settings_controller.ex:49
+#, elixir-autogen, elixir-format
+msgid "Password updated successfully."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_registration_controller.ex:74
+#, elixir-autogen, elixir-format
+msgid "Please check your email to verify your account"
+msgstr ""
+
+#: lib/cannery_web/live/home_live.ex:91
+#, elixir-autogen, elixir-format
+msgid "Register to setup %{name}"
+msgstr ""
+
+#: lib/cannery_web/components/add_shot_group_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
+#: lib/cannery_web/live/container_live/form_component.html.heex:52
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
+#: lib/cannery_web/live/range_live/form_component.html.heex:42
+#: lib/cannery_web/live/tag_live/form_component.ex:93
+#, elixir-autogen, elixir-format
+msgid "Saving..."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_settings_controller.ex:95
+#, elixir-autogen, elixir-format
+msgid "Your account has been deleted"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:16
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to remove the %{tag_name} tag from %{container_name}?"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:36
+#, elixir-autogen, elixir-format
+msgid "%{name} added successfully"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/show.ex:43
+#, elixir-autogen, elixir-format
+msgid "%{tag_name} has been removed from %{container_name}"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:55
+#, elixir-autogen, elixir-format
+msgid "Adding..."
+msgstr ""
+
+#: lib/cannery_web/components/add_shot_group_component.ex:56
+#, elixir-autogen, elixir-format
+msgid "Shots recorded successfully"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to unstage this ammo?"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.ex:137
+#: lib/cannery_web/live/range_live/index.ex:159
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to delete this shot record?"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.ex:83
+#: lib/cannery_web/live/range_live/index.ex:54
+#, elixir-autogen, elixir-format
+msgid "Shot records deleted succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/form_component.ex:55
+#, elixir-autogen, elixir-format
+msgid "Shot records updated successfully"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#, elixir-autogen, elixir-format
+msgid "%{email} confirmed successfully."
+msgstr ""
+
+#: lib/cannery_web/components/move_ammo_group_component.ex:53
+#, elixir-autogen, elixir-format
+msgid "Ammo moved to %{name} successfully"
+msgstr ""
+
+#: lib/cannery_web/live/invite_live/index.ex:121
+#, elixir-autogen, elixir-format
+msgid "Copied to clipboard"
+msgstr ""
+
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:58
+#, elixir-autogen, elixir-format
+msgid "%{name} removed successfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "You'll need to"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
+#, elixir-autogen, elixir-format
+msgid "Creating..."
+msgstr ""
+
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to change your language?"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_settings_controller.ex:65
+#, elixir-autogen, elixir-format
+msgid "Language updated successfully."
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.ex:64
+#: 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:68
+#, elixir-autogen, elixir-format
+msgid "Ammo unstaged succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+#, elixir-autogen, elixir-format
+msgid "Ammo updated successfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:178
+#, elixir-autogen, elixir-format
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/cannery_web/live/ammo_type_live/index.ex:232
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:28
+#, elixir-autogen, elixir-format
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr ""

priv/gettext/prompts.pot

@@ -10,16 +10,16 @@
 msgid ""
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
-#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:86
+#: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
 #: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: lib/cannery_web/live/ammo_type_live/index.ex:47
+#: lib/cannery_web/live/ammo_type_live/show.ex:55
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
@@ -37,8 +37,8 @@ msgstr ""
 msgid "%{name} enabled succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:62
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/index.ex:81
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
@@ -49,7 +49,7 @@ msgid "%{name} updated succesfully"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:67
-#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
 #: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
@@ -61,19 +61,15 @@ msgstr ""
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:56
-#, elixir-autogen, elixir-format
-msgid "Ammo group deleted succesfully"
-msgstr ""
-
 #: lib/cannery_web/live/invite_live/index.html.heex:103
 #: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:48
-#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/container_live/index.ex:236
+#: lib/cannery_web/live/container_live/index.html.heex:73
+#: lib/cannery_web/live/container_live/show.html.heex:59
 #: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
@@ -84,13 +80,13 @@ msgstr ""
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:131
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#: lib/cannery_web/templates/user_settings/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""
@@ -140,13 +136,13 @@ msgstr ""
 msgid "Please check your email to verify your account"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.ex:108
+#: lib/cannery_web/live/home_live.ex:91
 #, elixir-autogen, elixir-format
 msgid "Register to setup %{name}"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/components/add_shot_group_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:33
@@ -171,7 +167,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:37
+#: lib/cannery_web/live/container_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
@@ -191,13 +187,13 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:132
-#: lib/cannery_web/live/range_live/index.ex:131
+#: lib/cannery_web/live/ammo_group_live/show.ex:137
+#: lib/cannery_web/live/range_live/index.ex:159
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:78
+#: lib/cannery_web/live/ammo_group_live/show.ex:83
 #: lib/cannery_web/live/range_live/index.ex:54
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
@@ -234,7 +230,7 @@ msgstr ""
 msgid "You'll need to"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr ""
@@ -249,7 +245,8 @@ msgstr ""
 msgid "Language updated successfully."
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#: lib/cannery_web/live/ammo_group_live/index.ex:64
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format
 msgid "Ammo deleted succesfully"
 msgstr ""
@@ -264,14 +261,14 @@ msgstr ""
 msgid "Ammo updated successfully"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:178
 #, elixir-autogen, elixir-format
 msgid "Ammo added successfully"
 msgid_plural "Ammo added successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/index.ex:232
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/i18n/ga.tbx

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE martif PUBLIC "ISO 12200:1999A//DTD MARTIF core (DXFcdV04)//EN" "TBXcdv04.dtd">
+<martif type="TBX">
+<martifHeader>
+<fileDesc>
+<sourceDesc><p>Translate Toolkit</p></sourceDesc>
+</fileDesc>
+</martifHeader>
+<text><body></body></text>
+</martif>

priv/repo/migrations/20221119170815_add_more_indexes.exs

@@ -0,0 +1,16 @@
+defmodule Cannery.Repo.Migrations.AddMoreIndexes do
+  use Ecto.Migration
+
+  def change do
+    create unique_index(:container_tags, [:tag_id, :container_id])
+
+    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_types, [:user_id])
+
+    drop index(:shot_groups, [:id])
+    create index(:shot_groups, [:user_id, :ammo_group_id])
+  end
+end

priv/repo/migrations/20221119192131_add_purchase_date_to_ammo_group.exs

@@ -0,0 +1,19 @@
+defmodule Cannery.Repo.Migrations.AddPurchaseDateToAmmoGroup do
+  use Ecto.Migration
+
+  def up do
+    alter table(:ammo_groups) do
+      add :purchased_on, :date
+    end
+
+    flush()
+
+    execute("UPDATE ammo_groups SET purchased_on = inserted_at::DATE WHERE purchased_on IS NULL")
+  end
+
+  def down do
+    alter table(:ammo_groups) do
+      remove :purchased_on
+    end
+  end
+end

test/cannery/ammo_test.exs

@@ -94,16 +94,161 @@ defmodule Cannery.AmmoTest do
     end
   end
 
+  describe "ammo types with ammo groups" do
+    setup do
+      current_user = user_fixture()
+      ammo_type = ammo_type_fixture(current_user)
+      container = container_fixture(current_user)
+
+      [
+        ammo_type: ammo_type,
+        container: container,
+        current_user: current_user
+      ]
+    end
+
+    test "get_average_cost_for_ammo_type!/2 gets average cost for ammo type",
+         %{ammo_type: ammo_type, current_user: current_user, container: container} do
+      {1, [_ammo_group]} =
+        ammo_group_fixture(
+          %{"price_paid" => 25.00, "count" => 1},
+          ammo_type,
+          container,
+          current_user
+        )
+
+      assert 25.0 = Ammo.get_average_cost_for_ammo_type!(ammo_type, current_user)
+
+      {1, [_ammo_group]} =
+        ammo_group_fixture(
+          %{"price_paid" => 25.00, "count" => 1},
+          ammo_type,
+          container,
+          current_user
+        )
+
+      assert 25.0 = Ammo.get_average_cost_for_ammo_type!(ammo_type, current_user)
+
+      {1, [_ammo_group]} =
+        ammo_group_fixture(
+          %{"price_paid" => 70.00, "count" => 1},
+          ammo_type,
+          container,
+          current_user
+        )
+
+      assert 40.0 = Ammo.get_average_cost_for_ammo_type!(ammo_type, current_user)
+
+      {1, [_ammo_group]} =
+        ammo_group_fixture(
+          %{"price_paid" => 30.00, "count" => 1},
+          ammo_type,
+          container,
+          current_user
+        )
+
+      assert 37.5 = Ammo.get_average_cost_for_ammo_type!(ammo_type, current_user)
+    end
+
+    test "get_round_count_for_ammo_type/2 gets accurate round count for ammo type",
+         %{ammo_type: ammo_type, current_user: current_user, container: container} do
+      {1, [first_ammo_group]} =
+        ammo_group_fixture(%{"count" => 1}, ammo_type, container, current_user)
+
+      assert 1 = Ammo.get_round_count_for_ammo_type(ammo_type, current_user)
+
+      {1, [ammo_group]} = ammo_group_fixture(%{"count" => 50}, ammo_type, container, current_user)
+
+      assert 51 = Ammo.get_round_count_for_ammo_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 26}, current_user, ammo_group)
+      assert 25 = Ammo.get_round_count_for_ammo_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 1}, current_user, first_ammo_group)
+      assert 24 = Ammo.get_round_count_for_ammo_type(ammo_type, current_user)
+    end
+
+    test "get_used_count_for_ammo_type/2 gets accurate used round count for ammo type",
+         %{ammo_type: ammo_type, current_user: current_user, container: container} do
+      {1, [first_ammo_group]} =
+        ammo_group_fixture(%{"count" => 1}, ammo_type, container, current_user)
+
+      assert 0 = Ammo.get_used_count_for_ammo_type(ammo_type, current_user)
+
+      {1, [ammo_group]} = ammo_group_fixture(%{"count" => 50}, ammo_type, container, current_user)
+
+      assert 0 = Ammo.get_used_count_for_ammo_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 26}, current_user, ammo_group)
+      assert 26 = Ammo.get_used_count_for_ammo_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 1}, current_user, first_ammo_group)
+      assert 27 = Ammo.get_used_count_for_ammo_type(ammo_type, current_user)
+    end
+
+    test "get_historical_count_for_ammo_type/2 gets accurate total round count for ammo type",
+         %{ammo_type: ammo_type, current_user: current_user, container: container} do
+      {1, [first_ammo_group]} =
+        ammo_group_fixture(%{"count" => 1}, ammo_type, container, current_user)
+
+      assert 1 = Ammo.get_historical_count_for_ammo_type(ammo_type, current_user)
+
+      {1, [ammo_group]} = ammo_group_fixture(%{"count" => 50}, ammo_type, container, current_user)
+
+      assert 51 = Ammo.get_historical_count_for_ammo_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 26}, current_user, ammo_group)
+      assert 51 = Ammo.get_historical_count_for_ammo_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 1}, current_user, first_ammo_group)
+      assert 51 = Ammo.get_historical_count_for_ammo_type(ammo_type, current_user)
+    end
+
+    test "get_used_ammo_groups_count_for_type/2 gets accurate total ammo count for ammo type",
+         %{ammo_type: ammo_type, current_user: current_user, container: container} do
+      {1, [first_ammo_group]} =
+        ammo_group_fixture(%{"count" => 1}, ammo_type, container, current_user)
+
+      assert 0 = Ammo.get_used_ammo_groups_count_for_type(ammo_type, current_user)
+
+      {1, [ammo_group]} = ammo_group_fixture(%{"count" => 50}, ammo_type, container, current_user)
+
+      assert 0 = Ammo.get_used_ammo_groups_count_for_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 50}, current_user, ammo_group)
+      assert 1 = Ammo.get_used_ammo_groups_count_for_type(ammo_type, current_user)
+
+      shot_group_fixture(%{"count" => 1}, current_user, first_ammo_group)
+      assert 2 = Ammo.get_used_ammo_groups_count_for_type(ammo_type, current_user)
+    end
+  end
+
   describe "ammo_groups" do
-    @valid_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}
+    @valid_attrs %{
+      "count" => 42,
+      "notes" => "some notes",
+      "price_paid" => 120.5,
+      "purchased_on" => ~D[2022-11-19]
+    }
+    @update_attrs %{
+      "count" => 43,
+      "notes" => "some updated notes",
+      "price_paid" => 456.7
+    }
+    @invalid_attrs %{
+      "count" => nil,
+      "notes" => nil,
+      "price_paid" => nil
+    }
 
     setup do
       current_user = user_fixture()
       ammo_type = ammo_type_fixture(current_user)
       container = container_fixture(current_user)
-      {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
+
+      {1, [ammo_group]} =
+        %{"count" => 50, "price_paid" => 36.1}
+        |> ammo_group_fixture(ammo_type, container, current_user)
 
       [
         ammo_type: ammo_type,
@@ -113,9 +258,76 @@ defmodule Cannery.AmmoTest do
       ]
     end
 
-    test "list_ammo_groups/0 returns all ammo_groups",
-         %{ammo_group: ammo_group, current_user: current_user} do
+    test "list_ammo_groups/2 returns all ammo_groups",
+         %{
+           ammo_type: ammo_type,
+           ammo_group: ammo_group,
+           container: container,
+           current_user: current_user
+         } do
+      {1, [another_ammo_group]} =
+        ammo_group_fixture(%{"count" => 30}, ammo_type, container, current_user)
+
+      shot_group_fixture(%{"count" => 30}, current_user, another_ammo_group)
+      another_ammo_group = another_ammo_group |> Repo.reload!()
       assert Ammo.list_ammo_groups(current_user) == [ammo_group] |> Repo.preload(:shot_groups)
+
+      assert Ammo.list_ammo_groups(current_user, true)
+             |> Enum.sort_by(fn %{count: count} -> count end) ==
+               [another_ammo_group, ammo_group] |> Repo.preload(:shot_groups)
+    end
+
+    test "list_ammo_groups_for_type/2 returns all ammo_groups for a type",
+         %{
+           ammo_type: ammo_type,
+           container: container,
+           ammo_group: ammo_group,
+           current_user: current_user
+         } do
+      another_ammo_type = ammo_type_fixture(current_user)
+      {1, [_another]} = ammo_group_fixture(another_ammo_type, container, current_user)
+
+      assert Ammo.list_ammo_groups_for_type(ammo_type, current_user) ==
+               [ammo_group] |> Repo.preload(:shot_groups)
+    end
+
+    test "list_ammo_groups_for_container/2 returns all ammo_groups for a container",
+         %{
+           ammo_type: ammo_type,
+           container: container,
+           ammo_group: ammo_group,
+           current_user: current_user
+         } do
+      another_container = container_fixture(current_user)
+      {1, [_another]} = ammo_group_fixture(ammo_type, another_container, current_user)
+
+      assert Ammo.list_ammo_groups_for_container(container, current_user) ==
+               [ammo_group] |> Repo.preload(:shot_groups)
+    end
+
+    test "get_ammo_groups_count_for_type/2 returns count of ammo_groups for a type",
+         %{
+           ammo_type: ammo_type,
+           container: container,
+           current_user: current_user
+         } do
+      another_ammo_type = ammo_type_fixture(current_user)
+      {1, [_another]} = ammo_group_fixture(another_ammo_type, container, current_user)
+
+      assert 1 = Ammo.get_ammo_groups_count_for_type(ammo_type, current_user)
+    end
+
+    test "list_staged_ammo_groups/2 returns all ammo_groups that are staged",
+         %{
+           ammo_type: ammo_type,
+           container: container,
+           current_user: current_user
+         } do
+      {1, [another_ammo_group]} =
+        ammo_group_fixture(%{"staged" => true}, ammo_type, container, current_user)
+
+      assert Ammo.list_staged_ammo_groups(current_user) ==
+               [another_ammo_group] |> Repo.preload(:shot_groups)
     end
 
     test "get_ammo_group!/1 returns the ammo_group with given id",
@@ -140,6 +352,27 @@ defmodule Cannery.AmmoTest do
       assert ammo_group.price_paid == 120.5
     end
 
+    test "create_ammo_groups/3 with valid data creates multiple ammo_groups",
+         %{
+           ammo_type: ammo_type,
+           container: container,
+           current_user: current_user
+         } do
+      assert {:ok, {3, ammo_groups}} =
+               @valid_attrs
+               |> Map.merge(%{"ammo_type_id" => ammo_type.id, "container_id" => container.id})
+               |> Ammo.create_ammo_groups(3, current_user)
+
+      assert [%AmmoGroup{}, %AmmoGroup{}, %AmmoGroup{}] = ammo_groups
+
+      ammo_groups
+      |> Enum.map(fn %{count: count, notes: notes, price_paid: price_paid} ->
+        assert count == 42
+        assert notes == "some notes"
+        assert price_paid == 120.5
+      end)
+    end
+
     test "create_ammo_groups/3 with invalid data returns error changeset",
          %{ammo_type: ammo_type, container: container, current_user: current_user} do
       assert {:error, %Changeset{}} =
@@ -175,5 +408,112 @@ defmodule Cannery.AmmoTest do
         Ammo.get_ammo_group!(ammo_group.id, current_user)
       end
     end
+
+    test "get_used_count/1 returns accurate used count",
+         %{ammo_group: ammo_group, current_user: current_user} do
+      assert 0 = Ammo.get_used_count(ammo_group)
+      shot_group_fixture(%{"count" => 15}, current_user, ammo_group)
+      assert 15 = ammo_group |> Repo.preload(:shot_groups, force: true) |> Ammo.get_used_count()
+      shot_group_fixture(%{"count" => 10}, current_user, ammo_group)
+      assert 25 = ammo_group |> Repo.preload(:shot_groups, force: true) |> Ammo.get_used_count()
+    end
+
+    test "get_last_used_shot_group/1 returns accurate used count",
+         %{ammo_group: ammo_group, current_user: current_user} do
+      assert ammo_group
+             |> Repo.preload(:shot_groups, force: true)
+             |> Ammo.get_last_used_shot_group()
+             |> is_nil()
+
+      shot_group = shot_group_fixture(%{"date" => ~D[2022-11-10]}, current_user, ammo_group)
+
+      assert ^shot_group =
+               ammo_group
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_last_used_shot_group()
+
+      shot_group = shot_group_fixture(%{"date" => ~D[2022-11-11]}, current_user, ammo_group)
+
+      assert ^shot_group =
+               ammo_group
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_last_used_shot_group()
+    end
+
+    test "get_percentage_remaining/1 gets accurate total round count",
+         %{ammo_group: ammo_group, current_user: current_user} do
+      assert 100 = Ammo.get_percentage_remaining(ammo_group)
+
+      shot_group_fixture(%{"count" => 14}, current_user, ammo_group)
+
+      assert 72 =
+               ammo_group
+               |> Repo.reload!()
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_percentage_remaining()
+
+      shot_group_fixture(%{"count" => 11}, current_user, ammo_group)
+
+      assert 50 =
+               ammo_group
+               |> Repo.reload!()
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_percentage_remaining()
+
+      shot_group_fixture(%{"count" => 25}, current_user, ammo_group)
+
+      assert 0 =
+               ammo_group
+               |> Repo.reload!()
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_percentage_remaining()
+    end
+
+    test "get_cpr/1 gets accurate cpr",
+         %{ammo_group: ammo_group, current_user: current_user} do
+      assert %AmmoGroup{price_paid: nil} |> Ammo.get_cpr() |> is_nil()
+      assert %AmmoGroup{count: 1, price_paid: nil} |> Ammo.get_cpr() |> is_nil()
+      assert 1.0 = %AmmoGroup{count: 1, price_paid: 1.0} |> Ammo.get_cpr()
+      assert 1.5 = %AmmoGroup{count: 2, price_paid: 3.0} |> Ammo.get_cpr()
+      assert 0.722 = %AmmoGroup{count: 50, price_paid: 36.1} |> Ammo.get_cpr()
+
+      # with shot group, maintains total
+      shot_group_fixture(%{"count" => 14}, current_user, ammo_group)
+
+      assert 0.722 =
+               ammo_group
+               |> Repo.reload!()
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_cpr()
+    end
+
+    test "get_original_count/1 gets accurate original count",
+         %{ammo_group: ammo_group, current_user: current_user} do
+      assert 50 = Ammo.get_original_count(ammo_group)
+
+      shot_group_fixture(%{"count" => 14}, current_user, ammo_group)
+
+      assert 50 =
+               ammo_group
+               |> Repo.reload!()
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_original_count()
+
+      shot_group_fixture(%{"count" => 11}, current_user, ammo_group)
+
+      assert 50 =
+               ammo_group
+               |> Repo.reload!()
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_original_count()
+
+      shot_group_fixture(%{"count" => 25}, current_user, ammo_group)
+
+      assert 50 =
+               ammo_group
+               |> Repo.reload!()
+               |> Repo.preload(:shot_groups, force: true)
+               |> Ammo.get_original_count()
+    end
   end
 end

test/cannery_web/controllers/export_controller_test.exs

@@ -0,0 +1,138 @@
+defmodule CanneryWeb.ExportControllerTest do
+  @moduledoc """
+  Tests the export function
+  """
+
+  use CanneryWeb.ConnCase
+  alias Cannery.{Ammo, Containers, Repo}
+
+  @moduletag :export_controller_test
+
+  setup %{conn: conn} do
+    current_user = user_fixture() |> confirm_user()
+
+    [
+      current_user: current_user,
+      conn: conn |> log_in_user(current_user)
+    ]
+  end
+
+  defp add_data(%{current_user: current_user}) do
+    ammo_type = ammo_type_fixture(current_user)
+    container = container_fixture(current_user)
+    tag = tag_fixture(current_user)
+    Containers.add_tag!(container, tag, current_user)
+    {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,
+      ammo_group: ammo_group,
+      container: container,
+      shot_group: shot_group,
+      tag: tag
+    }
+  end
+
+  describe "Exports data" do
+    setup [:add_data]
+
+    test "in JSON", %{
+      conn: conn,
+      current_user: current_user,
+      container: container,
+      ammo_type: ammo_type,
+      ammo_group: ammo_group,
+      shot_group: shot_group,
+      tag: tag
+    } do
+      conn = get(conn, Routes.export_path(conn, :export, :json))
+
+      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 |> Ammo.get_used_count(),
+        "original_count" => ammo_group |> Ammo.get_original_count(),
+        "cpr" => ammo_group |> Ammo.get_cpr(),
+        "percentage_remaining" => ammo_group |> Ammo.get_percentage_remaining()
+      }
+
+      ideal_ammo_type = %{
+        "blank" => ammo_type.blank,
+        "bullet_core" => ammo_type.bullet_core,
+        "bullet_type" => ammo_type.bullet_type,
+        "caliber" => ammo_type.caliber,
+        "cartridge" => ammo_type.cartridge,
+        "case_material" => ammo_type.case_material,
+        "corrosive" => ammo_type.corrosive,
+        "desc" => ammo_type.desc,
+        "firing_type" => ammo_type.firing_type,
+        "grains" => ammo_type.grains,
+        "id" => ammo_type.id,
+        "incendiary" => ammo_type.incendiary,
+        "jacket_type" => ammo_type.jacket_type,
+        "manufacturer" => ammo_type.manufacturer,
+        "muzzle_velocity" => ammo_type.muzzle_velocity,
+        "name" => ammo_type.name,
+        "powder_grains_per_charge" => ammo_type.powder_grains_per_charge,
+        "powder_type" => ammo_type.powder_type,
+        "pressure" => ammo_type.pressure,
+        "primer_type" => ammo_type.primer_type,
+        "tracer" => ammo_type.tracer,
+        "upc" => ammo_type.upc,
+        "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 |> Ammo.get_used_count_for_ammo_type(current_user),
+        "ammo_group_count" => ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
+      }
+
+      ideal_container = %{
+        "desc" => container.desc,
+        "id" => container.id,
+        "location" => container.location,
+        "name" => container.name,
+        "tags" => [
+          %{
+            "id" => tag.id,
+            "name" => tag.name,
+            "bg_color" => tag.bg_color,
+            "text_color" => tag.text_color
+          }
+        ],
+        "type" => container.type,
+        "ammo_group_count" => container |> Containers.get_container_ammo_group_count!(),
+        "round_count" => container |> Containers.get_container_rounds!()
+      }
+
+      ideal_shot_group = %{
+        "ammo_group_id" => shot_group.ammo_group_id,
+        "count" => shot_group.count,
+        "date" => to_string(shot_group.date),
+        "id" => shot_group.id,
+        "notes" => shot_group.notes
+      }
+
+      ideal_user = %{
+        "confirmed_at" =>
+          current_user.confirmed_at |> Jason.encode!() |> String.replace(~r/\"/, ""),
+        "email" => current_user.email,
+        "id" => current_user.id,
+        "locale" => current_user.locale,
+        "role" => to_string(current_user.role)
+      }
+
+      json_resp = conn |> json_response(200)
+      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
+      assert %{"user" => ^ideal_user} = json_resp
+    end
+  end
+end

test/cannery_web/live/ammo_group_live_test.exs

@@ -10,25 +10,52 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
   @moduletag :ammo_group_live_test
   @shot_group_create_attrs %{"ammo_left" => 5, "notes" => "some notes"}
-  @shot_group_update_attrs %{"count" => 5, "notes" => "some updated notes"}
+  @shot_group_update_attrs %{
+    "count" => 5,
+    "date" => ~N[2022-02-13 03:17:00],
+    "notes" => "some updated notes"
+  }
   @create_attrs %{"count" => 42, "notes" => "some notes", "price_paid" => 120.5}
   @update_attrs %{"count" => 43, "notes" => "some updated notes", "price_paid" => 456.7}
   @ammo_group_create_limit 10_000
+  @empty_attrs %{
+    "price_paid" => 50,
+    "count" => 20
+  }
+  @shot_group_attrs %{
+    "price_paid" => 50,
+    "count" => 20
+  }
+
   # @invalid_attrs %{count: -1, notes: nil, price_paid: nil}
 
   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(ammo_type, container, current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@create_attrs, 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, ammo_group)
+    %{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
 
-  describe "Index" do
+  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
@@ -43,7 +70,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert index_live |> element("a", dgettext("actions", "Add Ammo")) |> render_click() =~
-               gettext("Add Ammo")
+               dgettext("actions", "Add Ammo")
 
       assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
 
@@ -67,7 +94,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert index_live |> element("a", dgettext("actions", "Add Ammo")) |> render_click() =~
-               gettext("Add Ammo")
+               dgettext("actions", "Add Ammo")
 
       assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
 
@@ -91,7 +118,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert index_live |> element("a", dgettext("actions", "Add Ammo")) |> render_click() =~
-               gettext("Add Ammo")
+               dgettext("actions", "Add Ammo")
 
       assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
 
@@ -123,6 +150,96 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
                )
     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("[data-qa=\"edit-#{ammo_group.id}\"]")
+             |> render_click() =~
+               gettext("Edit ammo")
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :edit, ammo_group))
+
+      # assert index_live
+      #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form", ammo_group: @update_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ dgettext("prompts", "Ammo updated successfully")
+      assert html =~ "43"
+    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("[data-qa=\"clone-#{ammo_group.id}\"]")
+        |> render_click()
+
+      assert html =~ dgettext("actions", "Add Ammo")
+      assert html =~ gettext("$%{amount}", amount: 120.5 |> :erlang.float_to_binary(decimals: 2))
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :clone, ammo_group))
+
+      # assert index_live
+      #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form")
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ dgettext("prompts", "Ammo added successfully")
+      assert html =~ "42"
+      assert html =~ gettext("$%{amount}", amount: 120.5 |> :erlang.float_to_binary(decimals: 2))
+    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("[data-qa=\"clone-#{ammo_group.id}\"]")
+        |> render_click()
+
+      assert html =~ dgettext("actions", "Add Ammo")
+      assert html =~ gettext("$%{amount}", amount: 120.5 |> :erlang.float_to_binary(decimals: 2))
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :clone, ammo_group))
+
+      # assert index_live
+      #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form", ammo_group: Map.merge(@create_attrs, %{"count" => 43}))
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ dgettext("prompts", "Ammo added successfully")
+      assert html =~ "43"
+      assert html =~ gettext("$%{amount}", amount: 120.5 |> :erlang.float_to_binary(decimals: 2))
+    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("[data-qa=\"delete-#{ammo_group.id}\"]")
+             |> 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))
 
@@ -143,43 +260,38 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
       assert html =~ dgettext("prompts", "Shots recorded successfully")
     end
+  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))
+  describe "Index of empty ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_group, :create_empty_ammo_group]
 
-      assert index_live
-             |> element("[data-qa=\"edit-#{ammo_group.id}\"]")
-             |> render_click() =~
-               gettext("Edit Ammo")
+    test "hides empty ammo groups by default", %{conn: conn, empty_ammo_group: ammo_group} do
+      {:ok, show_live, html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
-      assert_patch(index_live, Routes.ammo_group_index_path(conn, :edit, ammo_group))
+      assert html =~ dgettext("actions", "Show used")
+      refute html =~ gettext("$%{amount}", amount: 50.00 |> :erlang.float_to_binary(decimals: 2))
 
-      # assert index_live
-      #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
-      #        |> render_change() =~ dgettext("errors", "can't be blank")
+      refute html =~
+               "\n" <>
+                 gettext("%{percentage}%",
+                   percentage: ammo_group |> Ammo.get_percentage_remaining()
+                 ) <>
+                 "\n"
 
-      {:ok, _view, html} =
-        index_live
-        |> form("#ammo_group-form", ammo_group: @update_attrs)
-        |> render_submit()
-        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
 
-      assert html =~ dgettext("prompts", "Ammo updated successfully")
-      assert html =~ "43"
-    end
+      assert html =~ gettext("$%{amount}", amount: 50.00 |> :erlang.float_to_binary(decimals: 2))
 
-    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("[data-qa=\"delete-#{ammo_group.id}\"]")
-             |> render_click()
-
-      refute has_element?(index_live, "#ammo_group-#{ammo_group.id}")
+      assert html =~
+               "\n" <>
+                 gettext("%{percentage}%",
+                   percentage: ammo_group |> Ammo.get_percentage_remaining()
+                 ) <>
+                 "\n"
     end
   end
 
-  describe "Show" do
+  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
@@ -234,6 +346,10 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
       assert html =~ dgettext("prompts", "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

test/cannery_web/live/ammo_type_live_test.exs

@@ -6,7 +6,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
   use CanneryWeb.ConnCase
   import Phoenix.LiveViewTest
   import CanneryWeb.Gettext
-  alias Cannery.Ammo
+  alias Cannery.{Ammo, Repo}
 
   @moduletag :ammo_type_live_test
 
@@ -26,6 +26,14 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     "name" => "some updated name",
     "grains" => 456
   }
+  @ammo_group_attrs %{
+    "notes" => "some ammo group",
+    "count" => 20
+  }
+  @shot_group_attrs %{
+    "notes" => "some shot group",
+    "count" => 20
+  }
 
   # @invalid_attrs %{
   #   "bullet_type" => nil,
@@ -40,6 +48,22 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     %{ammo_type: ammo_type_fixture(@create_attrs, current_user)}
   end
 
+  defp create_ammo_group(%{ammo_type: ammo_type, current_user: current_user}) do
+    container = container_fixture(current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
+
+    %{ammo_group: ammo_group, container: container}
+  end
+
+  defp create_empty_ammo_group(%{ammo_type: ammo_type, current_user: current_user}) do
+    container = container_fixture(current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
+    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
+    ammo_group = ammo_group |> Repo.reload!()
+
+    %{ammo_group: ammo_group, container: container, shot_group: shot_group}
+  end
+
   describe "Index" do
     setup [:register_and_log_in_user, :create_ammo_type]
 
@@ -97,6 +121,58 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ "some updated bullet_type"
     end
 
+    test "clones ammo_type in listing",
+         %{conn: conn, current_user: current_user, ammo_type: ammo_type} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_type_index_path(conn, :index))
+
+      html = index_live |> element("[data-qa=\"clone-#{ammo_type.id}\"]") |> render_click()
+      assert html =~ gettext("New Ammo type")
+      assert html =~ "some bullet_type"
+
+      assert_patch(index_live, Routes.ammo_type_index_path(conn, :clone, ammo_type))
+
+      # assert index_live
+      #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_type-form", ammo_type: @create_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_type_index_path(conn, :index))
+
+      ammo_type = ammo_type.id |> Ammo.get_ammo_type!(current_user)
+      assert html =~ dgettext("prompts", "%{name} created successfully", name: ammo_type.name)
+      assert html =~ "some bullet_type"
+    end
+
+    test "clones ammo_type in listing with updates",
+         %{conn: conn, current_user: current_user, ammo_type: ammo_type} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_type_index_path(conn, :index))
+
+      html = index_live |> element("[data-qa=\"clone-#{ammo_type.id}\"]") |> render_click()
+      assert html =~ gettext("New Ammo type")
+      assert html =~ "some bullet_type"
+
+      assert_patch(index_live, Routes.ammo_type_index_path(conn, :clone, ammo_type))
+
+      # assert index_live
+      #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_type-form",
+          ammo_type: Map.merge(@create_attrs, %{"bullet_type" => "some updated bullet_type"})
+        )
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_type_index_path(conn, :index))
+
+      ammo_type = ammo_type.id |> Ammo.get_ammo_type!(current_user)
+      assert html =~ dgettext("prompts", "%{name} created successfully", name: ammo_type.name)
+      assert html =~ "some updated bullet_type"
+    end
+
     test "deletes ammo_type in listing", %{conn: conn, ammo_type: ammo_type} do
       {:ok, index_live, _html} = live(conn, Routes.ammo_type_index_path(conn, :index))
 
@@ -105,22 +181,59 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     end
   end
 
-  describe "Show" do
+  describe "Index with ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_type, :create_ammo_group]
+
+    test "shows used ammo groups on toggle",
+         %{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 =~ dgettext("actions", "Show used")
+      refute html =~ gettext("Used rounds")
+      refute html =~ gettext("Total ever rounds")
+      refute html =~ gettext("Used packs")
+      refute html =~ gettext("Total ever packs")
+
+      html = index_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+
+      assert html =~ gettext("Used rounds")
+      assert html =~ gettext("Total ever rounds")
+      assert html =~ gettext("Used packs")
+      assert html =~ gettext("Total ever packs")
+
+      assert html =~ "20"
+      assert html =~ "0"
+      assert html =~ "1"
+
+      shot_group_fixture(%{"count" => 5}, current_user, ammo_group)
+
+      {:ok, index_live, _html} = live(conn, Routes.ammo_type_index_path(conn, :index))
+      html = index_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+
+      assert html =~ "15"
+      assert html =~ "5"
+    end
+  end
+
+  describe "Show ammo type" do
     setup [:register_and_log_in_user, :create_ammo_type]
 
-    test "displays ammo_type", %{conn: conn, ammo_type: ammo_type} do
+    test "displays ammo_type", %{
+      conn: conn,
+      ammo_type: %{name: name, bullet_type: bullet_type} = ammo_type
+    } do
       {:ok, _show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
-      assert html =~ gettext("Show Ammo type")
-      assert html =~ ammo_type.bullet_type
+      assert html =~ name
+      assert html =~ bullet_type
     end
 
     test "updates ammo_type within modal",
-         %{conn: conn, current_user: current_user, ammo_type: ammo_type} do
+         %{conn: conn, current_user: current_user, ammo_type: %{name: name} = ammo_type} do
       {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
 
       assert show_live |> element("[data-qa=\"edit\"]") |> render_click() =~
-               gettext("Edit Ammo type")
+               gettext("Edit %{ammo_type_name}", ammo_type_name: name)
 
       assert_patch(show_live, Routes.ammo_type_show_path(conn, :edit, ammo_type))
 
@@ -139,4 +252,66 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ "some updated bullet_type"
     end
   end
+
+  describe "Show ammo type with ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_type, :create_ammo_group]
+
+    test "displays ammo group", %{
+      conn: conn,
+      ammo_type: %{name: ammo_type_name} = ammo_type,
+      container: %{name: container_name}
+    } do
+      {:ok, _show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
+
+      assert html =~ ammo_type_name
+      assert html =~ "some ammo group"
+      assert html =~ container_name
+    end
+
+    test "displays ammo group in table",
+         %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
+      {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
+
+      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
+      assert_patch(show_live, Routes.ammo_type_show_path(conn, :table, ammo_type))
+
+      assert html =~ "some ammo group"
+      assert html =~ container_name
+    end
+  end
+
+  describe "Show ammo type with empty ammo group" do
+    setup [:register_and_log_in_user, :create_ammo_type, :create_empty_ammo_group]
+
+    test "displays empty ammo groups on toggle",
+         %{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 =~ dgettext("actions", "Show used")
+      refute html =~ "some ammo group"
+
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+
+      assert html =~ "some ammo group"
+      assert html =~ "Empty"
+      assert html =~ container_name
+    end
+
+    test "displays empty ammo groups in table on toggle",
+         %{conn: conn, ammo_type: ammo_type, container: %{name: container_name}} do
+      {:ok, show_live, _html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
+
+      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
+      assert_patch(show_live, Routes.ammo_type_show_path(conn, :table, ammo_type))
+
+      assert html =~ dgettext("actions", "Show used")
+      refute html =~ "some ammo group"
+
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+
+      assert html =~ "some ammo group"
+      assert html =~ "Empty"
+      assert html =~ container_name
+    end
+  end
 end

test/cannery_web/live/container_live_test.exs

@@ -6,7 +6,7 @@ defmodule CanneryWeb.ContainerLiveTest do
   use CanneryWeb.ConnCase
   import Phoenix.LiveViewTest
   import CanneryWeb.Gettext
-  alias Cannery.Containers
+  alias Cannery.{Containers, Repo}
 
   @moduletag :container_live_test
 
@@ -22,6 +22,22 @@ defmodule CanneryWeb.ContainerLiveTest do
     "name" => "some updated name",
     "type" => "some updated type"
   }
+  @ammo_type_attrs %{
+    "bullet_type" => "some bullet_type",
+    "case_material" => "some case_material",
+    "desc" => "some desc",
+    "manufacturer" => "some manufacturer",
+    "name" => "some name",
+    "grains" => 120
+  }
+  @ammo_group_attrs %{
+    "notes" => "some ammo group",
+    "count" => 20
+  }
+  @shot_group_attrs %{
+    "notes" => "some shot group",
+    "count" => 20
+  }
 
   # @invalid_attrs %{desc: nil, location: nil, name: nil, type: nil}
 
@@ -30,7 +46,23 @@ defmodule CanneryWeb.ContainerLiveTest do
     %{container: container}
   end
 
-  describe "Index" do
+  defp create_ammo_group(%{container: container, current_user: current_user}) do
+    ammo_type = ammo_type_fixture(@ammo_type_attrs, current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
+
+    %{ammo_type: ammo_type, ammo_group: ammo_group}
+  end
+
+  defp create_empty_ammo_group(%{container: container, current_user: current_user}) do
+    ammo_type = ammo_type_fixture(@ammo_type_attrs, current_user)
+    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
+    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
+    ammo_group = ammo_group |> Repo.reload!()
+
+    %{ammo_type: ammo_type, ammo_group: ammo_group, shot_group: shot_group}
+  end
+
+  describe "Index regular" do
     setup [:register_and_log_in_user, :create_container]
 
     test "lists all containers", %{conn: conn, container: container} do
@@ -89,6 +121,63 @@ defmodule CanneryWeb.ContainerLiveTest do
       assert html =~ "some updated location"
     end
 
+    test "clones container in listing", %{
+      conn: conn,
+      current_user: current_user,
+      container: container
+    } do
+      {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :index))
+
+      html = index_live |> element("[data-qa=\"clone-#{container.id}\"]") |> render_click()
+      assert html =~ gettext("New Container")
+      assert html =~ "some location"
+
+      assert_patch(index_live, Routes.container_index_path(conn, :clone, container))
+
+      # assert index_live
+      #        |> form("#container-form", container: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#container-form", container: @create_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.container_index_path(conn, :index))
+
+      container = container.id |> Containers.get_container!(current_user)
+      assert html =~ dgettext("prompts", "%{name} created successfully", name: container.name)
+      assert html =~ "some location"
+    end
+
+    test "clones container in listing with updates", %{
+      conn: conn,
+      current_user: current_user,
+      container: container
+    } do
+      {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :index))
+
+      assert index_live |> element("[data-qa=\"clone-#{container.id}\"]") |> render_click() =~
+               gettext("New Container")
+
+      assert_patch(index_live, Routes.container_index_path(conn, :clone, container))
+
+      # assert index_live
+      #        |> form("#container-form", container: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#container-form",
+          container: Map.merge(@create_attrs, %{location: "some updated location"})
+        )
+        |> render_submit()
+        |> follow_redirect(conn, Routes.container_index_path(conn, :index))
+
+      container = container.id |> Containers.get_container!(current_user)
+      assert html =~ dgettext("prompts", "%{name} created successfully", name: container.name)
+      assert html =~ "some updated location"
+    end
+
     test "deletes container in listing", %{conn: conn, container: container} do
       {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :index))
 
@@ -97,14 +186,141 @@ defmodule CanneryWeb.ContainerLiveTest do
     end
   end
 
+  describe "Index table" do
+    setup [:register_and_log_in_user, :create_container]
+
+    test "lists all containers", %{conn: conn, container: container} do
+      {:ok, _index_live, html} = live(conn, Routes.container_index_path(conn, :table))
+
+      assert html =~ gettext("Containers")
+      assert html =~ container.location
+    end
+
+    test "saves new container", %{conn: conn, container: container} do
+      {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :table))
+
+      assert index_live |> element("a", dgettext("actions", "New Container")) |> render_click() =~
+               gettext("New Container")
+
+      assert_patch(index_live, Routes.container_index_path(conn, :new))
+
+      # assert index_live
+      #        |> form("#container-form", container: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#container-form", container: @create_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.container_index_path(conn, :table))
+
+      assert html =~ dgettext("prompts", "%{name} created successfully", name: container.name)
+      assert html =~ "some location"
+    end
+
+    test "updates container in listing", %{
+      conn: conn,
+      current_user: current_user,
+      container: container
+    } do
+      {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :table))
+
+      assert index_live |> element("[data-qa=\"edit-#{container.id}\"]") |> render_click() =~
+               gettext("Edit %{name}", name: container.name)
+
+      assert_patch(index_live, Routes.container_index_path(conn, :edit, container))
+
+      # assert index_live
+      #        |> form("#container-form", container: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#container-form", container: @update_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.container_index_path(conn, :table))
+
+      container = container.id |> Containers.get_container!(current_user)
+      assert html =~ dgettext("prompts", "%{name} updated successfully", name: container.name)
+      assert html =~ "some updated location"
+    end
+
+    test "clones container in listing", %{
+      conn: conn,
+      current_user: current_user,
+      container: container
+    } do
+      {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :index))
+
+      html = index_live |> element("[data-qa=\"clone-#{container.id}\"]") |> render_click()
+      assert html =~ gettext("New Container")
+      assert html =~ "some location"
+
+      assert_patch(index_live, Routes.container_index_path(conn, :clone, container))
+
+      # assert index_live
+      #        |> form("#container-form", container: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#container-form", container: @create_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.container_index_path(conn, :index))
+
+      container = container.id |> Containers.get_container!(current_user)
+      assert html =~ dgettext("prompts", "%{name} created successfully", name: container.name)
+      assert html =~ "some location"
+    end
+
+    test "clones container in listing with updates", %{
+      conn: conn,
+      current_user: current_user,
+      container: container
+    } do
+      {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :index))
+
+      assert index_live |> element("[data-qa=\"clone-#{container.id}\"]") |> render_click() =~
+               gettext("New Container")
+
+      assert_patch(index_live, Routes.container_index_path(conn, :clone, container))
+
+      # assert index_live
+      #        |> form("#container-form", container: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#container-form",
+          container: Map.merge(@create_attrs, %{location: "some updated location"})
+        )
+        |> render_submit()
+        |> follow_redirect(conn, Routes.container_index_path(conn, :index))
+
+      container = container.id |> Containers.get_container!(current_user)
+      assert html =~ dgettext("prompts", "%{name} created successfully", name: container.name)
+      assert html =~ "some updated location"
+    end
+
+    test "deletes container in listing", %{conn: conn, container: container} do
+      {:ok, index_live, _html} = live(conn, Routes.container_index_path(conn, :table))
+
+      assert index_live |> element("[data-qa=\"delete-#{container.id}\"]") |> render_click()
+      refute has_element?(index_live, "#container-#{container.id}")
+    end
+  end
+
   describe "Show" do
     setup [:register_and_log_in_user, :create_container]
 
-    test "displays container", %{conn: conn, container: container} do
+    test "displays container", %{
+      conn: conn,
+      container: %{name: name, location: location} = container
+    } do
       {:ok, _show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
 
-      assert html =~ gettext("Show %{name}", name: container.name)
-      assert html =~ container.location
+      assert html =~ name
+      assert html =~ location
     end
 
     test "updates container within modal", %{
@@ -134,4 +350,62 @@ defmodule CanneryWeb.ContainerLiveTest do
       assert html =~ "some updated location"
     end
   end
+
+  describe "Show with ammo group" do
+    setup [:register_and_log_in_user, :create_container, :create_ammo_group]
+
+    test "displays ammo group",
+         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
+      {:ok, _show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
+
+      assert html =~ ammo_type_name
+      assert html =~ "some ammo group"
+    end
+
+    test "displays ammo group in table",
+         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
+      {:ok, show_live, _html} = live(conn, Routes.container_show_path(conn, :show, container))
+
+      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
+      assert_patch(show_live, Routes.container_show_path(conn, :table, container))
+
+      assert html =~ ammo_type_name
+      assert html =~ "some ammo group"
+    end
+  end
+
+  describe "Show with empty ammo group" do
+    setup [:register_and_log_in_user, :create_container, :create_empty_ammo_group]
+
+    test "hides empty ammo groups by default",
+         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
+      {:ok, show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
+
+      assert html =~ dgettext("actions", "Show used")
+      refute html =~ "some ammo group"
+
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+
+      assert html =~ ammo_type_name
+      assert html =~ "some ammo group"
+      assert html =~ "Empty"
+    end
+
+    test "displays empty ammo groups in table on toggle",
+         %{conn: conn, ammo_type: %{name: ammo_type_name}, container: container} do
+      {:ok, show_live, _html} = live(conn, Routes.container_show_path(conn, :show, container))
+
+      html = show_live |> element("[data-qa=\"toggle_table\"]") |> render_click()
+      assert_patch(show_live, Routes.container_show_path(conn, :table, container))
+
+      assert html =~ dgettext("actions", "Show used")
+      refute html =~ "some ammo group"
+
+      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
+
+      assert html =~ ammo_type_name
+      assert html =~ "some ammo group"
+      assert html =~ "Empty"
+    end
+  end
 end

test/cannery_web/live/home_live_test.exs

@@ -14,4 +14,10 @@ defmodule CanneryWeb.HomeLiveTest do
     assert disconnected_html =~ gettext("Welcome to %{name}", name: "Cannery")
     assert render(home_live) =~ gettext("Welcome to %{name}", name: "Cannery")
   end
+
+  test "displays version number", %{conn: conn} do
+    {:ok, home_live, disconnected_html} = live(conn, "/")
+    assert disconnected_html =~ Mix.Project.config()[:version]
+    assert render(home_live) =~ Mix.Project.config()[:version]
+  end
 end

test/support/fixtures.ex

@@ -76,7 +76,7 @@ defmodule Cannery.Fixtures do
   def shot_group_fixture(attrs \\ %{}, %User{} = user, %AmmoGroup{} = ammo_group) do
     attrs
     |> Enum.into(%{
-      "count" => 25,
+      "count" => 20,
       "date" => ~N[2022-02-13 03:17:00],
       "notes" => "some notes"
     })
@@ -133,7 +133,8 @@ defmodule Cannery.Fixtures do
     |> Enum.into(%{
       "ammo_type_id" => ammo_type_id,
       "container_id" => container_id,
-      "count" => 20
+      "count" => 20,
+      "purchased_on" => Date.utc_today()
     })
     |> Ammo.create_ammo_groups(multiplier, user)
     |> unwrap_ok_tuple()