# HG changeset patch # User luisf # Date 1350663880 -3600 # Node ID b2e0731c5438434769fb81bc533e95e05b460448 # Parent 710921c48f062a85505c6da37b1c24da08f01cc5# Parent 30040a8e3a882fc35c5a6ead1a29fee7e9228e99 Merge from get_statistics branch diff -r 710921c48f06 -r b2e0731c5438 extra/soundsoftware/get-statistics.rb --- a/extra/soundsoftware/get-statistics.rb Fri Oct 19 14:47:53 2012 +0100 +++ b/extra/soundsoftware/get-statistics.rb Fri Oct 19 17:24:40 2012 +0100 @@ -38,41 +38,22 @@ weeks << end_date end - -users = [] # dates = months_between(d1, d2) dates = weeks_between(d1, d2) -private_projects = [] -all_projects = [] -public_projects = [] -top_level_and_private_projects = [] - dates.each do |date| - users << User.find(:all, :conditions => {:created_on => d1..date}) - all_projects << Project.find(:all, :conditions => {:created_on => d1..date}) - private_projects << Project.find(:all, :conditions => {:created_on => d1..date, + users = User.find(:all, :conditions => {:created_on => d1..date}) + all_projects = Project.find(:all, :conditions => {:created_on => d1..date}) + private_projects = Project.find(:all, :conditions => {:created_on => d1..date, :is_public => false}) - top_level_and_private_projects << Project.find(:all, :conditions => {:created_on => d1..date, + top_level_and_private_projects = Project.find(:all, :conditions => {:created_on => d1..date, :is_public => false, :parent_id => nil}) - puts "#{date} #{users.size} #{all_projects.size} #{private_projects.size} \n" + puts "#{date} #{users.count} #{all_projects.count} #{private_projects.count} #{top_level_and_private_projects.count}\n" end - - - - -#nusers.each_with_index do |num, idx| -# puts "#{dates[idx]} #{num}\n" -#end - - - - -