diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/timelog/_list.rhtml | 16 | ||||
| -rw-r--r-- | app/views/timelog/_report_criteria.rhtml | 22 | ||||
| -rw-r--r-- | app/views/timelog/details.rhtml | 3 | ||||
| -rw-r--r-- | app/views/timelog/report.rhtml | 46 |
4 files changed, 54 insertions, 33 deletions
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml index 929d8f7dd..ae5b6376a 100644 --- a/app/views/timelog/_list.rhtml +++ b/app/views/timelog/_list.rhtml @@ -3,6 +3,7 @@ <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %> <%= sort_header_tag('user_id', :caption => l(:label_member)) %> <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %> +<%= sort_header_tag("#{Project.table_name}.name", :caption => l(:label_project)) %> <%= sort_header_tag('issue_id', :caption => l(:label_issue), :default_order => 'desc') %> <th><%= l(:field_comments) %></th> <%= sort_header_tag('hours', :caption => l(:field_hours)) %> @@ -12,17 +13,16 @@ <% entries.each do |entry| -%> <tr class="time-entry <%= cycle("odd", "even") %>"> <td class="spent_on"><%= format_date(entry.spent_on) %></td> -<td class="user"><%= entry.user.name %></td> -<td class="activity"><%= entry.activity.name %></td> +<td class="user"><%=h entry.user %></td> +<td class="activity"><%=h entry.activity %></td> +<td class="project"><%=h entry.project %></td> <td class="subject"> - <% if entry.issue -%> - <div class="tooltip"><%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%> - <span class="tip"><%= render_issue_tooltip entry.issue %></span> - </div> - <% end -%> +<% if entry.issue -%> +<%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%> +<% end -%> </td> <td class="comments"><%=h entry.comments %></td> -<td class="hours"><%= entry.hours %></td> +<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td> <td align="center"><%= link_to_if_authorized(l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry}, :class => 'icon icon-edit') if entry.editable_by?(User.current) %></td> diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml index 0b7e91cfd..b048c874a 100644 --- a/app/views/timelog/_report_criteria.rhtml +++ b/app/views/timelog/_report_criteria.rhtml @@ -1,17 +1,17 @@ -<% @available_criterias[criterias[level]][:values].each do |value| %> -<tr class="<%= cycle('odd', 'even') if criterias.length < level + 2 %>"> +<% @hours.collect {|h| h[criterias[level]]}.uniq.each do |value| %> +<% hours_for_value = select_hours(hours, criterias[level], value) -%> +<% next if hours_for_value.empty? -%> +<tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>"> <%= '<td></td>' * level %> -<td><%= value.name %></td> -<%= '<td></td>' * (criterias.length - level - 1) %> -<% hours_for_value = select_hours(hours, criterias[level], value.id) %> - <% @periods.each do |period| %> +<td><%= value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value) %></td> +<%= '<td></td>' * (criterias.length - level - 1) -%> + <% @periods.each do |period| -%> <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)) %> - <td align="center"><%= sum > 0 ? "%.2f" % sum : "-" %></td> - <% end %> + <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td> + <% end -%> </tr> -<% if criterias.length > level+1 %> +<% if criterias.length > level+1 -%> <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %> -<% end %> +<% end -%> <% end %> -<% reset_cycle %> diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml index 0e128f6ae..802090b7a 100644 --- a/app/views/timelog/details.rhtml +++ b/app/views/timelog/details.rhtml @@ -1,4 +1,5 @@ <div class="contextual">
+<%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}, :class => 'icon icon-report') %>
<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
</div>
@@ -25,7 +26,7 @@ <%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
<%= l(:label_date_to) %>
<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
-<%= submit_tag l(:button_submit), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+<%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
</p>
</fieldset>
<% end %>
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' %> |