diff --git a/lib/runosaari/registration.ex b/lib/runosaari/registration.ex index a873c3d..5119f40 100644 --- a/lib/runosaari/registration.ex +++ b/lib/runosaari/registration.ex @@ -22,7 +22,7 @@ defmodule Runosaari.Registration do end @doc """ - Returns the :seqnum sorted list of confirmed performers. + Returns the :name sorted list of confirmed performers. ## Examples @@ -33,7 +33,7 @@ defmodule Runosaari.Registration do def list_sorted_confirmed_performers do Performer |> where([p], p.confirmed == true) - |> order_by(:seqnum) + |> order_by(:name) |> Repo.all() end diff --git a/lib/runosaari/registration/performer.ex b/lib/runosaari/registration/performer.ex index 551c03b..8b0f888 100644 --- a/lib/runosaari/registration/performer.ex +++ b/lib/runosaari/registration/performer.ex @@ -9,7 +9,6 @@ defmodule Runosaari.Registration.Performer do field :paragraph3, :string field :paragraph4, :string field :paragraph5, :string - field :seqnum, :integer, default: 999 field :photo_path, :string field :confirmed, :boolean, default: false @@ -21,7 +20,6 @@ defmodule Runosaari.Registration.Performer do performer |> cast(attrs, [ :name, - :seqnum, :paragraph1, :paragraph2, :paragraph3, @@ -32,7 +30,6 @@ defmodule Runosaari.Registration.Performer do ]) |> validate_required([ :name, - :seqnum, :photo_path, :confirmed ]) diff --git a/lib/runosaari_web/controllers/performer_controller.ex b/lib/runosaari_web/controllers/performer_controller.ex index 18146b8..6b8ca14 100644 --- a/lib/runosaari_web/controllers/performer_controller.ex +++ b/lib/runosaari_web/controllers/performer_controller.ex @@ -71,7 +71,7 @@ defmodule RunosaariWeb.PerformerController do {:ok, performer} -> conn |> put_flash(:info, "Esiintyjän tiedot päivitetty.") - |> redirect(to: Routes.performer_path(conn, :show, performer)) + |> redirect(to: Routes.admin_performer_path(conn, :admin)) {:error, %Ecto.Changeset{} = changeset} -> render(conn, "edit.html", performer: performer, changeset: changeset) diff --git a/lib/runosaari_web/templates/performer/admin.html.eex b/lib/runosaari_web/templates/performer/admin.html.eex index 7ff3464..187783c 100644 --- a/lib/runosaari_web/templates/performer/admin.html.eex +++ b/lib/runosaari_web/templates/performer/admin.html.eex @@ -14,7 +14,6 @@ <%= performer.name %> <%= performer.confirmed %> - <%= performer.seqnum %> <%= link "Esiintyjäsivu", to: Routes.performer_path(@conn, :show, performer) %> diff --git a/lib/runosaari_web/templates/performer/form.html.eex b/lib/runosaari_web/templates/performer/form.html.eex index 0012417..2a73ba6 100644 --- a/lib/runosaari_web/templates/performer/form.html.eex +++ b/lib/runosaari_web/templates/performer/form.html.eex @@ -9,7 +9,6 @@ <%= text_input form, :name %> <%= error_tag form, :name %> -
<%= label form, :paragraph1, "Kappale 1 (max 2000 merkkiä)" %> <%= textarea form, :paragraph1 %> <%= error_tag form, :paragraph1 %> @@ -30,10 +29,6 @@ <%= textarea form, :paragraph5 %> <%= error_tag form, :paragraph5 %> - <%= label form, :seqnum, "Prioriteetti (1 on korkein)" %> - <%= number_input form, :seqnum %> - <%= error_tag form, :seqnum %> - <%= label form, :photo, "Esiintyjän kuva (muokatessa ei vaadi uudelleen lisäys vaikka tyhjä)" %> <%= file_input form, :photo %> <%= error_tag form, :photo %> diff --git a/priv/repo/migrations/20210602164721_remove_performer_seqnum.exs b/priv/repo/migrations/20210602164721_remove_performer_seqnum.exs new file mode 100644 index 0000000..173a338 --- /dev/null +++ b/priv/repo/migrations/20210602164721_remove_performer_seqnum.exs @@ -0,0 +1,9 @@ +defmodule Runosaari.Repo.Migrations.RemovePerformerSeqnum do + use Ecto.Migration + + def change do + alter table("performers") do + remove :seqnum + end + end +end diff --git a/test/runosaari/registration_test.exs b/test/runosaari/registration_test.exs index eff1d39..0e0e9d3 100644 --- a/test/runosaari/registration_test.exs +++ b/test/runosaari/registration_test.exs @@ -9,20 +9,18 @@ defmodule Runosaari.RegistrationTest do @create_attrs %{ name: "some name", desc: "some description", - confirmed: false, - seqnum: 1 + confirmed: false } @update_attrs %{ name: "some updated name", desc: "some updated description", - confirmed: true, - seqnum: 2 + confirmed: true } - @valid_attrs %{name: "some name", desc: "some description", confirmed: false, seqnum: 1} + @valid_attrs %{name: "some name", desc: "some description", confirmed: false} - @invalid_attrs %{name: nil, desc: nil, confirmed: nil, seqnum: nil} + @invalid_attrs %{name: nil, desc: nil, confirmed: nil} def performer_fixture(attrs \\ %{}) do {:ok, performer} = @@ -48,7 +46,6 @@ defmodule Runosaari.RegistrationTest do assert performer.name == "some name" assert performer.desc == "some description" assert performer.confirmed == false - assert performer.seqnum == 1 end test "create_performer/1 with invalid data returns error changeset" do @@ -64,7 +61,6 @@ defmodule Runosaari.RegistrationTest do assert performer.name == "some updated name" assert performer.desc == "some updated description" assert performer.confirmed == true - assert performer.seqnum == 2 end test "update_performer/2 with invalid data returns error changeset" do