From fd742d6fc8849328749866dbff2936d43abcc7d1 Mon Sep 17 00:00:00 2001 From: "bugreport%peshkin.net" <> Date: Sun, 13 Oct 2002 11:26:02 +0000 Subject: Bug 24789 [E|A|R] Add Estimated, Actual, Remaining Time Fields patch by jeff.hedlund@matrixsi.com 2xr=joel,justdave --- template/en/default/bug/activity/table.html.tmpl | 18 +++++- template/en/default/bug/comments.html.tmpl | 12 +++- template/en/default/bug/create/create.html.tmpl | 14 +++++ template/en/default/bug/edit.html.tmpl | 79 ++++++++++++++++++++++++ template/en/default/bug/show-multiple.html.tmpl | 28 +++++++++ template/en/default/bug/time.html.tmpl | 48 ++++++++++++++ 6 files changed, 195 insertions(+), 4 deletions(-) create mode 100644 template/en/default/bug/time.html.tmpl (limited to 'template/en/default/bug') diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 43529bd23..45c8e4380 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -32,6 +32,8 @@ # incomplete_data: boolean. True if some of the data is incomplete (because # it was affected by an old Bugzilla bug.) #%] + +[% PROCESS bug/time.html.tmpl %] [% IF incomplete_data %]

@@ -72,14 +74,26 @@ [% IF change.removed %] - [% change.removed FILTER html %] + [% IF change.fieldname == 'estimated_time' || + change.fieldname == 'remaining_time' || + change.fieldname == 'work_time' %] + [% PROCESS formattimeunit time_unit=change.removed %] + [% ELSE %] + [% change.removed FILTER html %] + [% END %] [% ELSE %]   [% END %] [% IF change.added %] - [% change.added FILTER html %] + [% IF change.fieldname == 'estimated_time' || + change.fieldname == 'remaining_time' || + change.fieldname == 'work_time' %] + [% PROCESS formattimeunit time_unit=change.added %] + [% ELSE %] + [% change.added FILTER html %] + [% END %] [% ELSE %]   [% END %] diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 7a8ae73db..f5880a811 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -30,6 +30,7 @@ [% count = count + 1 %] [% END %] +[% PROCESS bug/time.html.tmpl %] [%############################################################################%] [%# Block for individual comments #%] @@ -43,9 +44,11 @@ ------- Additional Comment #[% count %] From [% comment.name FILTER html %] - [%+ comment.time %] ------- + [%+ comment.time %] + ------- [% END %] + [% IF mode == "edit" && isinsider %] Private [% END %] - + [% IF UserInGroup(Param('timetrackinggroup')) && + (comment.work_time > 0 || comment.work_time < 0) %] +
+ Additional hours worked: + [% PROCESS formattimeunit time_unit=comment.work_time %] + [% END %] [%# Don't indent the 

 block, since then the spaces are displayed in the
   # generated HTML
   #%]
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 066c11b63..354dd990c 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -155,6 +155,20 @@
     
   
 
+[% IF UserInGroup(Param('timetrackinggroup')) %]
+  
+    Estimated Hours:
+    
+      
+    
+  
+
+  
+     
+    
+  
+[% END %]
+
   
     URL:
     
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 152852169..453b4aa65 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -32,6 +32,29 @@
 [% END %]
 
 [% PROCESS bug/navigate.html.tmpl %]
+[% PROCESS bug/time.html.tmpl %]
+
+
 
 

 
@@ -264,6 +287,62 @@
      
   [% END %]
   
+
+  [% IF UserInGroup(Param('timetrackinggroup')) %]
+    

+    
+      
+        
+        
+        
+        
+        
+        
+      
+      
+        
+        
+        
+        
+        
+        
+      
+    

+          Orig. Est.
+        
+          Current Est.
+        
+          Hours Worked
+        
+          Hours Left
+        
+          %Complete
+        
+          Gain
+        

+          
+        
+          [% PROCESS formattimeunit 
+                     time_unit=(bug.actual_time + bug.remaining_time) %]
+        
+          [% PROCESS formattimeunit time_unit=bug.actual_time %] + 
+          
+        
+          
+        
+          [% PROCESS calculatepercentage act=bug.actual_time
+                                         rem=bug.remaining_time %]
+        
+          [% PROCESS formattimeunit time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %]
+        

+  [% END %]
   
 [%# *** Attachments *** %]
 
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 0c089e9c5..d7e2fcf09 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -24,6 +24,7 @@
   title = "Full Text Bug Listing"
   style_urls = [ "css/show_multiple.css" ]
 %]
+[% PROCESS bug/time.html.tmpl %]
 [% IF bugs.first %]
   [% FOREACH bug = bugs %]
     [% PROCESS bug_display %]
@@ -34,6 +35,7 @@
   

 [% END %]
 
+
 [% PROCESS global/footer.html.tmpl %]
 
 
@@ -130,6 +132,32 @@
       
     [% END %]
 
+    [% IF UserInGroup(Param("timetrackinggroup")) %]
+      
+        
+          Orig. Est.: 
+          [% PROCESS formattimeunit time_unit=bug.estimated_time %]
+           
+          Current Est.: 
+          [% PROCESS formattimeunit 
+                     time_unit=(bug.remaining_time + bug.actual_time) %]
+           
+          Hours Worked: 
+          [% PROCESS formattimeunit time_unit=bug.actual_time %] 
+          Hours Left: 
+          [% PROCESS formattimeunit time_unit=bug.remaining_time %]
+           
+          Percentage Complete: 
+          [% PROCESS calculatepercentage act=bug.actual_time 
+                                         rem=bug.remaining_time %] 
+          Gain 
+          [% PROCESS formattimeunit 
+                     time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %]
+           
+        
+      
+    [% END %]
+
     
       
         Description:
diff --git a/template/en/default/bug/time.html.tmpl b/template/en/default/bug/time.html.tmpl
new file mode 100644
index 000000000..af6966930
--- /dev/null
+++ b/template/en/default/bug/time.html.tmpl
@@ -0,0 +1,48 @@
+
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Jeff Hedlund 
+  #
+  #%]
+                                      
+[% BLOCK formattimeunit %]
+  [%# INTERFACE:
+    # time_unit:  the number converting, converts to 2 decimal places
+    #             unless the last character is a 0, then it truncates to 
+    #             1 decimal place
+    #%]
+  [% time_unit = time_unit FILTER format('%.2f') %]
+  [% IF time_unit.match('0\Z') %]
+    [% time_unit FILTER format('%.1f') %]
+  [% ELSE %]
+    [% time_unit FILTER format('%.2f') %]
+  [% END %]
+[% END %]
+
+[% BLOCK calculatepercentage %]
+  [%# INTERFACE:
+    # act:   actual time  
+    # rem:   remaining time
+    # %]
+  [% IF (act + rem) > 0 %]
+    [% (act / (act + rem)) * 100 
+       FILTER format("%d") %]
+  [% ELSE %]
+    0
+  [% END %]
+[% END %]
-- 
cgit v1.2.3-24-g4f1b