Visitor table altered: bus -> shared (car).

lib/runosaari/registration/visitor.ex

@@ -4,7 +4,7 @@ defmodule Runosaari.Registration.Visitor do
 
   schema "visitors" do
     field :accom, :boolean, default: false
-    field :bus, :boolean, default: false
+    field :shared, :boolean, default: false
     field :date1, :boolean, default: false
     field :date2, :boolean, default: false
     field :date3, :boolean, default: false
@@ -19,7 +19,7 @@ defmodule Runosaari.Registration.Visitor do
   @doc false
   def changeset(visitor, attrs) do
     visitor
-    |> cast(attrs, [:fname, :lname, :email, :tel, :date1, :date2, :date3, :bus, :accom])
+    |> cast(attrs, [:fname, :lname, :email, :tel, :date1, :date2, :date3, :shared, :accom])
-    |> validate_required([:fname, :lname, :email, :tel, :date1, :date2, :date3, :bus, :accom])
+    |> validate_required([:fname, :lname, :email, :tel, :date1, :date2, :date3, :shared, :accom])
   end
 end

lib/runosaari_web/templates/page/privacy.html.eex

@@ -40,7 +40,7 @@
                     <li>henkilön nimi</li>
                     <li>yhteystiedot (sähköpostiosoite, puhelinnumero)</li>
                     <li>halukkuus osallistua tapahtumapäiviin 22.7. torstai, 23.7. perjantai ja/tai 24.7. lauantai</li>
-                    <li>tarve bussikuljetukselle</li>
+                    <li>halukkuus kimppakyyti järjestelylle</li>
                     <li>tarve majoitukselle</li>
                 </ul>
             </p>

lib/runosaari_web/templates/visitor/form.html.eex

@@ -40,8 +40,8 @@
     <%= label form, :date3, "Lauantai 24.7." %>
   </div>
   <div class="checkbox-container">
-    <%= checkbox form, :bus %>
+    <%= checkbox form, :shared %>
-    <%= label form, :bus, "Olen kiinnostunut bussikuljetuksesta" %>
+    <%= label form, :shared, "Olen kiinnostunut kimppakyydeistä (Turku-Livonsaari)" %>
   </div>
   <div class="checkbox-container">
     <%= checkbox form, :accom %>

lib/runosaari_web/templates/visitor/index.html.eex

@@ -11,7 +11,7 @@
         <th>Torstai</th>
         <th>Perjantai</th>
         <th>Lauantai</th>
-        <th>Bussi</th>
+        <th>Kimppakyyti</th>
         <th>Majoitus</th>
 
         <th></th>
@@ -27,7 +27,7 @@
           <td><%= visitor.date1 %></td>
           <td><%= visitor.date2 %></td>
           <td><%= visitor.date3 %></td>
-          <td><%= visitor.bus %></td>
+          <td><%= visitor.shared %></td>
           <td><%= visitor.accom %></td>
 
           <td class="actions">

lib/runosaari_web/templates/visitor/show.html.eex

@@ -39,12 +39,12 @@
     </li>
 
     <li>
-      <strong>Bus:</strong>
+      <strong>Kimppakyyti:</strong>
-      <%= @visitor.bus %>
+      <%= @visitor.shared %>
     </li>
 
     <li>
-      <strong>Accom:</strong>
+      <strong>Majoitus:</strong>
       <%= @visitor.accom %>
     </li>
 

priv/repo/migrations/20210516164418_change_bus_to_shared.exs

@@ -0,0 +1,10 @@
+defmodule Runosaari.Repo.Migrations.ChangeBusToShared do
+  use Ecto.Migration
+
+  def change do
+    alter table("visitors") do
+      remove :bus
+      add :shared, :boolean, default: false, null: false
+    end
+  end
+end

test/runosaari/registration_test.exs

@@ -132,9 +132,39 @@ defmodule Runosaari.RegistrationTest do
   describe "visitors" do
     alias Runosaari.Registration.Visitor
 
-    @valid_attrs %{accom: true, bus: true, date1: true, date2: true, date3: true, email: "some email", fname: "some fname", lname: "some lname", tel: "some tel"}
+    @valid_attrs %{
-    @update_attrs %{accom: false, bus: false, date1: false, date2: false, date3: false, email: "some updated email", fname: "some updated fname", lname: "some updated lname", tel: "some updated tel"}
+      accom: true,
-    @invalid_attrs %{accom: nil, bus: nil, date1: nil, date2: nil, date3: nil, email: nil, fname: nil, lname: nil, tel: nil}
+      shared: true,
+      date1: true,
+      date2: true,
+      date3: true,
+      email: "some email",
+      fname: "some fname",
+      lname: "some lname",
+      tel: "some tel"
+    }
+    @update_attrs %{
+      accom: false,
+      shared: false,
+      date1: false,
+      date2: false,
+      date3: false,
+      email: "some updated email",
+      fname: "some updated fname",
+      lname: "some updated lname",
+      tel: "some updated tel"
+    }
+    @invalid_attrs %{
+      accom: nil,
+      shared: nil,
+      date1: nil,
+      date2: nil,
+      date3: nil,
+      email: nil,
+      fname: nil,
+      lname: nil,
+      tel: nil
+    }
 
     def visitor_fixture(attrs \\ %{}) do
       {:ok, visitor} =
@@ -158,7 +188,7 @@ defmodule Runosaari.RegistrationTest do
     test "create_visitor/1 with valid data creates a visitor" do
       assert {:ok, %Visitor{} = visitor} = Registration.create_visitor(@valid_attrs)
       assert visitor.accom == true
-      assert visitor.bus == true
+      assert visitor.shared == true
       assert visitor.date1 == true
       assert visitor.date2 == true
       assert visitor.date3 == true
@@ -176,7 +206,7 @@ defmodule Runosaari.RegistrationTest do
       visitor = visitor_fixture()
       assert {:ok, %Visitor{} = visitor} = Registration.update_visitor(visitor, @update_attrs)
       assert visitor.accom == false
-      assert visitor.bus == false
+      assert visitor.shared == false
       assert visitor.date1 == false
       assert visitor.date2 == false
       assert visitor.date3 == false

test/runosaari_web/controllers/visitor_controller_test.exs

@@ -5,7 +5,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
 
   @create_attrs %{
     accom: true,
-    bus: true,
+    shared: true,
     date1: true,
     date2: true,
     date3: true,
@@ -16,7 +16,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
   }
   @update_attrs %{
     accom: false,
-    bus: false,
+    shared: false,
     date1: false,
     date2: false,
     date3: false,
@@ -27,7 +27,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
   }
   @invalid_attrs %{
     accom: nil,
-    bus: nil,
+    shared: nil,
     date1: nil,
     date2: nil,
     date3: nil,