From ac66cb0cbee8d7e9de1701c009ea183c57b7ed1d Mon Sep 17 00:00:00 2001 From: Will Bradley Date: Sat, 9 Feb 2013 03:47:07 -0700 Subject: [PATCH] Added "how did you hear about us" to user. --- app/models/user.rb | 2 +- app/views/devise/registrations/_user.html.erb | 4 ++++ app/views/users/_form.html.erb | 4 ++++ app/views/users/show.html.erb | 6 ++++++ db/schema.rb | 3 ++- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 4f0a52f..c3182ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -9,7 +9,7 @@ class User < ActiveRecord::Base :recoverable, :rememberable, :trackable, :validatable # Setup accessible (or protected) attributes for your model - attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :instructor, :member, :emergency_name, :emergency_phone, :current_skills, :desired_skills, :waiver, :emergency_email, :phone, :payment_method, :orientation, :member_level, :certifications, :hidden #TODO: make admin/instructor/member/etc not accessible + attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :instructor, :member, :emergency_name, :emergency_phone, :current_skills, :desired_skills, :waiver, :emergency_email, :phone, :payment_method, :orientation, :member_level, :certifications, :hidden, :marketing_source #TODO: make admin/instructor/member/etc not accessible has_many :cards has_many :user_certifications diff --git a/app/views/devise/registrations/_user.html.erb b/app/views/devise/registrations/_user.html.erb index 4100df5..b96a026 100644 --- a/app/views/devise/registrations/_user.html.erb +++ b/app/views/devise/registrations/_user.html.erb @@ -48,6 +48,10 @@ Thanks again, and happy hacking!

<%= f.label :desired_skills, "What skills, knowledge and experiences are you looking for in HeatSync?" %>
<%= f.text_area :desired_skills %> +
+ <%= f.label :marketing_source, "How'd you find out about HeatSync?" %>
+ <%= f.text_area :marketing_source %> +
<%= f.label :password %><% if params[:action]!='new' %> (Only if you want to change your password)<% end %>
<%= f.password_field :password %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index c501cc1..436b530 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -77,6 +77,10 @@ <%= f.label :desired_skills, "What skills, knowledge and experiences are you looking for in HeatSync?" %>
<%= f.text_area :desired_skills %> +
+ <%= f.label :marketing_source, "How'd you find out about HeatSync?" %>
+ <%= f.text_area :marketing_source %> +
<%= f.label :member, "Member?" %>
<%= f.select :member, [[nil],["No",0],["Inactive",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]] %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3460322..20550aa 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -69,6 +69,12 @@ Desired Skills: <%= simple_format @user.desired_skills %>

+<% if current_user.admin? then %> +

+ Found HeatSync via: + <%= simple_format @user.marketing_source %> +

+<% end %>

Card: <% if current_user.admin? then %> diff --git a/db/schema.rb b/db/schema.rb index d957967..bf8e2f2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130201042646) do +ActiveRecord::Schema.define(:version => 20130209103457) do create_table "cards", :force => true do |t| t.string "card_number" @@ -95,6 +95,7 @@ ActiveRecord::Schema.define(:version => 20130201042646) do t.string "desired_skills" t.boolean "instructor" t.boolean "hidden" + t.string "marketing_source" end add_index "users", ["email"], :name => "index_users_on_email", :unique => true