Changeset 2449

Timestamp:

07/10/07 17:59:40 (1 year ago)

Author:

coling

Message:

WorkLogPlugin:

Complete full integration with TimingAndEstimationPlugin.
This commit adds support for automatically adding hours to the ticket based on the time spent working.
Config options control how to round the number of hours to the nearest x minutes.

Files:

• worklogplugin/0.10/worklog/manager.py (modified) (2 diffs)
• worklogplugin/0.10/worklog/templates/webadminui.cs (modified) (1 diff)

worklogplugin/0.10/worklog/manager.py

@@ -1 +1 @@
-from time import time
+from datetime import tzinfo, timedelta, datetime
+from util import pretty_timedelta
-from trac.ticket.notification import TicketNotifyEmail
-from trac.ticket import Ticket
-from trac.ticket.web_ui import TicketModule
+from trac.util.datefmt import format_date, format_time
-
-class WorkLogManager:
@@ -156 +159 @@
-                       'WHERE user=%s AND lastchange=%s AND endtime=0',
-                       (stoptime, stoptime, self.authname, active['lastchange']))
+
+        message = ''
+        if self.config.getbool('worklog', 'comment'):
+            started = datetime.fromtimestamp(active['starttime'])
+            finished = datetime.fromtimestamp(stoptime)
+            message = '%s worked on this ticket for %s between %s %s and %s %s' % \
+                      (self.authname, pretty_timedelta(started, finished), \
+                       format_date(active['starttime']), format_time(active['starttime']), \
+                       format_date(stoptime), format_time(stoptime))
+        if self.config.getbool('worklog', 'timingandestimation') and \
+               self.config.get('ticket-custom', 'hours'):
+            if not message:
+                message = 'Hours recorded automatically by the worklog plugin.'
+
+            round_delta = float(self.config.getint('worklog', 'roundup') or 1)
+            
+            # Get the delta in minutes
+            delta = float(int(stoptime) - int(active['starttime'])) / float(60)
+            
+            # Round up if needed
+            delta = int(round((delta / round_delta) + float(0.5))) * int(round_delta)
+            
+            db = self.env.get_db_cnx()
+            tckt = Ticket(self.env, active['ticket'], db)
+            tckt['hours'] = str(float(delta) / 60)
+            self.save_ticket(tckt, db, message)
+            message = ''
+
+        if message:
+            db = self.env.get_db_cnx()
+            tckt = Ticket(self.env, active['ticket'], db)
+            self.save_ticket(tckt, db, message)
+        
-        return True
-

worklogplugin/0.10/worklog/templates/webadminui.cs

@@ -4 +4 @@
-  <fieldset>
-    <legend>Options:</legend>
-    <p style="font-weight: bold">
-      The options below that have a line through them do not currently work!<br>
-      Implementations will come in time, please be patient!
-    </p>
-    <div class="field">
-      <input type="checkbox" id="timingandestimation" name="timingandestimation" value="1" <?cs var:settings.timingandestimation ?>>
- style="text-decoration: line-through"
+
-    </div>
-    <div class="field">
-      <input type="checkbox" id="comment" name="comment" value="1" <?cs var:settings.comment ?>>
- style="text-decoration: line-through"
+
-    </div>
-    <div class="field">