New: Include recovery info in activity summary

2 files changed, 17 insertions, 8 deletions

diff --git a/lib/postrunner/ActivitySummary.rb b/lib/postrunner/ActivitySummary.rb
index bf13fb7..c9234ac 100644
--- a/lib/postrunner/ActivitySummary.rb
+++ b/lib/postrunner/ActivitySummary.rb
@@ -79,8 +79,6 @@ module PostRunner
               "#{session.avg_heart_rate} bpm" : '-' ])
       t.row([ 'Max. HR:', session.max_heart_rate ?
               "#{session.max_heart_rate} bpm" : '-' ])
-      t.row([ 'Training Effect:', session.total_training_effect ?
-              session.total_training_effect : '-' ])
       t.row([ 'Avg. Run Cadence:',
               session.avg_running_cadence ?
               "#{(2 * session.avg_running_cadence).round} spm" : '-' ])
@@ -93,13 +91,24 @@ module PostRunner
       t.row([ 'Avg. Stride Length:',
               local_value(session, 'avg_stride_length', '%.2f %s',
                           { :metric => 'm', :statute => 'ft' }) ])
+
+      t.row([ 'Training Effect:', session.total_training_effect ?
+              session.total_training_effect : '-' ])
+
+      rec_info = @fit_activity.recovery_info
+      t.row([ 'Ignored Recovery Time:',
+              rec_info ? secsToDHMS(rec_info * 60) : '-' ])
+
       rec_hr = @fit_activity.recovery_hr
       end_hr = @fit_activity.ending_hr
       t.row([ 'Recovery HR:',
               rec_hr && end_hr ?
               "#{rec_hr} bpm [#{end_hr - rec_hr} bpm]" : '-' ])
+
       rec_time = @fit_activity.recovery_time
-      t.row([ 'Recovery Time:', rec_time ? secsToHMS(rec_time * 60) : '-' ])
+      t.row([ 'Suggested Recovery Time:',
+              rec_time ? secsToDHMS(rec_time * 60) : '-' ])
+
       vo2max = @fit_activity.vo2max
       t.row([ 'VO2max:', vo2max ? vo2max : '-' ])
 
diff --git a/lib/postrunner/EventList.rb b/lib/postrunner/EventList.rb
index d248001..0a1d662 100644
--- a/lib/postrunner/EventList.rb
+++ b/lib/postrunner/EventList.rb
@@ -81,13 +81,13 @@ module PostRunner
         value = event.message_index
       when 'battery'
         name = 'Battery Level'
-        value = event.battery_level
+        value = "#{event.battery_level} V"
       when 'hr_high_alert'
         name = 'HR high alert'
-        value = event.hr_high_alert
+        value = "#{event.hr_high_alert} bpm"
       when 'hr_low_alert'
         name = 'HR low alert'
-        value = event.hr_low_alert
+        value = "#{event.hr_low_alert} bpm"
       when 'speed_high_alert'
         name = 'Speed high alert'
         value = event.speed_high_alert
@@ -96,10 +96,10 @@ module PostRunner
         value = event.speed_low_alert
       when 'cad_high_alert'
         name = 'Cadence high alert'
-        value = event.cad_high_alert
+        value = "#{event.cad_high_alert} spm"
       when 'cad_low_alert'
         name = 'Cadence low alert'
-        value = event.cad_low_alert
+        value = "#{event.cad_low_alert} spm"
       when 'power_high_alert'
         name = 'Power high alert'
         value = event.power_high_alert