add CPR and original count to json export

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

lib/cannery_web/controllers/export_controller.ex

@@ -25,7 +25,9 @@ defmodule CanneryWeb.ExportController do
     ammo_groups =
       Ammo.list_ammo_groups(current_user, true)
       |> Enum.map(fn ammo_group ->
+        cpr = ammo_group |> Ammo.get_cpr()
         used_count = ammo_group |> Ammo.get_used_count()
+        original_count = ammo_group |> Ammo.get_original_count()
         percentage_remaining = ammo_group |> Ammo.get_percentage_remaining()
 
         ammo_group
@@ -33,7 +35,9 @@ defmodule CanneryWeb.ExportController do
         |> Jason.decode!()
         |> Map.merge(%{
           "used_count" => used_count,
-          "percentage_remaining" => percentage_remaining
+          "percentage_remaining" => percentage_remaining,
+          "original_count" => original_count,
+          "cpr" => cpr
         })
       end)