Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

2014-04-10 21:05:29 -07:00 · 2014-04-10 21:05:29 -07:00 · 18a52b4fca
commit 18a52b4fca
parent b3279299cf cb0f203f82
18 changed files with 166 additions and 126 deletions
--- a/1
+++ b/1
@ -3,7 +3,6 @@ source 'https://rubygems.org'
 ruby '1.9.3'

 gem 'rails', '3.2.8'
-
 gem 'dotenv-rails'

 # Bundle edge Rails instead:
--- a/app/controllers/contracts_controller.rb
+++ b/app/controllers/contracts_controller.rb
@ -18,6 +18,7 @@ class ContractsController < ApplicationController
  def create
    Rails.logger.info "CONTRACT"
    Rails.logger.info @contract.inspect
+    @contract.created_by = current_user
    respond_to do |format|
      if @contract.save
        format.html { redirect_to @contract, :notice => 'Contract was successfully created.' }
@ -51,6 +52,6 @@ class ContractsController < ApplicationController
  end

  def load_users
-    @users = @users = User.accessible_by(current_ability).sort_by(&:name)
+    @users = User.accessible_by(current_ability).sort_by(&:name)
  end
 end
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@ -1,6 +1,22 @@
 class HomeController < ApplicationController
+  layout 'resources'
+
+  def index
+    # Alerts
+    if user_signed_in? && current_user.orientation.blank? then
+      flash[:alert] = "There's a lot more to see here, but our records show you haven't completed the new member orientation yet. If that's incorrect, please contact a volunteer."
+    end
+    if user_signed_in? && current_user.member_status.between?(2,100) then
+      flash[:alert] = "<!--
+        Member: <%= current_user.member.inspect
+        Level: <%= current_user.member_level.inspect
+        -->
+        Looks like we haven't acknowledged a recent payment for you yet. This could be because we're slow, but if in doubt please see your profile for payment instructions, consider updating your membership level to something accurate, or contact us.<br/>Thanks for supporting us!"
+    end
+
+    # Fun Stats
+    @featured_resource = Resource.where("picture_file_name IS NOT NULL").sample

-def index
    @num_certs = UserCertification.count
    @recent_certs = UserCertification.where("created_at > ?", DateTime.now - 7.days).count
    @num_users = User.count
@ -27,12 +43,12 @@ def index
      respond_to do |format|
        format.html # index.html.erb
      end
-end
+  end

-def more_info
+  def more_info
    respond_to do |format|
      format.html # more_info.html.erb
    end
-end
+  end

 end
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1,6 +1,7 @@
 class UsersController < ApplicationController
  load_and_authorize_resource
  before_filter :authenticate_user!
+  layout 'resources'

  def sort_by_cert(certs,id)
    result = 0
@ -124,6 +125,9 @@ class UsersController < ApplicationController
  # POST /users
  # POST /users.json
  def create
+    # update oriented_by only if orientation has been set
+    @user.oriented_by_id = current_user.id unless @user.orientation.blank?
+
    respond_to do |format|
      if @user.save
        format.html { redirect_to @user, :notice => 'User was successfully created.' }
@ -138,6 +142,10 @@ class UsersController < ApplicationController
  # PUT /users/1
  # PUT /users/1.json
  def update
+    # update oriented_by only if it's blank but the (new) orientation isn't blank
+    # gotta test the params because they don't get applied til below.
+    @user.oriented_by_id = current_user.id if @user.oriented_by.blank? && (!params[:user]["orientation(1i)"].blank?)
+
    respond_to do |format|
      if @user.update_attributes(params[:user])
        format.html { redirect_to @user, :notice => 'User was successfully updated.' }
--- a/app/models/contract.rb
+++ b/app/models/contract.rb
@ -1,6 +1,10 @@
 class Contract < ActiveRecord::Base
  belongs_to :user
-  attr_accessible :user_id, :first_name, :last_name, :cosigner, :signed_at, :document, :document_file_name, :document_content_type, :document_file_size, :document_updated_at
+  belongs_to :created_by, :foreign_key => "created_by_id", :class_name => "User"
+  attr_accessible :user_id, :first_name, :last_name, :cosigner, 
+    :signed_at, :document, :document_file_name, :document_content_type, 
+    :document_file_size, :document_updated_at
+    # :created_by not accessible for security purposes

  validates_presence_of :first_name, :signed_at #, :last_name

--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -11,6 +11,7 @@ class User < ActiveRecord::Base
  # 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, :marketing_source, :payee, :accountant, :exit_reason, :twitter_url, :facebook_url, :github_url, :website_url, :email_visible, :phone_visible, :postal_code #TODO: make admin/instructor/member/etc not accessible

+  belongs_to :oriented_by, :foreign_key => "oriented_by_id", :class_name => "User"
  has_many :cards
  has_many :user_certifications
  has_many :certifications, :through => :user_certifications
--- a/app/views/contracts/show.html.erb
+++ b/app/views/contracts/show.html.erb
@ -18,9 +18,14 @@
    <%= @contract.signed_at.to_date.to_s(:long) %>
  </small>
 </h2>
+<% unless @contract.created_by.blank? %>
+  <p>
+    <em>Created by <%= @contract.created_by.name %></em>
+  </p>
+<% end %>

 <% if @contract.document.blank? %>
-  No document uploaded
+  <p>No document uploaded</p>
 <% else %>
 <p><%= link_to "Download Contract", @contract.document.url %>
  <div class="col-xs-12">
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@ -3,30 +3,22 @@
 <%= simple_format Setting.welcome_body %>
 <% end %>

-
-<% if user_signed_in? && current_user.orientation.blank? then %>
-<p class="alert">There's a lot more to see here, but our records show you haven't completed the new member orientation yet. If that's incorrect, please contact a volunteer.</p>
-<% end %>
-<% if user_signed_in? && current_user.member_status.between?(2,100) then %>
-<%= current_user.member.inspect %>
-<%= current_user.member_level.inspect %>
-<p class="alert">Looks like we haven't acknowledged a recent payment for you yet. This could be because we're slow, or this app just got started, but if in doubt please see your profile for payment instructions, or consider updating your membership level to something accurate.<br/>Thanks for supporting HeatSync!</p>
-<% end %>
-<table>
-<tr>
-<td>
 <% if ((can? :read, User) && (@recent_user_names.count > 1)) then %>
-<h2>New People: <em>(say hi!)</em></h2>
-<ul>
-<% @recent_user_names.each do |user| %>
+  <div class="col-sm-4">
+    <h2>New People: <em>(say hi!)</em></h2>
+    <ul>
+    <% @recent_user_names.each do |user| %>
      <% if can? :read, user %>
        <li><%= link_to user.name, user %> <%= raw(user.member_status_symbol) %> <em>(Signed up <%= user.created_at.strftime("%b %d") %>)</em></li>
      <% end %>
+    <% end %>
+    </ul>
+  </div>
 <% end %>
-</ul>
-<% end %>
-<h2>Cool Stats:</h2>
-<dl>
+
+<div class="col-sm-4">  
+  <h2>Cool Stats:</h2>
+  <dl>
    <dt># of People in this DB:</dt>
    <dd><%= @num_users %> (<%= @recent_users %> new in the last 7 days)</dd>
    <dt># of People Certified:</dt>
@ -41,17 +33,18 @@
    <dd><%= @num_logins %> (<%= @recent_logins %> users last 7 days)</dd>
    <dt># of Computers in this DB:</dt>
    <dd><%= @num_macs %> (<%= @recent_macs %> seen today)</dd>
-</dl>
+  </dl>
+</div>

-</td>
-<td>
+<div class="col-sm-4">
+  <h2>Member Resources</h2>
+  <% if can? :access_doors_remotely, :door_access %>
+  <ul><li><%= link_to "Remote Door Access", space_api_access_path %></li></ul>
+  <% end %>
+  <%= simple_format Setting.member_resources_inset %>
+</div>

-<h2>Member Resources</h2>
-<% if can? :access_doors_remotely, :door_access %>
-<ul><li><%= link_to "Remote Door Access", space_api_access_path %></li></ul>
-<% end %>
-<%= simple_format Setting.member_resources_inset %>
-
-</td>
-</tr>
-</table>
+<span class="col-sm-4">
+  <h3>Featured item:</h3>
+  <%= render @featured_resource unless @featured_resource.blank? %>
+</span>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -2,6 +2,7 @@
 <html>
 <head>
  <title>hsl_members(<%= controller.controller_name %>.<%= controller.action_name %><%=  "["+params[:id]+"]" unless params[:id].blank? %>)</title>
+  <link rel="icon" href="/favicon.ico">
  <% if params[:controller] == "resources" %>
    <link href="/bootstrap/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
    <link href="/bootstrap/css/bootstrap-theme.min.css" type="text/css" rel="stylesheet" />
--- a/app/views/layouts/resources.html.erb
+++ b/app/views/layouts/resources.html.erb
@ -10,6 +10,7 @@
  <link href="/bootstrap/css/bootstrap-theme.min.css" type="text/css" rel="stylesheet" />
  <script src="/bootstrap/js/bootstrap.min.js" type="text/javascript" ></script> 

+  <link rel="icon" href="/favicon.ico">

 <style>
  .resource .thumbnail { height: 150px; position: relative; }
@ -24,6 +25,8 @@
    font-weight: bold; left: 10px; }
  .resource .thumbnail .disposed { color: red; }
  .resource .thumbnail h4 { position: absolute; bottom: 1px; margin-bottom: 1px; }
+
+  .col_highlight { background-color: #f9f9f9; }
 </style>


--- a/app/views/users/activity.html.erb
+++ b/app/views/users/activity.html.erb
@ -6,7 +6,7 @@


 <h2><a name="new_users"></a>New Users</h2>
-<table>
+<table class="table table-hover">
  <tr>
    <th>Name</th>
    <th>Member Level</th>
@ -25,22 +25,22 @@
    <td><% if user.created_at.present? %> 
      <%= distance_of_time_in_words(DateTime.now, user.created_at.to_date)+" ago" %>
    <% else %>
-      <span class="alert">&times;</span>
+      <span class="label label-danger">&times;</span>
    <% end %></td>
    <td><% if user.waiver.present? %> 
      <%= distance_of_time_in_words(DateTime.now, user.waiver.to_date)+" ago" %>
    <% else %>
-      <span class="alert">&times;</span>
+      <span class="label label-danger">&times;</span>
    <% end %></td>
    <td><% if user.orientation.present? %> 
      <%= distance_of_time_in_words(DateTime.now, user.orientation.to_date)+" ago" %>
    <% else %>
-      <span class="alert">&times;</span>
+      <span class="label label-danger">&times;</span>
    <% end %></td>
    <td><% if user.payments.present? %> 
      <%= distance_of_time_in_words(Date.today, user.payments.maximum(:date))+" ago" %>
    <% else %>
-      <span class="alert">&times;</span>
+      <span class="label label-danger">&times;</span>
    <% end %></td>
  </tr>
  <% end %>
@ -48,7 +48,7 @@
 </table>

 <h2><a name="members_without_cards"></a>Basic+ Members Without Cards</h2>
-<table>
+<table class="table table-hover">
  <tr>
    <th>Name</th>
    <th>Account Created</th>
@ -67,19 +67,19 @@
    <td><% if user.payments.present? %> 
      <% last_payment = user.payments.maximum(:date) %>
      <% if Date.today-last_payment > 60 %>
-        <span class="alert">
+        <span class="label label-danger">
      <% else %>
-        <span class="notice">
+        <span class="label label-success">
      <% end %>
      <%= distance_of_time_in_words(Date.today, user.payments.maximum(:date))+" ago" %>
      </span>
    <% else %>
-      <span class="alert">&times;</span>
+      <span class="label label-danger">&times;</span>
    <% end %></td>
    <td><% if user.cards.present? %>
-      <span class="notice">&check;</span>
+      <span class="label label-success">&check;</span>
    <% else %>
-      <span class="alert">&times;</span>
+      <span class="label label-danger">&times;</span>
    <% end %></td>
  </tr>
  <% end %>
@ -88,7 +88,7 @@


 <h2><a name="logins"></a>Logins</h2>
-<table>
+<table class="table table-hover">
  <tr>
    <th>Name</th>
    <th>Current Sign In</th>
@ -118,7 +118,7 @@

 <h2><a name="zombies"></a>Never-Logged-In Members</h2>
 <em>Excluding non-members</em>
-<table>
+<table class="table table-hover">
  <tr>
    <th>Name</th>
    <th>Member Level</th>
--- a/app/views/users/inactive.html.erb
+++ b/app/views/users/inactive.html.erb
@ -1,6 +1,6 @@
 <h1>Inactive Users</h1>

-<table>
+<table class="table table-hover">
  <col />
  <col />
  <% if current_user.admin? then %><col /><% end %>
@ -24,14 +24,12 @@
    <th>Desired Level</th>
    <th>Last Payment</th>
    <th>Joined</th>
-    <th></th>
-    <th></th>
  </tr>
  
 <% if !@users.blank? %>
  <% @users.each do |user| %>
  <tr<%= " class='hidden'" if user.hidden? %>>
-    <td><%= image_tag user.gravatar_url(:default => "http://members.heatsynclabs.org/assets/nil.png"), :class => :avatar %></td>
+    <td><%= image_tag user.gravatar_url(:size => 25, :default => "http://members.heatsynclabs.org/assets/nil.png"), :class => :avatar %></td>
    <td><%= link_to user.name, user %></td>
    <% if current_user.admin? then %><td><%= user.email %></td><% end %>
    <td><% user.certifications.each do |c| %>
@ -51,8 +49,6 @@
      <% end %>
    </td>
    <td><%= user.created_at.to_date %></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>
  </tr>
  <% end %>
 <% end %>
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@ -1,23 +1,25 @@
 <h1>HeatSync People</h1>

+<p>
 <% if can? :create, User %>
-  <%= link_to 'New User', new_user_path %> |
+  <%= link_to 'New User', new_user_path, class: "btn btn-success" %>
 <% end %>
 <% if can? :manage, User %>
-  <%= link_to 'Merge Users', users_merge_path %> |
+  <%= link_to 'Merge Users', users_merge_path, class: "btn btn-primary" %>
 <% end %>
 <% if current_user.admin? %>
-  <%= link_to 'Inactive Users', users_inactive_path %> |
+  <%= link_to 'Inactive Users', users_inactive_path, class: "btn btn-default" %>
 <% end %>
 <% if can? :activity, User %>
-  <%= link_to 'Recent Activity', users_activity_path %> |
+  <%= link_to 'Recent Activity', users_activity_path, class: "btn btn-default" %>
 <% end %>
 <% if can? :new_member_report, User %>
-  <%= link_to 'New Members Report', users_new_member_report_path %>
+  <%= link_to 'New Members Report', users_new_member_report_path, class: "btn btn-default" %>
 <% end %>
+</p>

 <% @certifications = Certification.all.sort_by(&:id) %>
-<table>
+<table class="table table-hover">
  <col />
  <col />
  <% if current_user.admin? then %><col /><% end %>
@ -47,14 +49,12 @@
    <% @certifications.each do |c| %>
      <th><a href="?full=full&sort=cert&cert=<%= c.id %>"><%= c.name %></a></th>
    <% end %>
-    <th></th>
-    <th></th>
  </tr>
  
 <% if !@users.blank? %>
  <% @users.each do |user| %>
  <tr<%= ' class=hidden' if user.hidden? %>>
-    <td><%= image_tag user.gravatar_url(:default => "http://members.heatsynclabs.org/assets/nil.png"), :class => :avatar %></td>
+    <td><%= image_tag user.gravatar_url(:size => 25, :default => "http://members.heatsynclabs.org/assets/nil.png"), :class => :avatar %></td>
    <td><%= link_to user.name, user %></td>
    <td><%= raw(user.member_status_symbol) %></td>
    <% if current_user.admin? then %><td><%= user.email %></td><% end %>
@ -74,8 +74,6 @@
      <% end %>
    </td>
    <% end %>
-    <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>
  </tr>
  <% end %>
 <% end %>
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@ -6,9 +6,12 @@
  <%= link_to image_tag('/facebook.png', :class => 'social-icon', :title => "Facebook"), @user.facebook_url, :class => 'social-link' if @user.facebook_url.present? %>
  <%= link_to image_tag('/github.png', :class => 'social-icon', :title => "Github"), @user.github_url, :class => 'social-link' if @user.github_url.present? %>
  <%= link_to image_tag('/website.png', :class => 'social-icon', :title => "Website"), @user.website_url, :class => 'social-link' if @user.website_url.present? %>
-<%= link_to "Email User", user_compose_email_path(@user), :class => 'btn' %>
-</h2>

+  <%= link_to 'Back', :back, :class => 'btn btn-default' %>
+  <%= link_to 'Email User', user_compose_email_path(@user), :class => 'btn btn-default' %>
+  <%= link_to 'Edit', edit_user_path(@user), class: "btn btn-primary" if can? :update, @user %>
+  <%= link_to 'Destroy', @user, class: "btn btn-danger", :confirm => 'Are you sure? WARNING: THIS DOES NOT REMOVE THE USER FROM THE DOOR SYSTEM! DISABLE THEM FIRST.', :method => :delete if can? :destroy, @user %>
+</h2>

 <% if current_user.admin? || @user.email_visible %>
  <p>
@ -36,6 +39,9 @@
 <p>
  <b>Orientation?</b>
  <%= @user.orientation.strftime("%B %d %Y") unless @user.orientation.blank? %>
+  <% unless @user.oriented_by.blank? %>
+    <em>(recorded by <%= link_to @user.oriented_by.name, @user.oriented_by %>)</em>
+  <% end %>
 </p>
  <p>
    <b>Emergency Name:</b>
@ -74,7 +80,7 @@
  </p>
 <% end %>

-<b>Certifications:  </b><%= link_to "+ Add", (new_user_certification_path+"?user="+@user.id.to_s), :class => 'btn' if can? :create, UserCertification %>
+<b>Certifications:  </b><%= link_to "+ Add", (new_user_certification_path+"?user="+@user.id.to_s), :class => 'btn btn-default' if can? :create, UserCertification %>
 <ul>
  <% @user.certifications.each do |certification| %>
    <li><%= link_to certification.name, certification %></li>
@ -82,7 +88,7 @@
  <% if @user.certifications.blank? %><li>n/a</li><% end %>
 </ul>
 <p>
-  <b>Card:  </b><%= link_to "+ Add", (new_card_path+"?user="+@user.id.to_s), :class => 'btn' if can? :create, Card %>
+  <b>Card:  </b><%= link_to "+ Add", (new_card_path+"?user="+@user.id.to_s), :class => 'btn btn-default' if can? :create, Card %>
  <% if current_user.admin? then %>
    <ul>
    <% @user.cards.each do |c| %>
@ -94,7 +100,7 @@
  <% end %>
 </p>

-<b>Computers: </b><%= link_to "+ Add", new_mac_path, :class => 'btn' if can? :create, Mac %>
+<b>Computers: </b><%= link_to "+ Add", new_mac_path, :class => 'btn btn-default' if can? :create, Mac %>
 <ul>
  <% @user.macs.each do |mac| %>
    <li><%= link_to mac.mac, mac %></li>
@ -163,7 +169,7 @@ margin-right: auto;

  .clearfix { clear: both }
  </style>
-  <b>Resources: </b><%= link_to "+ Add", new_resource_path, :class => 'btn' if can? :create, Resource %>
+  <b>Resources: </b><%= link_to "+ Add", new_resource_path, :class => 'btn btn-default' if can? :create, Resource %>
  <div class="row"><%= render @user.resources if @user.resources %></div>
  <div class="clearfix"></div>
 </p>
@ -171,7 +177,7 @@ margin-right: auto;
 <p>
  <b>Waiver?</b>
  <%= @user.waiver.strftime("%B %d %Y") unless @user.waiver.blank? %><br/>
-  <b>Contracts:</b> <%= link_to "+ Add", new_contract_path, :class => 'btn' if can? :create, Contract %>
+  <b>Contracts:</b> <%= link_to "+ Add", new_contract_path, :class => 'btn btn-default' if can? :create, Contract %>
  <ul>
    <% @user.contracts.each do |contract| %>
      <li>
@ -201,6 +207,3 @@ margin-right: auto;
  <%= @user.current_sign_in_at %>
 </p>
 <% end %>
-
-<% if can? :update, @user then %><%= link_to 'Edit', edit_user_path(@user) %> |<% end %>
-<%= link_to 'Back', users_path %>
--- a/app/views/users/summary.html.erb
+++ b/app/views/users/summary.html.erb
@ -33,7 +33,7 @@

 <h1>HeatSync People
 <%= link_to 'New User', new_user_path, class: "btn btn-success" if can? :create, User %>
-<%= link_to 'Merge Users', users_merge_path, class: "btn btn-default" if can? :manage, User %>
+<%= link_to 'Merge Users', users_merge_path, class: "btn btn-primary" if can? :manage, User %>
 </h1>


--- a/db/migrate/20140411022819_add_created_by_to_contract.rb
+++ b/db/migrate/20140411022819_add_created_by_to_contract.rb
@ -0,0 +1,5 @@
+class AddCreatedByToContract < ActiveRecord::Migration
+  def change
+    add_column :contracts, :created_by_id, :integer
+  end
+end
--- a/db/migrate/20140411024809_add_oriented_by_to_users.rb
+++ b/db/migrate/20140411024809_add_oriented_by_to_users.rb
@ -0,0 +1,5 @@
+class AddOrientedByToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :oriented_by_id, :integer
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.

-ActiveRecord::Schema.define(:version => 20140303030220) do
+ActiveRecord::Schema.define(:version => 20140411024809) do

  create_table "cards", :force => true do |t|
    t.string   "card_number"
@ -42,6 +42,7 @@ ActiveRecord::Schema.define(:version => 20140303030220) do
    t.datetime "created_at",            :null => false
    t.datetime "updated_at",            :null => false
    t.string   "cosigner"
+    t.integer  "created_by_id"
  end

  create_table "door_logs", :force => true do |t|
@ -251,6 +252,7 @@ ActiveRecord::Schema.define(:version => 20140303030220) do
    t.boolean  "email_visible"
    t.boolean  "phone_visible"
    t.string   "postal_code"
+    t.integer  "oriented_by_id"
  end

  add_index "users", ["email"], :name => "index_users_on_email", :unique => true