shibao/cannery
1
2
Fork 1
Code Issues 14 Pull Requests Projects 1 Releases 40 Wiki Activity

change rimfire to firing type
Some checks reported errors
continuous-integration/drone/push Build was killed
Details

Browse Source
This commit is contained in:
shibao
2022-02-16 00:10:18 -05:00
parent d6e4090650
commit fb288e4389
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cannery/ammo/ammo_type.ex
View File

@@ -30,7 +30,7 @@ defmodule Cannery.Ammo.AmmoType do
field :grains, :integer field :grains, :integer
field :pressure, :string field :pressure, :string
field :primer_type, :string field :primer_type, :string
field :rimfire, :boolean, null: false, default: false field :firing_type, :string
field :tracer, :boolean, null: false, default: false field :tracer, :boolean, null: false, default: false
field :incendiary, :boolean, null: false, default: false field :incendiary, :boolean, null: false, default: false
field :blank, :boolean, null: false, default: false field :blank, :boolean, null: false, default: false
@@ -62,7 +62,7 @@ defmodule Cannery.Ammo.AmmoType do
grains: integer() | nil, grains: integer() | nil,
pressure: String.t() | nil, pressure: String.t() | nil,
primer_type: String.t() | nil, primer_type: String.t() | nil,
rimfire: boolean(), firing_type: String.t() | nil,
tracer: boolean(), tracer: boolean(),
incendiary: boolean(), incendiary: boolean(),
blank: boolean(), blank: boolean(),
@@ -95,7 +95,7 @@ defmodule Cannery.Ammo.AmmoType do
:grains, :grains,
:pressure, :pressure,
:primer_type, :primer_type,
:rimfire, :firing_type,
:tracer, :tracer,
:incendiary, :incendiary,
:blank, :blank,

9
lib/cannery_web/live/ammo_type_live/form_component.html.heex
View File

@@ -125,9 +125,12 @@
) %> ) %>
<%= error_tag(f, :primer_type, "col-span-3 text-center") %> <%= error_tag(f, :primer_type, "col-span-3 text-center") %>
<%= label(f, :rimfire, gettext("Rimfire"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :firing_type, gettext("Firing type"), class: "mr-4 title text-lg text-primary-500") %>
<%= checkbox(f, :rimfire, class: "text-center col-span-2 checkbox") %> <%= text_input(f, :firing_type,
<%= error_tag(f, :rimfire, "col-span-3 text-center") %> class: "text-center col-span-2 input input-primary",
placeholder: "Centerfire"
) %>
<%= error_tag(f, :firing_type, "col-span-3 text-center") %>
<%= label(f, :tracer, gettext("Tracer"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :tracer, gettext("Tracer"), class: "mr-4 title text-lg text-primary-500") %>
<%= checkbox(f, :tracer, class: "text-center col-span-2 checkbox") %> <%= checkbox(f, :tracer, class: "text-center col-span-2 checkbox") %>

2
priv/repo/migrations/20210903015537_create_ammo_types.exs
View File

@@ -20,7 +20,7 @@ defmodule Cannery.Repo.Migrations.CreateAmmoTypes do
add :grains, :integer add :grains, :integer
add :pressure, :string add :pressure, :string
add :primer_type, :string add :primer_type, :string
add :rimfire, :boolean, null: false, default: false add :firing_type, :string
add :tracer, :boolean, null: false, default: false add :tracer, :boolean, null: false, default: false
add :incendiary, :boolean, null: false, default: false add :incendiary, :boolean, null: false, default: false
add :blank, :boolean, null: false, default: false add :blank, :boolean, null: false, default: false