Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into rails3

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
app/views/home/_stats.erb
View file

@ -14,7 +14,7 @@ unless global_avg == 0 or global_avg.nan?
%>
Engagement Deiner Bestellgruppe
<div class="stats-bar" style="width:<%= length_of_group_bar -%>px; background-color:<%= color -%>">
<%= ((group_avg / global_avg) * 100).to_i -%><%= " Äpfel" if length_of_group_bar > 50 -%>
<%= @ordergroup.apples -%><%= " Äpfel" if length_of_group_bar > 50 -%>
</div>
Durchschnittsengagement
<div class="stats-bar" style="width:<%= length_of_global_bar -%>px">