Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-31 14:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes use of colors and labels to be more consistent between graphs. Fixes #647. Thanks Hans

Browse source 
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@712 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
lrbalt 2008-02-24 13:01:36 +00:00
parent dbb7d31055
commit 189d7726ba
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tracks/app/views/stats/actions_done_last12months_data.rhtml
View file

@ -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| -%>

26
tracks/app/views/stats/actions_done_last30days_data.rhtml
View file

@ -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