keithsalisbury-subtrac 0.1.1

data/lib/subtrac/trac-plugins/worklogplugin/worklog/htdocs/worklogplugin.css

@@ -0,0 +1,80 @@
+#worklogmanual
+{
+  display: block;
+  float: right;
+}
+#worklog_comment 
+{
+  font-size: 70%;
+  color: green;
+}
+#worklog_time_delta 
+{
+  font-size: 70%;
+  color: green;
+}
+table#worklog_report 
+{
+  width: 99%;
+  clear: both;
+}
+#content.worklog table th
+{
+  background: #f7f7f7;
+  border-bottom: 1px solid #d7d7d7;
+  font-size: 105%;
+  font-weight: bold;
+  text-align: left;
+  padding: 5px;
+}
+#content.worklog table td
+{
+  padding: 5px;
+  border: 1px solid #eee;
+}
+#content.worklog table td small
+{
+  color: #999;
+}
+.message
+{ 
+  font-weight:bold;
+  color:#283;
+}
+dt.workstart, dt.workstart a
+{
+  background-image: url(workstart.png);
+}
+dt.workstop, dt.workstop a
+{
+  background-image: url(workstop.png);
+}
+
+
+/* Ticket Page */
+#worklogTicketForm
+{
+    float: right;
+}
+fieldset.workloginfo ul
+{
+  margin: 0;
+  padding: 0;
+  padding-left: 3em;
+  font-size: 11px;
+  list-style: url(work.png) disc;
+}
+
+html .jqmWindow {
+    margin-left: -250px;
+    width: 500px;
+    
+    background-color: #fff;
+    border: 1px solid black;
+    padding: 12px;
+}
+
+textarea#worklogComment {
+	width: 100%;
+	margin: 2px 0;
+}

data/lib/subtrac/trac-plugins/worklogplugin/worklog/manager.py

@@ -0,0 +1,336 @@
+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, to_datetime
+
+class WorkLogManager:
+    env = None
+    config = None
+    authname = None
+    explanation = None
+    now = None
+    
+    def __init__(self, env, config, authname='anonymous'):
+        self.env = env
+        self.config = config
+        self.authname = authname
+        self.explanation = ""
+        self.now = int(time()) - 1
+
+    def get_explanation(self):
+        return self.explanation
+    
+    def can_work_on(self, ticket):
+        # Need to check several things.
+        # 1. Is some other user working on this ticket?
+        # 2. a) Is the autostopstart setting true? or
+        #    b) Is the user working on a ticket already?
+        # 3. a) Is the autoreassignaccept setting true? or
+        #    b) Is the ticket assigned to the user?
+
+        # 0. Are you logged in?
+        if self.authname == 'anonymous':
+            self.explanation = 'You need to be logged in to work on tickets.'
+            return False
+        
+        # 1. Other user working on it?
+        who,since = self.who_is_working_on(ticket)
+        if who:
+            if who != self.authname:
+                self.explanation = 'Another user (%s) has been working on ticket #%s since %s' % (who, ticket, since)
+            else:
+                self.explanation = 'You are already working on ticket #%s' % (ticket,)
+            return False
+
+        # 2. a) Is the autostopstart setting true? or
+        #    b) Is the user working on a ticket already?
+        if not self.config.getbool('worklog', 'autostopstart'):
+            active = self.get_active_task()
+            if active:
+                self.explanation = 'You cannot work on ticket #%s as you are currently working on ticket #%s. You have to chill out.' % (ticket, active['ticket'])
+                return False
+        
+        # 3. a) Is the autoreassignaccept setting true? or
+        #    b) Is the ticket assigned to the user?
+        if not self.config.getbool('worklog', 'autoreassignaccept'):
+            tckt = Ticket(self.env, ticket)
+            if self.authname != tckt['owner']:
+                self.explanation = 'You cannot work on ticket #%s as you are not the owner. You should speak to %s.' % (ticket, tckt['owner'])
+                return False
+
+        # If we get here then we know we can start work :)
+        return True
+
+    def save_ticket(self, tckt, db, msg):
+        # determine sequence number... 
+        cnum = 0
+        tm = TicketModule(self.env)
+        for change in tm.grouped_changelog_entries(tckt, db):
+            if change['permanent']:
+                cnum += 1
+        nowdt = self.now
+        nowdt = to_datetime(nowdt)
+        tckt.save_changes(self.authname, msg, nowdt, db, cnum+1)
+        ## Often the time overlaps and causes a db error,
+        ## especially when the trac integration post-commit hook is used.
+        ## NOTE TO SELF. I DON'T THINK THIS IS NECESSARY RIGHT NOW...
+        #count = 0
+        #while count < 10:
+        #    try:
+        #        tckt.save_changes(self.authname, msg, self.now, db, cnum+1)
+        #        count = 42
+        #    except Exception, e:
+        #        self.now += 1
+        #        count += 1
+        db.commit()
+        
+        tn = TicketNotifyEmail(self.env)
+        tn.notify(tckt, newticket=0, modtime=nowdt)
+        # We fudge time as it has to be unique
+        self.now += 1
+        
+
+    def start_work(self, ticket):
+
+        if not self.can_work_on(ticket):
+            return False
+
+        # We could just horse all the fields of the ticket to the right values
+        # bit it seems more correct to follow the in-build state-machine for
+        # ticket modification.
+
+        # If the ticket is closed, we need to reopen it.
+        db = self.env.get_db_cnx()
+        tckt = Ticket(self.env, ticket, db)
+
+        if 'closed' == tckt['status']:
+            tckt['status'] = 'reopened'
+            tckt['resolution'] = ''
+            self.save_ticket(tckt, db, 'Automatically reopening in order to start work.')
+
+            # Reinitialise for next test
+            db = self.env.get_db_cnx()
+            tckt = Ticket(self.env, ticket, db)
+
+            
+        if self.authname != tckt['owner']:
+            tckt['owner'] = self.authname
+            if 'new' == tckt['status']:
+                tckt['status'] = 'assigned'
+            else:
+                tckt['status'] = 'new'
+            self.save_ticket(tckt, db, 'Automatically reassigning in order to start work.')
+
+            # Reinitialise for next test
+            db = self.env.get_db_cnx()
+            tckt = Ticket(self.env, ticket, db)
+
+
+        if 'assigned' != tckt['status']:
+            tckt['status'] = 'assigned'
+            self.save_ticket(tckt, db, 'Automatically accepting in order to start work.')
+
+        # There is a chance the user may be working on another ticket at the moment
+        # depending on config options
+        if self.config.getbool('worklog', 'autostopstart'):
+            # Don't care if this fails, as with these arguments the only failure
+            # point is if there is no active task... which is the desired scenario :)
+            self.stop_work()
+            self.explanation = ''
+ 
+        cursor = db.cursor()
+        cursor.execute('INSERT INTO work_log (worker, ticket, lastchange, starttime, endtime) '
+                       'VALUES (%s, %s, %s, %s, %s)',
+                       (self.authname, ticket, self.now, self.now, 0))
+        db.commit()
+        return True
+
+    
+    def stop_work(self, stoptime=None, comment=''):
+        active = self.get_active_task()
+        if not active:
+            self.explanation = 'You cannot stop working as you appear to be a complete slacker already!'
+            return False
+
+        if stoptime:
+            if stoptime <= active['starttime']:
+                self.explanation = 'You cannot set your stop time to that value as it is before the start time!'
+                return False
+            elif stoptime >= self.now:
+                self.explanation = 'You cannot set your stop time to that value as it is in the future!'
+                return False
+        else:
+            stoptime = self.now - 1
+
+        stoptime = float(stoptime)
+        
+        db = self.env.get_db_cnx();
+        cursor = db.cursor()
+        cursor.execute('UPDATE work_log '
+                       'SET endtime=%s, lastchange=%s, comment=%s '
+                       'WHERE worker=%s AND lastchange=%s AND endtime=0',
+                       (stoptime, stoptime, comment, self.authname, active['lastchange']))
+        db.commit()
+
+        message = ''
+        # Leave a comment if the user has configured this or if they have entered
+        # a work log comment.
+        if self.config.getbool('worklog', 'comment') or 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 comment:
+                message += "\n[[BR]]\n" + comment
+            
+        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)
+            
+            # This hideous hack is here because I don't yet know how to do variable-DP rounding in python - sorry!
+            # It's meant to round to 2 DP, so please replace it if you know how.  Many thanks, MK.
+            tckt['hours'] = str(float(int(100 * float(delta) / 60) / 100.0))
+            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
+
+
+    def who_is_working_on(self, ticket):
+        db = self.env.get_db_cnx()
+        cursor = db.cursor()
+        cursor.execute('SELECT worker,starttime FROM work_log WHERE ticket=%s AND endtime=0', (ticket,))
+        try:
+            who,since = cursor.fetchone()
+            return who,float(since)
+        except:
+            pass
+        return None,None
+
+    def who_last_worked_on(self, ticket):
+        return "Not implemented"
+
+    def get_latest_task(self):
+        if self.authname == 'anonymous':
+            return None
+
+        db = self.env.get_db_cnx()
+        cursor = db.cursor()
+        cursor.execute('SELECT MAX(lastchange) FROM work_log WHERE worker=%s', (self.authname,))
+        row = cursor.fetchone()
+        if not row or not row[0]:
+            return None
+    
+        lastchange = row[0]
+    
+        task = {}
+        cursor.execute('SELECT wl.worker, wl.ticket, t.summary, wl.lastchange, wl.starttime, wl.endtime, wl.comment '
+                       'FROM work_log wl '
+                       'LEFT JOIN ticket t ON wl.ticket=t.id '
+                       'WHERE wl.worker=%s AND wl.lastchange=%s', (self.authname, lastchange))
+
+        for user,ticket,summary,lastchange,starttime,endtime,comment in cursor:
+            if not comment:
+                comment = ''
+            
+            task['user'] = user
+            task['ticket'] = ticket
+            task['summary'] = summary
+            task['lastchange'] = float(lastchange)
+            task['starttime'] = float(starttime)
+            task['endtime'] = float(endtime)
+            task['comment'] = comment
+        return task
+    
+    def get_active_task(self):
+        task = self.get_latest_task()
+        if not task:
+            return None
+        if not task.has_key('endtime'):
+            return None
+
+        if task['endtime'] > 0:
+            return None
+
+        return task
+
+    def get_work_log(self, mode='all'):
+        db = self.env.get_db_cnx()
+        cursor = db.cursor()
+        if mode == 'user':
+            cursor.execute('SELECT wl.worker, s.value, wl.starttime, wl.endtime, wl.ticket, t.summary, t.status, wl.comment '
+                           'FROM work_log wl '
+                           'INNER JOIN ticket t ON wl.ticket=t.id '
+                           'LEFT JOIN session_attribute s ON wl.worker=s.sid AND s.name=\'name\' '
+                           'WHERE wl.worker=%s '
+                           'ORDER BY wl.lastchange DESC', (self.authname,))
+        elif mode == 'summary':
+            cursor.execute('SELECT wl.worker, s.value, wl.starttime, wl.endtime, wl.ticket, t.summary, t.status, wl.comment '
+                           'FROM (SELECT worker,MAX(lastchange) AS lastchange FROM work_log GROUP BY worker) wlt '
+                           'INNER JOIN work_log wl ON wlt.worker=wl.worker AND wlt.lastchange=wl.lastchange '
+                           'INNER JOIN ticket t ON wl.ticket=t.id '
+                           'LEFT JOIN session_attribute s ON wl.worker=s.sid AND s.name=\'name\' '
+                           'ORDER BY wl.lastchange DESC, wl.worker')
+        else:
+            cursor.execute('SELECT wl.worker, s.value, wl.starttime, wl.endtime, wl.ticket, t.summary, t.status, wl.comment '
+                           'FROM work_log wl '
+                           'INNER JOIN ticket t ON wl.ticket=t.id '
+                           'LEFT JOIN session_attribute s ON wl.worker=s.sid AND s.name=\'name\' '
+                           'ORDER BY wl.lastchange DESC, wl.worker')
+        
+        rv = []
+        for user,name,starttime,endtime,ticket,summary,status,comment  in cursor:
+            starttime = float(starttime)
+            endtime = float(endtime)
+            
+            started = datetime.fromtimestamp(starttime)
+            
+            dispname = user
+            if name:
+                dispname = '%s (%s)' % (name, user)
+            
+            if not endtime == 0:
+                finished = datetime.fromtimestamp(endtime)
+                delta = 'Worked for %s (between %s %s and %s %s)' % \
+                        (pretty_timedelta(started, finished),
+                         format_date(starttime), format_time(starttime),
+                         format_date(endtime), format_time(endtime))
+            else:
+                delta = 'Started %s ago (%s %s)' % \
+                        (pretty_timedelta(started),
+                         format_date(starttime), format_time(starttime))
+
+            rv.append({'user': user,
+                       'name': name,
+                       'dispname': dispname,
+                       'starttime': int(starttime),
+                       'endtime': int(endtime),
+                       'delta': delta,
+                       'ticket': ticket,
+                       'summary': summary,
+                       'status': status,
+                       'comment': comment})
+        return rv
+        

data/lib/subtrac/trac-plugins/worklogplugin/worklog/reports.py

@@ -0,0 +1,598 @@
+# IF YOU ADD A NEW SECTION OF REPORTS, You will need to make
+# sure that section is also added to the all_reports hashtable
+# near the bottom
+
+#Please try to keep this clean"
+
+billing_reports = [
+        {
+    "title":"Ticket Work Summary",
+    "reportnumber":None,
+    "version":12,
+    "sql":"""
+SELECT __ticket__ as __group__, __style__, __ticket__,
+newvalue as Work_added, author, time, _ord
+FROM(
+  SELECT '' as __style__, author, t.id as __ticket__,
+  CAST(newvalue as REAL) as newvalue, ticket_change.time as time, 0 as _ord
+  FROM ticket_change
+  JOIN ticket t on t.id = ticket_change.ticket
+  LEFT JOIN ticket_custom as billable on billable.ticket = t.id 
+    and billable.name = 'billable'
+  WHERE field = 'hours' and
+    t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+      AND ticket_change.time >= $STARTDATE
+      AND ticket_change.time < $ENDDATE
+  
+  UNION 
+  
+  SELECT 'background-color:#DFE;' as __style__,
+    'Total work done on the ticket in the selected time period ' as author,
+    t.id as __ticket__, sum( CAST(newvalue as real) ) as newvalue,
+    NULL as time, 1 as _ord
+  FROM ticket_change
+  JOIN ticket t on t.id = ticket_change.ticket
+  LEFT JOIN ticket_custom as billable on billable.ticket = t.id 
+    and billable.name = 'billable'
+  WHERE field = 'hours' and
+    t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+      AND ticket_change.time >= $STARTDATE
+      AND ticket_change.time < $ENDDATE
+  GROUP By t.id
+)  as tbl
+ORDER BY __ticket__, _ord ASC, time ASC
+
+    """
+    },#END Ticket work summary
+        {
+    "title":"Milestone Work Summary",
+    "reportnumber":None,
+    "version":11,
+    "sql":"""
+
+SELECT 
+  milestone as __group__, __style__,  ticket, summary, newvalue as Work_added,
+  time, _ord
+FROM(
+  SELECT '' as __style__, t.id as ticket,
+    SUM(CAST(newvalue as real)) as newvalue, t.summary as summary,
+    MAX(ticket_change.time) as time, t.milestone as milestone, 0 as _ord
+  FROM ticket_change
+  JOIN ticket t on t.id = ticket_change.ticket
+  LEFT JOIN ticket_custom as billable on billable.ticket = t.id 
+    and billable.name = 'billable'
+  WHERE field = 'hours' and
+    t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+      AND ticket_change.time >= $STARTDATE
+      AND ticket_change.time < $ENDDATE
+  GROUP BY t.milestone, t.id, t.summary
+  
+  UNION 
+  
+  SELECT 'background-color:#DFE;' as __style__, NULL as ticket,
+    sum(CAST(newvalue as real)) as newvalue, 'Total work done' as summary,
+    NULL as time, t.milestone as milestone, 1 as _ord
+  FROM ticket_change
+  JOIN ticket t on t.id = ticket_change.ticket
+  LEFT JOIN ticket_custom as billable on billable.ticket = t.id 
+    and billable.name = 'billable'
+  WHERE field = 'hours' and
+    t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+      AND ticket_change.time >= $STARTDATE
+      AND ticket_change.time < $ENDDATE
+  GROUP By t.milestone
+)  as tbl
+ORDER BY milestone,  _ord ASC, ticket, time
+
+
+
+    """
+    },#END Milestone work summary
+        
+    {
+    "title":"Developer Work Summary",
+    "reportnumber":None,
+    "version":11,
+    "sql":"""
+SELECT author as __group__,__style__, ticket,
+  newvalue as Work_added, time as time, _ord
+FROM(
+  SELECT '' as __style__, author, cast(t.id as text) as ticket,
+    CAST(newvalue as REAL) as newvalue, ticket_change.time as time, 0 as _ord
+  FROM ticket_change
+  JOIN ticket t on t.id = ticket_change.ticket
+  LEFT JOIN ticket_custom as billable on billable.ticket = t.id 
+    and billable.name = 'billable'
+  WHERE field = 'hours' and
+    t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+      AND ticket_change.time >= $STARTDATE
+      AND ticket_change.time < $ENDDATE
+      
+  UNION 
+  
+  SELECT 'background-color:#DFE;' as __style__, author, NULL as ticket,
+    sum(CAST(newvalue as real)) as newvalue, NULL as time, 1 as _ord
+  FROM ticket_change
+  JOIN ticket t on t.id = ticket_change.ticket
+  LEFT JOIN ticket_custom as billable on billable.ticket = t.id 
+    and billable.name = 'billable'
+  WHERE field = 'hours' and
+    t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+      AND ticket_change.time >= $STARTDATE
+      AND ticket_change.time < $ENDDATE
+  GROUP By author
+)  as tbl
+ORDER BY author,  _ord ASC, time
+    
+    """
+    },#END Hours Per Developer
+]
+ticket_hours_reports = [
+{
+    "title": "Ticket Hours",
+    "reportnumber": None,
+    "version":8,
+    "sql": """
+SELECT __color__, __style__, ticket, summary, component ,version, severity,
+  milestone, status, owner, Estimated_work, Total_work, billable,_ord
+FROM (
+  SELECT p.value AS __color__,
+    '' as __style__,
+    t.id AS ticket, summary AS summary,             -- ## Break line here
+    component,version, severity, milestone, status, owner,
+    CAST(EstimatedHours.value as REAL) as Estimated_work,
+    CAST(totalhours.value as REAL) as Total_work, 
+    CASE WHEN billable.value = 1 THEN 'Y' else 'N' END as billable,
+    time AS created, changetime AS modified,         -- ## Dates are formatted
+    description AS _description_,                    -- ## Uses a full row
+    changetime AS _changetime,
+    reporter AS _reporter
+    ,0 as _ord                                        
+  	
+    FROM ticket as t
+    JOIN enum as p ON p.name=t.priority AND p.type='priority'
+    
+  LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+        AND EstimatedHours.Ticket = t.Id
+  LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+        AND totalhours.Ticket = t.Id
+  LEFT JOIN ticket_custom as billable ON billable.name='billable'
+        AND billable.Ticket = t.Id
+  
+    WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+    
+  
+  UNION 
+  
+  SELECT '1' AS __color__,
+         'background-color:#DFE;' as __style__,
+         NULL as ticket, 'Total' AS summary,             
+         NULL as component,NULL as version, NULL as severity, NULL as  milestone, NULL as status, NULL as owner,
+         SUM(CAST(EstimatedHours.value as real)) as Estimated_work,
+         SUM(CAST(totalhours.value as real)) as Total_work,
+         NULL as billable,
+         NULL as created, NULL as modified,         -- ## Dates are formatted
+  
+         NULL AS _description_,
+         NULL AS _changetime,
+         NULL AS _reporter
+         ,1 as _ord
+    FROM ticket as t
+    JOIN enum as p ON p.name=t.priority AND p.type='priority'
+    
+  LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+        AND EstimatedHours.Ticket = t.Id
+  
+  LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+        AND totalhours.Ticket = t.Id
+  
+  LEFT JOIN ticket_custom as billable ON billable.name='billable'
+        AND billable.Ticket = t.Id
+    
+    WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+      AND billable.value in ($BILLABLE, $UNBILLABLE)
+)  as tbl
+ORDER BY  _ord ASC, ticket
+    """
+    },
+#END Ticket Hours 
+{
+    "title": "Ticket Hours with Description",
+    "reportnumber": None,
+    "version":9,
+    "sql": """
+SELECT __color__,  __style__,  ticket, summary, component ,version, severity,
+ milestone, status, owner, Estimated_work, Total_work, billable
+--,created,  modified,         -- ## Dates are formatted
+,_description_
+-- _changetime,
+-- _reporter
+,_ord
+
+FROM (
+SELECT p.value AS __color__,
+       '' as __style__,
+       t.id AS ticket, summary AS summary,             -- ## Break line here
+       component,version, severity, milestone, status, owner,
+       CAST(EstimatedHours.value as REAL) as Estimated_work,
+       CAST(totalhours.value as REAL) as Total_work,
+       CASE WHEN billable.value = 1 THEN 'Y'
+            else 'N'
+       END as billable,
+       time AS created, changetime AS modified,         -- ## Dates are formatted
+       description AS _description_,                    -- ## Uses a full row
+       changetime AS _changetime,
+       reporter AS _reporter
+       ,0 as _ord                                        
+	
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  
+
+UNION 
+
+SELECT '1' AS __color__,
+       'background-color:#DFE;' as __style__,
+       NULL as ticket, 'Total' AS summary,             
+       NULL as component,NULL as version, NULL as severity, NULL as  milestone, NULL as status, NULL as owner,
+       SUM(CAST(EstimatedHours.value as real)) as Estimated_work,
+       SUM(CAST(totalhours.value as real)) as Total_work,
+       NULL as billable,
+       NULL as created, NULL as modified,         -- ## Dates are formatted
+
+       NULL AS _description_,
+       NULL AS _changetime,
+       NULL AS _reporter
+       ,1 as _ord
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+  
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+)  as tbl
+ORDER BY _ord ASC, ticket
+    """
+    },
+#END Ticket Hours 
+
+    {
+    "title":"Ticket Hours Grouped By Component",
+    "reportnumber":None,
+    "version":8,
+    "sql": """
+SELECT __color__, __group__, __style__, ticket, summary, __component__ ,version,
+  severity, milestone, status, owner, Estimated_work, total_work, billable,
+  _ord
+
+FROM (
+SELECT p.value AS __color__,
+       t.component AS __group__,
+       '' as __style__,
+       t.id AS ticket, summary AS summary,             -- ## Break line here
+       component as __component__,version, severity, milestone, status, owner,
+       CAST(EstimatedHours.value as REAL) as Estimated_work,
+       CAST(totalhours.value as REAL) as Total_work,
+       CASE WHEN billable.value = 1 THEN 'Y'
+            else 'N'
+       END as billable,
+       time AS created, changetime AS modified,         -- ## Dates are formatted
+       description AS _description_,                    -- ## Uses a full row
+       changetime AS _changetime,
+       reporter AS _reporter
+       ,0 as _ord                                        
+	
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  
+
+UNION 
+
+SELECT '1' AS __color__,
+       t.component AS __group__,
+       'background-color:#DFE;' as __style__,
+       NULL as ticket, 'Total work' AS summary,             
+       t.component as __component__, NULL as version, NULL as severity,
+       NULL as  milestone, NULL as status,
+       NULL as owner,
+       SUM(CAST(EstimatedHours.value as real)) as Estimated_work,
+       SUM(CAST(totalhours.value as real)) as Total_work,
+       NULL as billable,
+       NULL as created,
+       NULL as modified,         -- ## Dates are formatted
+
+       NULL AS _description_,
+       NULL AS _changetime,
+       NULL AS _reporter
+       ,1 as _ord
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+  
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  GROUP BY t.component
+)  as tbl
+ORDER BY __component__, _ord ASC,ticket
+    """
+    },
+# END Ticket Hours  GROUPED BY COMPONENT
+    
+    {
+    "title":"Ticket Hours Grouped By Component with Description",
+    "reportnumber":None,
+    "version":7,
+    "sql": """
+SELECT __color__, __group__, __style__,  ticket, summary, __component__ ,
+  version, severity, milestone, status, owner, Estimated_work, Total_work,
+  billable, _description_, _ord
+
+FROM (
+SELECT p.value AS __color__,
+       t.component AS __group__,
+       '' as __style__,
+       t.id AS ticket, summary AS summary,             -- ## Break line here
+       component as __component__, version, severity, milestone, status, owner,
+       CAST(EstimatedHours.value as REAL) as Estimated_work,
+       CAST(totalhours.value as REAL) as Total_work,
+       CASE WHEN billable.value = 1 THEN 'Y' else 'N' END as billable,
+       time AS created, changetime AS modified,         -- ## Dates are formatted
+       description AS _description_,                    -- ## Uses a full row
+       changetime AS _changetime,
+       reporter AS _reporter
+       ,0 as _ord                                        
+	
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  
+
+UNION 
+
+SELECT '1' AS __color__,
+       t.component AS __group__,
+       'background-color:#DFE;' as __style__,
+       NULL as ticket, 'Total work' AS summary,             
+       t.component as __component__, NULL as version, NULL as severity,
+       NULL as  milestone, NULL as status, NULL as owner,
+       SUM(CAST(EstimatedHours.value as real)) as Estimated_work,
+       SUM(CAST(totalhours.value as real)) as Total_work,
+       NULL as billable,
+       NULL as created, NULL as modified,         -- ## Dates are formatted
+
+       NULL AS _description_,
+       NULL AS _changetime,
+       NULL AS _reporter
+       ,1 as _ord
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+  
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  GROUP BY t.component
+)  as tbl
+ORDER BY __component__, _ord ASC, ticket
+    """
+    },
+# END Ticket Hours Grouped BY Component with Description
+    {
+    "title":"Ticket Hours Grouped By Milestone",
+    "reportnumber":None,
+    "version":8,
+    "sql": """
+SELECT __color__, __group__, __style__,  ticket, summary, component ,version,
+  severity, __milestone__, status, owner, Estimated_work, Total_work, billable,
+  _ord
+
+FROM (
+SELECT p.value AS __color__,
+       t.milestone AS __group__,
+       '' as __style__,
+       t.id AS ticket, summary AS summary,             -- ## Break line here
+       component,version, severity, milestone as __milestone__, status, owner,
+       CAST(EstimatedHours.value as REAL) as Estimated_work,
+       CAST(totalhours.value as REAL) as Total_work,
+       CASE WHEN billable.value = 1 THEN 'Y'
+            else 'N'
+       END as billable,
+       time AS created, changetime AS modified,         -- ## Dates are formatted
+       description AS _description_,                    -- ## Uses a full row
+       changetime AS _changetime,
+       reporter AS _reporter, 0 as _ord                                        
+	
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  
+
+UNION 
+
+SELECT '1' AS __color__,
+       t.milestone AS __group__,
+       'background-color:#DFE;' as __style__,
+       NULL as ticket, 'Total work' AS summary,             
+       NULL as component,NULL as version, NULL as severity,
+       t.milestone as  __milestone__, NULL as status, NULL as owner,
+       SUM(CAST(EstimatedHours.value as real)) as Estimated_work,
+       SUM(CAST(totalhours.value as real)) as Total_work,
+       NULL as billable,
+       NULL as created, NULL as modified,         -- ## Dates are formatted
+
+       NULL AS _description_,
+       NULL AS _changetime,
+       NULL AS _reporter
+       ,1 as _ord
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+  
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  GROUP BY t.milestone
+)  as tbl
+ORDER BY __milestone__, _ord ASC, ticket
+    """
+    },
+#END Ticket Hours Grouped By MileStone
+        {
+    "title":"Ticket Hours Grouped By MileStone with Description",
+    "reportnumber":None,
+    "version":8,
+    "sql": """
+SELECT __color__, __group__, __style__,  ticket, summary, component ,version, severity,
+ __milestone__, status, owner, Estimated_work, Total_work, billable,
+ _description_, _ord
+
+FROM (
+SELECT p.value AS __color__,
+       t.milestone AS __group__,
+       '' as __style__,
+       t.id AS ticket, summary AS summary,             -- ## Break line here
+       component,version, severity, milestone as __milestone__, status, owner,
+       CAST(EstimatedHours.value as REAL) as Estimated_work,
+       CAST(totalhours.value as REAL) as Total_work,
+       CASE WHEN billable.value = 1 THEN 'Y'
+            else 'N'
+       END as billable,
+       time AS created, changetime AS modified,         -- ## Dates are formatted
+       description AS _description_,                    -- ## Uses a full row
+       changetime AS _changetime,
+       reporter AS _reporter
+       ,0 as _ord                                        
+	
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  
+
+UNION 
+
+SELECT '1' AS __color__,
+       t.milestone AS __group__,
+       'background-color:#DFE;' as __style__,
+       NULL as ticket, 'Total work' AS summary,             
+       NULL as component,NULL as version, NULL as severity,
+       t.milestone as __milestone__,
+       NULL as status, NULL as owner,
+       SUM(CAST(EstimatedHours.value as real)) as Estimated_work,
+       SUM(CAST(totalhours.value as real)) as Total_work,
+       NULL as billable,
+       NULL as created, NULL as modified,         -- ## Dates are formatted
+       NULL AS _description_,
+       NULL AS _changetime,
+       NULL AS _reporter, 1 as _ord
+  FROM ticket as t
+  JOIN enum as p ON p.name=t.priority AND p.type='priority'
+  
+LEFT JOIN ticket_custom as EstimatedHours ON EstimatedHours.name='estimatedhours'
+      AND EstimatedHours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as totalhours ON totalhours.name='totalhours'
+      AND totalhours.Ticket = t.Id
+
+LEFT JOIN ticket_custom as billable ON billable.name='billable'
+      AND billable.Ticket = t.Id
+  
+  WHERE t.status IN ($NEW, $ASSIGNED, $REOPENED, $CLOSED) 
+    AND billable.value in ($BILLABLE, $UNBILLABLE)
+  GROUP BY t.milestone
+)  as tbl
+ORDER BY __milestone__, _ord ASC, ticket
+    """
+    }
+    #END Ticket Hours Grouped By MileStone with Description
+]
+    
+all_reports = [
+    {"title":"Billing Reports",
+     "reports":billing_reports},
+    {"title":"Ticket/Hour Reports",
+     "reports": ticket_hours_reports}
+    ]