lib/cannery_web/live/ammo_group_live/index.ex

@@ -194,7 +194,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
   end
 
   defp get_value_for_key(:remaining, ammo_group),
-    do: gettext("%{percentage}%", percentage: ammo_group |> Ammo.get_percentage_remaining())
+    do: "#{ammo_group |> Ammo.get_percentage_remaining()}%"
 
   defp get_value_for_key(:actions, ammo_group) do
     assigns = %{ammo_group: ammo_group}

lib/cannery_web/live/ammo_group_live/show.html.heex

@@ -16,7 +16,7 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Percentage left:") %>
-      <%= gettext("%{percentage}%", percentage: @ammo_group |> Ammo.get_percentage_remaining()) %>
+      <%= "#{@ammo_group |> Ammo.get_percentage_remaining()}%" %>
     </span>
 
     <%= if @ammo_group.notes do %>

lib/cannery_web/views/view_helpers.ex

@@ -95,12 +95,11 @@ defmodule CanneryWeb.ViewHelpers do
     ~H"""
     <label for={@id} class="inline-flex relative items-center cursor-pointer">
       <input
-        id={@id}
         type="checkbox"
         value={@value}
         checked={@value}
+        id={@id}
         class="sr-only peer"
-        data-qa={@id}
         {
           if assigns |> Map.has_key?(:target),
             do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},

priv/gettext/de/LC_MESSAGES/default.po

@@ -962,9 +962,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.ex:197
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
-#, elixir-autogen, elixir-format
-msgid "%{percentage}%"
-msgstr ""

priv/gettext/default.pot

@@ -945,9 +945,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.ex:197
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
-#, elixir-autogen, elixir-format
-msgid "%{percentage}%"
-msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -946,9 +946,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.ex:197
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
-#, elixir-autogen, elixir-format
-msgid "%{percentage}%"
-msgstr ""

priv/gettext/es/LC_MESSAGES/default.po

@@ -960,9 +960,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.ex:197
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
-#, elixir-autogen, elixir-format
-msgid "%{percentage}%"
-msgstr ""

priv/gettext/fr/LC_MESSAGES/default.po

@@ -965,9 +965,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.ex:197
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
-#, elixir-autogen, elixir-format
-msgid "%{percentage}%"
-msgstr ""

priv/gettext/ga/LC_MESSAGES/default.po

@@ -956,9 +956,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Used up on:"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.ex:197
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:19
-#, elixir-autogen, elixir-format
-msgid "%{percentage}%"
-msgstr ""

test/cannery_web/live/ammo_group_live_test.exs

@@ -10,23 +10,10 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
   @moduletag :ammo_group_live_test
   @shot_group_create_attrs %{"ammo_left" => 5, "notes" => "some notes"}
-  @shot_group_update_attrs %{
+  @shot_group_update_attrs %{"count" => 5, "notes" => "some updated notes"}
-    "count" => 5,
-    "date" => ~N[2022-02-13 03:17:00],
-    "notes" => "some updated notes"
-  }
   @create_attrs %{"count" => 42, "notes" => "some notes", "price_paid" => 120.5}
   @update_attrs %{"count" => 43, "notes" => "some updated notes", "price_paid" => 456.7}
   @ammo_group_create_limit 10_000
-  @ammo_group_attrs %{
-    "price_paid" => 50,
-    "count" => 20
-  }
-  @shot_group_attrs %{
-    "price_paid" => 50,
-    "count" => 20
-  }
-
   # @invalid_attrs %{count: -1, notes: nil, price_paid: nil}
 
   defp create_ammo_group(%{current_user: current_user}) do
@@ -34,28 +21,14 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
     container = container_fixture(current_user)
     {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
 
-    %{ammo_type: ammo_type, ammo_group: ammo_group, container: container}
+    shot_group =
-  end
+      %{"count" => 5, "date" => ~N[2022-02-13 03:17:00], "notes" => "some notes"}
-
+      |> shot_group_fixture(current_user, ammo_group)
-  defp create_shot_group(%{current_user: current_user, ammo_group: ammo_group}) do
-    shot_group = shot_group_fixture(@shot_group_update_attrs, current_user, ammo_group)
-    ammo_group = ammo_group |> Repo.reload!()
 
     %{ammo_group: ammo_group, shot_group: shot_group}
   end
 
-  defp create_empty_ammo_group(%{
+  describe "Index" do
-         current_user: current_user,
-         ammo_type: ammo_type,
-         container: container
-       }) do
-    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
-    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
-    ammo_group = ammo_group |> Repo.reload!()
-    %{empty_ammo_group: ammo_group, shot_group: shot_group}
-  end
-
-  describe "Index of ammo group" do
     setup [:register_and_log_in_user, :create_ammo_group]
 
     test "lists all ammo_groups", %{conn: conn, ammo_group: ammo_group} do
@@ -150,6 +123,27 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
                )
     end
 
+    test "saves new shot_group", %{conn: conn, ammo_group: ammo_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live |> element("a", dgettext("actions", "Record shots")) |> render_click() =~
+               gettext("Record shots")
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :add_shot_group, ammo_group))
+
+      # assert index_live
+      #        |> form("#shot_group-form", shot_group: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "is invalid")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#shot-group-form", shot_group: @shot_group_create_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ dgettext("prompts", "Shots recorded successfully")
+    end
+
     test "updates ammo_group in listing", %{conn: conn, ammo_group: ammo_group} do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
@@ -183,59 +177,9 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
       refute has_element?(index_live, "#ammo_group-#{ammo_group.id}")
     end
-
-    test "saves new shot_group", %{conn: conn, ammo_group: ammo_group} do
-      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
-
-      assert index_live |> element("a", dgettext("actions", "Record shots")) |> render_click() =~
-               gettext("Record shots")
-
-      assert_patch(index_live, Routes.ammo_group_index_path(conn, :add_shot_group, ammo_group))
-
-      # assert index_live
-      #        |> form("#shot_group-form", shot_group: @invalid_attrs)
-      #        |> render_change() =~ dgettext("errors", "is invalid")
-
-      {:ok, _view, html} =
-        index_live
-        |> form("#shot-group-form", shot_group: @shot_group_create_attrs)
-        |> render_submit()
-        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
-
-      assert html =~ dgettext("prompts", "Shots recorded successfully")
-    end
   end
 
-  describe "Index of empty ammo group" do
+  describe "Show" do
-    setup [:register_and_log_in_user, :create_ammo_group, :create_empty_ammo_group]
-
-    test "hides empty ammo groups by default", %{conn: conn, empty_ammo_group: ammo_group} do
-      {:ok, show_live, html} = live(conn, Routes.ammo_group_index_path(conn, :index))
-
-      assert html =~ gettext("Show used")
-      refute html =~ gettext("$%{amount}", amount: 50.00 |> :erlang.float_to_binary(decimals: 2))
-
-      refute html =~
-               "\n" <>
-                 gettext("%{percentage}%",
-                   percentage: ammo_group |> Ammo.get_percentage_remaining()
-                 ) <>
-                 "\n"
-
-      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
-
-      assert html =~ gettext("$%{amount}", amount: 50.00 |> :erlang.float_to_binary(decimals: 2))
-
-      assert html =~
-               "\n" <>
-                 gettext("%{percentage}%",
-                   percentage: ammo_group |> Ammo.get_percentage_remaining()
-                 ) <>
-                 "\n"
-    end
-  end
-
-  describe "Show ammo group" do
     setup [:register_and_log_in_user, :create_ammo_group]
 
     test "displays ammo_group", %{conn: conn, ammo_group: ammo_group} do
@@ -290,10 +234,6 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
       assert html =~ dgettext("prompts", "Shots recorded successfully")
     end
-  end
-
-  describe "Show ammo group with shot group" do
-    setup [:register_and_log_in_user, :create_ammo_group, :create_shot_group]
 
     test "updates shot_group in listing",
          %{conn: conn, ammo_group: ammo_group, shot_group: shot_group} do

test/cannery_web/live/ammo_type_live_test.exs

@@ -6,7 +6,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
   use CanneryWeb.ConnCase
   import Phoenix.LiveViewTest
   import CanneryWeb.Gettext
-  alias Cannery.{Ammo, Repo}
+  alias Cannery.Ammo
 
   @moduletag :ammo_type_live_test
 
@@ -26,14 +26,6 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     "name" => "some updated name",
     "grains" => 456
   }
-  @ammo_group_attrs %{
-    "notes" => "some ammo group",
-    "count" => 20
-  }
-  @shot_group_attrs %{
-    "notes" => "some shot group",
-    "count" => 20
-  }
 
   # @invalid_attrs %{
   #   "bullet_type" => nil,
@@ -48,15 +40,6 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     %{ammo_type: ammo_type_fixture(@create_attrs, current_user)}
   end
 
-  defp create_empty_ammo_group(%{ammo_type: ammo_type, current_user: current_user}) do
-    container = container_fixture(current_user)
-    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
-    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
-    ammo_group = ammo_group |> Repo.reload!()
-
-    %{ammo_group: ammo_group, shot_group: shot_group}
-  end
-
   describe "Index" do
     setup [:register_and_log_in_user, :create_ammo_type]
 
@@ -122,7 +105,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
     end
   end
 
-  describe "Show ammo type" do
+  describe "Show" do
     setup [:register_and_log_in_user, :create_ammo_type]
 
     test "displays ammo_type", %{conn: conn, ammo_type: ammo_type} do
@@ -156,21 +139,4 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       assert html =~ "some updated bullet_type"
     end
   end
-
-  describe "Show ammo type with empty ammo group" do
-    setup [:register_and_log_in_user, :create_ammo_type, :create_empty_ammo_group]
-
-    test "hides empty ammo groups by default",
-         %{conn: conn, ammo_type: ammo_type} do
-      {:ok, show_live, html} = live(conn, Routes.ammo_type_show_path(conn, :show, ammo_type))
-
-      assert html =~ gettext("Show used")
-      refute html =~ "some ammo group"
-
-      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
-
-      assert html =~ "some ammo group"
-      assert html =~ "Empty"
-    end
-  end
 end

test/cannery_web/live/container_live_test.exs

@@ -6,7 +6,7 @@ defmodule CanneryWeb.ContainerLiveTest do
   use CanneryWeb.ConnCase
   import Phoenix.LiveViewTest
   import CanneryWeb.Gettext
-  alias Cannery.{Containers, Repo}
+  alias Cannery.Containers
 
   @moduletag :container_live_test
 
@@ -22,22 +22,6 @@ defmodule CanneryWeb.ContainerLiveTest do
     "name" => "some updated name",
     "type" => "some updated type"
   }
-  @ammo_type_attrs %{
-    "bullet_type" => "some bullet_type",
-    "case_material" => "some case_material",
-    "desc" => "some desc",
-    "manufacturer" => "some manufacturer",
-    "name" => "some name",
-    "grains" => 120
-  }
-  @ammo_group_attrs %{
-    "notes" => "some ammo group",
-    "count" => 20
-  }
-  @shot_group_attrs %{
-    "notes" => "some shot group",
-    "count" => 20
-  }
 
   # @invalid_attrs %{desc: nil, location: nil, name: nil, type: nil}
 
@@ -46,15 +30,6 @@ defmodule CanneryWeb.ContainerLiveTest do
     %{container: container}
   end
 
-  defp create_empty_ammo_group(%{container: container, current_user: current_user}) do
-    ammo_type = ammo_type_fixture(@ammo_type_attrs, current_user)
-    {1, [ammo_group]} = ammo_group_fixture(@ammo_group_attrs, ammo_type, container, current_user)
-    shot_group = shot_group_fixture(@shot_group_attrs, current_user, ammo_group)
-    ammo_group = ammo_group |> Repo.reload!()
-
-    %{ammo_group: ammo_group, shot_group: shot_group}
-  end
-
   describe "Index" do
     setup [:register_and_log_in_user, :create_container]
 
@@ -159,21 +134,4 @@ defmodule CanneryWeb.ContainerLiveTest do
       assert html =~ "some updated location"
     end
   end
-
-  describe "Show with empty ammo group" do
-    setup [:register_and_log_in_user, :create_container, :create_empty_ammo_group]
-
-    test "hides empty ammo groups by default",
-         %{conn: conn, container: container} do
-      {:ok, show_live, html} = live(conn, Routes.container_show_path(conn, :show, container))
-
-      assert html =~ gettext("Show used")
-      refute html =~ "some ammo group"
-
-      html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
-
-      assert html =~ "some ammo group"
-      assert html =~ "Empty"
-    end
-  end
 end

test/support/fixtures.ex

@@ -76,7 +76,7 @@ defmodule Cannery.Fixtures do
   def shot_group_fixture(attrs \\ %{}, %User{} = user, %AmmoGroup{} = ammo_group) do
     attrs
     |> Enum.into(%{
-      "count" => 20,
+      "count" => 25,
       "date" => ~N[2022-02-13 03:17:00],
       "notes" => "some notes"
     })