diff --git a/tracks/app/controllers/stats_controller.rb b/tracks/app/controllers/stats_controller.rb index c44f592e..c28490ca 100755 --- a/tracks/app/controllers/stats_controller.rb +++ b/tracks/app/controllers/stats_controller.rb @@ -481,8 +481,10 @@ class StatsController < ApplicationController @chart_name = "actions_visible_running_time_data" @page_title = "Actions selected from week " + @further = false if params['id'] == 'avrt_end' @page_title += week_from.to_s + " and further" + @further = true else @page_title += week_from.to_s + " - " + week_to.to_s + "" end @@ -512,8 +514,10 @@ class StatsController < ApplicationController @chart_name = "actions_running_time_data" @page_title = "Actions selected from week " + @further = false if params['id'] == 'art_end' @page_title += week_from.to_s + " and further" + @further = true else @page_title += week_from.to_s + " - " + week_to.to_s + "" end diff --git a/tracks/app/views/stats/show_selection_from_chart.html.erb b/tracks/app/views/stats/show_selection_from_chart.html.erb index 2ef5f4ec..3da85a4c 100644 --- a/tracks/app/views/stats/show_selection_from_chart.html.erb +++ b/tracks/app/views/stats/show_selection_from_chart.html.erb @@ -1,18 +1,18 @@ <%= render :partial => 'chart', :locals => {:width => @chart_width, :height => @chart_height, :data => url_for(:action => @chart_name)} -%>
-

Click on a bar in the chart to update the actions below. Click <%=link_to "here", {:controller => "stats", :action => "index"} %> to return to the statistics page

+

Click on a bar in the chart to update the actions below. Click <%=link_to "here", {:controller => "stats", :action => "index"} %> to return to the statistics page. <% + unless @further -%> <%= + "Click " + + link_to("here", {:controller => "stats", :action => "show_selected_actions_from_chart", :id=>"#{params[:id]}_end", :index => params[:index]})+ + " to show the actions from week " + params[:index] + " and further." -%> + <% end %>


-

- <%= @page_title -%> -

- +

<%= @page_title -%>

There are no actions selected

- <%= render :partial => "todos/todo", :collection => @selected_actions, :locals => { :parent_container_type => 'stats' } %> -
\ No newline at end of file