diff --git a/app/views/reports/search.html.erb b/app/views/reports/search.html.erb index d5323bb..8df23c5 100644 --- a/app/views/reports/search.html.erb +++ b/app/views/reports/search.html.erb @@ -58,7 +58,7 @@
<%= label_tag :genus, 'Ape (Genus)' %>
- <%= select_tag :genus, options_for_select(["Bonobo (Pan)", "Chimpanzee (Pan)", "Gorilla (Gorilla)", "Orang-utan (Pongo)", "Unknown"]), multiple: true, class: 'select2' %> + <%= select_tag :genus, options_for_select(["Bonobo (Pan)", "Chimpanzee (Pan)", "Gorilla (Gorilla)", "Orangutan (Pongo)", "Unknown"]), multiple: true, class: 'select2' %>
diff --git a/config/questionnaire/pages/dead.json.erb b/config/questionnaire/pages/dead.json.erb index 2d0ebb4..3a57ac1 100644 --- a/config/questionnaire/pages/dead.json.erb +++ b/config/questionnaire/pages/dead.json.erb @@ -7,7 +7,7 @@ "Bonobo (Pan)", "Chimpanzee (Pan)", "Gorilla (Gorilla)", - "Orang-utan (Pongo)", + "Orangutan (Pongo)", "Unknown" ] }, @@ -40,14 +40,14 @@ "orangutan_species_dead": { "id": "species_subspecies_dead", "type": "subspecies", - "show_if": {"question": "genus_dead", "answer": "Orang-utan (Pongo)"}, + "show_if": {"question": "genus_dead", "answer": "Orangutan (Pongo)"}, "tooltip": "Please do not guess the subspecies; input only on surety, ideally confirmed by DNA analysis.", "question": "Confirmation of Species/subspecies (optional)", "answers": [ - "Bornean orang-utan (Pongo pygmaeus pygmaeus) – northwest populations", - "Bornean orang-utan (Pongo pygmaeus morio) – east populations", - "Bornean orang-utan (Pongo pygmaeus wurmbii) – southwest populations", - "Sumatran orang-utan (Pongo abelii)" + "Bornean orangutan (Pongo pygmaeus pygmaeus) – northwest populations", + "Bornean orangutan (Pongo pygmaeus morio) – east populations", + "Bornean orangutan (Pongo pygmaeus wurmbii) – southwest populations", + "Sumatran orangutan (Pongo abelii)" ] }, "intended_use_dead": { diff --git a/config/questionnaire/pages/live.json.erb b/config/questionnaire/pages/live.json.erb index 73e52ba..cbd21da 100644 --- a/config/questionnaire/pages/live.json.erb +++ b/config/questionnaire/pages/live.json.erb @@ -7,7 +7,7 @@ "Bonobo (Pan)", "Chimpanzee (Pan)", "Gorilla (Gorilla)", - "Orang-utan (Pongo)", + "Orangutan (Pongo)", "Unknown" ] }, @@ -40,14 +40,14 @@ "orangutan_species_live": { "id": "species_subspecies_live", "type": "subspecies", - "show_if": {"question": "genus_live", "answer": "Orang-utan (Pongo)"}, + "show_if": {"question": "genus_live", "answer": "Orangutan (Pongo)"}, "tooltip": "Please do not guess the subspecies; input only on surety, ideally confirmed by DNA analysis.", "question": "Confirmation of Species/subspecies (optional)", "answers": [ - "Bornean orang-utan (Pongo pygmaeus pygmaeus) – northwest populations", - "Bornean orang-utan (Pongo pygmaeus morio) – east populations", - "Bornean orang-utan (Pongo pygmaeus wurmbii) – southwest populations", - "Sumatran orang-utan (Pongo abelii)" + "Bornean orangutan (Pongo pygmaeus pygmaeus) – northwest populations", + "Bornean orangutan (Pongo pygmaeus morio) – east populations", + "Bornean orangutan (Pongo pygmaeus wurmbii) – southwest populations", + "Sumatran orangutan (Pongo abelii)" ] }, "intended_use_live": { diff --git a/config/questionnaire/pages/parts.json.erb b/config/questionnaire/pages/parts.json.erb index c13f092..cedd3e7 100644 --- a/config/questionnaire/pages/parts.json.erb +++ b/config/questionnaire/pages/parts.json.erb @@ -7,7 +7,7 @@ "Bonobo (Pan)", "Chimpanzee (Pan)", "Gorilla (Gorilla)", - "Orang-utan (Pongo)", + "Orangutan (Pongo)", "Unknown" ] }, @@ -55,8 +55,8 @@ }, "parts_orangutan": { "id": "parts_orangutan", - "question": "Orang-utan body parts found / Quantity", - "show_if": {"question": "genus_parts", "answer": "Orang-utan (Pongo)"}, + "question": "Orangutan body parts found / Quantity", + "show_if": {"question": "genus_parts", "answer": "Orangutan (Pongo)"}, "type": "body_parts", "parts": [ {"id": "bone_femur", "question": "Bone (Femur)", "type": "numeric"}, diff --git a/db/migrate/20160927163754_rename_orangutan.rb b/db/migrate/20160927163754_rename_orangutan.rb new file mode 100644 index 0000000..2ae04a7 --- /dev/null +++ b/db/migrate/20160927163754_rename_orangutan.rb @@ -0,0 +1,41 @@ +class RenameOrangutan < ActiveRecord::Migration + def change + Expertise + .where(name: "Orang-utan (Pongo)") + .update_all(name: "Orangutan (Pongo)") + + Report.all.each do |report| + if live_apes = report.data.dig("answers", "live") + report.data["answers"]["live"] = live_apes.map do |ape| + if ape.dig("genus_live", "selected") == "Orang-utan (Pongo)" + ape["genus_live"]["selected"] = "Orangutan (Pongo)" + end + + ape + end + end + + if dead_apes = report.data.dig("answers", "dead") + report.data["answers"]["dead"] = dead_apes.map do |ape| + if ape.dig("genus_dead", "selected") == "Orang-utan (Pongo)" + ape["genus_dead"]["selected"] = "Orangutan (Pongo)" + end + + ape + end + end + + if dead_apes = report.data.dig("answers", "body_parts") + report.data["answers"]["body_parts"] = dead_apes.map do |ape| + if orangutan_index = ape.dig("genus_parts", "selected").index("Orang-utan (Pongo)") + ape["genus_parts"]["selected"][orangutan_index] = "Orangutan (Pongo)" + end + + ape + end + end + + report.save + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 895ba9a..6261058 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160912103105) do +ActiveRecord::Schema.define(version: 20160927163754) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/db/seeds.rb b/db/seeds.rb index 7f7e21f..f6b3541 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,7 +6,7 @@ roles = ["admin", "validator", "provider"] roles.each { |r| Role.where(name: r).first_or_create } -expertise = ["Bonobo (Pan)", "Gorilla (Gorilla)", "Chimpanzee (Pan)", "Orang-utan (Pongo)", +expertise = ["Bonobo (Pan)", "Gorilla (Gorilla)", "Chimpanzee (Pan)", "Orangutan (Pongo)", "West Africa", "Central Africa", "East Africa", "Southeast Asia", "Rest of the World"] expertise.each { |e| Expertise.where(name: e).first_or_create } diff --git a/lib/modules/csv_builder.rb b/lib/modules/csv_builder.rb index 80d6f13..077f098 100644 --- a/lib/modules/csv_builder.rb +++ b/lib/modules/csv_builder.rb @@ -158,7 +158,7 @@ def self.to_db_name genus "bonobo (pan)" => "bonobo", "chimpanzee (pan)" => "chimpanzee", "gorilla (gorilla)" => "gorilla", - "orang-utan (pongo)" => "orangutan", + "orangutan (pongo)" => "orangutan", "unknown" => "unknown" } diff --git a/lib/modules/csv_converter.rb b/lib/modules/csv_converter.rb index 9fd86d6..56c6d82 100644 --- a/lib/modules/csv_converter.rb +++ b/lib/modules/csv_converter.rb @@ -75,7 +75,7 @@ def find_genus value "Bonobo (Pan)" => "bonobo", "Chimpanzee (Pan)" => "chimpanzee", "Gorilla (Gorilla)" => "gorilla", - "Orang-utan (Pongo)" => "orangutan", + "Orangutan (Pongo)" => "orangutan", "Unknown" => "unknown" }