vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 65839 - Actual time in reports 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@811 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2010-06-25 14:05:32 +00:00
parent d994e0cc3e
commit 29a566376d
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
report.cgi
View File

@ -127,6 +127,7 @@ my %valid_columns = map { $_ => 1 } @columns;
my $measures = { my $measures = {
etime => "bugs.estimated_time AS measure", etime => "bugs.estimated_time AS measure",
rtime => "bugs.remaining_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", count => "1 AS measure",
}; };
my $measure = $cgi->param('measure'); my $measure = $cgi->param('measure');

37
template/en/default/reports/report.html.tmpl
View File

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