Adding user_certifications relation, and paperclip gem

This commit is contained in:
Will Bradley 2013-01-25 03:50:53 -07:00
parent 43d949dc1d
commit 6e77b2bf68
25 changed files with 296 additions and 10 deletions

View File

@ -41,3 +41,5 @@ gem 'bcrypt-ruby', '~> 3.0.0'
# To use debugger # To use debugger
# gem 'ruby-debug' # gem 'ruby-debug'
gem "paperclip", "~> 3.0"

View File

@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

View File

@ -0,0 +1,3 @@
// Place all the styles related to the UserCertifications controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

View File

@ -1,3 +1,4 @@
// Place all the styles related to the users controller here. // Place all the styles related to the users controller here.
// They will automatically be included in application.css. // They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
.hoverinfo { cursor: progress; }

View File

@ -0,0 +1,83 @@
class UserCertificationsController < ApplicationController
# GET /user_certifications
# GET /user_certifications.json
def index
@user_certifications = UserCertification.all
respond_to do |format|
format.html # index.html.erb
format.json { render :json => @user_certifications }
end
end
# GET /user_certifications/1
# GET /user_certifications/1.json
def show
@user_certification = UserCertification.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render :json => @user_certification }
end
end
# GET /user_certifications/new
# GET /user_certifications/new.json
def new
@user_certification = UserCertification.new
respond_to do |format|
format.html # new.html.erb
format.json { render :json => @user_certification }
end
end
# GET /user_certifications/1/edit
def edit
@user_certification = UserCertification.find(params[:id])
end
# POST /user_certifications
# POST /user_certifications.json
def create
@user_certification = UserCertification.new(params[:user_certification])
respond_to do |format|
if @user_certification.save
format.html { redirect_to @user_certification, :notice => 'User certification was successfully created.' }
format.json { render :json => @user_certification, :status => :created, :location => @user_certification }
else
format.html { render :action => "new" }
format.json { render :json => @user_certification.errors, :status => :unprocessable_entity }
end
end
end
# PUT /user_certifications/1
# PUT /user_certifications/1.json
def update
@user_certification = UserCertification.find(params[:id])
respond_to do |format|
if @user_certification.update_attributes(params[:user_certification])
format.html { redirect_to @user_certification, :notice => 'User certification was successfully updated.' }
format.json { head :no_content }
else
format.html { render :action => "edit" }
format.json { render :json => @user_certification.errors, :status => :unprocessable_entity }
end
end
end
# DELETE /user_certifications/1
# DELETE /user_certifications/1.json
def destroy
@user_certification = UserCertification.find(params[:id])
@user_certification.destroy
respond_to do |format|
format.html { redirect_to user_certifications_url }
format.json { head :no_content }
end
end
end

View File

@ -0,0 +1,2 @@
module UserCertificationsHelper
end

View File

@ -1,4 +1,5 @@
class Certification < ActiveRecord::Base class Certification < ActiveRecord::Base
attr_accessible :description, :name attr_accessible :description, :name
has_many :users, :through => :certifications_users has_many :user_certifications
has_many :users, :through => :user_certifications
end end

View File

@ -6,8 +6,9 @@ class User < ActiveRecord::Base
:recoverable, :rememberable, :trackable, :validatable :recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model # Setup accessible (or protected) attributes for your model
attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :instructor, :active, :emergency_name, :emergency_phone, :current_skills, :desired_skills, :waiver, :emergency_email, :phone, :payment_method, :orientation, :member_level attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :instructor, :active, :emergency_name, :emergency_phone, :current_skills, :desired_skills, :waiver, :emergency_email, :phone, :payment_method, :orientation, :member_level, :certifications
has_many :cards has_many :cards
has_many :certifications, :through => :certifications_users has_many :user_certifications
has_many :certifications, :through => :user_certifications
end end

View File

@ -0,0 +1,5 @@
class UserCertification < ActiveRecord::Base
attr_accessible :certification_id, :user_id
belongs_to :user
belongs_to :certification
end

View File

@ -11,7 +11,7 @@
<b>Certified Users:</b> <b>Certified Users:</b>
<ul> <ul>
<% @certification.users.each do |user| %> <% @certification.users.each do |user| %>
<% unless user.name.blank? %><li><%= user.name %></li><% end %> <li><%= link_to user.name, user %></li>
<% end %> <% end %>
<% if @certification.users.blank? then %><li>n/a</li><% end %> <% if @certification.users.blank? then %><li>n/a</li><% end %>
</ul> </ul>

View File

@ -0,0 +1,25 @@
<%= form_for(@user_certification) do |f| %>
<% if @user_certification.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@user_certification.errors.count, "error") %> prohibited this user_certification from being saved:</h2>
<ul>
<% @user_certification.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
</ul>
</div>
<% end %>
<div class="field">
<%= f.label :user_id %><br />
<%= f.number_field :user_id %>
</div>
<div class="field">
<%= f.label :certification_id %><br />
<%= f.number_field :certification_id %>
</div>
<div class="actions">
<%= f.submit %>
</div>
<% end %>

View File

@ -0,0 +1,6 @@
<h1>Editing user_certification</h1>
<%= render 'form' %>
<%= link_to 'Show', @user_certification %> |
<%= link_to 'Back', user_certifications_path %>

View File

@ -0,0 +1,25 @@
<h1>Listing user_certifications</h1>
<table>
<tr>
<th>User</th>
<th>Certification</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @user_certifications.each do |user_certification| %>
<tr>
<td><%= user_certification.user_id %></td>
<td><%= user_certification.certification_id %></td>
<td><%= link_to 'Show', user_certification %></td>
<td><%= link_to 'Edit', edit_user_certification_path(user_certification) %></td>
<td><%= link_to 'Destroy', user_certification, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
</table>
<br />
<%= link_to 'New User certification', new_user_certification_path %>

View File

@ -0,0 +1,5 @@
<h1>New user_certification</h1>
<%= render 'form' %>
<%= link_to 'Back', user_certifications_path %>

View File

@ -0,0 +1,13 @@
<p>
<b>User:</b>
<%= @user_certification.user_id %>
</p>
<p>
<b>Certification:</b>
<%= @user_certification.certification_id %>
</p>
<%= link_to 'Edit', edit_user_certification_path(@user_certification) %> |
<%= link_to 'Back', user_certifications_path %>

View File

@ -10,8 +10,12 @@
<% if current_user.admin? then %> <% if current_user.admin? then %>
<th>Cards</th> <th>Cards</th>
<% end %> <% end %>
<th>Certifications</th>
<th>Active?</th> <th>Active?</th>
<th>Waiver?</th> <th>Waiver?</th>
<% if current_user.admin? then %>
<th>Orientation?</th>
<% end %>
<th>Admin?</th> <th>Admin?</th>
<th></th> <th></th>
<th></th> <th></th>
@ -20,16 +24,22 @@
<% if !@users.blank? %> <% if !@users.blank? %>
<% @users.each do |user| %> <% @users.each do |user| %>
<tr> <tr>
<td><%= user.name %></td> <td><%= link_to user.name, user %></td>
<td><%= user.email %></td> <td><%= user.email %></td>
<% if current_user.admin? then %><td> <% if current_user.admin? then %><td>
<% user.cards.each do |c| %> <% user.cards.each do |c| %>
<%= link_to c.card_number, card_url(c) %><%= "," unless c == user.cards.last %> <%= link_to c.card_number, card_url(c) %><%= "," unless c == user.cards.last %>
<% end %> <% end %>
</td><% end %> </td><% end %>
<td><%= if user.active? then "Active" end %></td> <td><% user.certifications.each do |c| %>
<td><%= if user.waiver.blank? then "Not Signed" else "Signed" end %></td> <%= link_to c.name, c %><%= "," unless c == user.certifications.last %>
<td><%= if user.admin? then "Admin" end %></td> <% end %></td>
<td><%= if user.active? then raw("&#x2713;") end %></td>
<td><%= unless user.waiver.blank? then raw("<span class='hoverinfo' title='"+user.waiver.strftime("%B %d %Y")+"'>&#x2713;</span>") end %></td>
<% if current_user.admin? then %><td>
<%= unless user.orientation.blank? then raw("<span class='hoverinfo' title='"+user.orientation.strftime("%B %d %Y")+"'>&#x2713;</span>") end %>
</td><% end %>
<td><%= if user.admin? then raw("&#x2713;") end %></td>
<td><%= link_to 'Edit', edit_user_path(user) if can? :update, user %></td> <td><%= link_to 'Edit', edit_user_path(user) if can? :update, user %></td>
<td><%= link_to 'Destroy', user, :confirm => 'Are you sure? WARNING: THIS DOES NOT REMOVE THE USER FROM THE DOOR SYSTEM! DISABLE THEM FIRST.', :method => :delete if can? :destroy, user %></td> <td><%= link_to 'Destroy', user, :confirm => 'Are you sure? WARNING: THIS DOES NOT REMOVE THE USER FROM THE DOOR SYSTEM! DISABLE THEM FIRST.', :method => :delete if can? :destroy, user %></td>
</tr> </tr>

View File

@ -22,7 +22,7 @@
<b>Certifications:</b> <b>Certifications:</b>
<ul> <ul>
<% @user.certifications.each do |certification| %> <% @user.certifications.each do |certification| %>
<li>certification.name</li> <li><%= link_to certification.name, certification %></li>
<% end %> <% end %>
<% if @user.certifications.blank? %><li>n/a</li><% end %> <% if @user.certifications.blank? %><li>n/a</li><% end %>
</ul> </ul>

View File

@ -1,5 +1,7 @@
Dooraccess::Application.routes.draw do Dooraccess::Application.routes.draw do
resources :user_certifications
resources :certifications resources :certifications
devise_for :users devise_for :users

View File

@ -0,0 +1,5 @@
class AddInstructorToUsers < ActiveRecord::Migration
def change
add_column :users, :instructor, :boolean
end
end

View File

@ -0,0 +1,10 @@
class CreateUserCertifications < ActiveRecord::Migration
def change
create_table :user_certifications do |t|
t.integer :user_id
t.integer :certification_id
t.timestamps
end
end
end

View File

@ -10,7 +10,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20121016211727) do ActiveRecord::Schema.define(:version => 20130125102002) do
create_table "cards", :force => true do |t| create_table "cards", :force => true do |t|
t.string "card_number" t.string "card_number"
@ -21,6 +21,13 @@ ActiveRecord::Schema.define(:version => 20121016211727) do
t.string "name" t.string "name"
end end
create_table "certifications", :force => true do |t|
t.string "name"
t.string "description"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "door_logs", :force => true do |t| create_table "door_logs", :force => true do |t|
t.string "key" t.string "key"
t.integer "data" t.integer "data"
@ -28,6 +35,13 @@ ActiveRecord::Schema.define(:version => 20121016211727) do
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
end end
create_table "user_certifications", :force => true do |t|
t.integer "user_id"
t.integer "certification_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "users", :force => true do |t| create_table "users", :force => true do |t|
t.string "name" t.string "name"
t.datetime "created_at", :null => false t.datetime "created_at", :null => false
@ -54,6 +68,7 @@ ActiveRecord::Schema.define(:version => 20121016211727) do
t.string "phone" t.string "phone"
t.string "current_skills" t.string "current_skills"
t.string "desired_skills" t.string "desired_skills"
t.boolean "instructor"
end end
add_index "users", ["email"], :name => "index_users_on_email", :unique => true add_index "users", ["email"], :name => "index_users_on_email", :unique => true

9
test/fixtures/user_certifications.yml vendored Normal file
View File

@ -0,0 +1,9 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
one:
user_id: 1
certification_id: 1
two:
user_id: 1
certification_id: 1

View File

@ -0,0 +1,49 @@
require 'test_helper'
class UserCertificationsControllerTest < ActionController::TestCase
setup do
@user_certification = user_certifications(:one)
end
test "should get index" do
get :index
assert_response :success
assert_not_nil assigns(:user_certifications)
end
test "should get new" do
get :new
assert_response :success
end
test "should create user_certification" do
assert_difference('UserCertification.count') do
post :create, :user_certification => { :certification_id => @user_certification.certification_id, :user_id => @user_certification.user_id }
end
assert_redirected_to user_certification_path(assigns(:user_certification))
end
test "should show user_certification" do
get :show, :id => @user_certification
assert_response :success
end
test "should get edit" do
get :edit, :id => @user_certification
assert_response :success
end
test "should update user_certification" do
put :update, :id => @user_certification, :user_certification => { :certification_id => @user_certification.certification_id, :user_id => @user_certification.user_id }
assert_redirected_to user_certification_path(assigns(:user_certification))
end
test "should destroy user_certification" do
assert_difference('UserCertification.count', -1) do
delete :destroy, :id => @user_certification
end
assert_redirected_to user_certifications_path
end
end

View File

@ -0,0 +1,4 @@
require 'test_helper'
class UserCertificationsHelperTest < ActionView::TestCase
end

View File

@ -0,0 +1,7 @@
require 'test_helper'
class UserCertificationTest < ActiveSupport::TestCase
# test "the truth" do
# assert true
# end
end