diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56e3eba..9edf9ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@
- Add "Cannery" to page titles
- Don't show true/false column for ammo types if all values are false
- Fix ammo type firing type display
-
+- Show original count, current value, and percentage remaining for ammo groups
+- Show shot history for an ammo group
# 0.1.0
- Initial release!
diff --git a/lib/cannery/ammo.ex b/lib/cannery/ammo.ex
index 01b4e13..6800c59 100644
--- a/lib/cannery/ammo.ex
+++ b/lib/cannery/ammo.ex
@@ -162,10 +162,12 @@ defmodule Cannery.Ammo do
@spec list_ammo_groups_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
def list_ammo_groups_for_type(%AmmoType{id: ammo_type_id, user_id: user_id}, %User{id: user_id}) do
Repo.all(
- from am in AmmoGroup,
- where: am.ammo_type_id == ^ammo_type_id,
- where: am.user_id == ^user_id,
- order_by: am.id
+ from ag in AmmoGroup,
+ left_join: sg in assoc(ag, :shot_groups),
+ where: ag.ammo_type_id == ^ammo_type_id,
+ where: ag.user_id == ^user_id,
+ preload: [shot_groups: sg],
+ order_by: ag.id
)
end
@@ -182,12 +184,18 @@ defmodule Cannery.Ammo do
@spec list_ammo_groups(User.t(), include_empty :: boolean()) :: [AmmoGroup.t()]
def list_ammo_groups(%User{id: user_id}, include_empty \\ false) do
if include_empty do
- from am in AmmoGroup, where: am.user_id == ^user_id, order_by: am.id
+ from ag in AmmoGroup,
+ left_join: sg in assoc(ag, :shot_groups),
+ where: ag.user_id == ^user_id,
+ preload: [shot_groups: sg],
+ order_by: ag.id
else
- from am in AmmoGroup,
- where: am.user_id == ^user_id,
- where: not (am.count == 0),
- order_by: am.id
+ from ag in AmmoGroup,
+ left_join: sg in assoc(ag, :shot_groups),
+ where: ag.user_id == ^user_id,
+ where: not (ag.count == 0),
+ preload: [shot_groups: sg],
+ order_by: ag.id
end
|> Repo.all()
end
@@ -204,10 +212,12 @@ defmodule Cannery.Ammo do
@spec list_staged_ammo_groups(User.t()) :: [AmmoGroup.t()]
def list_staged_ammo_groups(%User{id: user_id}) do
Repo.all(
- from am in AmmoGroup,
- where: am.user_id == ^user_id,
- where: am.staged == true,
- order_by: am.id
+ from ag in AmmoGroup,
+ left_join: sg in assoc(ag, :shot_groups),
+ where: ag.user_id == ^user_id,
+ where: ag.staged == true,
+ preload: [shot_groups: sg],
+ order_by: ag.id
)
end
@@ -226,8 +236,42 @@ defmodule Cannery.Ammo do
"""
@spec get_ammo_group!(AmmoGroup.id(), User.t()) :: AmmoGroup.t()
- def get_ammo_group!(id, %User{id: user_id}),
- do: Repo.one!(from am in AmmoGroup, where: am.id == ^id and am.user_id == ^user_id)
+ def get_ammo_group!(id, %User{id: user_id}) do
+ Repo.one!(
+ from ag in AmmoGroup,
+ left_join: sg in assoc(ag, :shot_groups),
+ where: ag.id == ^id,
+ where: ag.user_id == ^user_id,
+ preload: [shot_groups: sg]
+ )
+ end
+
+ @doc """
+ Returns the number of shot rounds for an ammo group
+ """
+ @spec get_used_count(AmmoGroup.t()) :: non_neg_integer()
+ def get_used_count(%AmmoGroup{} = ammo_group) do
+ ammo_group
+ |> Repo.preload(:shot_groups)
+ |> Map.get(:shot_groups)
+ |> Enum.map(fn %{count: count} -> count end)
+ |> Enum.sum()
+ end
+
+ @doc """
+ Calculates the percentage remaining of an ammo group out of 100
+ """
+ @spec get_percentage_remaining(AmmoGroup.t()) :: non_neg_integer()
+ def get_percentage_remaining(%AmmoGroup{count: 0}), do: 0
+
+ def get_percentage_remaining(%AmmoGroup{count: count} = ammo_group) 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()
+
+ round(count / (count + shot_group_sum) * 100)
+ end
@doc """
Creates a ammo_group.
diff --git a/lib/cannery_web/live/ammo_group_live/index.html.heex b/lib/cannery_web/live/ammo_group_live/index.html.heex
index 3377f6c..c2fab22 100644
--- a/lib/cannery_web/live/ammo_group_live/index.html.heex
+++ b/lib/cannery_web/live/ammo_group_live/index.html.heex
@@ -33,7 +33,7 @@
<%= gettext("Price paid") %>
|
- <%= gettext("Notes") %>
+ <%= gettext("% left") %>
|
<%= gettext("Range") %>
@@ -68,7 +68,7 @@
|
- <%= ammo_group.notes %>
+ <%= "#{ammo_group |> Ammo.get_percentage_remaining()}%" %>
|
diff --git a/lib/cannery_web/live/ammo_group_live/show.html.heex b/lib/cannery_web/live/ammo_group_live/show.html.heex
index c20e836..119e693 100644
--- a/lib/cannery_web/live/ammo_group_live/show.html.heex
+++ b/lib/cannery_web/live/ammo_group_live/show.html.heex
@@ -9,6 +9,16 @@
<%= @ammo_group.count %>
+
+ <%= gettext("Original count:") %>
+ <%= @ammo_group.count + Ammo.get_used_count(@ammo_group) %>
+
+
+
+ <%= gettext("Percentage left:") %>
+ <%= "#{@ammo_group |> Ammo.get_percentage_remaining()}%" %>
+
+
<%= if @ammo_group.notes do %>
<%= gettext("Notes:") %>
@@ -18,11 +28,20 @@
<%= if @ammo_group.price_paid do %>
- <%= gettext("Price paid:") %>
+ <%= gettext("Original cost:") %>
<%= gettext("$%{amount}",
amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
) %>
+
+
+ <%= gettext("Current value:") %>
+ <%= gettext("$%{amount}",
+ amount:
+ (@ammo_group.price_paid * Ammo.get_percentage_remaining(@ammo_group) / 100)
+ |> :erlang.float_to_binary(decimals: 2)
+ ) %>
+
<% end %>
@@ -84,6 +103,47 @@
<%= gettext("This ammo group is not in a container") %>
<% end %>
+
+ <%= unless @ammo_group.shot_groups |> Enum.empty?() do %>
+
+
+
+ <%= gettext("Rounds used") %>
+
+
+
+
+
+
+ |
+ <%= gettext("Rounds shot") %>
+ |
+
+ <%= gettext("Notes") %>
+ |
+
+ <%= gettext("Date") %>
+ |
+
+
+
+ <%= for shot_group <- @ammo_group.shot_groups do %>
+
+ |
+ <%= shot_group.count %>
+ |
+
+ <%= shot_group.notes %>
+ |
+
+ <%= shot_group.date |> display_date() %>
+ |
+
+ <% end %>
+
+
+ |