rename .rhtml to .html.erb of app/views/time_entry_reports/report.rhtml.
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6632 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
5bcb4427e1
commit
f32092783e
1 file changed
@@ -0,0 +1,70 @@
|
||||
<div class="contextual">
|
||||
<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
|
||||
</div>
|
||||
|
||||
<%= render_timelog_breadcrumb %>
|
||||
|
||||
<h2><%= l(:label_spent_time) %></h2>
|
||||
|
||||
<% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
|
||||
<% @criterias.each do |criteria| %>
|
||||
<%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
|
||||
<% end %>
|
||||
<%= render :partial => 'timelog/date_range' %>
|
||||
|
||||
<p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
|
||||
[l(:label_month), 'month'],
|
||||
[l(:label_week), 'week'],
|
||||
[l(:label_day_plural).titleize, 'day']], @columns),
|
||||
:onchange => "this.form.onsubmit();" %>
|
||||
|
||||
<%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
|
||||
:onchange => "this.form.submit();",
|
||||
:style => 'width: 200px',
|
||||
:id => nil,
|
||||
:disabled => (@criterias.length >= 3)) %>
|
||||
<%= 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>
|
||||
<% end %>
|
||||
|
||||
<% unless @criterias.empty? %>
|
||||
<div class="total-hours">
|
||||
<p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
|
||||
</div>
|
||||
|
||||
<% unless @hours.empty? %>
|
||||
<table class="list" id="time-report">
|
||||
<thead>
|
||||
<tr>
|
||||
<% @criterias.each do |criteria| %>
|
||||
<th><%= l_or_humanize(@available_criterias[criteria][:label]) %></th>
|
||||
<% end %>
|
||||
<% columns_width = (40 / (@periods.length+1)).to_i %>
|
||||
<% @periods.each do |period| %>
|
||||
<th class="period" width="<%= columns_width %>%"><%= period %></th>
|
||||
<% end %>
|
||||
<th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
|
||||
<tr class="total">
|
||||
<td><%= l(:label_total) %></td>
|
||||
<%= '<td></td>' * (@criterias.size - 1) %>
|
||||
<% total = 0 -%>
|
||||
<% @periods.each do |period| -%>
|
||||
<% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
|
||||
<td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
|
||||
<% end -%>
|
||||
<td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<% other_formats_links do |f| %>
|
||||
<%= f.link_to 'CSV', :url => params %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% html_title l(:label_spent_time), l(:label_report) %>
|
||||
|
||||
Reference in new issue
Block a user