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

improve Ammo.get_grouped_round_count

Browse Source
This commit is contained in:
shibao
2023-06-05 22:08:42 -04:00
parent 7e55446b3e
commit 9edeb1e803
11 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cannery_web/components/container_table_component.ex
View File

@ -73,7 +73,8 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
actions: actions,
pack_count:
Ammo.get_grouped_packs_count(current_user, containers: containers, group_by: :container_id),
round_count: Ammo.get_round_count_for_containers(containers, current_user)
round_count:
Ammo.get_grouped_round_count(current_user, containers: containers, group_by: :container_id)
}
rows =

2
lib/cannery_web/components/type_table_component.ex
View File

@ -151,7 +151,7 @@ defmodule CanneryWeb.Components.TypeTableComponent do
)
|> TableComponent.maybe_compose_columns(%{label: gettext("Name"), key: :name, type: :name})
round_counts = types |> Ammo.get_round_count_for_types(current_user)
round_counts = Ammo.get_grouped_round_count(current_user, types: types, group_by: :type_id)
packs_count = Ammo.get_grouped_packs_count(current_user, types: types, group_by: :type_id)
average_costs = types |> Ammo.get_average_cost_for_types(current_user)

2
lib/cannery_web/controllers/export_controller.ex
View File

@ -8,7 +8,7 @@ defmodule CanneryWeb.ExportController do
used_counts =
ActivityLog.get_grouped_used_counts(current_user, types: types, group_by: :type_id)
round_counts = types |> Ammo.get_round_count_for_types(current_user)
round_counts = Ammo.get_grouped_round_count(current_user, types: types, group_by: :type_id)
pack_counts = Ammo.get_grouped_packs_count(current_user, types: types, group_by: :type_id)
total_pack_counts =