bike/bike-database
1
0
Fork 0
mirror of https://github.com/fspc/bike-database.git synced 2025-10-31 08:45:34 -04:00
Code Issues Projects Releases Wiki Activity

lk | adds weight & height to clients

Browse Source
This commit is contained in:
Louis Knapp 2015-09-29 20:03:43 -05:00
parent 1971a1c305
commit d52e14ce01
4 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/clients_controller.rb
View File

@ -53,6 +53,7 @@ class ClientsController < ApplicationController
:application_date, :application_date,
:gender, :gender,
:age, :age,
:height,
:weight, :weight,
:helmet, :helmet,
:lock, :lock,

14
app/views/clients/_fields.html.haml
View File

@ -15,11 +15,21 @@
.col-sm-10 .col-sm-10
= f.text_field :gender, class: "form-control", disabled: disabled = f.text_field :gender, class: "form-control", disabled: disabled
.form-group
= f.label "Weight (lb)", class: "col-sm-2 control-label"
.col-sm-10
= f.text_field :weight, class: "form-control", disabled: disabled
.form-group .form-group
= f.label "Age", class: "col-sm-2 control-label" = f.label "Age", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.text_field :age, class: "form-control", disabled: disabled = f.text_field :age, class: "form-control", disabled: disabled
.form-group
= f.label "Height (ft)", class: "col-sm-2 control-label"
.col-sm-10
= f.text_field :height, class: "form-control", disabled: disabled
.form-group .form-group
= f.label "Application Date:", class: "col-sm-2 control-label" = f.label "Application Date:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
@ -53,12 +63,12 @@
.form-group .form-group
= f.label "Bike:", class: "col-sm-2 control-label" = f.label "Bike:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.select :bike_id, options_for_select( Bike.available_for_freecyclery.collect{|b| [ b.name, b.id ]}, @client.bike_id ), {include_blank: 'None'}, class: "selectpicker" = f.select :bike_id, options_for_select( Bike.available_for_freecyclery.collect{|b| [ b.name, b.id ]}, @client.bike_id ), {include_blank: 'None'}, class: "selectpicker", disabled: disabled
.form-group .form-group
= f.label "Agency:", class: "col-sm-2 control-label" = f.label "Agency:", class: "col-sm-2 control-label"
.col-sm-10 .col-sm-10
= f.select :agency_id, Agency.all.collect {|b| [ b.agency_name, b.id ] }, {include_blank: 'None'}, class: "selectpicker" = f.select :agency_id, Agency.all.collect {|b| [ b.agency_name, b.id ] }, {include_blank: 'None'}, class: "selectpicker", disabled: disabled
.form-group .form-group
= f.label "Notes:", class: "col-sm-2 control-label" = f.label "Notes:", class: "col-sm-2 control-label"

6
db/migrate/20150930005913_add_height_and_weight_to_client.rb Normal file
View File

@ -0,0 +1,6 @@
class AddHeightAndWeightToClient < ActiveRecord::Migration
def change
add_column :clients, :weight, :float
add_column :clients, :height, :float
end
end

64
db/schema.rb
View File

@ -11,33 +11,33 @@
# #
# 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: 20150918221119) do ActiveRecord::Schema.define(version: 20150930005913) 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"
create_table "agencies", force: :cascade do |t| create_table "agencies", force: :cascade do |t|
t.string "agency_name" t.string "agency_name", limit: 255
t.string "contact_name" t.string "contact_name", limit: 255
t.string "street_address" t.string "street_address", limit: 255
t.string "city" t.string "city", limit: 255
t.string "state" t.string "state", limit: 255
t.string "postal_code" t.string "postal_code", limit: 255
t.string "phone_number" t.string "phone_number", limit: 255
t.string "email" t.string "email", limit: 255
end end
create_table "bikes", force: :cascade do |t| create_table "bikes", force: :cascade do |t|
t.string "entry_date" t.string "entry_date", limit: 255
t.string "brand" t.string "brand", limit: 255
t.string "model" t.string "model", limit: 255
t.string "bike_type" t.string "bike_type", limit: 255
t.string "color" t.string "color", limit: 255
t.string "serial_number" t.string "serial_number", limit: 255
t.text "work_done" t.text "work_done"
t.text "new_parts" t.text "new_parts"
t.string "completion_date" t.string "completion_date", limit: 255
t.string "price" t.string "price", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.float "seat_tube_size" t.float "seat_tube_size"
@ -50,10 +50,10 @@ ActiveRecord::Schema.define(version: 20150918221119) do
end end
create_table "clients", force: :cascade do |t| create_table "clients", force: :cascade do |t|
t.string "first_name" t.string "first_name", limit: 255
t.string "last_name" t.string "last_name", limit: 255
t.date "application_date" t.date "application_date"
t.string "gender" t.string "gender", limit: 255
t.integer "age" t.integer "age"
t.boolean "helmet" t.boolean "helmet"
t.boolean "lock" t.boolean "lock"
@ -61,7 +61,7 @@ ActiveRecord::Schema.define(version: 20150918221119) do
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "bike_id" t.integer "bike_id"
t.string "bike_type_requested" t.string "bike_type_requested", limit: 255
t.boolean "will_pay" t.boolean "will_pay"
t.integer "agency_id" t.integer "agency_id"
t.text "notes" t.text "notes"
@ -69,23 +69,25 @@ ActiveRecord::Schema.define(version: 20150918221119) do
t.integer "number_of_calls" t.integer "number_of_calls"
t.boolean "application_voided" t.boolean "application_voided"
t.date "pickup_date" t.date "pickup_date"
t.string "volunteer_at_pickup" t.string "volunteer_at_pickup", limit: 255
t.float "weight"
t.float "height"
end end
add_index "clients", ["agency_id"], name: "index_clients_on_agency_id", using: :btree add_index "clients", ["agency_id"], name: "index_clients_on_agency_id", using: :btree
add_index "clients", ["bike_id"], name: "index_clients_on_bike_id", using: :btree add_index "clients", ["bike_id"], name: "index_clients_on_bike_id", using: :btree
create_table "users", force: :cascade do |t| create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false t.string "email", limit: 255, default: "", null: false
t.string "encrypted_password", default: "", null: false t.string "encrypted_password", limit: 255, default: "", null: false
t.string "reset_password_token" t.string "reset_password_token", limit: 255
t.datetime "reset_password_sent_at" t.datetime "reset_password_sent_at"
t.datetime "remember_created_at" t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at" t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at" t.datetime "last_sign_in_at"
t.string "current_sign_in_ip" t.string "current_sign_in_ip", limit: 255
t.string "last_sign_in_ip" t.string "last_sign_in_ip", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
@ -94,9 +96,9 @@ ActiveRecord::Schema.define(version: 20150918221119) do
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
create_table "volunteers", force: :cascade do |t| create_table "volunteers", force: :cascade do |t|
t.string "name" t.string "name", limit: 255
t.string "email" t.string "email", limit: 255
t.string "phone" t.string "phone", limit: 255
t.date "orientation_date" t.date "orientation_date"
t.integer "other_volunteer_hours" t.integer "other_volunteer_hours"
t.text "referral" t.text "referral"