Revision 441:cbce1fd3b1b7 app/views/time_entry_reports
| app/views/time_entry_reports/.svn/all-wcprops | ||
|---|---|---|
| 1 | 1 |
K 25 |
| 2 | 2 |
svn:wc:ra_dav:version-url |
| 3 |
V 53
|
|
| 4 |
/svn/!svn/ver/4239/trunk/app/views/time_entry_reports
|
|
| 3 |
V 67
|
|
| 4 |
/svn/!svn/ver/5878/branches/1.2-stable/app/views/time_entry_reports
|
|
| 5 | 5 |
END |
| 6 |
report.rhtml |
|
| 7 |
K 25 |
|
| 8 |
svn:wc:ra_dav:version-url |
|
| 9 |
V 66 |
|
| 10 |
/svn/!svn/ver/4239/trunk/app/views/time_entry_reports/report.rhtml |
|
| 11 |
END |
|
| 12 |
_report_criteria.rhtml |
|
| 13 |
K 25 |
|
| 14 |
svn:wc:ra_dav:version-url |
|
| 15 |
V 76 |
|
| 16 |
/svn/!svn/ver/4232/trunk/app/views/time_entry_reports/_report_criteria.rhtml |
|
| 17 |
END |
|
| app/views/time_entry_reports/.svn/entries | ||
|---|---|---|
| 1 | 1 |
10 |
| 2 | 2 |
|
| 3 | 3 |
dir |
| 4 |
4993
|
|
| 5 |
http://redmine.rubyforge.org/svn/trunk/app/views/time_entry_reports
|
|
| 4 |
6000
|
|
| 5 |
http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/time_entry_reports
|
|
| 6 | 6 |
http://redmine.rubyforge.org/svn |
| 7 | 7 |
|
| 8 | 8 |
|
| 9 | 9 |
|
| 10 |
2010-10-07T15:51:09.349542Z
|
|
| 11 |
4239
|
|
| 12 |
edavis10
|
|
| 10 |
2011-04-03T12:02:10.155680Z
|
|
| 11 |
5298
|
|
| 12 |
jplang
|
|
| 13 | 13 |
|
| 14 | 14 |
|
| 15 | 15 |
|
| ... | ... | |
| 32 | 32 |
|
| 33 | 33 |
|
| 34 | 34 |
|
| 35 |
2011-03-03T11:05:10.000000Z
|
|
| 36 |
d896f5cf56b2a3cd64887f239e584fdc
|
|
| 37 |
2010-10-07T15:51:09.349542Z
|
|
| 38 |
4239
|
|
| 39 |
edavis10
|
|
| 35 |
2011-06-06T13:18:33.000000Z
|
|
| 36 |
372b261e8c1bb4a74da7c6ea149de24f
|
|
| 37 |
2011-04-03T12:02:10.155680Z
|
|
| 38 |
5298
|
|
| 39 |
jplang
|
|
| 40 | 40 |
has-props |
| 41 | 41 |
|
| 42 | 42 |
|
| ... | ... | |
| 58 | 58 |
|
| 59 | 59 |
|
| 60 | 60 |
|
| 61 |
3569
|
|
| 61 |
3218
|
|
| 62 | 62 |
|
| 63 | 63 |
_report_criteria.rhtml |
| 64 | 64 |
file |
| ... | ... | |
| 66 | 66 |
|
| 67 | 67 |
|
| 68 | 68 |
|
| 69 |
2011-03-03T11:05:10.000000Z
|
|
| 69 |
2011-06-06T13:14:59.000000Z
|
|
| 70 | 70 |
5fa73daf0a67b2a39fd10320bcd7ab45 |
| 71 | 71 |
2010-10-05T16:07:17.015270Z |
| 72 | 72 |
4232 |
| app/views/time_entry_reports/.svn/text-base/report.rhtml.svn-base | ||
|---|---|---|
| 6 | 6 |
|
| 7 | 7 |
<h2><%= l(:label_spent_time) %></h2> |
| 8 | 8 |
|
| 9 |
<% form_remote_tag(:url => {}, :html => {:method => :get, :id => 'query_form'}, :method => :get, :update => 'content') do %>
|
|
| 9 |
<% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
|
|
| 10 | 10 |
<% @criterias.each do |criteria| %> |
| 11 | 11 |
<%= hidden_field_tag 'criterias[]', criteria, :id => nil %> |
| 12 | 12 |
<% end %> |
| 13 |
<%# TODO: get rid of the project_id field, that should already be in the URL %> |
|
| 14 |
<%= hidden_field_tag('project_id', params[:project_id]) if @project %>
|
|
| 15 |
<%= hidden_field_tag('issue_id', params[:issue_id]) if @issue %>
|
|
| 16 | 13 |
<%= render :partial => 'timelog/date_range' %> |
| 17 | 14 |
|
| 18 | 15 |
<p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'], |
| ... | ... | |
| 22 | 19 |
:onchange => "this.form.onsubmit();" %> |
| 23 | 20 |
|
| 24 | 21 |
<%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
|
| 25 |
:onchange => "this.form.onsubmit();",
|
|
| 22 |
:onchange => "this.form.submit();", |
|
| 26 | 23 |
:style => 'width: 200px', |
| 27 | 24 |
:id => nil, |
| 28 | 25 |
:disabled => (@criterias.length >= 3)) %> |
| 29 |
<%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns},
|
|
| 30 |
:method => :get, |
|
| 31 |
:update => 'content' |
|
| 32 |
}, :class => 'icon icon-reload' %></p> |
|
| 26 |
<%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-reload' %></p>
|
|
| 33 | 27 |
<% end %> |
| 34 | 28 |
|
| 35 | 29 |
<% unless @criterias.empty? %> |
| app/views/time_entry_reports/report.rhtml | ||
|---|---|---|
| 6 | 6 |
|
| 7 | 7 |
<h2><%= l(:label_spent_time) %></h2> |
| 8 | 8 |
|
| 9 |
<% form_remote_tag(:url => {}, :html => {:method => :get, :id => 'query_form'}, :method => :get, :update => 'content') do %>
|
|
| 9 |
<% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
|
|
| 10 | 10 |
<% @criterias.each do |criteria| %> |
| 11 | 11 |
<%= hidden_field_tag 'criterias[]', criteria, :id => nil %> |
| 12 | 12 |
<% end %> |
| 13 |
<%# TODO: get rid of the project_id field, that should already be in the URL %> |
|
| 14 |
<%= hidden_field_tag('project_id', params[:project_id]) if @project %>
|
|
| 15 |
<%= hidden_field_tag('issue_id', params[:issue_id]) if @issue %>
|
|
| 16 | 13 |
<%= render :partial => 'timelog/date_range' %> |
| 17 | 14 |
|
| 18 | 15 |
<p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'], |
| ... | ... | |
| 22 | 19 |
:onchange => "this.form.onsubmit();" %> |
| 23 | 20 |
|
| 24 | 21 |
<%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
|
| 25 |
:onchange => "this.form.onsubmit();",
|
|
| 22 |
:onchange => "this.form.submit();", |
|
| 26 | 23 |
:style => 'width: 200px', |
| 27 | 24 |
:id => nil, |
| 28 | 25 |
:disabled => (@criterias.length >= 3)) %> |
| 29 |
<%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns},
|
|
| 30 |
:method => :get, |
|
| 31 |
:update => 'content' |
|
| 32 |
}, :class => 'icon icon-reload' %></p> |
|
| 26 |
<%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-reload' %></p>
|
|
| 33 | 27 |
<% end %> |
| 34 | 28 |
|
| 35 | 29 |
<% unless @criterias.empty? %> |
Also available in: Unified diff