##// END OF EJS Templates
Fixed javascript error when changing time period on time report....
Jean-Philippe Lang -
r8581:6714d69767dd
parent child
Show More
@@ -1,72 +1,72
1 1 <div class="contextual">
2 2 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
3 3 </div>
4 4
5 5 <%= render_timelog_breadcrumb %>
6 6
7 7 <h2><%= l(:label_spent_time) %></h2>
8 8
9 9 <% form_tag({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
10 10 <% @report.criteria.each do |criterion| %>
11 11 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
12 12 <% end %>
13 13 <%= render :partial => 'timelog/date_range' %>
14 14
15 15 <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
16 16 [l(:label_month), 'month'],
17 17 [l(:label_week), 'week'],
18 18 [l(:label_day_plural).titleize, 'day']], @report.columns),
19 :onchange => "this.form.onsubmit();" %>
19 :onchange => "this.form.submit();" %>
20 20
21 21 <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
22 22 :onchange => "this.form.submit();",
23 23 :style => 'width: 200px',
24 24 :id => nil,
25 25 :disabled => (@report.criteria.length >= 3), :id => "criterias") %>
26 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 => @report.columns}, :class => 'icon icon-reload' %></p>
27 27 <% end %>
28 28
29 29 <% unless @report.criteria.empty? %>
30 30 <div class="total-hours">
31 31 <p><%= l(:label_total) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
32 32 </div>
33 33
34 34 <% unless @report.hours.empty? %>
35 35 <div class="autoscroll">
36 36 <table class="list" id="time-report">
37 37 <thead>
38 38 <tr>
39 39 <% @report.criteria.each do |criteria| %>
40 40 <th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
41 41 <% end %>
42 42 <% columns_width = (40 / (@report.periods.length+1)).to_i %>
43 43 <% @report.periods.each do |period| %>
44 44 <th class="period" width="<%= columns_width %>%"><%= period %></th>
45 45 <% end %>
46 46 <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
47 47 </tr>
48 48 </thead>
49 49 <tbody>
50 50 <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
51 51 <tr class="total">
52 52 <td><%= l(:label_total) %></td>
53 53 <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
54 54 <% total = 0 -%>
55 55 <% @report.periods.each do |period| -%>
56 56 <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
57 57 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
58 58 <% end -%>
59 59 <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
60 60 </tr>
61 61 </tbody>
62 62 </table>
63 63 </div>
64 64
65 65 <% other_formats_links do |f| %>
66 66 <%= f.link_to 'CSV', :url => params %>
67 67 <% end %>
68 68 <% end %>
69 69 <% end %>
70 70
71 71 <% html_title l(:label_spent_time), l(:label_report) %>
72 72
General Comments 0
You need to be logged in to leave comments. Login now