Survival instructions editable.

lib/runosaari_web/controllers/info_controller.ex

@@ -6,7 +6,16 @@ defmodule RunosaariWeb.InfoController do
 
   def index(conn, _params) do
     info_paragraphs = Pages.list_sorted_info_paragraphs()
-    render(conn, "index.html", info_paragraphs: info_paragraphs)
+    survival_items = Pages.list_sorted_survival_items()
+
+    render(
+      conn,
+      "index.html",
+      Map.new(
+        info_paragraphs: info_paragraphs,
+        survival_items: survival_items
+      )
+    )
   end
 
   def admin(conn, _params) do
@@ -21,7 +30,7 @@ defmodule RunosaariWeb.InfoController do
 
   def create(conn, %{"info" => info_params}) do
     case Pages.create_info(info_params) do
-      {:ok, info} ->
+      {:ok} ->
         conn
         |> put_flash(:info, "Info created successfully.")
         |> redirect(to: Routes.admin_info_path(conn, :admin))

lib/runosaari_web/controllers/survival_controller.ex

@@ -0,0 +1,67 @@
+defmodule RunosaariWeb.SurvivalController do
+  use RunosaariWeb, :controller
+
+  alias Runosaari.Pages
+  alias Runosaari.Pages.Survival
+
+  def index(conn, _params) do
+    survival_items = Pages.list_survival_items()
+    render(conn, "admin.html", survival_items: survival_items)
+  end
+
+  def admin(conn, _params) do
+    survival_items = Pages.list_survival_items()
+    render(conn, "admin.html", survival_items: survival_items)
+  end
+
+  def new(conn, _params) do
+    changeset = Pages.change_survival(%Survival{})
+    render(conn, "new.html", changeset: changeset)
+  end
+
+  def create(conn, %{"survival" => survival_params}) do
+    case Pages.create_survival(survival_params) do
+      {:ok, survival} ->
+        conn
+        |> put_flash(:info, "Survival created successfully.")
+        |> redirect(to: Routes.admin_survival_path(conn, :show, survival))
+
+      {:error, %Ecto.Changeset{} = changeset} ->
+        render(conn, "new.html", changeset: changeset)
+    end
+  end
+
+  def show(conn, %{"id" => id}) do
+    survival = Pages.get_survival!(id)
+    render(conn, "show.html", survival: survival)
+  end
+
+  def edit(conn, %{"id" => id}) do
+    survival = Pages.get_survival!(id)
+    changeset = Pages.change_survival(survival)
+    render(conn, "edit.html", survival: survival, changeset: changeset)
+  end
+
+  def update(conn, %{"id" => id, "survival" => survival_params}) do
+    survival = Pages.get_survival!(id)
+
+    case Pages.update_survival(survival, survival_params) do
+      {:ok, survival} ->
+        conn
+        |> put_flash(:info, "Survival updated successfully.")
+        |> redirect(to: Routes.admin_survival_path(conn, :show, survival))
+
+      {:error, %Ecto.Changeset{} = changeset} ->
+        render(conn, "edit.html", survival: survival, changeset: changeset)
+    end
+  end
+
+  def delete(conn, %{"id" => id}) do
+    survival = Pages.get_survival!(id)
+    {:ok, _survival} = Pages.delete_survival(survival)
+
+    conn
+    |> put_flash(:info, "Survival deleted successfully.")
+    |> redirect(to: Routes.admin_survival_path(conn, :admin))
+  end
+end

lib/runosaari_web/router.ex

@@ -38,6 +38,8 @@ defmodule RunosaariWeb.Router do
     resources "/visitors", VisitorController, except: [:new, :create]
     resources "/info", InfoController, except: [:index]
     get "/info", InfoController, :admin
+    resources "/survival", SurvivalController, except: [:index]
+    get "/survival", SurvivalController, :admin
   end
 
   # Other scopes may use custom stacks.

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

@@ -1,5 +1,7 @@
-<h1>Muokkaa kappaletta</h1>
+<section class="main">
+    <h1>Muokkaa kappaletta</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.admin_index_path(@conn, :update, @index)) %>
+    <%= render "form.html", Map.put(assigns, :action, Routes.admin_index_path(@conn, :update, @index)) %>
 
-<span><%= link "Takaisin", to: Routes.admin_index_path(@conn, :admin) %></span>
+    <span><%= link "Takaisin", to: Routes.admin_index_path(@conn, :admin) %></span>
+</section>

lib/runosaari_web/templates/info/admin.html.eex

@@ -2,28 +2,28 @@
     <h1>HALLINTA - Infon kappaleet</h1>
 
     <table>
-    <thead>
-        <tr>
-        <th>Sisältö</th>
-        <th>Prioriteetti</th>
+        <thead>
+            <tr>
+                <th>Sisältö</th>
+                <th>Prioriteetti</th>
 
-        <th></th>
-        </tr>
-    </thead>
-    <tbody>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
         <%= for info <- @info_paragraphs do %>
             <tr>
-            <td><%= info.content %></td>
-            <td><%= info.seqnum %></td>
+                <td><%= info.content %></td>
+                <td><%= info.seqnum %></td>
 
-            <td class="actions">
-                <span><%= link "Lisätietoja", to: Routes.admin_info_path(@conn, :show, info) %></span>
-                <span><%= link "Muokkaa", to: Routes.admin_info_path(@conn, :edit, info) %></span>
-                <span><%= link "Poista", to: Routes.admin_info_path(@conn, :delete, info), method: :delete, data: [confirm: "Oletko varma?"] %></span>
-            </td>
+                <td class="actions">
+                    <span><%= link "Lisätietoja", to: Routes.admin_info_path(@conn, :show, info) %></span>
+                    <span><%= link "Muokkaa", to: Routes.admin_info_path(@conn, :edit, info) %></span>
+                    <span><%= link "Poista", to: Routes.admin_info_path(@conn, :delete, info), method: :delete, data: [confirm: "Oletko varma?"] %></span>
+                </td>
             </tr>
         <% end %>
-    </tbody>
+        </tbody>
     </table>
 
     <span><%= link "Uusi kappale", to: Routes.admin_info_path(@conn, :new) %></span>

lib/runosaari_web/templates/info/edit.html.eex

@@ -1,5 +1,7 @@
-<h1>Muokkaa kappaletta</h1>
+<section class="main">
+    <h1>Muokkaa kappaletta</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.admin_info_path(@conn, :update, @info)) %>
+    <%= render "form.html", Map.put(assigns, :action, Routes.admin_info_path(@conn, :update, @info)) %>
 
-<span><%= link "Takaisin", to: Routes.admin_info_path(@conn, :admin) %></span>
+    <span><%= link "Takaisin", to: Routes.admin_info_path(@conn, :admin) %></span>
+</section>

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

@@ -18,18 +18,8 @@
     </p>
     <h2><i>[TULOSSA]</i> <br />SURVIVAL-ohjeet saariston syrjäseudulle</h2>
     <ul>
-        <li>Tietoa majoitusmahdollisuuksista ja ravitsemuspalveluista</li>
-        <li>
-        Tarjolla telttailumahdollisuus ja mahdollisesti yksinkertaista
-        yhteismajoitusta Livonsaaren yhteisökylän mailla, 1 km
-        Seurantalolta.
-        </li>
-        <li>Livonsaaren osuuskauppa palvelee: Infopiste</li>
-        <li>
-        Majoituspalvelut Velkualla: Wanha Salakuljettaja, Saaristohotelli
-        Vaihela
-        </li>
-        <li>Bussi- ja kimppataksikuljetukset</li>
-        <li>Kartta</li>
+    <%= for survival <- @survival_items do %>
+        <li><%= survival.content %>
+    <% end %>
     </ul>
 </section>

lib/runosaari_web/templates/info/new.html.eex

@@ -1,5 +1,5 @@
-<h1>New Info</h1>
+<h1>Uusi info kappale</h1>
 
 <%= render "form.html", Map.put(assigns, :action, Routes.admin_info_path(@conn, :create)) %>
 
-<span><%= link "Back", to: Routes.admin_info_path(@conn, :admin) %></span>
+<span><%= link "Takasin", to: Routes.admin_info_path(@conn, :admin) %></span>

lib/runosaari_web/templates/performance/edit.html.eex

@@ -1,5 +1,7 @@
-<h1>Muokkaa näytöksen tietoja</h1>
+<section class="main">
+    <h1>Muokkaa näytöksen tietoja</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.admin_performance_path(@conn, :update, @performance)) %>
+    <%= render "form.html", Map.put(assigns, :action, Routes.admin_performance_path(@conn, :update, @performance)) %>
 
-<span><%= link "Takaisin", to: Routes.admin_performance_path(@conn, :admin) %></span>
+    <span><%= link "Takaisin", to: Routes.admin_performance_path(@conn, :admin) %></span>
+</section>

lib/runosaari_web/templates/performer/edit.html.eex

@@ -1,5 +1,7 @@
-<h1>Muokkaa esiintyjän tietoja</h1>
+<section class="main">
+    <h1>Muokkaa esiintyjän tietoja</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.admin_performer_path(@conn, :update, @performer)) %>
+    <%= render "form.html", Map.put(assigns, :action, Routes.admin_performer_path(@conn, :update, @performer)) %>
 
-<span><%= link "Takaisin", to: Routes.admin_performer_path(@conn, :admin) %></span>
+    <span><%= link "Takaisin", to: Routes.admin_performer_path(@conn, :admin) %></span>
+</section>

lib/runosaari_web/templates/survival/admin.html.eex

@@ -0,0 +1,30 @@
+<section class="main">
+  <h1>HALLINTA - Survival listan kohdat</h1>
+
+  <table>
+    <thead>
+      <tr>
+        <th>Sisältö</th>
+        <th>Priotiteetti</th>
+
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+    <%= for survival <- @survival_items do %>
+        <tr>
+          <td><%= survival.content %></td>
+          <td><%= survival.seqnum %></td>
+
+          <td class="actions">
+              <span><%= link "Lisätietoja", to: Routes.admin_survival_path(@conn, :show, survival) %></span>
+              <span><%= link "Muokkaa", to: Routes.admin_survival_path(@conn, :edit, survival) %></span>
+              <span><%= link "Poista", to: Routes.admin_survival_path(@conn, :delete, survival), method: :delete, data: [confirm: "Oletko varma?"] %></span>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+
+  <span><%= link "Luo uusi survival kohta", to: Routes.admin_survival_path(@conn, :new) %></span>
+</section>

lib/runosaari_web/templates/survival/edit.html.eex

@@ -0,0 +1,7 @@
+<section class="main">
+    <h1>Muokkaa survival listan kohtaa</h1>
+
+    <%= render "form.html", Map.put(assigns, :action, Routes.admin_survival_path(@conn, :update, @survival)) %>
+
+    <span><%= link "Takaisin", to: Routes.admin_survival_path(@conn, :admin) %></span>
+</section>

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

@@ -0,0 +1,19 @@
+<%= form_for @changeset, @action, fn f -> %>
+  <%= if @changeset.action do %>
+    <div class="alert alert-danger">
+      <p>Joku kentistä on tyhjä.</p>
+    </div>
+  <% end %>
+
+  <%= label f, :content, "Sisältö" %>
+  <%= textarea f, :content %>
+  <%= error_tag f, :content %>
+
+  <%= label f, :seqnum, "Prioritetti (1 on korkein)" %>
+  <%= number_input f, :seqnum %>
+  <%= error_tag f, :seqnum %>
+
+  <div>
+    <%= submit "Tallenna" %>
+  </div>
+<% end %>

lib/runosaari_web/templates/survival/new.html.eex

@@ -0,0 +1,5 @@
+<h1>Uusi survival listan kohta</h1>
+
+<%= render "form.html", Map.put(assigns, :action, Routes.admin_survival_path(@conn, :create)) %>
+
+<span><%= link "Takaisin", to: Routes.admin_survival_path(@conn, :admin) %></span>

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

@@ -0,0 +1,20 @@
+<section class="main">
+  <h1>Survival listan kohdan tiedot</h1>
+
+  <ul>
+
+    <li>
+      <strong>Sisältö:</strong>
+      <%= @survival.content %>
+    </li>
+
+    <li>
+      <strong>Prioriteetti:</strong>
+      <%= @survival.seqnum %>
+    </li>
+
+  </ul>
+
+  <span><%= link "Muokkaa", to: Routes.admin_survival_path(@conn, :edit, @survival) %></span>
+  <span><%= link "Takaisin", to: Routes.admin_survival_path(@conn, :admin) %></span>
+</section>

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

@@ -1,5 +1,7 @@
-<h1>Muokkaa osallistujan tietoja</h1>
+<section class="main">
+    <h1>Muokkaa osallistujan tietoja</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.admin_visitor_path(@conn, :update, @visitor)) %>
+    <%= render "form.html", Map.put(assigns, :action, Routes.admin_visitor_path(@conn, :update, @visitor)) %>
 
-<span><%= link "Takaisin", to: Routes.admin_visitor_path(@conn, :index) %></span>
+    <span><%= link "Takaisin", to: Routes.admin_visitor_path(@conn, :index) %></span>
+</section>

lib/runosaari_web/views/survival_view.ex

@@ -0,0 +1,3 @@
+defmodule RunosaariWeb.SurvivalView do
+  use RunosaariWeb, :view
+end