Merge pull request #89 from spacemunkay/wheelsize-list

Wheelsize list

app/components/bikes.rb

@@ -25,7 +25,7 @@ class Bikes < Netzke::Basepack::Grid
       { :id => :bike_style__style, :name => :bike_style__style, :text => 'Style', :default_value => BikeStyle.first.id},
       { :name => :seat_tube_height, :text => 'Seat Tube (in)'},
       { :name => :top_tube_length, :text => 'Top Tube (in)'},
-      { :name => :wheel_size, :text => 'Wheel Size (in)'},
+      { :name => :bike_wheel_size__display_string, :text => 'Wheel Size'},
       :value,
       { :id => :bike_condition__condition, :name => :bike_condition__condition, :text => 'Condition', :default_value => BikeCondition.first.id},
       { :id => :bike_purpose__purpose, :name => :bike_purpose__purpose, :text => 'Purpose', :default_value => BikePurpose.first.id},
@@ -55,7 +55,7 @@ class Bikes < Netzke::Basepack::Grid
       { :name => :bike_style__style, :field_label => 'Style', :min_chars => 1},
       { :name => :seat_tube_height, :field_label => 'Seat Tube (in)'},
       { :name => :top_tube_length, :field_label => 'Top Tube (in)'},
-      { :name => :wheel_size, :field_label => 'Wheel Size (in)'},
+      { :name => :bike_wheel_size__display_string, :field_label => 'Wheel Size'},
       { :name => :value, :field_label => 'Value'},
       { :name => :bike_condition__condition, :field_label => 'Condition', :min_chars => 1},
       { :name => :bike_purpose__purpose, :field_label => 'Purpose', :min_chars => 1}

app/models/bike.rb

@@ -1,7 +1,7 @@
 class Bike < ActiveRecord::Base
   acts_as_loggable
   attr_accessible :shop_id, :serial_number, :bike_brand_id, :model, :color, :bike_style_id, :seat_tube_height,
-    :top_tube_length, :wheel_size, :value, :bike_condition_id, :bike_purpose_id
+    :top_tube_length, :bike_wheel_size_id, :value, :bike_condition_id, :bike_purpose_id
 
   has_many :transactions
 
@@ -11,6 +11,7 @@ class Bike < ActiveRecord::Base
   belongs_to :bike_style
   belongs_to :bike_condition
   belongs_to :bike_purpose
+  belongs_to :bike_wheel_size
 
   validates :shop_id, :presence => true, :uniqueness => true, :numericality => { :only_integer => true }
   validates :serial_number, :length => { :minimum => 3 }
@@ -20,8 +21,7 @@ class Bike < ActiveRecord::Base
   validates :bike_style_id, :presence => true
   validates :seat_tube_height, :presence => true
   validates :top_tube_length, :presence => true
-  validates :wheel_size, :presence => true
-  #validates :value, :presence => true
+  validates :bike_wheel_size_id, :presence => true
   validates :bike_condition_id, :presence => true
   validates :bike_purpose_id, :presence => true
 
@@ -45,6 +45,10 @@ class Bike < ActiveRecord::Base
     self.bike_purpose
   end
 
+  def wheel_size
+    self.bike_wheel_size
+  end
+
   def to_s
     "#{brand} - #{model} - #{style}"
   end

app/models/bike_wheel_size.rb

@@ -0,0 +1,11 @@
+class BikeWheelSize < ActiveRecord::Base
+  belongs_to :bike
+
+  def display_string
+    ["#{twmm}-#{rdmm}", "#{rdin}x#{twin}", "#{rdfr}x#{twfr}", description].join(" | ")
+  end
+
+  def to_s
+    "#{twmm}-#{rdmm} #{rdin}x#{twin} #{rdfr}x#{twfr} '#{description}' #{tire_common_score}"
+  end
+end

app/views/layouts/application.html.haml

@@ -11,6 +11,9 @@
       body {
         padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
       }
+      .x-boundlist-item {
+        white-space: nowrap;
+      }
 
   %body
     .container