mirror of
https://github.com/fspc/bike-database.git
synced 2025-04-04 10:03:22 -04:00
lk | removes completion date field
This commit is contained in:
parent
efd7197a35
commit
20b4c36f23
@ -91,7 +91,6 @@ class BikesController < ApplicationController
|
|||||||
:serial_number,
|
:serial_number,
|
||||||
:tag_info,
|
:tag_info,
|
||||||
:mechanic,
|
:mechanic,
|
||||||
:completion_date,
|
|
||||||
:price,
|
:price,
|
||||||
:top_tube_size,
|
:top_tube_size,
|
||||||
:seat_tube_size,
|
:seat_tube_size,
|
||||||
|
@ -30,8 +30,7 @@ class Bike < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def ready_for_pickup?
|
def ready_for_pickup?
|
||||||
client = self.client
|
self.client && !client.application_voided && self.date_sold.nil?
|
||||||
client && self.completion_date && !client.application_voided && self.date_sold.nil?
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.bikes_ready_for_pickup
|
def self.bikes_ready_for_pickup
|
||||||
@ -40,7 +39,7 @@ class Bike < ActiveRecord::Base
|
|||||||
|
|
||||||
def self.available_for_freecyclery
|
def self.available_for_freecyclery
|
||||||
assigned_bikes = Client.all.select{|c| !c.bike_id.nil?}.map(&:bike)
|
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
|
all_freecyclery_bikes - assigned_bikes
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
class RemoveCompletionDateFromBikes < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
remove_column :bikes, :completion_date
|
||||||
|
end
|
||||||
|
end
|
@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20150930005913) do
|
ActiveRecord::Schema.define(version: 20151013231450) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
@ -36,7 +36,6 @@ ActiveRecord::Schema.define(version: 20150930005913) do
|
|||||||
t.string "serial_number"
|
t.string "serial_number"
|
||||||
t.text "work_done"
|
t.text "work_done"
|
||||||
t.text "new_parts"
|
t.text "new_parts"
|
||||||
t.string "completion_date"
|
|
||||||
t.string "price"
|
t.string "price"
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
@ -57,7 +56,6 @@ ActiveRecord::Schema.define(version: 20150930005913) do
|
|||||||
t.integer "age"
|
t.integer "age"
|
||||||
t.boolean "helmet"
|
t.boolean "helmet"
|
||||||
t.boolean "lock"
|
t.boolean "lock"
|
||||||
t.date "completion_date"
|
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
t.integer "bike_id"
|
t.integer "bike_id"
|
||||||
|
@ -57,7 +57,6 @@ namespace :db do
|
|||||||
serial_number: Faker::Number.number(10),
|
serial_number: Faker::Number.number(10),
|
||||||
notes: Faker::Lorem.sentence,
|
notes: Faker::Lorem.sentence,
|
||||||
tag_info: Faker::Lorem.sentence,
|
tag_info: Faker::Lorem.sentence,
|
||||||
completion_date: rand(100.days).ago,
|
|
||||||
price: rand(400) + 50,
|
price: rand(400) + 50,
|
||||||
seat_tube_size: rand(45),
|
seat_tube_size: rand(45),
|
||||||
top_tube_size: rand(45),
|
top_tube_size: rand(45),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user