diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index d6ea8e21737d06c73e38d7e2de6c8d9509783c44..7b1fafa4d758628eb4cb4ace8b125f9a03b13c76 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -22,16 +22,19 @@ class AdminsController < ApplicationController end def weekly_user_stats - @created_users_by_day = User.where("username IS NOT NULL").count(:group => "date(created_at)") - @created_users_by_week = {} - @created_users_by_day.keys.each do |k| - unless k.nil? - if @created_users_by_week[k.beginning_of_week].blank? - @created_users_by_week[k.beginning_of_week] = @created_users_by_day[k] - else - @created_users_by_week[k.beginning_of_week] += @created_users_by_day[k] + @created_users = User.where("username IS NOT NULL") + @created_users_by_week = Hash.new{ |h,k| h[k] = [] } + @created_users.each do |u| + unless u.nil? + @created_users_by_week[u.created_at.beginning_of_week.strftime("%Y-%m-%d")].push("#{u.username}") end end + + unless(params[:week]).nil? + # @segment = "#{@created_users_by_week[(params[:week])]}" + @counter = "#{@created_users_by_week[(params[:week])].count}" + else + @segment = "date not found" end end diff --git a/app/views/admins/weekly_user_stats.haml b/app/views/admins/weekly_user_stats.haml index 6816c324e2eb7701a92dfa08434b18fb0151e3b8..e93fdf0b029bf6fa60b69574b25f1b62a471cbbd 100644 --- a/app/views/admins/weekly_user_stats.haml +++ b/app/views/admins/weekly_user_stats.haml @@ -6,8 +6,15 @@ .span-24.last %h2 - = "Users per week (Current server date is: #{Time.now.to_date}) " - %ul - - @created_users_by_week.keys.sort.reverse.each do |k| - %li - = "Week starting on #{k} , #{@created_users_by_week[k]}" + = "Current server date is: #{Time.now.to_date}) " + += form_tag('/admins/weekly_user_stats', :method => 'get') do + = select_tag(:week, options_for_select(@created_users_by_week.keys)) + = submit_tag 'go' + +amount of new users this week: += @counter +%br +- @created_users_by_week[(params[:week])].each do |m| + = link_to m, "/u/#{m}" + %br