From d52e14ce0134b29e3f144d75bca8516269d775a9 Mon Sep 17 00:00:00 2001 From: Louis Knapp Date: Tue, 29 Sep 2015 20:03:43 -0500 Subject: [PATCH] lk | adds weight & height to clients --- app/controllers/clients_controller.rb | 1 + app/views/clients/_fields.html.haml | 14 +++- ...0005913_add_height_and_weight_to_client.rb | 6 ++ db/schema.rb | 64 ++++++++++--------- 4 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 db/migrate/20150930005913_add_height_and_weight_to_client.rb diff --git a/app/controllers/clients_controller.rb b/app/controllers/clients_controller.rb index 9d30181..47dd05f 100644 --- a/app/controllers/clients_controller.rb +++ b/app/controllers/clients_controller.rb @@ -53,6 +53,7 @@ class ClientsController < ApplicationController :application_date, :gender, :age, + :height, :weight, :helmet, :lock, diff --git a/app/views/clients/_fields.html.haml b/app/views/clients/_fields.html.haml index ac3f109..92f23b7 100644 --- a/app/views/clients/_fields.html.haml +++ b/app/views/clients/_fields.html.haml @@ -15,11 +15,21 @@ .col-sm-10 = 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 = f.label "Age", class: "col-sm-2 control-label" .col-sm-10 = 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 = f.label "Application Date:", class: "col-sm-2 control-label" .col-sm-10 @@ -53,12 +63,12 @@ .form-group = f.label "Bike:", class: "col-sm-2 control-label" .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 = f.label "Agency:", class: "col-sm-2 control-label" .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 = f.label "Notes:", class: "col-sm-2 control-label" diff --git a/db/migrate/20150930005913_add_height_and_weight_to_client.rb b/db/migrate/20150930005913_add_height_and_weight_to_client.rb new file mode 100644 index 0000000..afa9af5 --- /dev/null +++ b/db/migrate/20150930005913_add_height_and_weight_to_client.rb @@ -0,0 +1,6 @@ +class AddHeightAndWeightToClient < ActiveRecord::Migration + def change + add_column :clients, :weight, :float + add_column :clients, :height, :float + end +end diff --git a/db/schema.rb b/db/schema.rb index a248f37..75766ab 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,33 +11,33 @@ # # 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 enable_extension "plpgsql" create_table "agencies", force: :cascade do |t| - t.string "agency_name" - t.string "contact_name" - t.string "street_address" - t.string "city" - t.string "state" - t.string "postal_code" - t.string "phone_number" - t.string "email" + t.string "agency_name", limit: 255 + t.string "contact_name", limit: 255 + t.string "street_address", limit: 255 + t.string "city", limit: 255 + t.string "state", limit: 255 + t.string "postal_code", limit: 255 + t.string "phone_number", limit: 255 + t.string "email", limit: 255 end create_table "bikes", force: :cascade do |t| - t.string "entry_date" - t.string "brand" - t.string "model" - t.string "bike_type" - t.string "color" - t.string "serial_number" + t.string "entry_date", limit: 255 + t.string "brand", limit: 255 + t.string "model", limit: 255 + t.string "bike_type", limit: 255 + t.string "color", limit: 255 + t.string "serial_number", limit: 255 t.text "work_done" t.text "new_parts" - t.string "completion_date" - t.string "price" + t.string "completion_date", limit: 255 + t.string "price", limit: 255 t.datetime "created_at" t.datetime "updated_at" t.float "seat_tube_size" @@ -50,10 +50,10 @@ ActiveRecord::Schema.define(version: 20150918221119) do end create_table "clients", force: :cascade do |t| - t.string "first_name" - t.string "last_name" + t.string "first_name", limit: 255 + t.string "last_name", limit: 255 t.date "application_date" - t.string "gender" + t.string "gender", limit: 255 t.integer "age" t.boolean "helmet" t.boolean "lock" @@ -61,7 +61,7 @@ ActiveRecord::Schema.define(version: 20150918221119) do t.datetime "created_at" t.datetime "updated_at" t.integer "bike_id" - t.string "bike_type_requested" + t.string "bike_type_requested", limit: 255 t.boolean "will_pay" t.integer "agency_id" t.text "notes" @@ -69,23 +69,25 @@ ActiveRecord::Schema.define(version: 20150918221119) do t.integer "number_of_calls" t.boolean "application_voided" t.date "pickup_date" - t.string "volunteer_at_pickup" + t.string "volunteer_at_pickup", limit: 255 + t.float "weight" + t.float "height" end 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 create_table "users", force: :cascade do |t| - t.string "email", default: "", null: false - t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" + t.string "email", limit: 255, default: "", null: false + t.string "encrypted_password", limit: 255, default: "", null: false + t.string "reset_password_token", limit: 255 t.datetime "reset_password_sent_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 "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" + t.string "current_sign_in_ip", limit: 255 + t.string "last_sign_in_ip", limit: 255 t.datetime "created_at" t.datetime "updated_at" 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 create_table "volunteers", force: :cascade do |t| - t.string "name" - t.string "email" - t.string "phone" + t.string "name", limit: 255 + t.string "email", limit: 255 + t.string "phone", limit: 255 t.date "orientation_date" t.integer "other_volunteer_hours" t.text "referral"