Merge branch 'main' into jdc-1955-inat-import

.codeclimate.yml

@@ -68,7 +68,7 @@ plugins:
     # because Github actions linter is broken
     # See .github/workflows/ci_rails.yml
     # JDC 2023-06-04
-    channel: beta
+    channel: brakeman-6-0-1
     enabled: true
 
 # helps find security vulnerabilities in Ruby dependencies

Gemfile.lock

@@ -264,7 +264,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.8.0)
+    racc (1.8.1)
     rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
@@ -308,14 +308,14 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.2)
+    rexml (3.3.4)
       strscan
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
     rtf (0.3.3)
-    rubocop (1.65.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

app/models/field_slip_job_tracker.rb

@@ -2,7 +2,7 @@
 
 class FieldSlipJobTracker < AbstractModel
   PUBLIC_DIR = "public/"
-  SUBDIR = "field_slips"
+  SUBDIR = "shared"
   PDF_DIR = PUBLIC_DIR + SUBDIR
 
   enum status:

config/locales/en.txt

@@ -1330,7 +1330,7 @@
   app_title: Mushroom Observer
 
   # This goes in a box at the top of the page.
-  app_banner_box: "Check out the \"Mushroom Observer Etsy store\":https://www.etsy.com/shop/MushroomObsMerch — T-shirts, bags and swag! <br>\nWe're working on MO. If you have trouble posting, try logging out and logging back in again.<br>\nPlease \"report a bug\":https://mushroomobserver.org/emails/ask_webmaster_question if you find one."
+  app_banner_box: "Check out the \"Mushroom Observer Etsy store\":https://www.etsy.com/shop/MushroomObsMerch — T-shirts, bags and swag! <br>\nWe're working on MO. If you have trouble posting, try logging out and logging back in again.<br>\nPlease \"report a bug\":admin/emails/webmaster_questions/new if you find one."
 
   # These are the controls/links in the left-hand panel.
   app_intro: Introduction
@@ -1436,8 +1436,8 @@
   ask_webmaster_title: Email Question or Comment
   ask_webmaster_your_email: Your email address
   ask_webmaster_question: Question or Comment
-  ask_webmaster_note: "Thanks for your interest in the Mushroom Observer website. This website was first launched in mid-2006. The site is owned by the non-profit \"Mushroom Observer, Inc.\":/support/governance and administered by a group of volunteer developers and maintainers. We welcome any questions about using the site or comments on how the site might be improved. \n\n [:ask_webmaster_bug] \n\nThe Mushroom Observer Team"
-  ask_webmaster_bug: "**Bug Reports**\n If you are reporting a bug, please let us know what hardware, operating system, and browser you use, and exactly what you were doing. (Which page(s) you were viewing, what you typed, which lin(s) you clicked.)"
+  ask_webmaster_note: "Thanks for your interest in the Mushroom Observer website. This website was first launched in mid-2006. The site is owned by the non-profit \"Mushroom Observer, Inc.\":/support/governance and administered by volunteer developers and maintainers. We welcome questions about using the site or comments on how the site might be improved.\n\n[:ask_webmaster_bug]\n\nThe Mushroom Observer Team"
+  ask_webmaster_bug: "**Bug Reports**\nIf you are reporting a bug, please let us know what hardware, operating system, and browser you use, and exactly what you were doing. (Which page(s) you were viewing, what you typed, which link(s) you clicked.)"
 
   # comments/new
   comment_add_title: Add Comment to [name]
@@ -1601,7 +1601,7 @@
   form_locations_notes: "[:Notes]"
   form_locations_refs: "[:form_names_refs]"
   form_locations_refs_help: "[:form_names_refs_help]"
-  form_locations_help: "Here you can define the place where you observed mushrooms, if a matching place doesn't exist in Mushroom Observer already. Please try to define locations that will be reusable by yourself or others. If you have an idea of the location's name, you can start typing and Google will return its best guess of the place you typed, and draw a box of the approximate boundaries on the map. At this point, you can manually edit both the boundaries and the name of the place. <a href=\"/locations/help\" target=\"_new\">More about Locations on MO.</a>"
+  form_locations_help: Here you can define the place where you observed mushrooms, if a matching place doesn't exist in Mushroom Observer already. Please try to define locations that will be reusable by yourself or others. If you have an idea of the location's name, you can start typing and Google will return its best guess of the place you typed, and draw a box of the approximate boundaries on the map. At this point, you can manually edit both the boundaries and the name of the place. <a href="/locations/help" target="_new">More about Locations on MO.</a>
   form_locations_find_on_map: Find on Map
   form_locations_get_elevation: Get Elevations
   form_locations_lat_long_help: All values should be in decimal degrees.
@@ -1671,10 +1671,10 @@
   form_observations_specimen_available: Specimen Available
   form_observations_is_collection_location: Is this location where it was collected?
   form_observations_gps_hidden: Hide exact coordinates?
-  form_observations_upload_images: "Upload [:images]"
-  form_observations_uploading_images: "Uploading [:images]"
+  form_observations_upload_images: Upload [:images]
+  form_observations_uploading_images: Uploading [:images]
   form_observations_upload_another: Upload another...
-  form_observations_creating_observation: "Creating [:observation]"
+  form_observations_creating_observation: Creating [:observation]
   form_observations_edit_image: "[:EDIT] [:image]"
   form_observations_remove_image: "[:REMOVE] [:image]"
   form_observations_lat_long_help: "Optional GPS location within **[:WHERE]**. Latitude must be -90.0 to 90.0;  longitude must be -180.0 to 180.0. Elevation will be converted to meters. If you choose to provide this data please make it as accurate as possible. Examples: \"34.1164\" = \"34°6&apos;59&quot;N\", \"-118.1459\" = \"118 8.754 W\", \"239 m\" = \"784 ft.\""
@@ -1694,7 +1694,7 @@
   form_observations_upload_help: Use the checkboxes on the left to select the image you would like to use as the thumbnail for this observation.
   form_observations_upload_help_multi_select: Use the checkboxes on the left to select the image you would like to use as the thumbnail for this observation. In the file select dialog you can select multiple images at a time.  You can also continue to add additional images by clicking the button below.
   form_observations_where_help: "Place where the Observation was made. **In the US this should be at least as precise as the county.**\n&nbsp;\nInclude administrative divisons ordered from smallest to largest, ending with the full name of the country, except use 'USA' for the United States of America.\nExamples:\n&nbsp;&nbsp; [loc1]\n&nbsp;&nbsp; [loc2]"
-  form_observations_locate_on_map_help: "Use the **[:form_observations_open_map]** button to bring this location up on the map. Then click to add a marker and drag it to the specific Latitude & Longitude."
+  form_observations_locate_on_map_help: Use the **[:form_observations_open_map]** button to bring this location up on the map. Then click to add a marker and drag it to the specific Latitude & Longitude.
   form_observations_dubious_help: Click '[button]' to use this location name or edit the text below to correct any typo.
   form_observations_project_help: Check any projects you wish to attach this observation to.  All images you upload will also automatically be attached to these projects, too.
   form_observations_list_help: Check any species lists you would like to add this observation to.

db/migrate/20240801202223_add_version_to_field_slip_job_trackers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddVersionToFieldSlipJobTrackers < ActiveRecord::Migration[7.1]
+  def change
+    add_column(:field_slip_job_trackers, :version, :integer, default: 1)
+  end
+end

db/migrate/20240802010123_add_notes_to_field_slip_job_trackers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotesToFieldSlipJobTrackers < ActiveRecord::Migration[7.1]
+  def change
+    add_column(:field_slip_job_trackers, :notes, :text)
+  end
+end

db/migrate/20240802092653_remove_tmp_fields_from_field_slip_job_trackers.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveTmpFieldsFromFieldSlipJobTrackers < ActiveRecord::Migration[7.1]
+  def change
+    remove_column(:field_slip_job_trackers, :notes, :text)
+    remove_column(:field_slip_job_trackers, :version, :integer)
+  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.1].define(version: 2024_07_25_223240) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_02_092653) do
   create_table "api_keys", id: :integer, charset: "utf8mb3", force: :cascade do |t|
     t.datetime "created_at", precision: nil
     t.datetime "last_used", precision: nil