Add country to C14Lab

Author: joeroe

app/helpers/application_helper.rb

@@ -57,6 +57,10 @@ def na_value
     '<abbr title="Unknown or missing value" class="initialism text-muted">NA</abbr>'.html_safe
   end
 
+  def na_or(value)
+    value.blank? ? na_value : value
+  end
+
   def tick_or_cross(bool)
     bool ? bs_icon("check") : bs_icon("x")
   end

app/models/c14_lab.rb

@@ -2,11 +2,12 @@
 #
 # Table name: c14_labs
 #
-#  id         :bigint           not null, primary key
-#  active     :boolean
-#  name       :string
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id           :bigint           not null, primary key
+#  active       :boolean
+#  country_code :string
+#  name         :string
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 # Indexes
 #
@@ -25,19 +26,31 @@ class C14Lab < ApplicationRecord
 
   acts_as_copy_target # enable CSV exports
 
+  scope :with_c14s_count, -> { select <<~SQL
+      "c14_labs".*,
+      (
+        SELECT COUNT(c14s.id) 
+        FROM c14s
+        WHERE c14_lab_id = "c14_labs".id
+      ) AS c14s_count
+    SQL
+  }
+
   def self.label
     "radiocarbon lab"
   end
 
-  def country
-    "an unknown land" # TODO
-  end
-
   def lab_code
     # TODO: There can only be one...
     c14_lab_codes.select(canonical: true).first.lab_code
   end
 
+  def country
+    return nil if country_code.blank?
+    ISO3166::Country[country_code] || 
+      ISO3166::Country.find_country_by_any_name(country_code)
+  end
+
   def c14s_count
     c14s.count
   end

app/views/c14_labs/show.html.erb

@@ -1,6 +1,6 @@
 <% content_for :title, @c14_lab.name %>
 <% content_for :meta_description do %>
-  <%= @c14_lab.name %> <%= @c14_lab.active ? "is" : "was" %> a radiocarbon laboratory in <%= @c14_lab.country %>.
+  <%= @c14_lab.name %> <%= @c14_lab.active ? "is" : "was" %> a radiocarbon laboratory<% unless @c14_lab.country.blank? %> in <%= @c14_lab.country %><% end %>.
   Its standard abbreviation <%= @c14_lab.active ? "is" : "was" %> '<%= @c14_lab.lab_code %>'<% if @c14_lab.c14_lab_codes.count > 1 %>; variants include <%= @c14_lab.c14_lab_codes.where(canonical: false).pluck(:lab_code).to_sentence %><% end %>.
   <% unless @c14_lab.active %>It is no longer operating.<% end %>
   XRONOS includes information on <%= @c14_lab.c14s_count %> <%= "radiocarbon date".pluralize(@c14_lab.c14s_count) %> produced by <%= @c14_lab.name %>.
@@ -28,7 +28,8 @@
 
     <div class="h5">
       <%= xr_icon C14, {}, { style: "width: auto; height: 1.25rem;" } %>
-      Radiocarbon laboratory in <%= @c14_lab.country %>
+      Radiocarbon laboratory
+      <% unless @c14_lab.country.blank? %>in <%= @c14_lab.country %><% end %>
     </div>
 
     <div class="my-3">
@@ -41,11 +42,11 @@
     <h2><%= bs_icon "clipboard" %> Laboratory metadata</h2>
     <dl>
 
-      <dt>Active</dt>
+      <dt>Status</dt>
       <dd class="font-monospace"><%= @c14_lab.active ? "Active" : "Inactive" %></dd>
 
       <dt>Country</dt>
-      <dd class="font-monospace"><%= @c14_lab.country %></dd>
+      <dd class="font-monospace"><%= na_or @c14_lab.country %></dd>
 
       <dt>Canonical laboratory code</dt>
       <dd class="font-monospace"><%= @c14_lab.lab_code %></dd>

db/migrate/20250407150504_add_country_to_c14_lab.rb

@@ -0,0 +1,5 @@
+class AddCountryToC14Lab < ActiveRecord::Migration[7.2]
+  def change
+    add_column :c14_labs, :country_code, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_04_07_124024) do
+ActiveRecord::Schema[7.2].define(version: 2025_04_07_150504) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
   enable_extension "plpgsql"
@@ -75,6 +75,7 @@
     t.boolean "active"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.string "country_code"
     t.index ["active"], name: "index_c14_labs_on_active"
     t.index ["name"], name: "index_c14_labs_on_name"
   end
@@ -212,8 +213,9 @@
   end
 
   create_table "periods_site_phases", id: false, force: :cascade do |t|
-    t.bigint "site_phase_id"
-    t.bigint "period_id"
+    t.bigint "site_phase_id", null: false
+    t.bigint "period_id", null: false
+    t.index ["site_phase_id", "period_id"], name: "index_spp"
   end
 
   create_table "pg_search_documents", force: :cascade do |t|
@@ -225,11 +227,13 @@
     t.index ["searchable_type", "searchable_id"], name: "index_pg_search_documents_on_searchable"
   end
 
-  create_table "physical_locations", id: false, force: :cascade do |t|
+  create_table "physical_locations", force: :cascade do |t|
     t.bigint "site_id"
     t.bigint "country_id"
-    t.text "created_at"
-    t.text "updated_at"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.index ["country_id"], name: "index_physical_locations_on_country_id"
+    t.index ["site_id"], name: "index_physical_locations_on_site_id"
   end
 
   create_table "references", force: :cascade do |t|
@@ -348,7 +352,8 @@
   end
 
   create_table "versions", force: :cascade do |t|
-    t.string "item_type", null: false
+    t.string "item_type"
+    t.string "{:null=>false}"
     t.bigint "item_id", null: false
     t.string "event", null: false
     t.string "whodunnit"

test/factories/c14_labs.rb

@@ -2,11 +2,12 @@
 #
 # Table name: c14_labs
 #
-#  id         :bigint           not null, primary key
-#  active     :boolean
-#  name       :string
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id           :bigint           not null, primary key
+#  active       :boolean
+#  country_code :string
+#  name         :string
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 # Indexes
 #