Merge branch 'master' into denney-new-user-form

Conflicts:
	db/schema.rb

app/models/ability.rb

@@ -1,14 +1,16 @@
 class Ability
   include CanCan::Ability
-  
+
   def initialize(current_user)
     @current_user = current_user
-    self.send(current_user.role.to_sym)
+    current_user.roles.each do |role|
+      self.send(role.role.to_sym)
+    end
   end
 
   def admin
     can :manage, :all
-  end  
+  end
 
   def staff
     can :manage, :all
@@ -21,7 +23,7 @@ class Ability
 
   def user
     can :read, :all
-    can :update, Bike, :id => @current_user.bike_id unless @current_user.bike.nil?
+    can :manage, Bike, :id => @current_user.bike_id unless @current_user.bike.nil?
     can :manage, ::ActsAsLoggable::Log, { :loggable_type => "Bike", :loggable_id => @current_user.bike_id }
     can :manage, ::ActsAsLoggable::Log, { :loggable_type => "User", :loggable_id => @current_user.id }
   end

app/models/role.rb

@@ -0,0 +1,16 @@
+class Role < ActiveRecord::Base
+  attr_accessible :role
+
+  has_many :user_role_joins
+  has_many :users, through: :user_role_joins
+  validates_uniqueness_of :role
+
+
+  def to_s
+    self.role
+  end
+
+  def ==(other)
+    self.role == other.role
+  end
+end

app/models/user.rb

@@ -7,14 +7,16 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me,
-    :first_name, :last_name, :nickname, :user_role_id, :bike_id,
-    :user_profiles_attributes
+    :first_name, :last_name, :nickname, :bike_id,
+    :user_profiles_attributes, :username
 
   has_many :transactions
   has_many :user_profiles
   accepts_nested_attributes_for :user_profiles, allow_destroy: false
 
-  has_one :user_role
+  has_many :user_role_joins, :conditions => ["ends IS NULL OR ends > ?", Time.now]
+  has_many :roles, through: :user_role_joins
+
   belongs_to :bike
 
   validates :first_name, :presence => true
@@ -24,29 +26,65 @@ class User < ActiveRecord::Base
     "#{first_name} #{last_name}"
   end
 
+  def email_required?
+    false
+  end
+
   def full_name
     to_s
   end
 
-  def role
-    user_role.role
+  def role?(role)
+    if role.kind_of?(String) or role.kind_of?(Symbol)
+      role = Role.find_by_role(role.to_s)
+    end
+    roles.include?(role)
   end
 
-  def role?(role)
-    user_role.to_s == role.to_s
-  end
+### TODO methods below probably belong somewhere else
 
   def total_hours
-    ActsAsLoggable::Log.where( :loggable_type => self.class.to_s, :loggable_id => self.id).sum { |l| (l.end_date - l.start_date)/3600 }.round(2)
+    log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN")
+    logs.where("log_action_id != ? AND log_action_type = ?", log_action.id, log_action.class.to_s).sum { |l| (l.end_date - l.start_date)/3600 }.round(2)
   end
 
   def current_month_hours
+    log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN")
     #TODO need to prevent users from saving logs across months, force to create a new log if crossing month
     current_month_range = (Time.now.beginning_of_month..Time.now.end_of_month)
-    ActsAsLoggable::Log.where( :loggable_type => self.class.to_s, :loggable_id => self.id)
+    logs.where("log_action_id != ? AND log_action_type = ?", log_action.id, log_action.class.to_s)
       .where( :start_date => current_month_range)
       .where( :end_date => current_month_range)
       .sum { |l| (l.end_date - l.start_date)/3600 }
       .round(2)
   end
+
+  def checked_in?
+    log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN")
+    checked = logs.where( log_action_id: log_action.id).
+      where("start_date >= ?", Time.zone.now.beginning_of_day).
+      where("start_date = end_date")
+    !checked.empty?
+  end
+
+  def checkin
+    log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN")
+    time = Time.now
+    logs.create( logger_id: self.id,
+                 logger_type: self.class.to_s,
+                 start_date: time,
+                 end_date: time,
+                 log_action_id: log_action.id,
+                 log_action_type: log_action.class.to_s)
+    save
+  end
+
+  def checkout
+    log_action = ::ActsAsLoggable::UserAction.find_by_action("CHECKIN")
+    checked = logs.where( log_action_id: log_action.id).
+      where("start_date >= ?", Time.zone.now.beginning_of_day).
+      where("start_date = end_date").first
+    checked.end_date = Time.now
+    checked.save
+  end
 end

app/models/user_role.rb

@@ -1,11 +0,0 @@
-class UserRole < ActiveRecord::Base
-  attr_accessible :role
-
-  belongs_to :user
-
-  self.per_page = 15
-
-  def to_s
-    self.role
-  end
-end

app/models/user_role_join.rb

@@ -0,0 +1,13 @@
+class UserRoleJoin < ActiveRecord::Base
+  self.table_name = :user_role_joins
+  attr_accessible :role_id, :user_id, :ends
+
+  belongs_to :user
+  belongs_to :role
+
+  validate :role_id, presence: true, numericality: true
+  validate :user_id, presence: true, numericality: true
+  validates_uniqueness_of :user_id, :scope => :role_id
+
+  self.per_page = 15
+end