Remove sequence number from performer.

This commit is contained in:
codevictory
2021-06-02 19:58:29 +03:00
parent 2f912e6153
commit 4fed654c2d
7 changed files with 16 additions and 20 deletions

View File

@@ -22,7 +22,7 @@ defmodule Runosaari.Registration do
end end
@doc """ @doc """
Returns the :seqnum sorted list of confirmed performers. Returns the :name sorted list of confirmed performers.
## Examples ## Examples
@@ -33,7 +33,7 @@ defmodule Runosaari.Registration do
def list_sorted_confirmed_performers do def list_sorted_confirmed_performers do
Performer Performer
|> where([p], p.confirmed == true) |> where([p], p.confirmed == true)
|> order_by(:seqnum) |> order_by(:name)
|> Repo.all() |> Repo.all()
end end

View File

@@ -9,7 +9,6 @@ defmodule Runosaari.Registration.Performer do
field :paragraph3, :string field :paragraph3, :string
field :paragraph4, :string field :paragraph4, :string
field :paragraph5, :string field :paragraph5, :string
field :seqnum, :integer, default: 999
field :photo_path, :string field :photo_path, :string
field :confirmed, :boolean, default: false field :confirmed, :boolean, default: false
@@ -21,7 +20,6 @@ defmodule Runosaari.Registration.Performer do
performer performer
|> cast(attrs, [ |> cast(attrs, [
:name, :name,
:seqnum,
:paragraph1, :paragraph1,
:paragraph2, :paragraph2,
:paragraph3, :paragraph3,
@@ -32,7 +30,6 @@ defmodule Runosaari.Registration.Performer do
]) ])
|> validate_required([ |> validate_required([
:name, :name,
:seqnum,
:photo_path, :photo_path,
:confirmed :confirmed
]) ])

View File

@@ -71,7 +71,7 @@ defmodule RunosaariWeb.PerformerController do
{:ok, performer} -> {:ok, performer} ->
conn conn
|> put_flash(:info, "Esiintyjän tiedot päivitetty.") |> 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} -> {:error, %Ecto.Changeset{} = changeset} ->
render(conn, "edit.html", performer: performer, changeset: changeset) render(conn, "edit.html", performer: performer, changeset: changeset)

View File

@@ -14,7 +14,6 @@
<tr> <tr>
<td><%= performer.name %></td> <td><%= performer.name %></td>
<td><%= performer.confirmed %></td> <td><%= performer.confirmed %></td>
<td><%= performer.seqnum %></td>
<td class="actions"> <td class="actions">
<span><%= link "Esiintyjäsivu", to: Routes.performer_path(@conn, :show, performer) %></span> <span><%= link "Esiintyjäsivu", to: Routes.performer_path(@conn, :show, performer) %></span>

View File

@@ -9,7 +9,6 @@
<%= text_input form, :name %> <%= text_input form, :name %>
<%= error_tag form, :name %> <%= error_tag form, :name %>
<hr />
<%= label form, :paragraph1, "Kappale 1 (max 2000 merkkiä)" %> <%= label form, :paragraph1, "Kappale 1 (max 2000 merkkiä)" %>
<%= textarea form, :paragraph1 %> <%= textarea form, :paragraph1 %>
<%= error_tag form, :paragraph1 %> <%= error_tag form, :paragraph1 %>
@@ -30,10 +29,6 @@
<%= textarea form, :paragraph5 %> <%= textarea form, :paragraph5 %>
<%= error_tag 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ä)" %> <%= label form, :photo, "Esiintyjän kuva (muokatessa ei vaadi uudelleen lisäys vaikka tyhjä)" %>
<%= file_input form, :photo %> <%= file_input form, :photo %>
<%= error_tag form, :photo %> <%= error_tag form, :photo %>

View File

@@ -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

View File

@@ -9,20 +9,18 @@ defmodule Runosaari.RegistrationTest do
@create_attrs %{ @create_attrs %{
name: "some name", name: "some name",
desc: "some description", desc: "some description",
confirmed: false, confirmed: false
seqnum: 1
} }
@update_attrs %{ @update_attrs %{
name: "some updated name", name: "some updated name",
desc: "some updated description", desc: "some updated description",
confirmed: true, confirmed: true
seqnum: 2
} }
@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 def performer_fixture(attrs \\ %{}) do
{:ok, performer} = {:ok, performer} =
@@ -48,7 +46,6 @@ defmodule Runosaari.RegistrationTest do
assert performer.name == "some name" assert performer.name == "some name"
assert performer.desc == "some description" assert performer.desc == "some description"
assert performer.confirmed == false assert performer.confirmed == false
assert performer.seqnum == 1
end end
test "create_performer/1 with invalid data returns error changeset" do 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.name == "some updated name"
assert performer.desc == "some updated description" assert performer.desc == "some updated description"
assert performer.confirmed == true assert performer.confirmed == true
assert performer.seqnum == 2
end end
test "update_performer/2 with invalid data returns error changeset" do test "update_performer/2 with invalid data returns error changeset" do