aaron_nad/cannery
1
0
Fork 0
forked from shibao/cannery
Code Pull Requests Activity

rename ammo groups to packs

Browse Source
This commit is contained in:
shibao
2023-03-29 22:54:55 -04:00
parent 0cae7c2940
commit 6d26103784
68 changed files with 1829 additions and 1852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/cannery_web/live/ammo_group_live/form_component.ex
View File

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

4
lib/cannery_web/live/ammo_group_live/form_component.html.heex
View File

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

64
lib/cannery_web/live/ammo_group_live/index.ex
View File

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

76
lib/cannery_web/live/ammo_group_live/index.html.heex
View File

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

55
lib/cannery_web/live/ammo_group_live/show.ex
View File

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

69
lib/cannery_web/live/ammo_group_live/show.html.heex
View File

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