forked from shibao/cannery
Show average price per round on ammo type table
This commit is contained in:
parent
45d905b384
commit
9e754fe630
@ -2,6 +2,7 @@
|
|||||||
- Add German translation: Thank you [Kaia](https://shitposter.club/users/kaia)!
|
- Add German translation: Thank you [Kaia](https://shitposter.club/users/kaia)!
|
||||||
- Fix not being able to edit ammo group when fully used up
|
- Fix not being able to edit ammo group when fully used up
|
||||||
- Fix bug with average price per round calculation
|
- Fix bug with average price per round calculation
|
||||||
|
- Show average price per round on ammo type table
|
||||||
|
|
||||||
# v0.4.1
|
# v0.4.1
|
||||||
- Fix button and tag text wrapping
|
- Fix button and tag text wrapping
|
||||||
|
@ -84,6 +84,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
|
|||||||
end)
|
end)
|
||||||
|> Kernel.++([
|
|> Kernel.++([
|
||||||
%{label: gettext("Total # of rounds"), key: "round_count", type: :round_count},
|
%{label: gettext("Total # of rounds"), key: "round_count", type: :round_count},
|
||||||
|
%{label: gettext("Average Price paid"), key: "avg_price_paid", type: :avg_price_paid},
|
||||||
%{label: nil, key: "actions", type: :actions, sortable: false}
|
%{label: nil, key: "actions", type: :actions, sortable: false}
|
||||||
])
|
])
|
||||||
|
|
||||||
@ -107,6 +108,13 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
|
|||||||
:round_count ->
|
:round_count ->
|
||||||
ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
|
ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
|
||||||
|
|
||||||
|
:avg_price_paid ->
|
||||||
|
|
||||||
|
case ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user) do
|
||||||
|
nil -> gettext("No cost information")
|
||||||
|
count -> gettext("$%{amount}", amount: count |> :erlang.float_to_binary(decimals: 2))
|
||||||
|
end
|
||||||
|
|
||||||
:actions ->
|
:actions ->
|
||||||
~H"""
|
~H"""
|
||||||
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
<div class="px-4 py-2 space-x-4 flex justify-center items-center">
|
||||||
|
@ -44,6 +44,7 @@ msgid "Ammo type"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
|
#: lib/cannery_web/live/ammo_type_live/index.ex:87
|
||||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:94
|
#: lib/cannery_web/live/ammo_type_live/show.html.heex:94
|
||||||
msgid "Average Price paid"
|
msgid "Average Price paid"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -628,6 +629,7 @@ msgstr ""
|
|||||||
#: lib/cannery_web/live/ammo_group_live/index.ex:117
|
#: lib/cannery_web/live/ammo_group_live/index.ex:117
|
||||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:32
|
#: 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_group_live/show.html.heex:39
|
||||||
|
#: lib/cannery_web/live/ammo_type_live/index.ex:117
|
||||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:98
|
#: lib/cannery_web/live/ammo_type_live/show.html.heex:98
|
||||||
msgid "$%{amount}"
|
msgid "$%{amount}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -738,6 +740,7 @@ msgid "Show %{name}"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
|
#: lib/cannery_web/live/ammo_type_live/index.ex:114
|
||||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:104
|
#: lib/cannery_web/live/ammo_type_live/show.html.heex:104
|
||||||
msgid "No cost information"
|
msgid "No cost information"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
@ -94,7 +94,7 @@ msgstr ""
|
|||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/live/ammo_group_live/index.ex:167
|
#: lib/cannery_web/live/ammo_group_live/index.ex:167
|
||||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
|
#: 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.ex:140
|
||||||
msgid "Are you sure you want to delete this ammo?"
|
msgid "Are you sure you want to delete this ammo?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user