Merge branch 'master' into rails3

Conflicts:
	.gitignore
	app/models/task.rb
	app/models/workgroup.rb
	app/views/shared/_group_form.html.haml
	config/locales/de.yml
	db/schema.rb
This commit is contained in:
benni 2012-06-24 21:59:46 +02:00
commit 182742fbec
10 changed files with 46 additions and 26 deletions

View file

@ -63,6 +63,12 @@ class Ordergroup < Group
stats[:orders_sum] != 0 ? stats[:jobs_size].to_f / stats[:orders_sum].to_f : 0
end
# This is the ordergroup job per euro performance
# in comparison to the hole foodcoop average
def apples
((avg_jobs_per_euro / Ordergroup.avg_jobs_per_euro) * 100).to_i rescue 0
end
# Global average
def self.avg_jobs_per_euro
stats = Ordergroup.all.collect(&:stats)