Fix historical fact ordering within a single person

SplitTime · Dec 2, 2024 · 0fbb9bc · 0fbb9bc
1 parent a6a3cdd
commit 0fbb9bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/helpers/badge_helper.rb b/app/helpers/badge_helper.rb
@@ -58,7 +58,7 @@ def historical_fact_kind_badge(kind)
     when "volunteer_multi"
       title = "VMulti"
       color = :success
-      tooltip_text = "Multiple years of volunteer work (as reported in a specific year)"
+      tooltip_text = "Multiple years of volunteer work (as of the year shown)"
     when "qualifier_finish"
       title = "Qualifier"
       color = :secondary

diff --git a/app/models/historical_fact.rb b/app/models/historical_fact.rb
@@ -55,6 +55,7 @@ class HistoricalFact < ApplicationRecord
     end
   end
   scope :ordered, -> { order(:last_name, :first_name, :state_code, :year, :kind) }
+  scope :ordered_within_person, -> { order(:year, :kind) }
   scope :reconciled, -> { where.not(person_id: nil) }
   scope :unreconciled, -> { where(person_id: nil) }
 

diff --git a/app/views/historical_facts/_reconcile_card.html.erb b/app/views/historical_facts/_reconcile_card.html.erb
@@ -30,7 +30,7 @@
       </tr>
       </thead>
       <tbody>
-      <%= render partial: "reconcile_row", collection: presenter.relevant_historical_facts.ordered, as: :fact %>
+      <%= render partial: "reconcile_row", collection: presenter.relevant_historical_facts.ordered_within_person, as: :fact %>
       </tbody>
     </table>
   </div>

diff --git a/app/views/lotteries/_calculations_applicant.html.erb b/app/views/lotteries/_calculations_applicant.html.erb
@@ -27,7 +27,7 @@
         </tr>
         </thead>
         <tbody>
-        <%= render partial: "historical_facts/calculations_row", collection: record.person.historical_facts.ordered, as: :fact %>
+        <%= render partial: "historical_facts/calculations_row", collection: record.person.historical_facts.ordered_within_person, as: :fact %>
         </tbody>
       </table>
     </div>