Index: summarize_time.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/summarize_time.cgi,v
retrieving revision 1.21
diff -u -r1.21 summarize_time.cgi
--- summarize_time.cgi	4 Sep 2006 16:21:47 -0000	1.21
+++ summarize_time.cgi	30 Jun 2007 00:32:36 -0000
@@ -250,6 +250,57 @@
     }
 }
 
+sub query_remaining_by_buglist {
+    my ($bugids) = @_;
+    my $dbh = Bugzilla->dbh;
+    my $res;
+
+    my $buglist = join ", ", @{$bugids};
+
+    my $q = qq{SELECT sum(bugs.remaining_time)
+                 FROM bugs
+                WHERE bugs.bug_id IN ($buglist)};
+    my $sth = $dbh->prepare($q);
+    $sth->execute();
+    $res = $sth->fetch->[0];
+
+    return $res;
+}
+
+sub query_estimated_by_buglist {
+    my ($bugids) = @_;
+    my $dbh = Bugzilla->dbh;
+    my $res;
+
+    my $buglist = join ", ", @{$bugids};
+
+    my $q = qq{SELECT sum(bugs.estimated_time)
+                 FROM bugs
+                WHERE bugs.bug_id IN ($buglist)};
+    my $sth = $dbh->prepare($q);
+    $sth->execute();
+    $res = $sth->fetch->[0];
+
+    return $res;
+}    
+
+sub query_total_work_by_buglist {
+    my ($bugids) = @_;
+    my $dbh = Bugzilla->dbh;
+    my $res;
+
+    my $buglist = join ", ", @{$bugids};
+
+    my $q = qq{SELECT sum(longdescs.work_time)
+                 FROM longdescs
+                WHERE longdescs.bug_id IN ($buglist)};
+    my $sth = $dbh->prepare($q);
+    $sth->execute();
+    $res = $sth->fetch->[0];
+
+    return $res;
+}    
+
 #
 # Queries and data structure assembly
 #
@@ -506,7 +557,12 @@
     $vars->{'part_list'} = \@part_list;
     $vars->{'parts'} = \@parts;
 
-} elsif ($cgi->cookie("time-summary-dates")) {
+    $vars->{'estimated_time_total'} = query_estimated_by_buglist(\@bugs);
+    $vars->{'remaining_time_total'} = query_remaining_by_buglist(\@bugs);
+    $vars->{'work_time_total'} = query_total_work_by_buglist(\@bugs);
+
+}
+elsif ($cgi->cookie("time-summary-dates")) {
     ($start_date, $end_date) = split ";", $cgi->cookie('time-summary-dates');
 }
 
Index: template/en/default/bug/summarize-time.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl,v
retrieving revision 1.8
diff -u -r1.8 summarize-time.html.tmpl
--- template/en/default/bug/summarize-time.html.tmpl	7 Jan 2007 23:59:20 -0000	1.8
+++ template/en/default/bug/summarize-time.html.tmpl	2 Jul 2007 16:00:48 -0000
@@ -47,6 +47,12 @@
 
         [% global.grand_total = 0 %]
 
+        <span><b>Orig. Est:</b>&nbsp;[% estimated_time_total %]</span>
+        <span>
+          <b>Current Est:</b>&nbsp;[% remaining_time_total + work_time_total FILTER format("%.2f") %]
+        </span>
+        <span><b>Hours Left:</b>&nbsp;[% remaining_time_total %]</span>
+
         [% FOREACH workdata = part_list %]
             [% part = parts.shift %]
             <div align="right">