Fixing issue #19 and also styling homepage

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.id
     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

app/controllers/home_controller.rb

@@ -1,38 +1,53 @@
 class HomeController < ApplicationController
+  layout 'resources'
 
-def index
-  @num_certs = UserCertification.count
-  @recent_certs = UserCertification.where("created_at > ?", DateTime.now - 7.days).count
-  @num_users = User.count
-  @recent_users = User.where("created_at > ?", DateTime.now - 7.days).count
-  # Payments: member levels are multipled by 10 to indicate current payment; 25 x 10 = 250
-  @num_paid_users = User.all.select{|u| u.member_status >= 250 }.count
-  @num_plus_users = User.all.select{|u| u.member_status == 1000 }.count
-  @num_basic_users = User.all.select{|u| u.member_status == 500 }.count
-  @num_associate_users = User.all.select{|u| u.member_status == 250 }.count
-  @num_delinquent_users = User.all.select{|u| !u.payment_status }.count
-  if can? :read, User then
-    @recent_user_names = User.where("member_level > 10").accessible_by(current_ability).order('created_at desc').limit(5)
-  end
-  @num_door_opens = DoorLog.where("key = 'G'").count
-  @today_door_opens = DoorLog.where("key = 'G' AND created_at > ?", DateTime.now - 1.day).count
-  @recent_door_opens = DoorLog.where("key = 'G' AND created_at > ?", DateTime.now - 7.days).count
-  @num_door_denieds = DoorLog.where("key = 'D'").count
-  @recent_door_denieds = DoorLog.where("key = 'D' AND created_at > ?", DateTime.now - 1.month).count
-  @num_logins = User.sum('sign_in_count')
-  @recent_logins = User.where('current_sign_in_at > ?',Date.today - 7.days).count
-  @num_macs = Mac.count
-  @recent_macs = Mac.where("since > ?", DateTime.now - 1.day).count
-
-    respond_to do |format|
-      format.html # index.html.erb
+  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
-end
 
-def more_info
-  respond_to do |format|
-    format.html # more_info.html.erb
+    # Fun Stats
+
+    @num_certs = UserCertification.count
+    @recent_certs = UserCertification.where("created_at > ?", DateTime.now - 7.days).count
+    @num_users = User.count
+    @recent_users = User.where("created_at > ?", DateTime.now - 7.days).count
+    # Payments: member levels are multipled by 10 to indicate current payment; 25 x 10 = 250
+    @num_paid_users = User.all.select{|u| u.member_status >= 250 }.count
+    @num_plus_users = User.all.select{|u| u.member_status == 1000 }.count
+    @num_basic_users = User.all.select{|u| u.member_status == 500 }.count
+    @num_associate_users = User.all.select{|u| u.member_status == 250 }.count
+    @num_delinquent_users = User.all.select{|u| !u.payment_status }.count
+    if can? :read, User then
+      @recent_user_names = User.where("member_level > 10").accessible_by(current_ability).order('created_at desc').limit(5)
+    end
+    @num_door_opens = DoorLog.where("key = 'G'").count
+    @today_door_opens = DoorLog.where("key = 'G' AND created_at > ?", DateTime.now - 1.day).count
+    @recent_door_opens = DoorLog.where("key = 'G' AND created_at > ?", DateTime.now - 7.days).count
+    @num_door_denieds = DoorLog.where("key = 'D'").count
+    @recent_door_denieds = DoorLog.where("key = 'D' AND created_at > ?", DateTime.now - 1.month).count
+    @num_logins = User.sum('sign_in_count')
+    @recent_logins = User.where('current_sign_in_at > ?',Date.today - 7.days).count
+    @num_macs = Mac.count
+    @recent_macs = Mac.where("since > ?", DateTime.now - 1.day).count
+
+      respond_to do |format|
+        format.html # index.html.erb
+      end
+  end
+
+  def more_info
+    respond_to do |format|
+      format.html # more_info.html.erb
+    end
   end
-end
 
 end