From 189d7726ba23bb176e76fd5407f931ca1b7bfd15 Mon Sep 17 00:00:00 2001 From: lrbalt Date: Sun, 24 Feb 2008 13:01:36 +0000 Subject: [PATCH] Changes use of colors and labels to be more consistent between graphs. Fixes #647. Thanks Hans git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@712 a4c988fc-2ded-0310-b66e-134b36920a42 --- .../actions_done_last12months_data.rhtml | 24 ++++++++--------- .../stats/actions_done_last30days_data.rhtml | 26 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tracks/app/views/stats/actions_done_last12months_data.rhtml b/tracks/app/views/stats/actions_done_last12months_data.rhtml index 98ef2356..df76645a 100755 --- a/tracks/app/views/stats/actions_done_last12months_data.rhtml +++ b/tracks/app/views/stats/actions_done_last12months_data.rhtml @@ -2,20 +2,20 @@ &y_legend=Number of actions,12,0x736AFF& &x_legend=Months ago,12,0x736AFF& &y_ticks=5,10,5& -&filled_bar=50,0x9933CC,0x8010A0,Completed,9& -&filled_bar_2=50,0x0066CC,0x0066CC,Created,9& -&line_3=2,0xFF0000, Avg completed, 9& -&line_4=2,0x00FF00, Avg created, 9& -&line_5=2,0xAA0000, 3 Month Avg Completed, 9& -&line_6=2,0x007700, 3 Month Avg Created, 9& +&filled_bar=50,0x9933CC,0x8010A0,Created,9& +&filled_bar_2=50,0x0066CC,0x0066CC,Completed,9& +&line_3=2,0x00FF00, Avg Created, 9& +&line_4=2,0xFF0000, Avg Completed, 9& +&line_5=2,0x007700, 3 Month Avg Created, 9& +&line_6=2,0xAA0000, 3 Month Avg Completed, 9& &line_7=1,0xAA0000& &line_8=1,0x007700& -&values=<% 0.upto 11 do |i| -%><%= @actions_done_last12months_hash[i]%>,<% end -%><%= @actions_done_last12months_hash[12]%>& -&values_2=<% 0.upto 11 do |i| -%><%= @actions_created_last12months_hash[i]%>,<% end -%><%= @actions_created_last12months_hash[12]%>& -&values_3=<%0.upto 11 do |i| -%><%=@sum_actions_done_last12months/12-%>,<%end-%><%=@sum_actions_done_last12months/12-%>& -&values_4=<%0.upto 11 do |i| -%><%=@sum_actions_created_last12months/12-%>,<%end-%><%=@sum_actions_created_last12months/12-%>& -&values_5=<%0.upto 11 do |i| -%><%=@actions_done_avg_last12months_hash[i]-%>,<%end-%><%=@actions_done_avg_last12months_hash[12]-%>& -&values_6=<%0.upto 11 do |i| -%><%=@actions_created_avg_last12months_hash[i]-%>,<%end-%><%=@actions_created_avg_last12months_hash[12]-%>& +&values=<% 0.upto 11 do |i| -%><%= @actions_created_last12months_hash[i]%>,<% end -%><%= @actions_created_last12months_hash[12]%>& +&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_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]%>& &values_8=<%=@interpolated_actions_done_this_month%>,<%=@actions_created_avg_last12months_hash[1]%>& &x_labels=<%0.upto 11 do |i| -%> diff --git a/tracks/app/views/stats/actions_done_last30days_data.rhtml b/tracks/app/views/stats/actions_done_last30days_data.rhtml index 448dac33..94c48001 100755 --- a/tracks/app/views/stats/actions_done_last30days_data.rhtml +++ b/tracks/app/views/stats/actions_done_last30days_data.rhtml @@ -2,28 +2,28 @@ &y_legend=Number of actions,12,0x736AFF& &x_legend=Number of days ago,12,0x736AFF& &y_ticks=5,10,5& -&filled_bar=50,0x9933CC,0x8010A0,Completed,9& -&filled_bar_2=50,0x0066CC,0x0066CC,Created,9& -&line_3=3,0xFF0000, Avg completed, 9& -&line_4=3,0x00FF00, Avg created, 9& +&filled_bar=50,0x9933CC,0x8010A0,Created,9& +&filled_bar_2=50,0x0066CC,0x0066CC,Completed,9& +&line_3=3,0x00FF00, Avg Created, 9& +&line_4=3,0xFF0000, Avg Completed, 9& &values= <% 0.upto 29 do |i| -%> -<%= @actions_done_last30days_hash[i]%>, -<% end -%><%= @actions_done_last30days_hash[30]%>& -&values_2= -<% 0.upto 29 do |i| -%> <%= @actions_created_last30days_hash[i]%>, <% end -%><%= @actions_created_last30days_hash[30]%>& +&values_2= +<% 0.upto 29 do |i| -%> +<%= @actions_done_last30days_hash[i]%>, +<% end -%><%= @actions_done_last30days_hash[30]%>& &values_3= <%0.upto 29 do |i| -%> -<%=@sum_actions_done_last30days/30-%>, -<%end-%> -<%=@sum_actions_done_last30days/30-%>& -&values_4= -<%0.upto 29 do |i| -%> <%=@sum_actions_created_last30days/30-%>, <%end-%> <%=@sum_actions_created_last30days/30-%>& +&values_4= +<%0.upto 29 do |i| -%> +<%=@sum_actions_done_last30days/30-%>, +<%end-%> +<%=@sum_actions_done_last30days/30-%>& &x_labels= <%0.upto 29 do |i| seconds = i * 24 * 60 * 60