postrunner 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f97b4e5dfa4c8a6c9c8a4f9cab4132b2b19b1a
-  data.tar.gz: 54a3a63da33ff6520ba83b98c0b8b34d5a87fcf8
+  metadata.gz: 8175543b8737461af3bcc0e1430d0c7185d5502b
+  data.tar.gz: 2b5ede7abe4719de50d2a2f1d6879286744ede18
 SHA512:
-  metadata.gz: 37d9b100dd4a8f2038f03e184d1ca0906f68993a40f7aa1fe27ff85d30571371274376ebccb5960f3b4981533e1b5c0df13cf01aad863129b4b020a87bc9909c
-  data.tar.gz: 2196e339f331e5789984badbd969af6d08bedb9eaa126441be6dbac319339bee038c39c7c77c023d939519f8d0e04d593985eb5dbfbbcc8e3024c9f278bf5831
+  metadata.gz: 132301b28c06fa5514be5fe4f99f271eb0a1c8922db6d3dbd815cab8110d0896cf5791f6ff472e85e2f061bf4c0f28a6170f74136fb6a3229a212e5ea630965f
+  data.tar.gz: 537282d6b43f6874cbc1cc171bc426e1bb609df9a03b49104bbcd461aff62cf5b781f5ae62449b5930b029816d0f3b4d86e94d7b6acd71d3e965ea932e492854

data/lib/postrunner/ChartView.rb

@@ -30,7 +30,7 @@ module PostRunner
           :unit => select_unit('min/km'),
           :graph => :line_graph,
           :colors => '#0A7BEE',
-          :show => @sport == 'running' || @sport = 'multisport',
+          :show => @sport == 'running' || @sport == 'multisport',
         },
         {
           :id => 'speed',
@@ -63,7 +63,9 @@ module PostRunner
           :unit => 'ms',
           :graph => :line_graph,
           :colors => '#900000',
-          :show => @hrv_analyzer.has_hrv_data?
+          :show => @hrv_analyzer.has_hrv_data?,
+          :min_y => -30,
+          :max_y => 30
         },
         {
           :id => 'hrv_score',
@@ -327,7 +329,14 @@ EOT
              "           inverseTransform: function (v) { return -v; } }"
       else
         # Set the minimum slightly below the lowest found value.
-        s << ", yaxis: { min: #{0.9 * min_value} }" if min_value > 0.0
+        if min_value > 0.0 && !chart[:min_y]
+          s << ", yaxis: { min: #{0.9 * min_value} }"
+        end
+      end
+      if chart[:min_y]
+        s << ", yaxis: { #{chart[:min_y] ? "min: #{chart[:min_y]}" : '' } " +
+                        "#{chart[:min_y] && chart[:max_y] ? ', ' : ''}" +
+                        "#{chart[:max_y] ? "max: #{chart[:max_y]}" : '' } }"
       end
       s << "});\n"
       s << lap_mark_labels(chart_id, start_time)

data/lib/postrunner/DailyMonitoringAnalyzer.rb

@@ -231,6 +231,9 @@ module PostRunner
         end
       end
 
+      unless @window_start_time
+        raise RuntimeError, "No window start time set for day #{day}"
+      end
     end
 
   end

data/lib/postrunner/DailyMonitoringView.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = DailyMonitoringView.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2016 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby'
+
+require 'postrunner/View'
+require 'postrunner/MonitoringStatistics'
+
+module PostRunner
+
+  class DailyMonitoringView < View
+
+    attr_reader :file_name
+
+    def initialize(db, date, monitoring_files)
+      @db = db
+      @ffs = db['file_store']
+      views = @ffs.views
+      views.current_page = nil
+      @date = date
+      @monitoring_files = monitoring_files
+
+      @file_name = File.join(@db['config']['html_dir'], "#{date}.html")
+
+      pages = PagingButtons.new([ date ])
+      #pages.current_page = "#{date}.html"
+
+      super("PostRunner Daily Monitoring: #{date}", views, pages)
+      generate_html(@doc)
+      write(@file_name)
+    end
+
+    private
+
+    def generate_html(doc)
+      doc.unique(:dailymonitoringview_style) {
+        doc.head {
+          [ 'jquery/jquery-2.1.1.min.js', 'flot/jquery.flot.js',
+            'flot/jquery.flot.time.js' ].each do |js|
+            doc.script({ 'language' => 'javascript',
+                         'type' => 'text/javascript', 'src' => js })
+          end
+          doc.style(style)
+        }
+      }
+      #doc.meta({ 'name' => 'viewport',
+      #           'content' => 'width=device-width, ' +
+      #                        'initial-scale=1.0, maximum-scale=1.0, ' +
+      #                        'user-scalable=0' })
+
+      body {
+        doc.body {
+          doc.div({ :class => 'main' }) {
+            MonitoringStatistics.new(@monitoring_files).daily_html(@date, doc)
+          }
+        }
+      }
+    end
+
+    def style
+      <<EOT
+body {
+  font-family: verdana,arial,sans-serif;
+  margin: 0px;
+}
+.main {
+  width: 550px;
+  margin: 0 auto;
+}
+EOT
+    end
+
+  end
+
+end
+

data/lib/postrunner/DailySleepAnalyzer.rb

@@ -277,7 +277,13 @@ module PostRunner
 
     # During the nightly sleep the heart rate is alternating between a high
     # and a low frequency. The actual frequencies vary so that we need to look
-    # for the transitions to classify each sample as high or low.
+    # for the transitions to classify each sample as high or low. Research has
+    # shown that sleep cycles are roughly 90 minutes long. The early cycles
+    # have a lot more deep sleep (low HR) and less REM (high HR) while with
+    # every cycle the deep sleep phase shortens and the REM phase gets longer.
+    # We assume that a normalized half-phase is at least 25 minutes long and
+    # the weight shifts by 4 minutes towards the high HR (REM) phase with
+    # every phase.
     def categorize_sleep_heart_rate
       @sleep_heart_rate_classification = Array.new(TIME_WINDOW_MINUTES, nil)
 
@@ -301,10 +307,12 @@ module PostRunner
           if current_category == :high_hr
             if last_heart_rate > @heart_rate[i]
               # High/low transition found
-              current_category = :low_hr
-              transitions += 1
-              last_transition_delta = last_heart_rate - @heart_rate[i]
-              last_transition_index = i
+              if i - last_transition_index >= 25 - 2 * transitions
+                current_category = :low_hr
+                transitions += 1
+                last_transition_delta = last_heart_rate - @heart_rate[i]
+                last_transition_index = i
+              end
             elsif last_heart_rate < @heart_rate[i] &&
                   last_transition_delta < @heart_rate[i] - last_heart_rate
               # The previously found high segment was wrongly categorized as
@@ -320,10 +328,12 @@ module PostRunner
           else
             if last_heart_rate < @heart_rate[i]
               # Low/High transition found.
-              current_category = :high_hr
-              transitions += 1
-              last_transition_delta = @heart_rate[i] - last_heart_rate
-              last_transition_index = i
+              if i - last_transition_index >= 25 + 2 * transitions
+                current_category = :high_hr
+                transitions += 1
+                last_transition_delta = @heart_rate[i] - last_heart_rate
+                last_transition_index = i
+              end
             elsif last_heart_rate > @heart_rate[i] &&
                   last_transition_delta < last_heart_rate - @heart_rate[i]
               # The previously found low segment was wrongly categorized as

data/lib/postrunner/FitFileStore.rb

@@ -17,6 +17,7 @@ require 'postrunner/Log'
 require 'postrunner/DirUtils'
 require 'postrunner/FFS_Device'
 require 'postrunner/ActivityListView'
+require 'postrunner/DailyMonitoringView'
 require 'postrunner/ViewButtons'
 require 'postrunner/MonitoringStatistics'
 
@@ -336,7 +337,26 @@ module PostRunner
       end
     end
 
+    def show_monitoring(day)
+      # 'day' specifies the current day. But we don't know what timezone the
+      # watch was set to for a given date. The files are always named after
+      # the moment of finishing the recording expressed as GMT time.
+      # Each file contains information about the time zone for the specific
+      # file. Recording is always flipped to a new file at midnight GMT but
+      # there are usually multiple files per GMT day.
+      day_as_time = Time.parse(day).gmtime
+      # To get weekly intensity minutes we need 7 days of data prior to the
+      # current date and 1 day after to include the following night. We add
+      # at least 12 extra hours to accomodate time zone changes.
+      monitoring_files = monitorings(day_as_time - 8 * 24 * 60 * 60,
+                                     day_as_time + 36 * 60 * 60)
+
+      show_in_browser(DailyMonitoringView.new(@store, day, monitoring_files).
+                      file_name)
+    end
+
     def daily_report(day)
+      monitoring_files = gather_monitoring_files(day)
       # 'day' specifies the current day. But we don't know what timezone the
       # watch was set to for a given date. The files are always named after
       # the moment of finishing the recording expressed as GMT time.
@@ -353,8 +373,28 @@ module PostRunner
       puts MonitoringStatistics.new(monitoring_files).daily(day)
     end
 
+    def weekly_report(day)
+      # 'day' specifies the current week. It must be in the form of
+      # YYYY-MM-DD and references a day in the specific week. But we don't
+      # know what timezone the watch was set to for a given date. The files
+      # are always named after the moment of finishing the recording expressed
+      # as GMT time.  Each file contains information about the time zone for
+      # the specific file. Recording is always flipped to a new file at
+      # midnight GMT but there are usually multiple files per
+      # GMT day.
+      day_as_time = Time.parse(day).gmtime
+      start_day = day_as_time -
+        (24 * 60 * 60 * (day_as_time.wday - @store['config']['week_start_day']))
+      # To get weekly intensity minutes we need 7 days of data prior to the
+      # current month start and 1 after to include the following night. We add
+      # at least 12 extra hours to accomondate time zone changes.
+      monitoring_files = monitorings(start_day - 8 * 24 * 60 * 60,
+                                     start_day + 8 * 24 * 60 * 60)
+
+      puts MonitoringStatistics.new(monitoring_files).weekly(start_day)
+    end
+
     def monthly_report(day)
-      monitorings = []
       # 'day' specifies the current month. It must be in the form of
       # YYYY-MM-01. But we don't know what timezone the watch was set to for a
       # given date. The files are always named after the moment of finishing

data/lib/postrunner/Main.rb

@@ -13,6 +13,7 @@
 require 'optparse'
 require 'fit4ruby'
 require 'perobs'
+require 'fileutils'
 
 require 'postrunner/version'
 require 'postrunner/Log'
@@ -54,12 +55,16 @@ module PostRunner
 
       begin
         create_directory(@db_dir, 'PostRunner data')
-        @db = PEROBS::Store.new(File.join(@db_dir, 'database'))
+        ensure_flat_file_db
+        @db = PEROBS::Store.new(File.join(@db_dir, 'database'),
+                                { :engine => PEROBS::FlatFileDB })
         # Create a hash to store configuration data in the store unless it
         # exists already.
         cfg = (@db['config'] ||= @db.new(PEROBS::Hash))
         cfg['unit_system'] ||= :metric
         cfg['version'] ||= VERSION
+        # First day of the week. 0 means Sunday, 1 Monday and so on.
+        cfg['week_start_day'] ||= 1
         # We always override the data_dir as the user might have moved the data
         # directory. The only reason we store it in the DB is to have it
         # available throught the application.
@@ -69,7 +74,10 @@ module PostRunner
         cfg['html_dir'] = File.join(@db_dir, 'html')
 
         setup_directories
-        return execute_command(args)
+        retval = execute_command(args)
+        @db.exit
+
+        return retval
 
       rescue Exception => e
         if e.is_a?(SystemExit) || e.is_a?(Interrupt)
@@ -215,9 +223,10 @@ set <attribute> <value> <ref>
            type:     The type of the activity
            subtype:  The subtype of the activity
 
-show [ <ref> ]
-           Show the referenced FIT activity in a web browser. If no reference
-           is provided show the list of activities in the database.
+show [ <ref> | <YYYY-MM-DD> ]
+           Show the referenced FIT activity or monitoring data for the given
+           date in a web browser. If no argument is provided show the list of
+           activities in the database.
 
 sources [ <ref> ]
            Show the data sources for the various measurements and how they
@@ -235,6 +244,11 @@ htmldir <directory>
 update-gps Download the current set of GPS Extended Prediction Orbit (EPO)
            data and store them on the device.
 
+weekly [ <YYYY-MM-DD> ]
+
+           Print a table with various statistics for each day of the specified
+           week. If no date is given, yesterday's week will be used.
+
 
 <fit file> An absolute or relative name of a .FIT file.
 
@@ -307,6 +321,10 @@ EOT
         # Get the date of requested day in 'YY-MM-DD' format. If no argument
         # is given, use the current date.
         @ffs.daily_report(day_in_localtime(args, '%Y-%m-%d'))
+      when 'weekly'
+        # Get the date of requested day in 'YY-MM-DD' format. If no argument
+        # is given, use the current date.
+        @ffs.weekly_report(day_in_localtime(args, '%Y-%m-%d'))
       when 'monthly'
         # Get the date of requested day in 'YY-MM-DD' format. If no argument
         # is given, use the current date.
@@ -351,6 +369,10 @@ EOT
       when 'show'
         if args.empty?
           @ffs.show_list_in_browser
+        elsif args[0] =~ /\A2\d{3}-\d{2}-\d{2}\z/
+          # Likely a valid YYYY-MM-DD date. Show the monitoring data for the
+          # given day in a browser.
+          @ffs.show_monitoring(args[0])
         else
           process_activities(args, :show)
         end
@@ -603,6 +625,33 @@ EOT
       end
     end
 
+    def ensure_flat_file_db
+      # Earlier versions of the PEROBS library used the BTreeDB as standard
+      # database format. With the introduction of FlatFileDB a much more
+      # compact and faster alternative is available now. Check existing
+      # installations and convert the database if needed.
+      database_dir = File.join(@db_dir, 'database')
+      return unless Dir.exist?(File.join(database_dir, '000'))
+
+      Log.info "Converting BTreeDB based database to FlatFileDB format"
+      db = PEROBS::Store.new(database_dir)
+      if Dir.exist?(database_dir + '-new')
+        # This may be a leftover from a failed conversion.
+        FileUtils.rm_rf(database_dir + '-new')
+      end
+      db.copy(database_dir + '-new', { :engine => PEROBS::FlatFileDB })
+      db.exit
+
+      FileUtils.mv(database_dir, database_dir + '-old')
+      FileUtils.mv(database_dir + '-new', database_dir)
+
+      db = PEROBS::Store.new(database_dir, { :engine => PEROBS::FlatFileDB })
+      db.check
+      db.exit
+      # TODO: Delete -old directory in some later version when we have some
+      # confidence that the conversion always works.
+      Log.info "DB conversion completed successfully"
+    end
   end
 
 end

data/lib/postrunner/MonitoringStatistics.rb

@@ -55,6 +55,39 @@ module PostRunner
       str
     end
 
+    # Generate a report for a certain day.
+    # @param day [String] Date of the day as YYYY-MM-DD string.
+    def daily_html(day, doc)
+      sleep_analyzer = DailySleepAnalyzer.new(@monitoring_files, day,
+                                              +12 * 60 * 60)
+      monitoring_analyzer = DailyMonitoringAnalyzer.new(@monitoring_files, day)
+
+      doc.div {
+        doc.h2("Daily Monitoring Report for #{day}")
+        daily_goals_table(monitoring_analyzer).to_html(doc)
+        doc.br
+        daily_stats_table(monitoring_analyzer, sleep_analyzer).to_html(doc)
+
+        if sleep_analyzer.sleep_cycles.empty?
+          doc.h3('No sleep data available for this day')
+        else
+          doc.h2("Sleep Statistics for " +
+                 "#{sleep_analyzer.window_start_time.strftime('%Y-%m-%d')} - " +
+                 "#{sleep_analyzer.window_end_time.strftime('%Y-%m-%d')}")
+          daily_sleep_cycle_table(sleep_analyzer).to_html(doc)
+        end
+      }
+    end
+
+    # Generate a report for a certain week.
+    # @param day [String] Date of a day in that week as YYYY-MM-DD string.
+    def weekly(start_day)
+      "Monitoring Statistics for the week of " +
+        "#{start_day.strftime('%Y-%m-%d')}\n\n" +
+        weekly_goal_table(start_day).to_s + "\n" +
+        weekly_sleep_table(start_day).to_s
+    end
+
     # Generate a report for a certain month.
     # @param day [String] Date of a day in that months as YYYY-MM-DD string.
     def monthly(day)
@@ -193,6 +226,100 @@ module PostRunner
       t
     end
 
+    def weekly_goal_table(start_day)
+      t = FlexiTable.new
+      left = { :halign => :left }
+      right = { :halign => :right }
+      t.set_column_attributes([ left ] + [ right ] * 10)
+      t.head
+      t.row([ 'Day', 'Steps', '% of', 'Goal', 'Intens.', '% of',
+              'Floors', '% of', 'Floors', 'Dist.', 'Cals.' ])
+      t.row([ '', '', 'Goal', 'Steps', 'Minutes', '150', 'clmbd.', '10',
+              'descd.', 'm', 'kCal' ])
+      t.body
+      totals = Hash.new(0)
+      counted_days = 0
+      intensity_minutes_sum = 0
+      0.upto(7) do |dow|
+        break if (time = start_day + 24 * 60 * 60 * dow) > Time.now
+
+        day_str = time.strftime('%a')
+        t.cell(day_str)
+
+        analyzer = DailyMonitoringAnalyzer.new(@monitoring_files,
+                                               time.strftime('%Y-%m-%d'))
+
+        steps_distance_calories = analyzer.steps_distance_calories
+        steps = steps_distance_calories[:steps]
+        totals[:steps] += steps
+        steps_goal = analyzer.steps_goal
+        totals[:steps_goal] += steps_goal
+        t.cell(steps)
+        t.cell(percent(steps, steps_goal))
+        t.cell(steps_goal)
+
+        intensity_minutes =
+          analyzer.intensity_minutes[:moderate_minutes] +
+          2 * analyzer.intensity_minutes[:vigorous_minutes]
+        intensity_minutes_sum += intensity_minutes
+        totals[:intensity_minutes] += intensity_minutes
+        t.cell(intensity_minutes.to_i)
+        t.cell(percent(intensity_minutes_sum, 150))
+
+        floors = analyzer.total_floors
+        floors_climbed = floors[:floors_climbed]
+        totals[:floors_climbed] += floors_climbed
+        t.cell(floors_climbed)
+        t.cell(percent(floors_climbed, 10))
+
+        floors_descended = floors[:floors_descended]
+        totals[:floors_descended] += floors_descended
+        t.cell(floors_descended)
+
+
+        distance = steps_distance_calories[:distance]
+        totals[:distance] += distance
+        t.cell(distance.to_i)
+
+        calories = steps_distance_calories[:calories]
+        totals[:calories] += calories
+        t.cell(calories.to_i)
+
+        t.new_row
+        counted_days += 1
+      end
+
+      t.foot
+      t.cell('Totals')
+      t.cell(totals[:steps])
+      t.cell('')
+      t.cell(totals[:steps_goal])
+      t.cell(totals[:intensity_minutes].to_i)
+      t.cell('')
+      t.cell(totals[:floors_climbed])
+      t.cell('')
+      t.cell(totals[:floors_descended])
+      t.cell(totals[:distance].to_i)
+      t.cell(totals[:calories].to_i)
+      t.new_row
+
+      if counted_days > 0
+        t.cell('Averages')
+        t.cell((totals[:steps] / counted_days).to_i)
+        t.cell(percent(totals[:steps], totals[:steps_goal]))
+        t.cell((totals[:steps_goal] / counted_days).to_i)
+        t.cell((totals[:intensity_minutes] / counted_days).to_i)
+        t.cell(percent(totals[:intensity_minutes], (counted_days / 7.0) * 150))
+        t.cell((totals[:floors_climbed] / counted_days).to_i)
+        t.cell(percent(totals[:floors_climbed] / counted_days, 10))
+        t.cell((totals[:floors_descended] / counted_days).to_i)
+        t.cell('%.0f' % (totals[:distance] / counted_days))
+        t.cell((totals[:calories] / counted_days).to_i)
+      end
+
+      t
+    end
+
     def monthly_goal_table(year, month, last_day_of_month)
       t = FlexiTable.new
       left = { :halign => :left }
@@ -202,7 +329,7 @@ module PostRunner
       t.row([ 'Day', 'Steps', '% of', 'Goal', 'Wk. Int.', '% of',
               'Floors', '% of', 'Floors', 'Dist.', 'Cals.' ])
       t.row([ '', '', 'Goal', 'Steps', 'Minutes', '150', 'clmbd.', '10',
-              'descd.', 'km', 'kCal' ])
+              'descd.', 'm', 'kCal' ])
       t.body
       totals = Hash.new(0)
       counted_days = 0
@@ -213,7 +340,8 @@ module PostRunner
         day_str = time.strftime('%d %a')
         t.cell(day_str)
 
-        analyzer = DailyMonitoringAnalyzer.new(@monitoring_files, day_str)
+        analyzer = DailyMonitoringAnalyzer.new(@monitoring_files,
+                                               "#{year}-#{month}-#{dom}")
 
         steps_distance_calories = analyzer.steps_distance_calories
         steps = steps_distance_calories[:steps]
@@ -282,7 +410,7 @@ module PostRunner
         t.cell((totals[:intensity_minutes] / counted_days).to_i)
         t.cell(percent(totals[:intensity_minutes], (counted_days / 7.0) * 150))
         t.cell((totals[:floors_climbed] / counted_days).to_i)
-        t.cell(percent(totals[:floors] / counted_days, 10))
+        t.cell(percent(totals[:floors_climbed] / counted_days, 10))
         t.cell((totals[:floors_descended] / counted_days).to_i)
         t.cell('%.0f' % (totals[:distance] / counted_days))
         t.cell((totals[:calories] / counted_days).to_i)
@@ -291,6 +419,76 @@ module PostRunner
       t
     end
 
+    def weekly_sleep_table(start_day)
+      t = FlexiTable.new
+      left = { :halign => :left }
+      right = { :halign => :right }
+      t.set_column_attributes([ left ] + [ right ] * 6)
+      t.head
+      t.row([ 'Date', 'Total Sleep', 'Cycles', 'REM Sleep', 'Light Sleep',
+              'Deep Sleep', 'RHR' ])
+      t.body
+      totals = Hash.new(0)
+      counted_days = 0
+      rhr_days = 0
+
+      0.upto(7) do |dow|
+        break if (time = start_day + 24 * 60 * 60 * dow) > Time.now
+
+        day_str = time.strftime('%a')
+        t.cell(day_str)
+
+        analyzer = DailySleepAnalyzer.new(@monitoring_files,
+                                          time.strftime('%Y-%m-%d'),
+                                          -12 * 60 * 60)
+
+        if (analyzer.sleep_cycles.empty?)
+          5.times { t.cell('-') }
+        else
+          totals[:total_sleep] += analyzer.total_sleep
+          totals[:cycles] += analyzer.sleep_cycles.length
+          totals[:rem_sleep] += analyzer.rem_sleep
+          totals[:light_sleep] += analyzer.light_sleep
+          totals[:deep_sleep] += analyzer.deep_sleep
+          counted_days += 1
+
+          t.cell(secsToHM(analyzer.total_sleep))
+          t.cell(analyzer.sleep_cycles.length)
+          t.cell(secsToHM(analyzer.rem_sleep))
+          t.cell(secsToHM(analyzer.light_sleep))
+          t.cell(secsToHM(analyzer.deep_sleep))
+        end
+
+        if (rhr = analyzer.resting_heart_rate) && rhr > 0
+          t.cell(rhr)
+          totals[:rhr] += rhr
+          rhr_days += 1
+        else
+          t.cell('-')
+        end
+        t.new_row
+      end
+      t.foot
+      t.cell('Averages')
+      if counted_days > 0
+        t.cell(secsToHM(totals[:total_sleep] / counted_days))
+        t.cell('%.1f' % (totals[:cycles].to_f / counted_days))
+        t.cell(secsToHM(totals[:rem_sleep] / counted_days))
+        t.cell(secsToHM(totals[:light_sleep] / counted_days))
+        t.cell(secsToHM(totals[:deep_sleep] / counted_days))
+      else
+        5.times { t.cell('-') }
+      end
+      if rhr_days > 0
+        t.cell('%.0f' % (totals[:rhr] / rhr_days))
+      else
+        t.cell('-')
+      end
+      t.new_row
+
+      t
+    end
+
     def monthly_sleep_table(year, month, last_day_of_month)
       t = FlexiTable.new
       left = { :halign => :left }
@@ -310,7 +508,8 @@ module PostRunner
         day_str = time.strftime('%d %a')
         t.cell(day_str)
 
-        analyzer = DailySleepAnalyzer.new(@monitoring_files, day_str,
+        analyzer = DailySleepAnalyzer.new(@monitoring_files,
+                                          "#{year}-#{month}-#{dom}",
                                           -12 * 60 * 60)
 
         if (analyzer.sleep_cycles.empty?)
@@ -343,7 +542,7 @@ module PostRunner
       t.cell('Averages')
       if counted_days > 0
         t.cell(secsToHM(totals[:total_sleep] / counted_days))
-        t.cell('%.1f' % (totals[:cycles] / counted_days))
+        t.cell('%.1f' % (totals[:cycles].to_f / counted_days))
         t.cell(secsToHM(totals[:rem_sleep] / counted_days))
         t.cell(secsToHM(totals[:light_sleep] / counted_days))
         t.cell(secsToHM(totals[:deep_sleep] / counted_days))

data/lib/postrunner/TrackView.rb

@@ -33,22 +33,26 @@ module PostRunner
     def to_html(doc)
       return unless @has_geo_data
 
+      doc.body_init_script('pr_trackview_init_xy();')
+
       doc.head {
         doc.unique(:trackview_style) {
           doc.style(style)
           doc.link({ 'rel' => 'stylesheet',
                      'href' => 'openlayers/ol.css',
                      'type' => 'text/css' })
-          doc.script({ 'src' => 'openlayers/ol.js' })
-          doc.script({ 'src' => 'postrunner/trackview.js' })
+          doc.script({ 'language' => 'javascript', 'type' => 'text/javascript',
+                       'src' => 'openlayers/ol.js' })
+          doc.script({ 'language' => 'javascript', 'type' => 'text/javascript',
+                       'src' => 'postrunner/trackview.js' })
         }
         doc.script(java_script)
-        doc.body_init_script('pr_trackview_init_xy()')
       }
 
       ViewFrame.new('map', 'Map', 600, nil, true) {
         doc.div({ 'id' => 'map', 'class' => 'trackmap' })
       }.to_html(doc)
+
     end
 
     private

data/lib/postrunner/ViewFrame.rb

@@ -40,7 +40,8 @@ module PostRunner
         # Add the necessary style sheet snippets to the document head.
         doc.head {
           doc.style(style)
-          doc.script({ 'src' => 'postrunner/postrunner.js' })
+          doc.script({ 'language' => 'javascript', 'type' => 'text/javascript',
+                       'src' => 'postrunner/postrunner.js' })
         }
       }
       doc.head {

data/lib/postrunner/version.rb

@@ -11,5 +11,5 @@
 #
 
 module PostRunner
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/misc/postrunner/postrunner.js

@@ -0,0 +1,34 @@
+function createCookie(name,value,days) {
+  if (days) {
+    var date = new Date();
+    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+    var expires = "; expires=" + date.toGMTString();
+  }
+  else {
+    var expires = "";
+  }
+  document.cookie = name+"="+value+expires+"; path=/";
+}
+
+function readCookie(name) {
+  var nameEQ = name + "=";
+  var ca = document.cookie.split(';');
+  for (var i = 0; i < ca.length; i++) {
+    var c = ca[i];
+    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+    if (c.indexOf(nameEQ) == 0) {
+      return c.substring(nameEQ.length,c.length);
+    }
+  }
+  return null;
+}
+
+var pr_view_frame_toggle = function(checkbox, target_id) {
+  var cookie_name = "postrunner_checkbox_" + target_id;
+  createCookie(cookie_name, checkbox.checked);
+  if (checkbox.checked) {
+    $(target_id).show();
+  } else {
+    $(target_id).hide();
+  };
+};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postrunner
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fit4ruby
@@ -141,6 +141,7 @@ files:
 - lib/postrunner/BackedUpFile.rb
 - lib/postrunner/ChartView.rb
 - lib/postrunner/DailyMonitoringAnalyzer.rb
+- lib/postrunner/DailyMonitoringView.rb
 - lib/postrunner/DailySleepAnalyzer.rb
 - lib/postrunner/DataSources.rb
 - lib/postrunner/DeviceList.rb
@@ -305,6 +306,7 @@ files:
 - misc/jquery/jquery-2.1.1.min.js
 - misc/openlayers/ol.css
 - misc/openlayers/ol.js
+- misc/postrunner/postrunner.js
 - misc/postrunner/trackview.js
 - postrunner.gemspec
 - spec/ActivitySummary_spec.rb