radiant-race_results-extension 1.4.3 → 1.4.5

data/app/controllers/admin/race_instances_controller.rb

@@ -1,6 +1,6 @@
 class Admin::RaceInstancesController < Admin::ResourceController
   paginate_models
-  
+    
 protected
 
   def continue_url(options)

data/app/controllers/race_instances_controller.rb

@@ -4,10 +4,16 @@ class RaceInstancesController < SiteController
   before_filter :establish_context
 
   def show
-
+    expires_in 1.month, :private => false, :public => true
+    respond_to do |format|
+      format.html {}
+      format.csv {}
+      format.json { render :json => @performances.completed }
+    end
   end
 
   def splits
+    expires_in 1.month, :private => false, :public => true
     @checkpoints = @instance.checkpoints
     @splits = @instance.assembled_checkpoint_times
   end

data/app/controllers/race_performances_controller.rb

@@ -5,6 +5,14 @@ class RacePerformancesController < SiteController
 
   def show
     expires_in 1.month, :private => false, :public => true
+    respond_to do |format|
+      format.html { 
+        render
+      }
+      format.json {
+        render :json => @performance.neighbourhood(10).to_json(:vs => @performance)
+      }
+    end
   end
 
 private

data/app/models/race.rb

@@ -17,6 +17,8 @@ class Race < ActiveRecord::Base
   belongs_to :map_asset, :class_name => 'Asset'
   accepts_nested_attributes_for :map_asset, :allow_destroy => true
 
+  before_save :ensure_finish_checkpoint
+  
   validates_presence_of :name, :slug
   validates_uniqueness_of :name, :slug
   validates_length_of :slug, :maximum => 100, :message => '%{count}-character limit'
@@ -62,6 +64,11 @@ class Race < ActiveRecord::Base
     checkpoints.at(checkpoints.index(cp) + 1) if checkpoints.include?(cp) and checkpoints.last != cp
   end
   
+protected
+
+  def ensure_finish_checkpoint
+    self.checkpoints << RaceCheckpoint.new(:name => "Finish") unless checkpoints.find_by_name('Finish')
+  end
 
 end
 

data/app/models/race_checkpoint.rb

@@ -1,5 +1,5 @@
 class RaceCheckpoint < ActiveRecord::Base
-  
+
   has_site if respond_to? :has_site
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
@@ -26,6 +26,32 @@ class RaceCheckpoint < ActiveRecord::Base
   def self.find_by_normalized_name(name)
     find_by_name(name.gsub(/\s+/, "_").downcase)
   end
+  
+  def fastest_time(instance)
+    self.times.in(instance).first.time_in_seconds
+  end
+
+  def fastest_leg(instance)
+    self.times.in(instance).by_interval.first.interval_in_seconds
+  end
+
+  def median_time(instance)
+    count = self.times.in(instance).count
+    if count && count !=0
+      @median = self.times.in(instance).by_time.single(count/2).first.time_in_seconds
+    else
+      0
+    end
+  end
+
+  def median_leg(instance)
+    count = self.times.in(instance).count
+    if count && count !=0
+      @median = self.times.in(instance).by_interval.single(count/2).first.interval_in_seconds
+    else
+      0
+    end
+  end
 
 end
 

data/app/models/race_checkpoint_time.rb

@@ -15,6 +15,18 @@ class RaceCheckpointTime < ActiveRecord::Base
   default_scope :include => [:race_performance, :race_checkpoint]
   before_save :calculate_interval   # position would be nice too but we may not have imported all the data at this stage
   
+  named_scope :with_context, :include => [:race_performance, :race_checkpoint]
+  named_scope :by_time, { :order => 'race_checkpoint_times.elapsed_time' }
+  named_scope :by_interval, { :order => 'race_checkpoint_times.interval' }
+
+
+  named_scope :single, lambda { |offset| 
+    {
+      :limit => 1,
+      :offset => offset.to_i
+    }
+  }
+
   named_scope :in, lambda {|instance|
     {
       :joins => "INNER JOIN race_performances as performances ON race_checkpoint_times.race_performance_id = performances.id",  
@@ -22,8 +34,6 @@ class RaceCheckpointTime < ActiveRecord::Base
     }
   }
   
-  named_scope :with_context, :include => [:race_performance, :race_checkpoint]
-
   named_scope :at_checkpoint, lambda {|checkpoint|
     {
       :conditions => ["race_checkpoint_id = ?", checkpoint.id]
@@ -42,6 +52,7 @@ class RaceCheckpointTime < ActiveRecord::Base
     }
   }
   
+  
   def to_s
     time = read_attribute(:elapsed_time)
     if time && time != 0
@@ -55,6 +66,10 @@ class RaceCheckpointTime < ActiveRecord::Base
     faster = self.class.in(race_instance).at_checkpoint(checkpoint).ahead_of(elapsed_time.seconds)
     faster.length + 1
   end
+  
+  def inverted_position
+    race_instance.total_runners - position
+  end
 
   def leg_position
     if !previous
@@ -65,6 +80,10 @@ class RaceCheckpointTime < ActiveRecord::Base
     end
   end
   
+  def inverted_leg_position
+    race_instance.total_runners - leg_position
+  end
+  
   def elapsed_time
     if s = read_attribute(:elapsed_time)
       s.to_timecode
@@ -73,6 +92,10 @@ class RaceCheckpointTime < ActiveRecord::Base
     end
   end
   
+  def time_in_seconds
+    read_attribute(:elapsed_time)
+  end
+  
   def elapsed_time=(time)
     write_attribute(:elapsed_time, time.seconds)    # numbers will pass through unchanged. strings will be timecode-parsed
   end
@@ -85,6 +108,10 @@ class RaceCheckpointTime < ActiveRecord::Base
     end
   end
   
+  def interval_in_seconds
+    read_attribute(:interval)
+  end
+  
   def previous
     performance.time_at(checkpoint.previous) if checkpoint.previous
   end
@@ -104,9 +131,10 @@ class RaceCheckpointTime < ActiveRecord::Base
 private
 
   def calculate_interval
-    if previous
-      write_attribute(:interval, (elapsed_time - previous.elapsed_time).seconds)
-    end
+    previous_time = previous.elapsed_time if previous
+    previous_time ||= 0
+    write_attribute(:interval, (elapsed_time - previous_time).seconds)
+    save if changed?
   end
 
 end

data/app/models/race_instance.rb

@@ -1,7 +1,8 @@
 require 'csv'
 
 class RaceInstance < ActiveRecord::Base
-
+  attr_accessor :checkpoint_times, :performances_count
+  
   has_site if respond_to? :has_site
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
@@ -80,12 +81,14 @@ class RaceInstance < ActiveRecord::Base
   end
   
   def assembled_checkpoint_times
-    checkpoint_times = {}
-    RaceCheckpointTime.in(self).with_context.each do |cpt|
-      checkpoint_times[cpt.performance.id] ||= {}
-      checkpoint_times[cpt.performance.id][cpt.checkpoint.id] = cpt.elapsed_time
+    unless @checkpoint_times
+      @checkpoint_times = {}
+      RaceCheckpointTime.in(self).with_context.each do |cpt|
+        @checkpoint_times[cpt.performance.id] ||= {}
+        @checkpoint_times[cpt.performance.id][cpt.checkpoint.id] = cpt.elapsed_time
+      end
     end
-    checkpoint_times
+    @checkpoint_times
   end
 
   def performance_by(competitor)
@@ -123,14 +126,40 @@ class RaceInstance < ActiveRecord::Base
     categories.include?(category)
   end
   
+  def total_runners
+    @performances_count ||= performances.count
+  end
+  
+  def fastest_checkpoint_times
+    @leading ||= self.checkpoints.map{|cp| cp.fastest_time(self) }
+  end
+
+  def fastest_checkpoint_legs
+    @fastest_legs ||= self.checkpoints.map{|cp| cp.fastest_leg(self) }
+  end
+
+  def median_checkpoint_legs
+    @median_legs ||= self.checkpoints.map{|cp| cp.median_leg(self) }
+  end
+
+  def median_checkpoint_times
+    carry = 0
+    @medians ||= self.checkpoints.map{|cp| cp.median_time(self) }
+  end
+
+  def as_json(options={})
+    json = {
+      :name => full_name,
+      :performances => performances.map(&:as_json)
+    }
+  end
+  
 protected
   
   def process_results_file
     if csv_data = read_results_file
       headers = csv_data.shift.map(&:to_s)
-      Rails.logger.warn "!!! headers: #{headers.inspect}"
       checkpoints = headers.map{|h| race.checkpoints.find_by_name(h.strip) }.compact
-      Rails.logger.warn "!!! checkpoints: #{checkpoints.inspect}"
       race_data = csv_data.map {|row| row.map {|cell| cell.to_s } }.map {|row| Hash[*headers.zip(row).flatten] } # build AoA and then hash the second level
       RaceInstance.transaction do
         performances.destroy_all
@@ -153,7 +182,7 @@ protected
             :elapsed_time => runner.delete('elapsed_time'),
             :status_id => status.id
           })
-        
+          
           checkpoints.each do |cp|
             value = runner[normalize(cp.name)]
             cpt = performance.checkpoint_times.create!(:race_checkpoint_id => cp.id, :elapsed_time => value) unless value.blank?

data/app/models/race_performance.rb

@@ -1,3 +1,5 @@
+require 'enumerator'
+
 class RacePerformance < ActiveRecord::Base
   
   has_site if respond_to? :has_site
@@ -9,6 +11,7 @@ class RacePerformance < ActiveRecord::Base
   has_many :checkpoint_times, :class_name => 'RaceCheckpointTime', :dependent => :destroy
 
   delegate :name, :reader, :club, :to => :competitor
+  delegate :race, :to => :race_instance
   
   before_validation_on_create :times_from_checkpoints
   validates_presence_of :race_competitor_id, :race_instance_id
@@ -75,6 +78,13 @@ class RacePerformance < ActiveRecord::Base
       :conditions => ["elapsed_time IS NOT NULL AND elapsed_time > 0 AND elapsed_time < ?", seconds]
     }
   }
+  
+  named_scope :finishing_between, lambda { |bottom, top|
+    bottom, top = [top, bottom] if bottom > top
+    {
+      :conditions => ["position > ? AND position < ?", bottom, top]
+    }
+  }
 
   named_scope :completed, {
     :conditions => 'status_id >= 100'
@@ -122,6 +132,18 @@ class RacePerformance < ActiveRecord::Base
     race_instance.performances.eligible_for_category(cat).quicker_than(time_in_seconds).count + 1
   end
   
+  def sparkline_positions
+    checkpoint_times.map(&:inverted_leg_position)
+  end
+  
+  def neighbourhood(spread=3)
+    race_instance.performances.finishing_between(self.position.to_i - spread, self.position.to_i + spread)
+  end
+  
+  def neighbours(spread=3)
+    neighbourhood(spread) - [self]
+  end
+  
   def time_in_seconds
     read_attribute(:elapsed_time)
   end
@@ -143,6 +165,20 @@ class RacePerformance < ActiveRecord::Base
     cpt.first if cpt.any?
   end
 
+  def splits
+    self.checkpoint_times.each_with_object({}) do |cpt, hsh| 
+      hsh[cpt.race_checkpoint_id] = cpt.elapsed_time
+    end
+  end
+  
+  def split_times
+    @split_times ||= race_instance.checkpoints.map{ |cp| self.time_at(cp) }
+  end
+
+  def split_seconds
+    @split_seconds ||= split_times.map{ |st| st.time_in_seconds if st }
+  end
+
   def status
     RacePerformanceStatus.find(self.status_id)
   end
@@ -152,13 +188,46 @@ class RacePerformance < ActiveRecord::Base
   def finished?
      status == RacePerformanceStatus["Finished"]
   end
-  
-  
     
   def prized?
     true if prizes.any?
   end
-    
+  
+  def club_name
+    self.club ? self.club.name : 'unattached'
+  end
+  
+  def as_json(options={})
+    json = {
+      :id => self.id,
+      :pos => self.position,
+      :name => self.name,
+    }
+    splits = []
+    baseline = case options[:vs]
+    when 'median'
+      race_instance.median_checkpoint_times
+    when 'leader'
+      race_instance.winning_performance.split_seconds
+    when RacePerformance
+      options[:vs].split_seconds.dup
+    else
+      nil
+    end
+    if baseline
+      splits = self.split_seconds.map{ |cpt| 
+        base = baseline.shift # we need to step through the baseline even if this cp is missing
+        base - cpt if cpt && base
+      }
+    else
+      splits = self.split_seconds
+    end
+    intervals = race_instance.fastest_checkpoint_legs
+    carry = 0
+    json[:splits] = splits.map{|t| [carry += intervals.shift, t]}
+    json
+  end
+  
 protected
 
   def times_from_checkpoints
@@ -171,6 +240,15 @@ protected
     position(true)
     prizes(true)
   end
+  
+  def record_finish_checkpoint_time
+    unless self.elapsed_time.blank?
+      cp = self.race.checkpoints.find_by_name('Finish')
+      cpt = self.checkpoint_times.find_or_create_by_race_checkpoint_id(cp.id)
+      cpt.elapsed_time = self.elapsed_time
+      cpt.save if cpt.changed?
+    end
+  end
 
 end
 

data/app/views/admin/races/_form.html.haml

@@ -12,8 +12,7 @@
     %br
     = @race.errors.full_messages
 
-.container_12
-
+#form_container
   - render_region :form do |form|
     - form.edit_name do
       %p.title

data/app/views/race_clubs/show.html.haml

@@ -14,11 +14,11 @@
 
 - content_for :breadhead do
   = link_to "Races", races_url
-  = t('separator')
+  = t('race_results_extension.separator')
   = link_to @instance.race.name, race_url(@instance.race), :class => 'breadhead'
-  = t('separator')
+  = t('race_results_extension.separator')
   = link_to @instance.name, race_instance_url(@instance), :class => 'breadhead'
-  = t('separator')
+  = t('race_results_extension.separator')
 
 - content_for :title do
   = @instance.full_name

data/app/views/race_instances/_results_header.html.haml

@@ -0,0 +1,10 @@
+%thead
+  %tr
+    - if @instance.splits_available?
+      %th
+    %th.pos= link_to t('activerecord.attributes.race_performance.position'), '#'
+    %th.name= link_to t('activerecord.attributes.race_performance.name'), '#'
+    %th.club= link_to t('activerecord.attributes.race_performance.club'), '#'
+    %th.cat= link_to t('activerecord.attributes.race_performance.category'), '#'
+    %th.time= link_to t('activerecord.attributes.race_performance.time'), '#'
+    %th.prizes