bike/bike-database
1
0
Fork 0
mirror of https://github.com/fspc/bike-database.git synced 2026-09-16 08:31:39 -04:00
Code Issues Projects Releases Wiki Activity

lk | removes completion date field

Browse Source
This commit is contained in:
Louis Knapp
2015-10-13 18:22:18 -05:00
parent efd7197a35
commit 20b4c36f23
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/bikes_controller.rb
-1
View File
@@ -91,7 +91,6 @@ class BikesController < ApplicationController
:serial_number,
:tag_info,
:mechanic,
:completion_date,
:price,
:top_tube_size,
:seat_tube_size,
app/models/bike.rb
+2 -3
View File
@@ -30,8 +30,7 @@ class Bike < ActiveRecord::Base
end
def ready_for_pickup?
client = self.client
client && self.completion_date && !client.application_voided && self.date_sold.nil?
self.client && !client.application_voided && self.date_sold.nil?
end
def self.bikes_ready_for_pickup
@@ -40,7 +39,7 @@ class Bike < ActiveRecord::Base
def self.available_for_freecyclery
assigned_bikes = Client.all.select{|c| !c.bike_id.nil?}.map(&:bike)
all_freecyclery_bikes = Bike.order(log_number: :desc).select{|bike| bike.completion_date && (bike.purpose == "Freecyclery")}
all_freecyclery_bikes = Bike.order(log_number: :desc).select{|bike| bike.purpose == "Freecyclery"}
all_freecyclery_bikes - assigned_bikes
end