Changeset 2335

Timestamp:

06/25/07 16:55:40 (1 year ago)

Author:

coling

Message:

WorkLogPlugin:

Refactored some code:

• Moved the current task info function to util.py
  
• Moved the 'liberated' Trac pretty_timedelta function to util.py
  
• Add time spent display to the Timeline
  
• Remove some manual SQL in favour of utility function
  

Files:

• worklogplugin/0.10/worklog/dbhelper.py (modified) (1 diff)
• worklogplugin/0.10/worklog/timeline_hook.py (modified) (4 diffs)
• worklogplugin/0.10/worklog/uihooks_ticket.py (modified) (3 diffs)
• worklogplugin/0.10/worklog/util.py (added)
• worklogplugin/0.10/worklog/webui.py (modified) (7 diffs)

worklogplugin/0.10/worklog/dbhelper.py

@@ -84 +84 @@
-    return ResultSet(get_all(db, sql, *params))
-
-def get_active_task(env, authname):
-    sql = "SELECT MAX(lastchange) FROM work_log WHERE user='%s'" % (authname)
-    lastchange = get_scalar(env.get_db_cnx(), sql)
-    if not lastchange:
-        return None
-
-    sql = "SELECT user,ticket,starttime,endtime FROM work_log WHERE user='%s' AND lastchange=%s" % (authname, lastchange)
-    data = get_all(env.get_db_cnx(), sql)[1]
-    task = {}
-    for row in data:
-        task["user"] = row[0]
-        task["ticket"] = row[1]
-        task["starttime"] = row[2]
-        task["endtime"] = row[3]
-    return task
-
-
-class ResultSet:
-    """ the result of calling getResultSet """

worklogplugin/0.10/worklog/timeline_hook.py

@@ -1 +1 @@
-import re
-
+
-from trac.log import logger_factory
-from trac.core import *
@@ -28 +28 @@
-            cursor = db.cursor()
-
-
+starttime,wl.
-                             FROM (
-                             
-
+starttime, 
-                             FROM work_log
-
-                             UNION
-
-
+starttime, 
-                             FROM work_log
-
@@ -45 +45 @@
-                           % (start, stop))
-            previous_update = None
-
+starttime,
-                ticket_href = href.ticket(ticket)
-                if format == 'rss':
@@ -54 +54 @@
-                                   (user, humankind, summary, ticket))
-                message = ''
+                if kind == 'workstop':
+                    started = datetime.fromtimestamp(starttime)
+                    finished = datetime.fromtimestamp(time)
+                    message = 'Time spent: ~' + pretty_timedelta(started, finished)
-                yield kind, ticket_href, title, time, user, message
-

worklogplugin/0.10/worklog/uihooks_ticket.py

@@ -1 +1 @@
-import re
-
+
-from trac.log import logger_factory
-from trac.core import *
@@ -66 +66 @@
-        
-    def get_navigation_items(self, req):
+        if req.authname == 'anonymous':
+            return
+        
-        match = re.match(r'/ticket/([0-9]+)$', req.path_info)
-        if match:
@@ -71 +74 @@
-
-            # Check to see if y
-
-
-
-
-
+
-
-
-
-
+
+
+
+
-                yield 'mainnav', "ticket-addon", self.get_javascript(req, ticket, 0)
-                return
-
+
-            # We are working on SOMETHING, but not this ticket...
-
-
-
-
+
+

worklogplugin/0.10/worklog/webui.py

@@ -1 +1 @@
-import re
-import dbhelper
+from util import *
-from time import time
-from datetime import tzinfo, timedelta, datetime
@@ -34 +35 @@
-                  Markup('<a href="%s">%s</a>' % \
-                         (url , "Work Log"))
-
-    # Stolen from Trac trunk :)
-    def pretty_timedelta(self, time1, time2=None, resolution=None):
-        """Calculate time delta (inaccurately, only for decorative purposes ;-) for
-        prettyprinting. If time1 is None, the current time is used."""
-        if not time1: time1 = datetime.now()
-        if not time2: time2 = datetime.now()
-        if time1 > time2:
-            time2, time1 = time1, time2
-        units = ((3600 * 24 * 365, 'year',   'years'),
-                 (3600 * 24 * 30,  'month',  'months'),
-                 (3600 * 24 * 7,   'week',   'weeks'),
-                 (3600 * 24,       'day',    'days'),
-                 (3600,            'hour',   'hours'),
-                 (60,              'minute', 'minutes'))
-        diff = time2 - time1
-        age_s = int(diff.days * 86400 + diff.seconds)
-        if resolution and age_s < resolution:
-            return ''
-        if age_s < 60:
-            return '%i second%s' % (age_s, age_s != 1 and 's' or '')
-        for u, unit, unit_plural in units:
-            r = float(age_s) / float(u)
-            if r >= 0.9:
-                r = int(round(r))
-                return '%d %s' % (r, r == 1 and unit or unit_plural)
-        return ''
-
-    # IRequestHandler methods
@@ -101 +75 @@
-                          "started": started,
-                          "delta": 'Started ' + format_date(starttime) + " " + format_time(starttime) + \
-self.
+
-                          }
-
@@ -108 +82 @@
-                log[user]["finished"] = finished
-                log[user]["delta"] = 'Worked on from ' + format_date(starttime) + " " + format_time(starttime) + " - " + format_date(endtime) + " " + format_time(endtime) + \
-self.
+
-
-                
@@ -130 +104 @@
-            tckt_link = Markup('#' + ticket)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            if not authname == tckt['owner']:
-                addMessage("You cannot work on ticket " + tckt_link + " as you are not the owner.")
@@ -151 +121 @@
-            sql = "INSERT INTO work_log (user, ticket, lastchange, starttime, endtime) VALUES ('%s', %s, %s, %s, %s)" % \
-                  (authname, ticket, now, now, 0)
-
+
+
+
-            addMessage("You are now working on ticket " + tckt_link + ".")
-
@@ -160 +132 @@
-            tckt_link = Markup('#' + ticket)
-
-
-
-
+
+
-                addMessage("You cannot stop working on ticket " + tckt_link + " as it apears you've not started working on anything yet!")
-                return
-            
-
-
-
+
-                addMessage("You cannot stop working on ticket " + tckt_link + " as it appears you've not started working on it yet!")
-                return
-
-
-
-
-
-
-
+
+
+
-            
-            # Here we should calculate times and automatically add hours to ticket etc.
-            now = int(time());
-            sql = "UPDATE work_log SET endtime=%s, lastchange=%s WHERE user='%s' AND lastchange=%s AND endtime=0" % \
-
-
+
+
+
+
-            addMessage("You are no longer working on ticket " + tckt_link + ".")
-