diff options
Diffstat (limited to 'app/views/timelog/report.rhtml')
| -rw-r--r-- | app/views/timelog/report.rhtml | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml index 4fabfe3dd..8fc15a3b4 100644 --- a/app/views/timelog/report.rhtml +++ b/app/views/timelog/report.rhtml @@ -1,31 +1,43 @@ +<div class="contextual"> +<%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}, :class => 'icon icon-details') %> +<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %> +</div> + <h2><%= l(:label_spent_time) %></h2> <% form_remote_tag(:url => {:project_id => @project}, :update => 'content') do %> <% @criterias.each do |criteria| %> <%= hidden_field_tag 'criterias[]', criteria %> <% end %> + <fieldset><legend><%= l(:label_date_range) %></legend> <p> - <%= l(:label_date_from) %>: <%= text_field_tag 'date_from', @date_from, :size => 10 %><%= calendar_for('date_from') %> - - <%= l(:label_date_to) %>: <%= text_field_tag 'date_to', @date_to, :size => 10 %><%= calendar_for('date_to') %> - - <%= l(:label_details) %>: + <%= l(:label_date_from) %> + <%= text_field_tag 'date_from', @date_from, :size => 10 %><%= calendar_for('date_from') %> + <%= l(:label_date_to) %> + <%= text_field_tag 'date_to', @date_to, :size => 10 %><%= calendar_for('date_to') %> + <%= l(:label_details) %> <%= select_tag 'period', options_for_select([[l(:label_year), 'year'], [l(:label_month), 'month'], [l(:label_week), 'week']], @columns) %> <%= submit_tag l(:button_apply) %> - <%= link_to_remote l(:button_clear), {:url => {:project_id => @project}, :update => 'content'}, :class => 'icon icon-reload' %> </p> + </fieldset> - <% if @criterias.length < 3 %> - <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}), :onchange => "this.form.onsubmit();") %></p> - <% end %> + <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}), + :onchange => "this.form.onsubmit();", + :style => 'width: 200px', + :disabled => (@criterias.length >= 3)) %> + <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'}, + :class => 'icon icon-reload' %></p> -<br /> +<% unless @criterias.empty? %> +<div class="total-hours"> +<p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p> +</div> -<% unless @criterias.empty? %> -<table class="list"> +<% unless @hours.empty? %> +<table class="list" id="time-report"> <thead> <tr> <% @criterias.each do |criteria| %> @@ -36,13 +48,21 @@ <% end %> </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) %> + <% @periods.each do |period| -%> + <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)) %> + <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td> + <% end -%> + </tr> </tbody> </table> <% end %> <% end %> +<% end %> <% content_for :header_tags do %> <%= javascript_include_tag 'calendar/calendar' %> |