From 4da2ec9463569415621c6ccae3cd7b6e92e96917 Mon Sep 17 00:00:00 2001 From: Will Bradley Date: Sat, 28 Sep 2013 20:17:38 -0700 Subject: [PATCH] Tweaking main page stats to show member counts --- app/controllers/home_controller.rb | 6 +++++- app/views/home/index.html.erb | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 26efe11..61422ed 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -5,7 +5,11 @@ def index @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) @@ -14,7 +18,7 @@ def index @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 - 7.days).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 diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 8da38f9..d382862 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -30,12 +30,12 @@
# of People Certified:
<%= @num_certs %> (<%= @recent_certs %> new in the last 7 days)
# of Current Paying Members:
-
<%= @num_paid_users %> (<%= @num_delinquent_users %> not-current)
+
<%= @num_paid_users %> (<%= @num_plus_users %> plus, <%= @num_basic_users %> basic, <%= @num_associate_users %> associate. <%= @num_delinquent_users %> not-current)
# of Door Accesses Granted:
<%= @num_door_opens %> (<%= @today_door_opens %> today, <%= @recent_door_opens %> in the last 7 days)
# of Door Accesses Denied:
-
<%= @num_door_denieds %> (<%= @recent_door_denieds %> in the last 7 days)
-
# of Logins:
+
<%= @num_door_denieds %> (<%= @recent_door_denieds %> in the last month)
+
# of Members DB Logins:
<%= @num_logins %> (<%= @recent_logins %> users last 7 days)
# of Computers in this DB:
<%= @num_macs %> (<%= @recent_macs %> seen today)