bible270 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb5049bbbd494dff154cb3061567f7184f13c3eb55bc625f823e3cf6204addfb
-  data.tar.gz: 04fe5e22682dc2975b1548ed5a5ee8b5402909ff60000130794fcae8611a0abf
+  metadata.gz: 7e566c5e5c2097bfcb768ef08108d115814096e552c768636b67f009a6c31532
+  data.tar.gz: d11ec18971a487ef039492849da05543062b88841b80f79f3d2fa545ff674cbb
 SHA512:
-  metadata.gz: 0d9b760049053e5d85156bc010ad363da6817f3baee350fad8d1955ba11455fe509fce4fe03747e5ce0f78dd8c2f2737f983646c1a7c437567844365b8c9438f
-  data.tar.gz: 0dc11557e3316ed5cb4c64ba224892392baf64c0fae3b0958e15b13f3a57f036ad69564f5540c90ea3d6409d0162d9593a526981b43e460cf87e7931e5d2edd3
+  metadata.gz: 067e9c103eb5688c04c4e2c352a225768d9d9d98e04a4b046c16a285b736adf313c9687e825a781f615199bac580a94104107b3f273947b2faeb378712a53b87
+  data.tar.gz: f9c658c9e118f25c880ece18f7128b931fef51ddd6cc7d83042c3b18ede120f84398a09c1d34b028ec913ab6a19ad683f8824b28ed9174fecc61e9ac6bdc950e

data/CHANGELOG.md

@@ -7,6 +7,11 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 ### Added
 
 - show Blue Letter Bible Scripture popups when readers hover over references in rendered reflections, replies, and Markdown previews; popups follow each reader's selected translation, handle original-language choices by testament, and rescan content added by Turbo without forcing a page reload
+- let administrators sort the reader list and Reader Stats report by most or least recent reading activity, while keeping readers with no activity at the end
+
+### Changed
+
+- link reader email addresses directly to email composition and link recent-activity day labels to their Day pages with passage tooltips in Admin
 
 **[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.6.2...main)**
 

data/app/controllers/bible270/admin_controller.rb

@@ -15,7 +15,9 @@ module Bible270
       'first_name' => 'First Name',
       'last_name' => 'Last Name',
       'most_completed' => 'Most days completed',
-      'least_completed' => 'Least days completed'
+      'least_completed' => 'Least days completed',
+      'most_recent_activity' => 'Most recent activity',
+      'least_recent_activity' => 'Least recent activity'
     }.freeze
 
     before_action :require_admin!
@@ -65,9 +67,15 @@ module Bible270
       @days_completed = Reader.completed_days_by_id
       @reader_sort_options = READER_SORT_OPTIONS
       @reader_sort = READER_SORT_OPTIONS.key?(params[:sort]) ? params[:sort] : 'first_name'
-      @reader_report = ReaderProgressReport.new(completed_days: @days_completed, sort: @reader_sort)
+      readers = Reader.all.load
+      @recent_reader_activities = Checkoff.recent_activity_by_reader(readers.map(&:id))
+      @reader_report = ReaderProgressReport.new(
+        readers: readers,
+        completed_days: @days_completed,
+        recent_activities: @recent_reader_activities,
+        sort: @reader_sort
+      )
       @readers = @reader_report.sorted_readers
-      @recent_reader_activities = Checkoff.recent_activity_by_reader(@readers.map(&:id))
       @run_start_date = Setting.run_start_date
       @configured_start_date = Bible270.config.start_date
       @run_start_date_overridden = Setting.run_start_date_overridden?

data/app/helpers/bible270/plan_helper.rb

@@ -182,12 +182,14 @@ module Bible270
     end
 
     def b270_reader_activity_description(activity)
+      day_link = link_to "Day #{activity.day}", day_path(activity.day), title: b270_day_readings(activity.day)
+
       if activity.day_completed?
         readings = Plan.readings_for(activity.day).values.compact.join(', ')
-        "completed Day #{activity.day} (#{readings})"
+        safe_join(['completed ', day_link, " (#{readings})"])
       else
         reference = Plan.parts_for(activity.day, activity.track).fetch(activity.part)
-        "checked off “#{reference}” for Day #{activity.day}"
+        safe_join(["checked off “#{reference}” for ", day_link])
       end
     end
 

data/app/views/bible270/admin/index.html.erb

@@ -85,7 +85,11 @@
           <% if Bible270.config.admin?(reader) %> <span class="sub"><strong>[admin]</strong></span> <% end %>
           </div>
           <div class="sub">
-            <%= reader.email.presence || reader.provider %>
+            <% if reader.email.present? %>
+              <%= mail_to reader.email %>
+            <% else %>
+              <%= reader.provider %>
+            <% end %>
             · <%= @days_completed[reader.id] %>/<%= Bible270::Plan::DAYS %> days
             <% if reader.dated? %>· started <%= reader.effective_start_date.strftime('%b %-d, %Y') %><% end %>
           </div>

data/lib/bible270/reader_progress_report.rb

@@ -4,13 +4,17 @@ module Bible270
   # Builds the plain-text reader progress table used by administrative tasks.
   class ReaderProgressReport
     HEADERS = ['Name', 'Days Read', 'Status'].freeze
-    SORTS = %w[first_name last_name most_completed least_completed].freeze
+    SORTS = %w[
+      first_name last_name most_completed least_completed most_recent_activity least_recent_activity
+    ].freeze
     DEFAULT_SORT = 'most_completed'
     Row = Struct.new(:name, :days_read, :status, keyword_init: true)
 
-    def initialize(readers: Reader.all, completed_days: Reader.completed_days_by_id, sort: DEFAULT_SORT)
+    def initialize(readers: Reader.all, completed_days: Reader.completed_days_by_id, recent_activities: {},
+                   sort: DEFAULT_SORT)
       @readers = readers
       @completed_days = completed_days
+      @recent_activities = recent_activities
       @sort = SORTS.include?(sort.to_s) ? sort.to_s : DEFAULT_SORT
     end
 
@@ -40,7 +44,7 @@ module Bible270
 
   private
 
-    attr_reader :readers, :completed_days, :sort
+    attr_reader :readers, :completed_days, :recent_activities, :sort
 
     def reader_sort_key(reader)
       case sort
@@ -51,11 +55,21 @@ module Bible270
         [last_name.to_s.downcase, reader.sort_name, reader.id]
       when 'least_completed'
         [completed_days[reader.id].to_i, reader.sort_name, reader.id]
+      when 'most_recent_activity'
+        activity_sort_key(reader, descending: true)
+      when 'least_recent_activity'
+        activity_sort_key(reader, descending: false)
       else
         [-completed_days[reader.id].to_i, reader.sort_name, reader.id]
       end
     end
 
+    def activity_sort_key(reader, descending:)
+      activity = recent_activities[reader.id]
+      timestamp = activity&.occurred_at&.to_f
+      [activity.nil? ? 1 : 0, descending && timestamp ? -timestamp : timestamp.to_f, reader.sort_name, reader.id]
+    end
+
     def status(reader, days_read)
       calendar_day = reader.calendar_day
       return 'undated' unless calendar_day

data/lib/bible270/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bible270
-  VERSION = '1.7.0'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Andrew vonderLuft