radiant-race_results-extension 1.3.2 → 1.3.3

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/app/models/race_instance.rb

@@ -128,7 +128,9 @@ protected
   def process_results_file
     if csv_data = read_results_file
       headers = csv_data.shift.map(&:to_s)
-      checkpoints = headers.map{|h| race.checkpoints.find_by_name(h) }.compact
+      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
@@ -154,7 +156,7 @@ protected
         
           checkpoints.each do |cp|
             value = runner[normalize(cp.name)]
-            cpt = performance.checkpoint_times.create!(:race_checkpoint_id => cp.id, :elapsed_time => value || 0)
+            cpt = performance.checkpoint_times.create!(:race_checkpoint_id => cp.id, :elapsed_time => value) unless value.blank?
           end
         end
       end

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

@@ -22,14 +22,12 @@
   = link_to "Races", races_url, :class => 'breadhead'
   = t('separator')
   = link_to @instance.race.name, race_url(@instance.race), :class => 'breadhead'
+  - if @club || @category
+    = t('separator')
+    = link_to @instance.name, race_instance_url(@instance.race, @instance), :class => 'breadhead'
 
 - content_for :title do
-  - if @club
-    = "#{@instance.full_name}: #{@club.name}"
-  - elsif @category
-    = "#{@instance.full_name}: #{@category.name}"
-  - else
-    = @instance.full_name
+  = @instance.full_name
   
 - content_for :introduction do
   - if @instance.past?

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

@@ -27,15 +27,10 @@
   = t('separator')
   = link_to @instance.race.name, race_url(@instance.race), :class => 'breadhead'
   = t('separator')
-  splits
+  = link_to @instance.name, race_instance_url(@instance.race, @instance), :class => 'breadhead'
 
 - content_for :title do
-  - if @club
-    = "#{@instance.full_name}: #{@club.name} splits"
-  - elsif @category
-    = "#{@instance.full_name}: #{@category.name} splits"
-  - else
-    = "#{@instance.full_name}: splits"
+  = "#{@instance.full_name}: splits"
 
 - content_for :introduction do
   - if @instance.past?

data/app/views/race_performances/_performance.html.haml

@@ -3,19 +3,24 @@
 %tr{:class => trclass}
   %td.pos
     - if performance.finished?
-      = link_to performance.position, race_performance_url(@instance.race, @instance, performance)
+      - if @instance.splits_available?
+        = link_to performance.position, race_performance_url(@instance.race, @instance, performance)
+      - else
+        = performance.position
     - else
       = performance.status
   %td.name
-    = link_to performance.name, race_performance_url(@instance.race, @instance, performance)
+    - if @instance.splits_available?
+      = link_to performance.name, race_performance_url(@instance.race, @instance, performance)
+    - else
+      = performance.name
   %td.club
     - if performance.club
       = link_to_unless_current performance.club.name, race_club_url(@instance.race, @instance, performance.club)
   %td.cat
     = link_to_unless_current performance.race_category.name, race_category_url(@instance.race, @instance, performance.race_category)
   %td.time
-    - if performance.finished?
-      = performance.elapsed_time
+    = performance.elapsed_time
   %td.prizes
     - if performance.finished?
       = performance.prizes

data/app/views/race_performances/_splits.html.haml

@@ -9,9 +9,10 @@
   %td.runner
     = link_to performance.name, race_performance_url(@instance.race, @instance, performance)
   - previous = nil
+  - splits = @splits[performance.id] || []
   - @checkpoints.each do |cp|
     %td.cpt
-      - if t = @splits[performance.id][cp.id]
+      - if t = splits[cp.id]
         = t
         - if previous
           %br
@@ -22,9 +23,8 @@
         - previous = nil
         —
   %td.time
-    - if performance.finished?
-      = performance.elapsed_time
-      - if previous
-        %br
-          %span.note
-            = performance.elapsed_time - previous
+    = performance.elapsed_time
+    - if previous
+      %br
+        %span.note
+          = performance.elapsed_time - previous

data/race_results_extension.rb

@@ -2,7 +2,7 @@
 # require_dependency 'application_controller'
 
 class RaceResultsExtension < Radiant::Extension
-  version "1.3.2"
+  version "1.3.3"
   description "Makes easy the uploading, analysis and display of race results. Built for fell races but should work for most timed or score events."
   url "http://spanner.org/radiant/race_results"
   

data/radiant-race_results-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-race_results-extension}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-race_results-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - spanner