diff --git a/lib/runosaari/registration/performer.ex b/lib/runosaari/registration/performer.ex index 2e7aa15..bc691eb 100644 --- a/lib/runosaari/registration/performer.ex +++ b/lib/runosaari/registration/performer.ex @@ -3,17 +3,9 @@ defmodule Runosaari.Registration.Performer do import Ecto.Changeset schema "performers" do + field :name, :string field :confirmed, :boolean, default: false - field :email, :string - field :fname, :string - field :lname, :string field :desc, :string - field :tel, :string - field :date1, :boolean, default: false - field :date2, :boolean, default: false - field :date3, :boolean, default: false - field :bus, :boolean, default: false - field :accom, :boolean, default: false field :seqnum, :integer, default: 999 timestamps() @@ -23,31 +15,15 @@ defmodule Runosaari.Registration.Performer do def changeset(performer, attrs) do performer |> cast(attrs, [ - :fname, - :lname, - :email, - :tel, + :name, :confirmed, :desc, - :date1, - :date2, - :date3, - :bus, - :accom, :seqnum ]) |> validate_required([ - :fname, - :lname, - :email, - :tel, + :name, :confirmed, :desc, - :date1, - :date2, - :date3, - :bus, - :accom, :seqnum ]) |> unique_constraint(:email) diff --git a/lib/runosaari_web/templates/performer/admin.html.eex b/lib/runosaari_web/templates/performer/admin.html.eex index 4f39f86..0073390 100644 --- a/lib/runosaari_web/templates/performer/admin.html.eex +++ b/lib/runosaari_web/templates/performer/admin.html.eex @@ -4,26 +4,22 @@ - - - - + + <%= for performer <- @performers do %> - - - - + + <% end %> diff --git a/lib/runosaari_web/templates/performer/form.html.eex b/lib/runosaari_web/templates/performer/form.html.eex index 8cf04f3..b735918 100644 --- a/lib/runosaari_web/templates/performer/form.html.eex +++ b/lib/runosaari_web/templates/performer/form.html.eex @@ -5,63 +5,25 @@ <% end %> -
- <%= if @action != "/admin/performers" do %> - <%= checkbox form, :confirmed %> - <%= label form, :confirmed, "Hyväksytty #{@changeset.action}" %> - <%= error_tag form, :confirmed %> - <% end %> -
+ <%= label form, :name, "Nimi" %> + <%= text_input form, :name %> + <%= error_tag form, :name %> - <%= label form, :fname, "Etunimi (julkistetaan nettisivuilla kun ilmoittautumisesi on hyväksytty)" %> - <%= text_input form, :fname %> - <%= error_tag form, :fname %> - - <%= label form, :lname, "Sukunimi (julkistetaan nettisivuilla kun ilmoittautumisesi on hyväksytty)" %> - <%= text_input form, :lname %> - <%= error_tag form, :lname %> - - <%= label form, :email, "Sähköposti" %> - <%= email_input form, :email %> - <%= error_tag form, :email %> - - <%= label form, :tel, "Puhelinumero" %> - <%= text_input form, :tel %> - <%= error_tag form, :tel %> - - <%= label form, :desc, "Seloste (julkistetaan nettisivuilla kun ilmoittautumisesi on hyväksytty)" %> + <%= label form, :desc, "Seloste" %> <%= textarea form, :desc %> <%= error_tag form, :desc %> -

Ilmoita alustava kiinnostuksesi tässä

+ <%= label form, :seqnum, "Prioriteetti (1 on korkein)" %> + <%= textarea form, :seqnum %> + <%= error_tag form, :seqnum %>
- <%= checkbox form, :date1 %> - <%= label form, :date1, "Torstai 22.7" %> - <%= error_tag form, :date1 %> -
-
- <%= checkbox form, :date2 %> - <%= label form, :date2, "Perjantai 23.7." %> - <%= error_tag form, :date2 %> -
-
- <%= checkbox form, :date3 %> - <%= label form, :date3, "Lauantai 24.7." %> - <%= error_tag form, :date3 %> -
-
- <%= checkbox form, :bus %> - <%= label form, :bus, "Olen kiinnostunut bussikuljetuksesta" %> - <%= error_tag form, :bus %> -
-
- <%= checkbox form, :accom %> - <%= label form, :accom, "Olen kiinnostunut majoituksesta" %> - <%= error_tag form, :accom %> + <%= checkbox form, :confirmed %> + <%= label form, :confirmed, "Vahvistettu" %> + <%= error_tag form, :confirmed %>
- <%= submit "Lähetä" %> + <%= submit "Tallenna" %>
<% end %> diff --git a/lib/runosaari_web/templates/performer/index.html.eex b/lib/runosaari_web/templates/performer/index.html.eex index 9302b46..ec880f9 100644 --- a/lib/runosaari_web/templates/performer/index.html.eex +++ b/lib/runosaari_web/templates/performer/index.html.eex @@ -5,7 +5,7 @@ Lisätietoja tulossa myöhemmin! <% end %> <%= for performer <- @performers do %> -

<%= performer.fname %> <%= performer.lname %>

+

<%= performer.name %>

<%= performer.desc %>

<% end %> diff --git a/lib/runosaari_web/templates/performer/show.html.eex b/lib/runosaari_web/templates/performer/show.html.eex index edf3ae5..7723f4a 100644 --- a/lib/runosaari_web/templates/performer/show.html.eex +++ b/lib/runosaari_web/templates/performer/show.html.eex @@ -4,28 +4,8 @@ diff --git a/priv/repo/migrations/20210516171757_performers_v2.exs b/priv/repo/migrations/20210516171757_performers_v2.exs new file mode 100644 index 0000000..e619ca7 --- /dev/null +++ b/priv/repo/migrations/20210516171757_performers_v2.exs @@ -0,0 +1,18 @@ +defmodule Runosaari.Repo.Migrations.PerformersV2 do + use Ecto.Migration + + def change do + alter table("performers") do + remove :email + remove :fname + remove :lname + remove :tel + remove :date1 + remove :date2 + remove :date3 + remove :bus + remove :accom + add :name, :string + end + end +end
EtunimiSukunimiSähköpostiPuhelin numeroNimi VahvistettuPrioriteetti
<%= performer.fname %><%= performer.lname %><%= performer.email %><%= performer.tel %><%= performer.name %> <%= performer.confirmed %><%= performer.seqnum %> <%= link "Lisätietoja", to: Routes.admin_performer_path(@conn, :show, performer) %> <%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, performer) %> - <%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Haluatko poistaa esiintyjän #{performer.fname} #{performer.lname}?"] %> + <%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Haluatko poistaa esiintyjän #{performer.name}?"] %>