Bug 65839 - Actual time in reports

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@811 6955db30-a419-402b-8a0d-67ecbb4d7f56

report.cgi

@@ -127,6 +127,7 @@ my %valid_columns = map { $_ => 1 } @columns;
 my $measures = {
     etime => "bugs.estimated_time AS measure",
     rtime => "bugs.remaining_time AS measure",
+    wtime => "(SELECT SUM(lwt.work_time) FROM longdescs lwt WHERE lwt.bug_id=bugs.bug_id) AS measure",
     count => "1 AS measure",
 };
 my $measure = $cgi->param('measure');

template/en/default/reports/report.html.tmpl

@@ -163,29 +163,20 @@
   </table>
 
   <table><tr><td>
-          [% IF measure !='rtime'%]
-            <a href="[% formaturl %]&amp;format=[% format %]&amp;measure=rtime">
-          [% END %]
-              Remaining time
-          [% IF measure !='rtime'%]
-              </a>
-          [% END %]
-          </td><td>|
-          [% IF measure !='etime'%]
-            <a href="[% formaturl %]&amp;format=[% format %]&amp;measure=etime">
-          [% END %]
-              Estimated time
-          [% IF measure !='etime'%]
-              </a>
-          [% END %]
-          </td><td>|
-          [% IF (NOT measure) || (measure !='count') %]
-            <a href="[% formaturl %]&amp;format=[% format %]&amp;measure=count">
-          [% END %]
-             Bugs count
-          [% IF (NOT measure) || (measure !='count') %]
-              </a>
-          [% END %]
+    [% measure_descs = {
+      rtime => 'Remaining time'
+      etime => 'Estimated time'
+      wtime => 'Actual time'
+      count => 'Bugs count'
+    } %]
+    [% FOR m = measure_descs.keys.sort %]
+      [%+ IF measure != m %]<a href="[% formaturl %]&amp;format=[% format %]&amp;measure=[% m %]">[% END %]
+      [% measure_descs.$m %]
+      [% IF measure != m %]</a>[% END %]
+      [% IF NOT loop.last %]
+      |
+      [% END %]
+    [% END %]
   </td></tr></table>