From 9897f8c170d407a5c9ca28d985a8848b63c5edc8 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Mon, 16 Mar 2009 14:59:24 +0100 Subject: [PATCH] apply the patch from Steven Aerts which fixes some small issues with stats. Thanks Steven! --- app/views/stats/actions_done_last12months_data.html.erb | 4 ++-- app/views/stats/actions_done_last30days_data.html.erb | 8 ++++---- app/views/stats/context_running_actions_data.html.erb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/stats/actions_done_last12months_data.html.erb b/app/views/stats/actions_done_last12months_data.html.erb index d038ac48..e1191042 100755 --- a/app/views/stats/actions_done_last12months_data.html.erb +++ b/app/views/stats/actions_done_last12months_data.html.erb @@ -14,8 +14,8 @@ &links=<% 0.upto 11 do |i| -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>,<% end -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>& &links_2=<% 0.upto 11 do |i| -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>,<% end -%><%= url_for :controller => 'stats', :action => 'actions_done_last_years' %>& &values_2=<% 0.upto 11 do |i| -%><%= @actions_done_last12months_hash[i]%>,<% end -%><%= @actions_done_last12months_hash[12]%>& -&values_3=<%0.upto 11 do |i| -%><%=@sum_actions_created_last12months/12-%>,<%end-%><%=@sum_actions_created_last12months/12-%>& -&values_4=<%0.upto 11 do |i| -%><%=@sum_actions_done_last12months/12-%>,<%end-%><%=@sum_actions_done_last12months/12-%>& +&values_3=<%0.upto 11 do |i| -%><%=@sum_actions_created_last12months/12.0-%>,<%end-%><%=@sum_actions_created_last12months/12.0-%>& +&values_4=<%0.upto 11 do |i| -%><%=@sum_actions_done_last12months/12.0-%>,<%end-%><%=@sum_actions_done_last12months/12.0-%>& &values_5=<%0.upto 11 do |i| -%><%=@actions_created_avg_last12months_hash[i]-%>,<%end-%><%=@actions_created_avg_last12months_hash[12]-%>& &values_6=<%0.upto 11 do |i| -%><%=@actions_done_avg_last12months_hash[i]-%>,<%end-%><%=@actions_done_avg_last12months_hash[12]-%>& &values_7=<%=@interpolated_actions_created_this_month%>,<%=@actions_done_avg_last12months_hash[1]%>& diff --git a/app/views/stats/actions_done_last30days_data.html.erb b/app/views/stats/actions_done_last30days_data.html.erb index 94c48001..5eac2776 100755 --- a/app/views/stats/actions_done_last30days_data.html.erb +++ b/app/views/stats/actions_done_last30days_data.html.erb @@ -16,14 +16,14 @@ <% end -%><%= @actions_done_last30days_hash[30]%>& &values_3= <%0.upto 29 do |i| -%> -<%=@sum_actions_created_last30days/30-%>, +<%=@sum_actions_created_last30days/30.0-%>, <%end-%> -<%=@sum_actions_created_last30days/30-%>& +<%=@sum_actions_created_last30days/30.0-%>& &values_4= <%0.upto 29 do |i| -%> -<%=@sum_actions_done_last30days/30-%>, +<%=@sum_actions_done_last30days/30.0-%>, <%end-%> -<%=@sum_actions_done_last30days/30-%>& +<%=@sum_actions_done_last30days/30.0-%>& &x_labels= <%0.upto 29 do |i| seconds = i * 24 * 60 * 60 diff --git a/app/views/stats/context_running_actions_data.html.erb b/app/views/stats/context_running_actions_data.html.erb index 500c34c0..4ee6b264 100755 --- a/app/views/stats/context_running_actions_data.html.erb +++ b/app/views/stats/context_running_actions_data.html.erb @@ -10,7 +10,7 @@ end 0.upto @actions_per_context.size()-2 do | i | %><%=truncate(@actions_per_context[i]['name'], :length => @truncate_chars, :omission => '...')%>,<% end --%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :legnth => @truncate_chars, :omission => '...') %>& +-%><%=truncate(@actions_per_context[@actions_per_context.size()-1]['name'], :length => @truncate_chars, :omission => '...') %>& &links=<% 0.upto @actions_per_context.size()-2 do | i | %><%=url_for :controller => "contexts", :action => "show", :id=>@actions_per_context[i]['id']%>,<%