##// END OF EJS Templates
jro_apps » redmine
RSS
Test broken, display hours like in other tables (#23996)....
Jean-Philippe Lang -
r15585:8c9f9ba38b29
parent child
Show More
Side by Side Unified
Context file:
r15585:8c9f9ba38b29 Loading diff...:
Show file before | Show file after | Hide comments
@@ -8,9 +8,9
8 <% total = 0 -%>
8 <% total = 0 -%>
9 <% @report.periods.each do |period| -%>
9 <% @report.periods.each do |period| -%>
10 <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%>
10 <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%>
11 <td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td>
11 <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td>
12 <% end -%>
12 <% end -%>
13 <td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td>
13 <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td>
14 </tr>
14 </tr>
15 <% if criterias.length > level+1 -%>
15 <% if criterias.length > level+1 -%>
16 <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
16 <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
Show file before | Show file after | Hide comments
@@ -52,9 +52,9
52 <% total = 0 -%>
52 <% total = 0 -%>
53 <% @report.periods.each do |period| -%>
53 <% @report.periods.each do |period| -%>
54 <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
54 <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
55 <td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td>
55 <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td>
56 <% end -%>
56 <% end -%>
57 <td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td>
57 <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td>
58 </tr>
58 </tr>
59 </tbody>
59 </tbody>
60 </table>
60 </table>
General Comments 0
You need to be logged in to leave comments. Login now