mirror of
https://github.com/TracksApp/tracks.git
synced 2026-01-02 15:28:50 +01:00
in the stats page you can downdrill to see the active todos in a certain week from the running time charts. This patch adds the option to see all active todos from the selected week and older.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@870 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
parent
32b54383ee
commit
d875c5477d
2 changed files with 11 additions and 7 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
<%= render :partial => 'chart', :locals => {:width => @chart_width, :height => @chart_height, :data => url_for(:action => @chart_name)} -%>
|
||||
<br/>
|
||||
<p>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</p>
|
||||
<p>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 %></p>
|
||||
<br/>
|
||||
<div class="container tickler" id="tickler_container">
|
||||
<h2>
|
||||
<%= @page_title -%>
|
||||
</h2>
|
||||
|
||||
<h2><%= @page_title -%></h2>
|
||||
<div id="tickler" class="items toggle_target">
|
||||
<div id="tickler-empty-nd" style="display:<%= @selected_actions.empty? ? 'block' : 'none'%>;">
|
||||
<div class="message"><p>There are no actions selected</p></div>
|
||||
</div>
|
||||
|
||||
<%= render :partial => "todos/todo", :collection => @selected_actions, :locals => { :parent_container_type => 'stats' } %>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue