add CPR and original count to json export

2022-11-12 14:37:55 -05:00
parent 1fed895b82
commit 44d4d7c6f9
10 changed files with 75 additions and 74 deletions
--- a/lib/cannery_web/components/ammo_group_table_component.ex
+++ b/lib/cannery_web/components/ammo_group_table_component.ex
@ -81,6 +81,7 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do

    columns = [
      %{label: gettext("Count"), key: :count},
+      %{label: gettext("Original Count"), key: :original_count},
      %{label: gettext("Price paid"), key: :price_paid},
      %{label: gettext("CPR"), key: :cpr},
      %{label: gettext("% left"), key: :remaining},
@ -88,13 +89,6 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
      | columns
    ]

-    columns =
-      if show_used do
-        [%{label: gettext("Original Count"), key: :original_count} | columns]
-      else
-        columns
-      end
-
    columns =
      if ammo_type == [] do
        columns