jro_apps/redmine Commit - r15585:8c9f9ba38b29

Test broken, display hours like in other tables (#23996)....

Jean-Philippe Lang -

r15585:8c9f9ba38b29

parent child

Context file:

r15585:8c9f9ba38b29

Collapse all files

app/views/timelog/_report_criteria.html.erb +2 -2

             <% @report.hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
             <% hours_for_value = select_hours(hours, criterias[level], value) -%>
             <% next if hours_for_value.empty? -%>
             <tr class="<%= cycle('odd', 'even') %> <%= criterias.length > level+1 ? 'subtotal' : 'last-level' %>">
             <%= ("<td></td>" * level).html_safe %>
             <td class="name"><%= format_criteria_value(@report.available_criteria[criterias[level]], value) %></td>
             <%= ("<td></td>" * (criterias.length - level - 1)).html_safe -%>
               <% total = 0 -%>
               <% @report.periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%>
-                <td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td>
+                <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td>
               <% end -%>
-              <td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td>
+              <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td>
             </tr>
             <% if criterias.length > level+1 -%>
               <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
             <% end -%>
             <% end %>

app/views/timelog/report.html.erb +2 -2

             <div class="contextual">
             <%= link_to l(:button_log_time),
                         _new_time_entry_path(@project, @issue),
                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
             <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
             <%= form_tag(_report_time_entries_path(@project, nil), :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>
               <%= render :partial => 'timelog/date_range' %>
               <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
                                                                                         [l(:label_day_plural).titleize, 'day']], @report.columns),
                                                                     :onchange => "this.form.submit();" %>
               <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]}),
                                                                       :onchange => "this.form.submit();",
                                                                       :style => 'width: 200px',
                                                                       :disabled => (@report.criteria.length >= 3),
                                                                       :id => "criterias") %>
                  <%= 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>
             <% end %>
             <% unless @report.criteria.empty? %>
             <% if @report.hours.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <div class="autoscroll">
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @report.criteria.each do |criteria| %>
               <th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@report.periods.length+1)).to_i %>
             <% @report.periods.each do |period| %>
               <th class="period" style="width:<%= columns_width %>%;"><%= period %></th>
             <% end %>
               <th class="total" style="width:<%= columns_width %>%;"><%= l(:label_total_time) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total_time) %></td>
               <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
               <% total = 0 -%>
               <% @report.periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
-                <td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td>
+                <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td>
               <% end -%>
-              <td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td>
+              <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td>
               </tr>
             </tbody>
             </table>
             </div>
             <% other_formats_links do |f| %>
               <%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% end %>
             <% content_for :sidebar do %>
               <%= render_sidebar_queries(TimeEntryQuery, @project) %>
             <% end %>
             <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_report)) %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages