postrunner 0.0.6 → 0.0.7

data/lib/postrunner/ActivityLink.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = ActivityLink.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2014, 2015 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 'postrunner/HTMLBuilder'
+
+module PostRunner
+
+  # Generates the name of an Activity with a link to the ActivityReport.
+  # Optionally, an icon can be shown for Activities that contain a current
+  # personal record.
+  class ActivityLink
+
+    def initialize(activity, show_record_icon = false)
+      @activity = activity
+      @show_record_icon = show_record_icon
+    end
+
+    # Add the ActivityLink as HTML Elements to the document.
+    # @param doc [HTMLBuilder] XML Document
+    def to_html(doc)
+      doc.unique(:activitylink_style) { doc.style(style) }
+
+      doc.a(@activity.name, { :class => 'activity_link',
+                              :href => @activity.fit_file[0..-5] + '.html' })
+      if @show_record_icon && @activity.has_records?
+        doc.img(nil, { :src => 'icons/record-small.png',
+                       :style => 'vertical-align:middle' })
+      end
+    end
+
+    # Convert the ActivityLink into a plain text form. Return the first 20
+    # characters of the Activity name.
+    def to_s
+      @activity.name[0..19]
+    end
+
+    private
+
+    def style
+      <<EOT
+.activity_link {
+  padding: 0px 3px 0px 3px;
+}
+EOT
+    end
+
+  end
+
+end
+

data/lib/postrunner/ActivityListView.rb

@@ -14,31 +14,15 @@ require 'fit4ruby'
 
 require 'postrunner/FlexiTable'
 require 'postrunner/HTMLBuilder'
-require 'postrunner/ViewWidgets'
+require 'postrunner/ActivityLink'
 
 module PostRunner
 
+  # Generates a paged list of all Activity objects in the database. HTML and
+  # plain text output are supported.
   class ActivityListView
 
-    class ActivityLink
-
-      def initialize(activity)
-        @activity = activity
-      end
-
-      def to_html(doc)
-        doc.a(@activity.name, { :class => 'activity_link',
-                                :href => @activity.fit_file[0..-5] + '.html' })
-      end
-
-      def to_s
-        @activity.name[0..19]
-      end
-
-    end
-
     include Fit4Ruby::Converters
-    include ViewWidgets
 
     def initialize(db)
       @db = db
@@ -48,85 +32,42 @@ module PostRunner
       @last_page = (@db.activities.length - 1) / @page_size
     end
 
-    def update_html_index
+    def update_index_pages
       0.upto(@last_page) do |page_no|
         @page_no = page_no
-        generate_html_index_page
+        generate_html_index_page(page_no)
       end
     end
 
-    def to_html(doc)
-      generate_table.to_html(doc)
-    end
-
     def to_s
       generate_table.to_s
     end
 
     private
 
-    def generate_html_index_page
-      doc = HTMLBuilder.new
+    def generate_html_index_page(page_index)
+      views = @db.views
+      views.current_page = 'index.html'
 
-      doc.html {
-        head(doc)
-        body(doc)
-      }
-
-      write_file(doc)
-    end
+      pages = PagingButtons.new((0..@last_page).map do |i|
+        "index#{i == 0 ? '' : "-#{i}"}.html"
+      end)
+      pages.current_page =
+        "index#{page_index == 0 ? '' : "-#{page_index}"}.html"
+      @view = View.new("PostRunner Activities", views, pages)
 
-    def head(doc)
-      doc.head {
-        doc.meta({ 'http-equiv' => 'Content-Type',
-                   'content' => 'text/html; charset=utf-8' })
-        doc.title("PostRunner Activities")
-        style(doc)
-      }
-    end
+      @view.doc.head { @view.doc.style(style) }
+      body(@view.doc)
 
-    def style(doc)
-      view_widgets_style(doc)
-      doc.style(<<EOT
-body {
-  font-family: verdana,arial,sans-serif;
-  margin: 0px;
-}
-.main {
-  text-align: center;
-}
-.widget_frame {
-  width: 900px;
-}
-.activity_link {
-  padding: 0px 3px 0px 3px;
-}
-.ft_cell {
-  height: 30px
-}
-EOT
-               )
+      output_file = File.join(@db.cfg[:html_dir], pages.current_page)
+      @view.write(output_file)
     end
 
     def body(doc)
-      doc.body {
-        first_page = @page_no == 0 ? nil: 'index.html'
-        prev_page = @page_no == 0 ? nil :
-                    @page_no == 1 ? 'index.html' :
-                                    "index#{@page_no - 1}.html"
-        prev_page = @page_no == 0 ? nil :
-                    @page_no == 1 ? 'index.html' :
-                                    "index#{@page_no - 1}.html"
-        next_page = @page_no < @last_page ? "index#{@page_no + 1}.html" : nil
-        last_page = @page_no == @last_page ? nil : "index#{@last_page}.html"
-        titlebar(doc, first_page, prev_page, nil, next_page, last_page)
-
+      @view.body {
         doc.div({ :class => 'main' }) {
-          frame(doc, 'Activities') {
-            generate_table.to_html(doc)
-          }
+          ViewFrame.new('Activities', 900, generate_table).to_html(doc)
         }
-        footer(doc)
       }
     end
 
@@ -134,11 +75,11 @@ EOT
       i = @page_no < 0 ? 0 : @page_no * @page_size
       t = FlexiTable.new
       t.head
-      t.row(%w( Ref. Activity Start Distance Duration Speed/Pace ),
+      t.row(%w( Ref. Activity Type Start Distance Duration Speed/Pace ),
             { :halign => :left })
       t.set_column_attributes([
         { :halign => :right },
-        {}, {},
+        {}, {}, {},
         { :halign => :right },
         { :halign => :right },
         { :halign => :right }
@@ -150,7 +91,8 @@ EOT
       activities.each do |a|
         t.row([
           i += 1,
-          ActivityLink.new(a),
+          ActivityLink.new(a, true),
+          a.activity_type,
           a.timestamp.strftime("%a, %Y %b %d %H:%M"),
           local_value(a.total_distance, 'm', '%.2f',
                       { :metric => 'km', :statute => 'mi' }),
@@ -163,14 +105,19 @@ EOT
       t
     end
 
-    def write_file(doc)
-      output_file = File.join(@db.html_dir,
-                              "index#{@page_no == 0 ? '' : @page_no}.html")
-      begin
-        File.write(output_file, doc.to_html)
-      rescue IOError
-        Log.fatal "Cannot write activity index file '#{output_file}: #{$!}"
-      end
+    def style
+      <<EOT
+body {
+  font-family: verdana,arial,sans-serif;
+  margin: 0px;
+}
+.main {
+  text-align: center;
+}
+.ft_cell {
+  height: 30px
+}
+EOT
     end
 
     def local_value(value, from_unit, format, units)

data/lib/postrunner/ActivitySummary.rb

@@ -13,18 +13,19 @@
 require 'fit4ruby'
 
 require 'postrunner/FlexiTable'
-require 'postrunner/ViewWidgets'
+require 'postrunner/ViewFrame'
 
 module PostRunner
 
   class ActivitySummary
 
     include Fit4Ruby::Converters
-    include ViewWidgets
 
-    def initialize(fit_activity, name, unit_system)
+    def initialize(fit_activity, unit_system, custom_fields)
       @fit_activity = fit_activity
-      @name = name
+      @name = custom_fields[:name]
+      @type = custom_fields[:type]
+      @sub_type = custom_fields[:sub_type]
       @unit_system = unit_system
     end
 
@@ -33,12 +34,9 @@ module PostRunner
     end
 
     def to_html(doc)
-      frame(doc, "Activity: #{@name}") {
-        summary.to_html(doc)
-      }
-      frame(doc, 'Laps') {
-        laps.to_html(doc)
-      }
+      width = 600
+      ViewFrame.new("Activity: #{@name}", width, summary).to_html(doc)
+      ViewFrame.new('Laps', width, laps).to_html(doc)
     end
 
     private
@@ -49,7 +47,9 @@ module PostRunner
       t = FlexiTable.new
       t.enable_frame(false)
       t.body
-      t.row([ 'Date:', session.timestamp])
+      t.row([ 'Type:', @type ])
+      t.row([ 'Sub Type:', @sub_type ])
+      t.row([ 'Date:', session.timestamp ])
       t.row([ 'Distance:',
               local_value(session, 'total_distance', '%.2f %s',
                           { :metric => 'km', :statute => 'mi'}) ])
@@ -76,7 +76,7 @@ module PostRunner
               session.total_training_effect : '-' ])
       t.row([ 'Avg. Run Cadence:',
               session.avg_running_cadence ?
-              "#{session.avg_running_cadence.round} spm" : '-' ])
+              "#{(2 * session.avg_running_cadence).round} spm" : '-' ])
       t.row([ 'Avg. Vertical Oscillation:',
               local_value(session, 'avg_vertical_oscillation', '%.1f %s',
                           { :metric => 'cm', :statute => 'in' }) ])

data/lib/postrunner/ActivityView.rb

@@ -3,7 +3,7 @@
 #
 # = ActivityView.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015 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
@@ -12,67 +12,75 @@
 
 require 'fit4ruby'
 
-require 'postrunner/HTMLBuilder'
+require 'postrunner/View'
 require 'postrunner/ActivitySummary'
 require 'postrunner/DeviceList'
 require 'postrunner/UserProfileView'
-require 'postrunner/ViewWidgets'
 require 'postrunner/TrackView'
 require 'postrunner/ChartView'
 
 module PostRunner
 
-  class ActivityView
+  class ActivityView < View
 
-    include ViewWidgets
-
-    def initialize(activity, unit_system, predecessor, successor)
+    def initialize(activity, unit_system)
       @activity = activity
+      db = @activity.db
       @unit_system = unit_system
-      @predecessor = predecessor
-      @successor = successor
-      @output_dir = activity.html_dir
-      @output_file = nil
 
-      @doc = HTMLBuilder.new
+      views = db.views
+      views.current_page = nil
+
+      # Sort activities in reverse order so the newest one is considered the
+      # last report by the pagin buttons.
+      activities = db.activities.sort do |a1, a2|
+        a1.timestamp <=> a2.timestamp
+      end
+
+      pages = PagingButtons.new(activities.map do |a|
+        "#{a.fit_file[0..-5]}.html"
+      end, false)
+      pages.current_page = "#{@activity.fit_file[0..-5]}.html"
+
+      super("PostRunner Activity: #{@activity.name}", views, pages)
       generate_html(@doc)
-      write_file
+      write(File.join(db.cfg[:html_dir], pages.current_page))
     end
 
     private
 
     def generate_html(doc)
-      @report = ActivitySummary.new(@activity.fit_activity, @activity.name,
-                                    @unit_system)
-      @device_list = DeviceList.new(@activity.fit_activity)
-      @user_profile = UserProfileView.new(@activity.fit_activity, @unit_system)
-      @track_view = TrackView.new(@activity)
-      @chart_view = ChartView.new(@activity, @unit_system)
-
-      doc.html {
-        head(doc)
-        body(doc)
-      }
-    end
-
-    def head(doc)
-      doc.head {
-        doc.meta({ 'http-equiv' => 'Content-Type',
-                   'content' => 'text/html; charset=utf-8' })
-        doc.meta({ 'name' => 'viewport',
-                   'content' => 'width=device-width, ' +
-                                'initial-scale=1.0, maximum-scale=1.0, ' +
-                                'user-scalable=0' })
-        doc.title("PostRunner Activity: #{@activity.name}")
-        view_widgets_style(doc)
-        @chart_view.head(doc)
-        @track_view.head(doc)
-        style(doc)
+      doc.head { 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({ :onload => 'init()' }) {
+          # The main area with the 2 column layout.
+          doc.div({ :class => 'main' }) {
+            doc.div({ :class => 'left_col' }) {
+              ActivitySummary.new(@activity.fit_activity, @unit_system,
+                                  { :name => @activity.name,
+                                    :type => @activity.activity_type,
+                                    :sub_type => @activity.activity_sub_type
+                                  }).to_html(doc)
+              TrackView.new(@activity).to_html(doc)
+              DeviceList.new(@activity.fit_activity).to_html(doc)
+              UserProfileView.new(@activity.fit_activity, @unit_system).
+                to_html(doc)
+            }
+            doc.div({ :class => 'right_col' }) {
+              ChartView.new(@activity, @unit_system).to_html(doc)
+            }
+          }
+        }
       }
     end
 
-    def style(doc)
-      doc.style(<<EOT
+    def style
+      <<EOT
 body {
   font-family: verdana,arial,sans-serif;
   margin: 0px;
@@ -90,37 +98,6 @@ body {
   width: 600px;
 }
 EOT
-               )
-    end
-
-    def body(doc)
-      doc.body({ :onload => 'init()' }) {
-        prev_page = @predecessor ? @predecessor.fit_file[0..-5] + '.html' : nil
-        next_page = @successor ? @successor.fit_file[0..-5] + '.html' : nil
-        titlebar(doc, nil, prev_page, 'index.html', next_page)
-        # The main area with the 2 column layout.
-        doc.div({ :class => 'main' }) {
-          doc.div({ :class => 'left_col' }) {
-            @report.to_html(doc)
-            @track_view.div(doc)
-            @device_list.to_html(doc)
-            @user_profile.to_html(doc)
-          }
-          doc.div({ :class => 'right_col' }) {
-            @chart_view.div(doc)
-          }
-        }
-        footer(doc)
-      }
-    end
-
-    def write_file
-      @output_file = File.join(@output_dir, "#{@activity.fit_file[0..-5]}.html")
-      begin
-        File.write(@output_file, @doc.to_html)
-      rescue IOError
-        Log.fatal "Cannot write activity view file '#{@output_file}: #{$!}"
-      end
     end
 
   end