Survival links.

lib/runosaari/pages/survival.ex

@@ -5,6 +5,7 @@ defmodule Runosaari.Pages.Survival do
   schema "survival_items" do
     field :content, :string
     field :seqnum, :integer, default: 999
+    field :link, :string
 
     timestamps()
   end
@@ -12,7 +13,7 @@ defmodule Runosaari.Pages.Survival do
   @doc false
   def changeset(survival, attrs) do
     survival
-    |> cast(attrs, [:content, :seqnum])
+    |> cast(attrs, [:content, :seqnum, :link])
     |> validate_required([:content, :seqnum])
   end
 end

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

@@ -19,7 +19,12 @@
     <h2>SURVIVAL-ohjeet saariston syrjäseudulle</h2>
     <ul>
     <%= for survival <- @survival_items do %>
-        <li><%= survival.content %>
+        <li>
+            <%= survival.content %>
+            <%= if survival.link != nil do %>
+                <a href="https://<%= survival.link %>" class="generic-link"><%= survival.link %></a>
+            <% end %>
+        </li>
     <% end %>
     </ul>
 </section>

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

@@ -5,6 +5,7 @@
     <thead>
       <tr>
         <th>Sisältö</th>
+        <th>Linkki</th>
         <th>Priotiteetti</th>
 
         <th></th>
@@ -14,6 +15,7 @@
     <%= for survival <- @survival_items do %>
         <tr>
           <td><%= survival.content %></td>
+          <td><%= survival.link %></td>
           <td><%= survival.seqnum %></td>
 
           <td class="actions">

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

@@ -9,6 +9,10 @@
   <%= textarea f, :content %>
   <%= error_tag f, :content %>
 
+  <%= label f, :link, "Linkki" %>
+  <%= text_input f, :link %>
+  <%= error_tag f, :link %>
+
   <%= label f, :seqnum, "Prioritetti (1 on korkein)" %>
   <%= number_input f, :seqnum %>
   <%= error_tag f, :seqnum %>

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

@@ -8,6 +8,11 @@
       <%= @survival.content %>
     </li>
 
+    <li>
+      <strong>Linkki:</strong>
+      <%= @survival.link %>
+    </li>
+
     <li>
       <strong>Prioriteetti:</strong>
       <%= @survival.seqnum %>

mix.exs

@@ -4,7 +4,7 @@ defmodule Runosaari.MixProject do
   def project do
     [
       app: :runosaari,
-      version: "1.1.0",
+      version: "1.1.1",
       elixir: "~> 1.7",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),

priv/repo/migrations/20210703144451_survival_links.exs

@@ -0,0 +1,9 @@
+defmodule Runosaari.Repo.Migrations.SurvivalLinks do
+  use Ecto.Migration
+
+  def change do
+    alter table("survival_items") do
+      add :link, :string, null: true
+    end
+  end
+end

test/runosaari/pages_test.exs

@@ -128,9 +128,9 @@ defmodule Runosaari.PagesTest do
   describe "survival_items" do
     alias Runosaari.Pages.Survival
 
-    @valid_attrs %{content: "some content", seqnum: 42}
+    @valid_attrs %{content: "some content", seqnum: 42, link: "some link"}
-    @update_attrs %{content: "some updated content", seqnum: 43}
+    @update_attrs %{content: "some updated content", seqnum: 43, link: "some updated link"}
-    @invalid_attrs %{content: nil, seqnum: nil}
+    @invalid_attrs %{content: nil, seqnum: nil, link: nil}
 
     def survival_fixture(attrs \\ %{}) do
       {:ok, survival} =

test/runosaari_web/controllers/survival_controller_test.exs

@@ -3,9 +3,9 @@ defmodule RunosaariWeb.SurvivalControllerTest do
 
   alias Runosaari.Pages
 
-  @create_attrs %{content: "some content", seqnum: 42}
+  @create_attrs %{content: "some content", seqnum: 42, link: "some link"}
-  @update_attrs %{content: "some updated content", seqnum: 43}
+  @update_attrs %{content: "some updated content", seqnum: 43, link: "some updated link"}
-  @invalid_attrs %{content: nil, seqnum: nil}
+  @invalid_attrs %{content: nil, seqnum: nil, link: nil}
 
   def fixture(:survival) do
     {:ok, survival} = Pages.create_survival(@create_attrs)