Compare commits
No commits in common. "c0179f48bd5c449b850db9c16b5fbc567206d979" and "d0857eccc15bcbf1df1dc6cb3d59f9c8bf578c45" have entirely different histories.
c0179f48bd
...
d0857eccc1
@ -1,10 +1,3 @@
|
||||
# v0.4.0
|
||||
- Make tables sortable
|
||||
- Add link to changelog from version number
|
||||
- Fix some elements flashing with black background
|
||||
- Fix bug with moving ammo group to new container
|
||||
- Fix bug with no error showing up for create ammo group form
|
||||
|
||||
# v0.3.0
|
||||
- Fix ammo type counts not showing when count is 0
|
||||
- Add prompt to create first container before first ammo group
|
||||
|
||||
@ -2,10 +2,7 @@
|
||||
// update. https://github.com/phoenixframework/phoenix_live_view/issues/1011
|
||||
|
||||
export default {
|
||||
attrs () {
|
||||
const attrs = this.el.getAttribute('data-attrs')
|
||||
if (attrs) { return attrs.split(', ') } else { return [] }
|
||||
},
|
||||
attrs () { return this.el.getAttribute('data-attrs').split(', ') },
|
||||
beforeUpdate () { this.prevAttrs = this.attrs().map(name => [name, this.el.getAttribute(name)]) },
|
||||
updated () { this.prevAttrs.forEach(([name, val]) => this.el.setAttribute(name, val)) }
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ defmodule Cannery.Ammo do
|
||||
import Ecto.Query, warn: false
|
||||
alias Cannery.{Accounts.User, Containers, Repo}
|
||||
alias Cannery.Ammo.{AmmoGroup, AmmoType}
|
||||
alias Ecto.Changeset
|
||||
alias Ecto.{Changeset, Multi}
|
||||
|
||||
@ammo_group_create_limit 10_000
|
||||
|
||||
@ -342,7 +342,7 @@ defmodule Cannery.Ammo do
|
||||
"""
|
||||
@spec create_ammo_groups(attrs :: map(), multiplier :: non_neg_integer(), User.t()) ::
|
||||
{:ok, {count :: non_neg_integer(), [AmmoGroup.t()] | nil}}
|
||||
| {:error, Changeset.t(AmmoGroup.new_ammo_group())}
|
||||
| {:error, Changeset.t(AmmoGroup.new_ammo_group()) | nil}
|
||||
def create_ammo_groups(
|
||||
%{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
|
||||
multiplier,
|
||||
@ -361,24 +361,26 @@ defmodule Cannery.Ammo do
|
||||
end)
|
||||
|
||||
if changesets |> Enum.all?(fn %{valid?: valid} -> valid end) do
|
||||
{count, inserted_ammo_groups} =
|
||||
Repo.insert_all(
|
||||
AmmoGroup,
|
||||
changesets
|
||||
|> Enum.map(fn changeset ->
|
||||
changeset
|
||||
|> Map.get(:changes)
|
||||
|> Map.merge(%{inserted_at: now, updated_at: now})
|
||||
end),
|
||||
returning: true
|
||||
)
|
||||
|
||||
{:ok, {count, inserted_ammo_groups}}
|
||||
Multi.new()
|
||||
|> Multi.insert_all(
|
||||
:create_ammo_groups,
|
||||
AmmoGroup,
|
||||
changesets
|
||||
|> Enum.map(fn changeset ->
|
||||
changeset
|
||||
|> Map.get(:changes)
|
||||
|> Map.merge(%{inserted_at: now, updated_at: now})
|
||||
end),
|
||||
returning: true
|
||||
)
|
||||
|> Repo.transaction()
|
||||
|> case do
|
||||
{:ok, %{create_ammo_groups: {count, ammo_groups}}} -> {:ok, {count, ammo_groups}}
|
||||
{:error, :create_ammo_groups, changeset, _changes_so_far} -> {:error, changeset}
|
||||
{:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
|
||||
end
|
||||
else
|
||||
changesets
|
||||
|> Enum.reject(fn %{valid?: valid} -> valid end)
|
||||
|> List.first()
|
||||
|> Changeset.apply_action(:insert)
|
||||
{:error, changesets |> List.first()}
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -4,8 +4,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
|
||||
"""
|
||||
|
||||
use CanneryWeb, :live_component
|
||||
alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers, Containers.Container}
|
||||
alias CanneryWeb.Endpoint
|
||||
alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers}
|
||||
alias Phoenix.LiveView.Socket
|
||||
|
||||
@impl true
|
||||
@ -28,12 +27,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
|
||||
Containers.list_containers(current_user)
|
||||
|> Enum.reject(fn %{id: id} -> id == container_id end)
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign(assigns)
|
||||
|> assign(changeset: changeset, containers: containers)
|
||||
|
||||
{:ok, socket}
|
||||
{:ok, socket |> assign(assigns) |> assign(changeset: changeset, containers: containers)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@ -60,76 +54,4 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
|
||||
|
||||
{:noreply, socket}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def render(%{containers: containers} = assigns) do
|
||||
columns = [
|
||||
%{label: gettext("Container"), key: "name"},
|
||||
%{label: gettext("Type"), key: "type"},
|
||||
%{label: gettext("Location"), key: "location"},
|
||||
%{label: nil, key: "actions", sortable: false}
|
||||
]
|
||||
|
||||
rows = containers |> get_rows_for_containers(assigns, columns)
|
||||
|
||||
assigns = assigns |> Map.merge(%{columns: columns, rows: rows})
|
||||
|
||||
~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") %>
|
||||
</h2>
|
||||
|
||||
<%= if @containers |> Enum.empty?() do %>
|
||||
<h2 class="title text-xl text-primary-600">
|
||||
<%= gettext("No other containers") %>
|
||||
<%= display_emoji("😔") %>
|
||||
</h2>
|
||||
|
||||
<%= live_patch(dgettext("actions", "Add another container!"),
|
||||
to: Routes.container_index_path(Endpoint, :new),
|
||||
class: "btn btn-primary"
|
||||
) %>
|
||||
<% else %>
|
||||
<.live_component
|
||||
module={CanneryWeb.Components.TableComponent}
|
||||
id="move_ammo_group_table"
|
||||
columns={@columns}
|
||||
rows={@rows}
|
||||
/>
|
||||
<% end %>
|
||||
</div>
|
||||
"""
|
||||
end
|
||||
|
||||
@spec get_rows_for_containers([Container.t()], map(), [map()]) :: [map()]
|
||||
defp get_rows_for_containers(containers, assigns, columns) do
|
||||
containers
|
||||
|> Enum.map(fn container ->
|
||||
columns
|
||||
|> Enum.into(%{}, fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
|
||||
end)
|
||||
end
|
||||
|
||||
@spec get_row_value_by_key(String.t(), Container.t(), map()) :: any()
|
||||
defp get_row_value_by_key("actions", container, assigns) do
|
||||
assigns = assigns |> Map.put(:container, container)
|
||||
|
||||
~H"""
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary"
|
||||
phx-click="move"
|
||||
phx-target={@myself}
|
||||
phx-value-container_id={container.id}
|
||||
>
|
||||
<%= dgettext("actions", "Select") %>
|
||||
</button>
|
||||
</div>
|
||||
"""
|
||||
end
|
||||
|
||||
defp get_row_value_by_key(key, container, _assigns),
|
||||
do: container |> Map.get(key |> String.to_existing_atom())
|
||||
end
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
<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") %>
|
||||
</h2>
|
||||
|
||||
<%= if @containers |> Enum.empty?() do %>
|
||||
<h2 class="title text-xl text-primary-600">
|
||||
<%= gettext("No other containers") %>
|
||||
<%= display_emoji("😔") %>
|
||||
</h2>
|
||||
|
||||
<%= live_patch(dgettext("actions", "Add another container!"),
|
||||
to: Routes.container_index_path(Endpoint, :new),
|
||||
class: "btn btn-primary"
|
||||
) %>
|
||||
<% else %>
|
||||
<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
|
||||
<table class="min-w-full table-auto text-center bg-white">
|
||||
<thead class="border-b border-primary-600">
|
||||
<tr>
|
||||
<th class="p-2">
|
||||
<%= gettext("Container") %>
|
||||
</th>
|
||||
|
||||
<th class="p-2">
|
||||
<%= gettext("Type") %>
|
||||
</th>
|
||||
|
||||
<th class="p-2">
|
||||
<%= gettext("Location") %>
|
||||
</th>
|
||||
|
||||
<th class="p-2"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="containers">
|
||||
<%= for container <- @containers do %>
|
||||
<tr id={"container-#{container.id}"}>
|
||||
<td class="p-2">
|
||||
<%= container.name %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= container.type %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= container.location %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary"
|
||||
phx-click="move"
|
||||
phx-target={@myself}
|
||||
phx-value-container_id={container.id}
|
||||
>
|
||||
<%= dgettext("actions", "Select") %>
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
@ -1,87 +0,0 @@
|
||||
defmodule CanneryWeb.Components.TableComponent do
|
||||
@moduledoc """
|
||||
Livecomponent that presents a resortable table
|
||||
|
||||
It takes the following required assigns:
|
||||
- `:columns`: An array of maps containing the following keys
|
||||
- `:label`: A gettext'd or otherwise user-facing string label for the
|
||||
column. Can be nil
|
||||
- `:key`: A string key used for sorting
|
||||
- `:class`: Extra classes to be applied to the column element, if desired.
|
||||
Optional
|
||||
- `:sortable`: If false, will prevent the user from sorting with it.
|
||||
Optional
|
||||
- `:values`: An array of maps containing data for each row. Each map is
|
||||
string-keyed with the associated column key to the following values:
|
||||
- A single element, like string, integer or Phoenix.LiveView.Rendered
|
||||
object, like returned from the ~H sigil
|
||||
- A tuple, containing a custom value used for sorting, and the displayed
|
||||
content.
|
||||
"""
|
||||
|
||||
use CanneryWeb, :live_component
|
||||
alias Phoenix.LiveView.Socket
|
||||
|
||||
@impl true
|
||||
@spec update(
|
||||
%{
|
||||
required(:columns) =>
|
||||
list(%{
|
||||
required(:label) => String.t() | nil,
|
||||
required(:key) => String.t() | nil,
|
||||
optional(:class) => String.t(),
|
||||
optional(:sortable) => false
|
||||
}),
|
||||
required(:rows) =>
|
||||
list(%{
|
||||
(key :: String.t()) => any() | {custom_sort_value :: String.t(), value :: any()}
|
||||
}),
|
||||
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)
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign(assigns)
|
||||
|> assign(columns: columns, rows: rows, last_sort_key: initial_key, sort_mode: :asc)
|
||||
|
||||
{:ok, socket}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_event(
|
||||
"sort_by",
|
||||
%{"sort-key" => key},
|
||||
%{assigns: %{rows: rows, last_sort_key: key, sort_mode: sort_mode}} = socket
|
||||
) do
|
||||
sort_mode = if sort_mode == :asc, do: :desc, else: :asc
|
||||
rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
|
||||
{:noreply, socket |> assign(sort_mode: sort_mode, rows: rows)}
|
||||
end
|
||||
|
||||
def handle_event(
|
||||
"sort_by",
|
||||
%{"sort-key" => key},
|
||||
%{assigns: %{rows: rows}} = socket
|
||||
) do
|
||||
rows = rows |> sort_by_custom_sort_value_or_value(key, :asc)
|
||||
{:noreply, socket |> assign(last_sort_key: key, sort_mode: :asc, rows: rows)}
|
||||
end
|
||||
|
||||
defp sort_by_custom_sort_value_or_value(rows, key, sort_mode) do
|
||||
rows
|
||||
|> Enum.sort_by(
|
||||
fn row ->
|
||||
case row |> Map.get(key) do
|
||||
{custom_sort_key, _value} -> custom_sort_key
|
||||
value -> value
|
||||
end
|
||||
end,
|
||||
sort_mode
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -1,52 +0,0 @@
|
||||
<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
|
||||
<table class="min-w-full table-auto text-center bg-white">
|
||||
<thead class="border-b border-primary-600">
|
||||
<tr>
|
||||
<%= for %{key: key, label: label} = column <- @columns do %>
|
||||
<%= if column |> Map.get(:sortable, true) do %>
|
||||
<th class={"p-2 #{column[:class]}"}>
|
||||
<span
|
||||
class="cursor-pointer"
|
||||
phx-click="sort_by"
|
||||
phx-value-sort-key={key}
|
||||
phx-target={@myself}
|
||||
>
|
||||
<span class="underline"><%= label %></span>
|
||||
<%= if @last_sort_key == key do %>
|
||||
<%= case @sort_mode do %>
|
||||
<% :asc -> %>
|
||||
<i class="fas fa-sm fa-chevron-down"></i>
|
||||
<% :desc -> %>
|
||||
<i class="fas fa-sm fa-chevron-up"></i>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<i class="fas fa-sm fa-chevron-up opacity-0"></i>
|
||||
<% end %>
|
||||
</span>
|
||||
</th>
|
||||
<% else %>
|
||||
<th class={"p-2 #{column[:class]}"}>
|
||||
<%= label %>
|
||||
</th>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<%= for values <- @rows do %>
|
||||
<tr>
|
||||
<%= for %{key: key} = value <- @columns do %>
|
||||
<td class={"p-2 #{value[:class]}"}>
|
||||
<%= case values |> Map.get(key) do %>
|
||||
<% {_custom_sort_value, value} -> %>
|
||||
<%= value %>
|
||||
<% value -> %>
|
||||
<%= value %>
|
||||
<% end %>
|
||||
</td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@ -36,23 +36,10 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
|
||||
def handle_event(
|
||||
"validate",
|
||||
%{"ammo_group" => ammo_group_params},
|
||||
%{assigns: %{action: action, ammo_group: ammo_group}} = socket
|
||||
%{assigns: %{ammo_group: ammo_group}} = socket
|
||||
) do
|
||||
changeset_action =
|
||||
case action do
|
||||
:new -> :insert
|
||||
:edit -> :update
|
||||
end
|
||||
|
||||
changeset = ammo_group |> Ammo.change_ammo_group(ammo_group_params)
|
||||
|
||||
changeset =
|
||||
case changeset |> Changeset.apply_action(changeset_action) do
|
||||
{:ok, _data} -> changeset
|
||||
{:error, changeset} -> changeset
|
||||
end
|
||||
|
||||
{:noreply, socket |> assign(:changeset, changeset)}
|
||||
socket = socket |> assign(:changeset, ammo_group |> Ammo.change_ammo_group(ammo_group_params))
|
||||
{:noreply, socket}
|
||||
end
|
||||
|
||||
def handle_event(
|
||||
@ -155,6 +142,9 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
|
||||
|
||||
{:error, %Changeset{} = changeset} ->
|
||||
socket |> assign(changeset: changeset)
|
||||
|
||||
{:error, nil} ->
|
||||
socket
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -75,112 +75,6 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
|
||||
defp display_ammo_groups(%{assigns: %{current_user: current_user}} = socket) do
|
||||
ammo_groups = Ammo.list_ammo_groups(current_user) |> Repo.preload([:ammo_type, :container])
|
||||
containers = Containers.list_containers(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: 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, containers: containers, columns: columns, rows: rows)
|
||||
socket |> assign(ammo_groups: ammo_groups, containers: containers)
|
||||
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(String.t(), AmmoGroup.t()) :: any()
|
||||
defp get_value_for_key("ammo_type", %{ammo_type: ammo_type}) do
|
||||
{ammo_type.name,
|
||||
live_patch(ammo_type.name,
|
||||
to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
|
||||
class: "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("range", %{staged: staged} = ammo_group) do
|
||||
assigns = %{ammo_group: ammo_group}
|
||||
|
||||
{staged,
|
||||
~H"""
|
||||
<button
|
||||
type="button"
|
||||
class="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>
|
||||
|
||||
<%= live_patch(dgettext("actions", "Record shots"),
|
||||
to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
|
||||
class: "btn btn-primary"
|
||||
) %>
|
||||
"""}
|
||||
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">
|
||||
<%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, ammo_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "view-#{ammo_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-eye"></i>
|
||||
<% end %>
|
||||
|
||||
<%= live_patch to: Routes.ammo_group_index_path(Endpoint, :edit, ammo_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{ammo_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
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?"),
|
||||
qa: "delete-#{ammo_group.id}"
|
||||
] do %>
|
||||
<i class="fa-fw fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</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
|
||||
{container_name,
|
||||
live_patch(container_name,
|
||||
to: Routes.ammo_group_index_path(Endpoint, :move, ammo_group),
|
||||
class: "btn btn-primary"
|
||||
)}
|
||||
end
|
||||
|
||||
defp get_value_for_key(key, ammo_group),
|
||||
do: ammo_group |> Map.get(key |> String.to_existing_atom())
|
||||
end
|
||||
|
||||
@ -45,13 +45,116 @@
|
||||
) %>
|
||||
<% end %>
|
||||
|
||||
<.live_component
|
||||
module={CanneryWeb.Components.TableComponent}
|
||||
id="ammo_groups_index_table"
|
||||
action={@live_action}
|
||||
columns={@columns}
|
||||
rows={@rows}
|
||||
/>
|
||||
<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
|
||||
<table class="min-w-full table-auto text-center bg-white">
|
||||
<thead class="border-b border-primary-600">
|
||||
<tr>
|
||||
<th class="p-2">
|
||||
<%= gettext("Ammo type") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Count") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Price paid") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("% left") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Range") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Container") %>
|
||||
</th>
|
||||
|
||||
<th class="p-2"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="ammo_groups">
|
||||
<%= for ammo_group <- @ammo_groups do %>
|
||||
<tr id={"ammo_group-#{ammo_group.id}"}>
|
||||
<td class="p-2">
|
||||
<%= live_patch(ammo_group.ammo_type.name,
|
||||
to: Routes.ammo_type_show_path(Endpoint, :show, ammo_group.ammo_type),
|
||||
class: "link"
|
||||
) %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= ammo_group.count %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= if ammo_group.price_paid do %>
|
||||
<%= gettext("$%{amount}",
|
||||
amount: ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
|
||||
) %>
|
||||
<% end %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= "#{ammo_group |> Ammo.get_percentage_remaining()}%" %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<button
|
||||
type="button"
|
||||
class="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>
|
||||
|
||||
<%= live_patch(dgettext("actions", "Record shots"),
|
||||
to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
|
||||
class: "btn btn-primary"
|
||||
) %>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= if ammo_group.container do %>
|
||||
<%= live_patch(ammo_group.container.name,
|
||||
to: Routes.ammo_group_index_path(Endpoint, :move, ammo_group),
|
||||
class: "btn btn-primary"
|
||||
) %>
|
||||
<% end %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, ammo_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "view-#{ammo_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-eye"></i>
|
||||
<% end %>
|
||||
|
||||
<%= live_patch to: Routes.ammo_group_index_path(Endpoint, :edit, ammo_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{ammo_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
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?"),
|
||||
qa: "delete-#{ammo_group.id}"
|
||||
] do %>
|
||||
<i class="fa-fw fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@ -94,5 +197,4 @@
|
||||
/>
|
||||
</.modal>
|
||||
<% true -> %>
|
||||
<%= nil %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@ -5,7 +5,7 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
|
||||
|
||||
use CanneryWeb, :live_view
|
||||
import CanneryWeb.Components.ContainerCard
|
||||
alias Cannery.{ActivityLog, ActivityLog.ShotGroup, Ammo, Ammo.AmmoGroup, Repo}
|
||||
alias Cannery.{ActivityLog, Ammo, Ammo.AmmoGroup, Repo}
|
||||
alias CanneryWeb.Endpoint
|
||||
alias Phoenix.LiveView.Socket
|
||||
|
||||
@ -84,64 +84,9 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
|
||||
@spec display_ammo_group(Socket.t(), AmmoGroup.t() | AmmoGroup.id()) :: Socket.t()
|
||||
defp display_ammo_group(socket, %AmmoGroup{} = ammo_group) do
|
||||
ammo_group = ammo_group |> Repo.preload([:container, :ammo_type, :shot_groups], force: true)
|
||||
|
||||
columns = [
|
||||
%{label: gettext("Rounds shot"), key: "count"},
|
||||
%{label: gettext("Notes"), key: "notes"},
|
||||
%{label: gettext("Date"), key: "date"},
|
||||
%{label: nil, key: "actions", sortable: false}
|
||||
]
|
||||
|
||||
rows =
|
||||
ammo_group.shot_groups
|
||||
|> Enum.map(fn shot_group ->
|
||||
ammo_group |> get_table_row_for_shot_group(shot_group, columns)
|
||||
end)
|
||||
|
||||
socket |> assign(ammo_group: ammo_group, columns: columns, rows: rows)
|
||||
socket |> assign(:ammo_group, ammo_group)
|
||||
end
|
||||
|
||||
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()]
|
||||
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} ->
|
||||
value =
|
||||
case key do
|
||||
"date" ->
|
||||
{date, date |> display_date()}
|
||||
|
||||
"actions" ->
|
||||
~H"""
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, shot_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{shot_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
class: "text-primary-600 link",
|
||||
phx_click: "delete_shot_group",
|
||||
phx_value_id: shot_group.id,
|
||||
data: [
|
||||
confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
|
||||
qa: "delete-#{shot_group.id}"
|
||||
] do %>
|
||||
<i class="fa-fw fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</div>
|
||||
"""
|
||||
|
||||
key ->
|
||||
shot_group |> Map.get(key |> String.to_existing_atom())
|
||||
end
|
||||
|
||||
{key, value}
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
@ -111,12 +111,63 @@
|
||||
<%= gettext("Rounds used") %>
|
||||
</h1>
|
||||
|
||||
<.live_component
|
||||
module={CanneryWeb.Components.TableComponent}
|
||||
id="ammo_group_shot_groups_table"
|
||||
columns={@columns}
|
||||
rows={@rows}
|
||||
/>
|
||||
<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
|
||||
<table class="min-w-full table-auto text-center bg-white">
|
||||
<thead class="border-b border-primary-600">
|
||||
<tr>
|
||||
<th class="p-2">
|
||||
<%= gettext("Rounds shot") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Notes") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Date") %>
|
||||
</th>
|
||||
|
||||
<th class="p-2"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="shot_groups">
|
||||
<%= for shot_group <- @ammo_group.shot_groups do %>
|
||||
<tr id={"shot_group-#{shot_group.id}"}>
|
||||
<td class="p-2">
|
||||
<%= shot_group.count %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= shot_group.notes %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<%= shot_group.date |> display_date() %>
|
||||
</td>
|
||||
|
||||
<td class="p-2 w-full h-full space-x-2 flex justify-center items-center">
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, shot_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{shot_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
class: "text-primary-600 link",
|
||||
phx_click: "delete_shot_group",
|
||||
phx_value_id: shot_group.id,
|
||||
data: [
|
||||
confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
|
||||
qa: "delete-#{shot_group.id}"
|
||||
] do %>
|
||||
<i class="fa-fw fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
@ -46,103 +46,37 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
|
||||
defp list_ammo_types(%{assigns: %{current_user: current_user}} = socket) do
|
||||
ammo_types = Ammo.list_ammo_types(current_user)
|
||||
|
||||
columns =
|
||||
columns_to_display =
|
||||
[
|
||||
%{label: gettext("Name"), key: "name", type: :string},
|
||||
%{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}
|
||||
{gettext("Name"), :name, :string},
|
||||
{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}
|
||||
]
|
||||
|> Enum.filter(fn %{key: key, type: type} ->
|
||||
|> Enum.filter(fn {_label, field, type} ->
|
||||
# remove columns if all values match defaults
|
||||
default_value = if type == :boolean, do: false, else: nil
|
||||
|
||||
ammo_types
|
||||
|> Enum.any?(fn ammo_type ->
|
||||
not (ammo_type |> Map.get(key |> String.to_existing_atom()) == default_value)
|
||||
end)
|
||||
|> Enum.any?(fn ammo_type -> not (ammo_type |> Map.get(field) == default_value) end)
|
||||
end)
|
||||
|> Kernel.++([
|
||||
%{label: gettext("Total # of rounds"), key: "round_count", type: :round_count},
|
||||
%{label: nil, key: "actions", type: :actions, sortable: false}
|
||||
])
|
||||
|
||||
rows =
|
||||
ammo_types
|
||||
|> Enum.map(fn ammo_type -> ammo_type |> get_ammo_type_values(columns, current_user) end)
|
||||
|
||||
socket |> assign(columns: columns, rows: rows)
|
||||
end
|
||||
|
||||
defp get_ammo_type_values(ammo_type, columns, current_user) do
|
||||
assigns = %{ammo_type: ammo_type}
|
||||
|
||||
columns
|
||||
|> Enum.into(%{}, fn %{key: key, type: type} ->
|
||||
value =
|
||||
case type do
|
||||
:boolean ->
|
||||
ammo_type |> Map.get(key |> String.to_existing_atom()) |> humanize()
|
||||
|
||||
:round_count ->
|
||||
ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
|
||||
|
||||
:actions ->
|
||||
~H"""
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<%= live_redirect to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "view-#{ammo_type.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-eye"></i>
|
||||
<% end %>
|
||||
|
||||
<%= live_patch to: Routes.ammo_type_index_path(Endpoint, :edit, ammo_type),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{ammo_type.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
class: "text-primary-600 link",
|
||||
phx_click: "delete",
|
||||
phx_value_id: ammo_type.id,
|
||||
data: [
|
||||
confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
|
||||
qa: "delete-#{ammo_type.id}"
|
||||
] do %>
|
||||
<i class="fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</div>
|
||||
"""
|
||||
|
||||
nil ->
|
||||
nil
|
||||
|
||||
_other ->
|
||||
ammo_type |> Map.get(key |> String.to_existing_atom())
|
||||
end
|
||||
|
||||
{key, value}
|
||||
end)
|
||||
socket |> assign(ammo_types: ammo_types, columns_to_display: columns_to_display)
|
||||
end
|
||||
end
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<%= gettext("Ammo Types") %>
|
||||
</h1>
|
||||
|
||||
<%= if @rows |> Enum.empty?() do %>
|
||||
<%= if @ammo_types |> Enum.empty?() do %>
|
||||
<h2 class="title text-xl text-primary-600">
|
||||
<%= gettext("No Ammo Types") %>
|
||||
<%= display_emoji("😔") %>
|
||||
@ -19,13 +19,71 @@
|
||||
class: "btn btn-primary"
|
||||
) %>
|
||||
|
||||
<.live_component
|
||||
module={CanneryWeb.Components.TableComponent}
|
||||
id="ammo_types_index_table"
|
||||
action={@live_action}
|
||||
columns={@columns}
|
||||
rows={@rows}
|
||||
/>
|
||||
<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
|
||||
<table class="min-w-full table-auto text-center bg-white">
|
||||
<thead class="border-b border-primary-600">
|
||||
<tr>
|
||||
<%= for {field_name, _field, _type} <- @columns_to_display do %>
|
||||
<th class="p-2">
|
||||
<%= field_name %>
|
||||
</th>
|
||||
<% end %>
|
||||
<th class="p-2">
|
||||
<%= gettext("Total # of rounds") %>
|
||||
</th>
|
||||
|
||||
<th class="p-2"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<%= for ammo_type <- @ammo_types do %>
|
||||
<tr id={"ammo_type-#{ammo_type.id}"}>
|
||||
<%= for {_label, field, type} <- @columns_to_display do %>
|
||||
<td class="p-2">
|
||||
<%= case type do %>
|
||||
<% :boolean -> %>
|
||||
<%= ammo_type |> Map.get(field) |> humanize() %>
|
||||
<% _other -> %>
|
||||
<%= ammo_type |> Map.get(field) %>
|
||||
<% end %>
|
||||
</td>
|
||||
<% end %>
|
||||
|
||||
<td class="p-2">
|
||||
<%= ammo_type |> Ammo.get_round_count_for_ammo_type(@current_user) %>
|
||||
</td>
|
||||
|
||||
<td class="p-2">
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<%= live_redirect to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "view-#{ammo_type.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-eye"></i>
|
||||
<% end %>
|
||||
|
||||
<%= live_patch to: Routes.ammo_type_index_path(Endpoint, :edit, ammo_type),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{ammo_type.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
class: "text-primary-600 link",
|
||||
phx_click: "delete",
|
||||
phx_value_id: ammo_type.id,
|
||||
data: [
|
||||
confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
|
||||
qa: "delete-#{ammo_type.id}"
|
||||
] do %>
|
||||
<i class="fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
@ -127,15 +127,11 @@ defmodule CanneryWeb.HomeLive do
|
||||
</p>
|
||||
</li>
|
||||
|
||||
<li class="flex flex-row justify-center items-center space-x-2">
|
||||
<li class="flex flex-row justify-center space-x-2">
|
||||
<b>Version:</b>
|
||||
<%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
|
||||
to: "https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md",
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer" do %>
|
||||
<p>0.3.0</p>
|
||||
<i class="fas fa-md fa-info-circle"></i>
|
||||
<% end %>
|
||||
<p>
|
||||
0.3.0
|
||||
</p>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -77,69 +77,6 @@ defmodule CanneryWeb.RangeLive.Index do
|
||||
ActivityLog.list_shot_groups(current_user) |> Repo.preload(ammo_group: :ammo_type)
|
||||
|
||||
ammo_groups = Ammo.list_staged_ammo_groups(current_user)
|
||||
|
||||
columns = [
|
||||
%{label: gettext("Ammo"), key: "name"},
|
||||
%{label: gettext("Rounds shot"), key: "count"},
|
||||
%{label: gettext("Notes"), key: "notes"},
|
||||
%{label: gettext("Date"), key: "date"},
|
||||
%{label: nil, key: "actions", sortable: false}
|
||||
]
|
||||
|
||||
rows =
|
||||
shot_groups
|
||||
|> Enum.map(fn shot_group -> shot_group |> get_row_data_for_shot_group(columns) end)
|
||||
|
||||
socket
|
||||
|> assign(ammo_groups: ammo_groups, columns: columns, rows: rows, shot_groups: shot_groups)
|
||||
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} ->
|
||||
value =
|
||||
case key do
|
||||
"name" ->
|
||||
{shot_group.ammo_group.ammo_type.name,
|
||||
live_patch(shot_group.ammo_group.ammo_type.name,
|
||||
to: Routes.ammo_group_show_path(Endpoint, :show, shot_group.ammo_group),
|
||||
class: "link"
|
||||
)}
|
||||
|
||||
"date" ->
|
||||
date |> display_date()
|
||||
|
||||
"actions" ->
|
||||
~H"""
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{shot_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
class: "text-primary-600 link",
|
||||
phx_click: "delete",
|
||||
phx_value_id: shot_group.id,
|
||||
data: [
|
||||
confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
|
||||
qa: "delete-#{shot_group.id}"
|
||||
] do %>
|
||||
<i class="fa-fw fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</div>
|
||||
"""
|
||||
|
||||
key ->
|
||||
shot_group |> Map.get(key |> String.to_existing_atom())
|
||||
end
|
||||
|
||||
{key, value}
|
||||
end)
|
||||
socket |> assign(shot_groups: shot_groups, ammo_groups: ammo_groups)
|
||||
end
|
||||
end
|
||||
|
||||
@ -53,12 +53,70 @@
|
||||
<%= gettext("Shot log") %>
|
||||
</h1>
|
||||
|
||||
<.live_component
|
||||
module={CanneryWeb.Components.TableComponent}
|
||||
id="shot_groups_index_table"
|
||||
columns={@columns}
|
||||
rows={@rows}
|
||||
/>
|
||||
<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
|
||||
<table class="min-w-full table-auto text-center bg-white">
|
||||
<thead class="border-b border-primary-600">
|
||||
<tr>
|
||||
<th class="p-2">
|
||||
<%= gettext("Ammo") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Rounds shot") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Notes") %>
|
||||
</th>
|
||||
<th class="p-2">
|
||||
<%= gettext("Date") %>
|
||||
</th>
|
||||
|
||||
<th class="p-2"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="shot_groups">
|
||||
<%= for shot_group <- @shot_groups do %>
|
||||
<tr id={"shot_group-#{shot_group.id}"}>
|
||||
<td class="p-2">
|
||||
<%= live_patch(shot_group.ammo_group.ammo_type.name,
|
||||
to: Routes.ammo_group_show_path(Endpoint, :show, shot_group.ammo_group),
|
||||
class: "link"
|
||||
) %>
|
||||
</td>
|
||||
<td class="p-2">
|
||||
<%= shot_group.count %>
|
||||
</td>
|
||||
<td class="p-2">
|
||||
<%= shot_group.notes %>
|
||||
</td>
|
||||
<td class="p-2">
|
||||
<%= shot_group.date |> display_date() %>
|
||||
</td>
|
||||
|
||||
<td class="p-2 w-full h-full space-x-2 flex justify-center items-center">
|
||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||
<%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
|
||||
class: "text-primary-600 link",
|
||||
data: [qa: "edit-#{shot_group.id}"] do %>
|
||||
<i class="fa-fw fa-lg fas fa-edit"></i>
|
||||
<% end %>
|
||||
|
||||
<%= link to: "#",
|
||||
class: "text-primary-600 link",
|
||||
phx_click: "delete",
|
||||
phx_value_id: shot_group.id,
|
||||
data: [
|
||||
confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
|
||||
qa: "delete-#{shot_group.id}"
|
||||
] do %>
|
||||
<i class="fa-fw fa-lg fas fa-trash"></i>
|
||||
<% end %>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" class="m-0 p-0 w-full h-full bg-white">
|
||||
<html lang="en" class="m-0 p-0 w-full h-full">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
@ -17,7 +17,7 @@
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body class="m-0 p-0 w-full h-full bg-white">
|
||||
<body class="m-0 p-0 w-full h-full">
|
||||
<%= @inner_content %>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -7,8 +7,6 @@ defmodule CanneryWeb.ViewHelpers do
|
||||
|
||||
import Phoenix.LiveView.Helpers
|
||||
|
||||
@id_length 16
|
||||
|
||||
@doc """
|
||||
Returns a <time> element that renders the naivedatetime in the user's local
|
||||
timezone with Alpine.js
|
||||
@ -18,12 +16,11 @@ defmodule CanneryWeb.ViewHelpers do
|
||||
|
||||
def display_datetime(datetime) do
|
||||
assigns = %{
|
||||
id: :crypto.strong_rand_bytes(@id_length) |> Base.url_encode64(),
|
||||
datetime: datetime |> DateTime.from_naive!("Etc/UTC") |> DateTime.to_iso8601(:extended)
|
||||
}
|
||||
|
||||
~H"""
|
||||
<time id={@id} datetime={@datetime} x-data={"{
|
||||
<time datetime={@datetime} x-data={"{
|
||||
date:
|
||||
Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
|
||||
.format(new Date(\"#{@datetime}\"))
|
||||
@ -41,13 +38,10 @@ defmodule CanneryWeb.ViewHelpers do
|
||||
def display_date(nil), do: ""
|
||||
|
||||
def display_date(date) do
|
||||
assigns = %{
|
||||
id: :crypto.strong_rand_bytes(@id_length) |> Base.url_encode64(),
|
||||
date: date |> Date.to_iso8601(:extended)
|
||||
}
|
||||
assigns = %{date: date |> Date.to_iso8601(:extended)}
|
||||
|
||||
~H"""
|
||||
<time id={@id} datetime={@date} x-data={"{
|
||||
<time datetime={@date} x-data={"{
|
||||
date:
|
||||
Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}).format(new Date(\"#{@date}\"))
|
||||
}"} x-text="date">
|
||||
|
||||
@ -160,7 +160,7 @@ msgid "Why not get some ready to shoot?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:133
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:111
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:36
|
||||
msgid "Record shots"
|
||||
@ -172,7 +172,7 @@ msgid "Ammo Details"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:89
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:12
|
||||
msgid "Add another container!"
|
||||
msgstr ""
|
||||
|
||||
@ -182,7 +182,7 @@ msgid "Move containers"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:127
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:60
|
||||
msgid "Select"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -33,13 +33,13 @@ msgstr ""
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:52
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
|
||||
#: lib/cannery_web/live/range_live/index.ex:82
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:61
|
||||
msgid "Ammo"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:80
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:53
|
||||
msgid "Ammo type"
|
||||
msgstr ""
|
||||
|
||||
@ -55,7 +55,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:71
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:67
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
|
||||
msgid "Blank"
|
||||
msgstr ""
|
||||
@ -101,9 +101,9 @@ msgid "Case material"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:67
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:22
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:85
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:68
|
||||
msgid "Container"
|
||||
msgstr ""
|
||||
|
||||
@ -116,14 +116,14 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:72
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:68
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
|
||||
msgid "Corrosive"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:81
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:56
|
||||
msgid "Count"
|
||||
msgstr ""
|
||||
|
||||
@ -194,14 +194,14 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:65
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:61
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
|
||||
msgid "Grains"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:70
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:66
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
|
||||
msgid "Incendiary"
|
||||
msgstr ""
|
||||
@ -234,7 +234,7 @@ msgid "Keep me logged in for 60 days"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:69
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:30
|
||||
#: lib/cannery_web/live/container_live/form_component.html.heex:42
|
||||
msgid "Location"
|
||||
msgstr ""
|
||||
@ -257,7 +257,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:73
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:69
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
|
||||
msgid "Manufacturer"
|
||||
msgstr ""
|
||||
@ -340,9 +340,9 @@ msgstr ""
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/add_shot_group_component.html.heex:30
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:90
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:122
|
||||
#: lib/cannery_web/live/range_live/form_component.html.heex:29
|
||||
#: lib/cannery_web/live/range_live/index.ex:84
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:67
|
||||
msgid "Notes"
|
||||
msgstr ""
|
||||
|
||||
@ -359,14 +359,14 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:66
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:62
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
|
||||
msgid "Pressure"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:82
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
|
||||
msgid "Price paid"
|
||||
msgstr ""
|
||||
|
||||
@ -377,7 +377,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:67
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:63
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
|
||||
msgid "Primer type"
|
||||
msgstr ""
|
||||
@ -462,13 +462,13 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:69
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:65
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
|
||||
msgid "Tracer"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:68
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:26
|
||||
#: lib/cannery_web/live/container_live/form_component.html.heex:35
|
||||
msgid "Type"
|
||||
msgstr ""
|
||||
@ -511,7 +511,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:64
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:84
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:65
|
||||
msgid "Range"
|
||||
msgstr ""
|
||||
|
||||
@ -521,8 +521,8 @@ msgid "Range day"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:91
|
||||
#: lib/cannery_web/live/range_live/index.ex:85
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:125
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:70
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
@ -592,8 +592,8 @@ msgid "Rounds left"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:89
|
||||
#: lib/cannery_web/live/range_live/index.ex:83
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:119
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:64
|
||||
msgid "Rounds shot"
|
||||
msgstr ""
|
||||
|
||||
@ -609,12 +609,12 @@ msgid "Move Ammo group"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:80
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:3
|
||||
msgid "Move ammo"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:85
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:8
|
||||
msgid "No other containers"
|
||||
msgstr ""
|
||||
|
||||
@ -625,7 +625,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/ammo_group_card.ex:43
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:117
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:90
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:32
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:39
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:98
|
||||
@ -653,7 +653,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:61
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:60
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
|
||||
msgid "Powder grains per charge"
|
||||
msgstr ""
|
||||
@ -667,7 +667,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:74
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:70
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
|
||||
msgid "UPC"
|
||||
msgstr ""
|
||||
@ -689,18 +689,18 @@ msgid "New password"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:108
|
||||
msgid "Stage"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:108
|
||||
msgid "Unstage"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:68
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:64
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
|
||||
msgid "Firing type"
|
||||
msgstr ""
|
||||
@ -743,7 +743,7 @@ msgid "No cost information"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:83
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:62
|
||||
msgid "% left"
|
||||
msgstr ""
|
||||
|
||||
@ -778,7 +778,7 @@ msgid "Current # of rounds:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:86
|
||||
#: lib/cannery_web/live/ammo_type_live/index.html.heex:32
|
||||
msgid "Total # of rounds"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -161,7 +161,7 @@ msgid "Why not get some ready to shoot?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:133
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:111
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:36
|
||||
msgid "Record shots"
|
||||
@ -173,7 +173,7 @@ msgid "Ammo Details"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:89
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:12
|
||||
msgid "Add another container!"
|
||||
msgstr ""
|
||||
|
||||
@ -183,7 +183,7 @@ msgid "Move containers"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:127
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:60
|
||||
msgid "Select"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -34,13 +34,13 @@ msgstr ""
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:52
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
|
||||
#: lib/cannery_web/live/range_live/index.ex:82
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:61
|
||||
msgid "Ammo"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:80
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:53
|
||||
msgid "Ammo type"
|
||||
msgstr ""
|
||||
|
||||
@ -56,7 +56,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:71
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:67
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:55
|
||||
msgid "Blank"
|
||||
msgstr ""
|
||||
@ -102,9 +102,9 @@ msgid "Case material"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:67
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:22
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:85
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:68
|
||||
msgid "Container"
|
||||
msgstr ""
|
||||
|
||||
@ -117,14 +117,14 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:72
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:68
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
|
||||
msgid "Corrosive"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:81
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:56
|
||||
msgid "Count"
|
||||
msgstr ""
|
||||
|
||||
@ -195,14 +195,14 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:65
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:61
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
|
||||
msgid "Grains"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:70
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:66
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
|
||||
msgid "Incendiary"
|
||||
msgstr ""
|
||||
@ -235,7 +235,7 @@ msgid "Keep me logged in for 60 days"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:69
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:30
|
||||
#: lib/cannery_web/live/container_live/form_component.html.heex:42
|
||||
msgid "Location"
|
||||
msgstr ""
|
||||
@ -258,7 +258,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:73
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:69
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:57
|
||||
msgid "Manufacturer"
|
||||
msgstr ""
|
||||
@ -341,9 +341,9 @@ msgstr ""
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/add_shot_group_component.html.heex:30
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:90
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:122
|
||||
#: lib/cannery_web/live/range_live/form_component.html.heex:29
|
||||
#: lib/cannery_web/live/range_live/index.ex:84
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:67
|
||||
msgid "Notes"
|
||||
msgstr ""
|
||||
|
||||
@ -360,14 +360,14 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:66
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:62
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
|
||||
msgid "Pressure"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:82
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:59
|
||||
msgid "Price paid"
|
||||
msgstr ""
|
||||
|
||||
@ -378,7 +378,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:67
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:63
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
|
||||
msgid "Primer type"
|
||||
msgstr ""
|
||||
@ -463,13 +463,13 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:69
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:65
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:53
|
||||
msgid "Tracer"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:68
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:26
|
||||
#: lib/cannery_web/live/container_live/form_component.html.heex:35
|
||||
msgid "Type"
|
||||
msgstr ""
|
||||
@ -512,7 +512,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:64
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:84
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:65
|
||||
msgid "Range"
|
||||
msgstr ""
|
||||
|
||||
@ -522,8 +522,8 @@ msgid "Range day"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:91
|
||||
#: lib/cannery_web/live/range_live/index.ex:85
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:125
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:70
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
@ -593,8 +593,8 @@ msgid "Rounds left"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:89
|
||||
#: lib/cannery_web/live/range_live/index.ex:83
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:119
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:64
|
||||
msgid "Rounds shot"
|
||||
msgstr ""
|
||||
|
||||
@ -610,12 +610,12 @@ msgid "Move Ammo group"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:80
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:3
|
||||
msgid "Move ammo"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:85
|
||||
#: lib/cannery_web/components/move_ammo_group_component.html.heex:8
|
||||
msgid "No other containers"
|
||||
msgstr ""
|
||||
|
||||
@ -626,7 +626,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/ammo_group_card.ex:43
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:117
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:90
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:32
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:39
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:98
|
||||
@ -654,7 +654,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:61
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:60
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
|
||||
msgid "Powder grains per charge"
|
||||
msgstr ""
|
||||
@ -668,7 +668,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:74
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:70
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
|
||||
msgid "UPC"
|
||||
msgstr ""
|
||||
@ -690,18 +690,18 @@ msgid "New password"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:108
|
||||
msgid "Stage"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:108
|
||||
msgid "Unstage"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:68
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:64
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
|
||||
msgid "Firing type"
|
||||
msgstr ""
|
||||
@ -744,7 +744,7 @@ msgid "No cost information"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:83
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:62
|
||||
msgid "% left"
|
||||
msgstr ""
|
||||
|
||||
@ -779,7 +779,7 @@ msgid "Current # of rounds:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:86
|
||||
#: lib/cannery_web/live/ammo_type_live/index.html.heex:32
|
||||
msgid "Total # of rounds"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -93,9 +93,9 @@ msgid "Are you sure you want to delete the invite for %{name}?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:165
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:146
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
|
||||
msgid "Are you sure you want to delete this ammo?"
|
||||
msgstr ""
|
||||
|
||||
@ -206,8 +206,8 @@ msgid "Ammo group unstaged succesfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:132
|
||||
#: lib/cannery_web/live/range_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:159
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:108
|
||||
msgid "Are you sure you want to delete this shot record?"
|
||||
msgstr ""
|
||||
|
||||
@ -228,7 +228,7 @@ msgid "%{email} confirmed successfully."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:53
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:47
|
||||
msgid "Ammo moved to %{name} successfully"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -159,11 +159,11 @@ msgid "Tag could not be removed"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:113
|
||||
msgid "Could not parse number of copies"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:98
|
||||
msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
|
||||
msgstr ""
|
||||
|
||||
@ -68,7 +68,7 @@ msgid "Ammo group deleted succesfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:75
|
||||
msgid "Ammo group updated successfully"
|
||||
msgstr ""
|
||||
|
||||
@ -92,9 +92,9 @@ msgid "Are you sure you want to delete the invite for %{name}?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:165
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:146
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
|
||||
msgid "Are you sure you want to delete this ammo?"
|
||||
msgstr ""
|
||||
|
||||
@ -205,8 +205,8 @@ msgid "Ammo group unstaged succesfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:132
|
||||
#: lib/cannery_web/live/range_live/index.ex:130
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:159
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:108
|
||||
msgid "Are you sure you want to delete this shot record?"
|
||||
msgstr ""
|
||||
|
||||
@ -227,7 +227,7 @@ msgid "%{email} confirmed successfully."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:53
|
||||
#: lib/cannery_web/components/move_ammo_group_component.ex:47
|
||||
msgid "Ammo moved to %{name} successfully"
|
||||
msgstr ""
|
||||
|
||||
@ -253,7 +253,7 @@ msgid "Creating..."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.ex:134
|
||||
msgid "Ammo group created successfully"
|
||||
msgid_plural "Ammo groups created successfully"
|
||||
msgstr[0] ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user