Ticket #2288: 2288-time-queries-r7578.patch

trac/htdocs/css/report.css

@@ -38 +38 @@
 #filters td label { font-size: 11px }
 #filters td.mode { text-align: right }
 #filters td.filter { width: 100% }
-#filters td.filter label { padding-right: 1em }
+#filters td.filter label.control { padding-right: 1em }
 #filters td.actions { text-align: right; white-space: nowrap }
 
 #columns div label { 

trac/htdocs/js/query.js

@@ -16 +16 @@
     // Removes an existing row from the filters table
     function removeRow(button, propertyName) {
       var tr = getAncestorByTagName(button, "tr");
-  
-      var mode = null;
-      var selects = tr.getElementsByTagName("select");
-      for (var i = 0; i < selects.length; i++) {
-        if (selects[i].name == propertyName + "_mode") {
-          mode = selects[i];
-          break;
-        }
-      }
-      if (mode && (getAncestorByTagName(mode, "tr") == tr)) {
+      var label = document.getElementById("label_" + propertyName);
+      if (label && (getAncestorByTagName(label, "tr") == tr)) {
         // Check whether there are more 'or' rows for this filter
         var next = $(tr).next()[0];
         if (next && (next.className == propertyName)) {
@@ -42 +34 @@
   
           var thisTh = getChildElementAt(tr, 0);
           var nextTh = getChildElementAt(next, 0);
-          next.insertBefore(thisTh, nextTh);
-          nextTh.colSpan = 1;
-  
-          thisTd = getChildElementAt(tr, 0);
-          nextTd = getChildElementAt(next, 1);
-          next.replaceChild(thisTd, nextTd);
+          if (nextTh.colSpan == 1) {
+            next.replaceChild(thisTh, nextTh);
+          } else {
+            next.insertBefore(thisTh, nextTh);
+            nextTh.colSpan = 1;
+            thisTd = getChildElementAt(tr, 0);
+            nextTd = getChildElementAt(next, 1);
+            next.replaceChild(thisTd, nextTd);
+          }
         }
       }
   
@@ -117 +112 @@
       function createLabel(text, htmlFor) {
         var label = document.createElement("label");
         if (text) label.appendChild(document.createTextNode(text));
-        if (htmlFor) label.htmlFor = htmlFor;
+        if (htmlFor) {
+          label.htmlFor = htmlFor;
+          label.className = "control";
+        }
         return label;
       }
   
+      // Convenience function for creating an <input type="text">
+      function createText(name, size) {
+        var input = document.createElement("input");
+        input.type = "text";
+        if (name) input.name = name;
+        if (size) input.size = size;
+        return input;
+      }
+      
       // Convenience function for creating an <input type="checkbox">
       function createCheckbox(name, value, id) {
         var input = document.createElement("input");
@@ -182 +189 @@
       var th = document.createElement("th");
       th.scope = "row";
       if (!alreadyPresent) {
-        th.appendChild(createLabel(property.label));
+        var label = createLabel(property.label);
+        label.id = "label_" + propertyName;
+        th.appendChild(label);
       } else {
-        th.colSpan = 2;
+        th.colSpan = property.type == "time"? 1: 2;
         th.appendChild(createLabel("or"));
       }
       tr.appendChild(th);
   
       var td = document.createElement("td");
-      if (property.type == "radio" || property.type == "checkbox") {
+      var focusElement = null;
+      if (property.type == "radio" || property.type == "checkbox" || property.type == "time") {
         td.colSpan = 2;
         td.className = "filter";
         if (property.type == "radio") {
@@ -201 +211 @@
             td.appendChild(createLabel(option ? option : "none",
               propertyName + "_" + option));
           }
-        } else {
+        } else if (property.type == "checkbox") {
           td.appendChild(createRadio(propertyName, "1", propertyName + "_on"));
           td.appendChild(document.createTextNode(" "));
           td.appendChild(createLabel("yes", propertyName + "_on"));
           td.appendChild(createRadio(propertyName, "0", propertyName + "_off"));
           td.appendChild(document.createTextNode(" "));
           td.appendChild(createLabel("no", propertyName + "_off"));
+        } else if (property.type == "time") {
+          td.appendChild(createLabel("between"));
+          td.appendChild(document.createTextNode(" "));
+          focusElement = createText(propertyName, 14);
+          td.appendChild(focusElement);
+          td.appendChild(document.createTextNode(" "));
+          td.appendChild(createLabel("and"));
+          td.appendChild(document.createTextNode(" "));
+          td.appendChild(createText(propertyName + "_end", 14));
         }
         tr.appendChild(td);
       } else {
@@ -224 +243 @@
         td = document.createElement("td");
         td.className = "filter";
         if (property.type == "select") {
-          var element = createSelect(propertyName, property.options, true);
+          focusElement = createSelect(propertyName, property.options, true);
         } else if ((property.type == "text") || (property.type == "textarea")) {
-          var element = document.createElement("input");
-          element.type = "text";
-          element.name = propertyName;
-          element.size = 42;
+          focusElement = createText(propertyName, 42);
         }
-        td.appendChild(element);
-        element.focus();
+        td.appendChild(focusElement);
         tr.appendChild(td);
       }
   
@@ -266 +281 @@
         tbody.appendChild(tr);
         insertionPoint.parentNode.insertBefore(tbody, insertionPoint);
       }
+      if(focusElement)
+          focusElement.focus();
   
       // Disable the add filter in the drop-down list
       if (property.type == "radio" || property.type == "checkbox") {

trac/ticket/api.py

@@ -240 +240 @@
             field = {'name': name, 'type': 'text', 'label': name.title()}
             fields.append(field)
 
+        # Date/time fields
+        fields.append({'name': 'time', 'type': 'time',
+                       'label': _('Created')})
+        fields.append({'name': 'changetime', 'type': 'time',
+                       'label': _('Modified')})
+
         for field in self.get_custom_fields():
             if field['name'] in [f['name'] for f in fields]:
                 self.log.warning('Duplicate field name "%s" (ignoring)',
@@ -281 +287 @@
 
         fields.sort(lambda x, y: cmp(x['order'], y['order']))
         return fields
+
+    def get_field_synonyms(self):
+        """Return a mapping from field name synonyms to field names.
+        The synonyms are supposed to be more intuitive for custom queries."""
+        return {'created': 'time', 'modified': 'changetime'}
 
     # IPermissionRequestor methods
 

trac/ticket/model.py

@@ -40 +40 @@
     def id_is_valid(num):
         return 0 < int(num) <= 1L << 31
 
+    # 0.11 compatibility
+    time_created = property(lambda self: self.values.get('time'))
+    time_changed = property(lambda self: self.values.get('changetime'))
+    
     def __init__(self, env, tkt_id=None, db=None, version=None):
         self.env = env
         self.resource = Resource('ticket', tkt_id, version)
         self.fields = TicketSystem(self.env).get_ticket_fields()
+        self.time_fields = [f['name'] for f in self.fields
+                            if f['type'] == 'time']
         self.values = {}
         if tkt_id is not None:
             self._fetch_ticket(tkt_id, db)
         else:
             self._init_defaults(db)
-            self.id = self.time_created = self.time_changed = None
+            self.id = None
         self._old = {}
 
     def _get_db(self, db):
@@ -66 +72 @@
     def _init_defaults(self, db=None):
         for field in self.fields:
             default = None
-            if field['name'] in ['resolution', 'status']:
+            if field['name'] in ['resolution', 'status', 'time', 'changetime']:
                 # Ignore for new - only change through workflow
                 pass
             elif not field.get('custom'):
@@ -93 +99 @@
             # Fetch the standard ticket fields
             std_fields = [f['name'] for f in self.fields if not f.get('custom')]
             cursor = db.cursor()
-            cursor.execute("SELECT %s,time,changetime FROM ticket WHERE id=%%s"
+            cursor.execute("SELECT %s FROM ticket WHERE id=%%s"
                            % ','.join(std_fields), (tkt_id,))
             row = cursor.fetchone()
         if not row:
@@ -104 +110 @@
         for i in range(len(std_fields)):
             value = row[i]
             if value is not None:
-                self.values[std_fields[i]] = row[i]
-        self.time_created = datetime.fromtimestamp(row[len(std_fields)], utc)
-        self.time_changed = datetime.fromtimestamp(row[len(std_fields) + 1], utc)
+                field = std_fields[i]
+                if field in self.time_fields:
+                    self.values[field] = datetime.fromtimestamp(value, utc)
+                else:
+                    self.values[field] = value
 
         # Fetch custom fields if available
         custom_fields = [f['name'] for f in self.fields if f.get('custom')]
@@ -166 +174 @@
         # Add a timestamp
         if when is None:
             when = datetime.now(utc)
-        self.time_created = self.time_changed = when
+        self.values['time'] = self.values['changetime'] = when
 
         cursor = db.cursor()
 
@@ -180 +188 @@
                 # No such component exists
                 pass
 
+        # Perform type conversions
+        values = dict(self.values)
+        for field in self.time_fields:
+            if field in values:
+                values[field] = to_timestamp(values[field])
+        
         # Insert ticket record
-        created = to_timestamp(self.time_created)
-        changed = to_timestamp(self.time_changed)
         std_fields = []
         custom_fields = []
         for f in self.fields:
@@ -192 +204 @@
                     custom_fields.append(fname)
                 else:
                     std_fields.append(fname)
-        cursor.execute("INSERT INTO ticket (%s,time,changetime) VALUES (%s)"
+        cursor.execute("INSERT INTO ticket (%s) VALUES (%s)"
                        % (','.join(std_fields),
-                          ','.join(['%s'] * (len(std_fields) + 2))),
-                       [self[name] for name in std_fields] + [created, changed])
+                          ','.join(['%s'] * len(std_fields))),
+                       [values[name] for name in std_fields])
         tkt_id = db.get_last_id(cursor, 'ticket')
 
         # Insert custom fields
@@ -291 +303 @@
             db.commit()
         old_values = self._old
         self._old = {}
-        self.time_changed = when
+        self.values['changetime'] = when
 
         for listener in TicketSystem(self.env).change_listeners:
             listener.ticket_changed(self, comment, author, old_values)

trac/ticket/notification.py

@@ -149 +149 @@
 
     def format_props(self):
         tkt = self.ticket
-        fields = [f for f in tkt.fields if f['name'] not in ('summary', 'cc')]
+        fields = [f for f in tkt.fields 
+                  if f['name'] not in ('summary', 'cc', 'time', 'changetime')]
         width = [0, 0, 0, 0]
         i = 0
         for f in [f['name'] for f in fields if f['type'] != 'textarea']:

trac/ticket/query.py

@@ -31 +31 @@
 from trac.resource import Resource
 from trac.ticket.api import TicketSystem
 from trac.util import Ranges
-from trac.util.datefmt import to_timestamp, utc
+from trac.util.datefmt import format_datetime, parse_date, to_timestamp, utc
 from trac.util.presentation import Paginator
 from trac.util.text import shorten_line
 from trac.util.translation import _, tag_
@@ -56 +56 @@
         self.env = env
         self.id = report # if not None, it's the corresponding saved query
         self.constraints = constraints or {}
-        self.order = order
+        synonyms = TicketSystem(self.env).get_field_synonyms()
+        self.order = synonyms.get(order, order)     # 0.11 compatibility
         self.desc = desc
         self.group = group
         self.groupdesc = groupdesc
@@ -100 +101 @@
         if verbose and 'description' not in rows: # 0.10 compatibility
             rows.append('description')
         self.fields = TicketSystem(self.env).get_ticket_fields()
+        self.time_fields = [f['name'] for f in self.fields
+                            if f['type'] == 'time']
         field_names = [f['name'] for f in self.fields]
         self.cols = [c for c in cols or [] if c in field_names or 
-                     c in ('id', 'time', 'changetime')]
+                     c == 'id']
         self.rows = [c for c in rows if c in field_names]
         if self.order != 'id' and self.order not in field_names:
-            # TODO: fix after adding time/changetime to the api.py
-            if order == 'created':
-                order = 'time'
-            elif order == 'modified':
-                order = 'changetime'
-            if order in ('time', 'changetime'):
-                self.order = order
-            else:
-                self.order = 'priority'
+            self.order = 'priority'
 
         if self.group not in field_names:
             self.group = None
@@ -124 +119 @@
         kw_strs = ['order', 'group', 'page', 'max']
         kw_arys = ['rows']
         kw_bools = ['desc', 'groupdesc', 'verbose']
+        synonyms = TicketSystem(env).get_field_synonyms()
         constraints = {}
         cols = []
         for filter_ in filters:
@@ -131 +127 @@
             if len(filter_) != 2:
                 raise QuerySyntaxError(_('Query filter requires field and ' 
                                          'constraints separated by a "="'))
-            field,values = filter_
+            field, values = filter_
             if not field:
                 raise QuerySyntaxError(_('Query filter requires field name'))
             # from last char of `field`, get the mode of comparison
@@ -157 +153 @@
                 elif field in kw_bools:
                     kw[field] = True
                 elif field == 'col':
-                    cols.extend(processed_values)
+                    cols.extend(synonyms.get(value, value)
+                                for value in processed_values)
                 else:
-                    constraints[field] = processed_values
+                    constraints.setdefault(synonyms.get(field, field), 
+                                           []).extend(processed_values)
             except UnicodeError:
                 pass # field must be a str, see `get_href()`
         report = constraints.pop('report', None)
@@ -185 +183 @@
             if col in cols:
                 cols.remove(col)
                 cols.append(col)
-        # TODO: fix after adding time/changetime to the api.py
-        cols += ['time', 'changetime']
 
         # Semi-intelligently remove columns that are restricted to a single
         # value by a query constraint.
@@ -195 +191 @@
             constraint = self.constraints[col]
             if len(constraint) == 1 and constraint[0] \
                     and not constraint[0][0] in ('!', '~', '^', '$'):
-                if col in cols:
+                if col in cols and col not in self.time_fields:
                     cols.remove(col)
             if col == 'status' and not 'closed' in constraint \
                     and 'resolution' in cols:
@@ -299 +295 @@
                     result['href'] = req.href.ticket(val)
                 elif val is None:
                     val = '--'
-                elif name in ('changetime', 'time'):
+                elif name in self.time_fields:
                     val = datetime.fromtimestamp(int(val or 0), utc)
                 elif field and field['type'] == 'checkbox':
                     try:
@@ -425 +421 @@
 
         def get_constraint_sql(name, value, mode, neg):
             if name not in custom_fields:
-                name = 't.' + name
+                col = 't.' + name
             else:
-                name = name + '.value'
+                col = name + '.value'
             value = value[len(mode) + neg:]
 
+            if name in self.time_fields:
+                if ';' in value:
+                    (start, end) = [each.strip() for each in 
+                                    value.split(';', 1)]
+                else:
+                    (start, end) = (value.strip(), '')
+                col_cast = db.cast(col, 'int')
+                if start and end:
+                    start = to_timestamp(parse_date(start, req.tz))
+                    end = to_timestamp(parse_date(end, req.tz))
+                    return ("%s(%s>=%%s AND %s<%%s)" % (neg and 'NOT ' or '',
+                                                        col_cast, col_cast),
+                            (start, end))
+                elif start:
+                    start = to_timestamp(parse_date(start, req.tz))
+                    return ("%s%s>=%%s" % (neg and 'NOT ' or '', col_cast),
+                            (start, ))
+                elif end:
+                    end = to_timestamp(parse_date(end, req.tz))
+                    return ("%s%s<%%s" % (neg and 'NOT ' or '', col_cast),
+                            (end, ))
+                else:
+                    return None
+                
             if mode == '':
-                return ("COALESCE(%s,'')%s=%%s" % (name, neg and '!' or ''),
-                        value)
+                return ("COALESCE(%s,'')%s=%%s" % (col, neg and '!' or ''),
+                        (value, ))
+
             if not value:
                 return None
-            db = self.env.get_db_cnx()
             value = db.like_escape(value)
             if mode == '~':
                 value = '%' + value + '%'
@@ -443 +463 @@
                 value = value + '%'
             elif mode == '$':
                 value = '%' + value
-            return ("COALESCE(%s,'') %s%s" % (name, neg and 'NOT ' or '',
+            return ("COALESCE(%s,'') %s%s" % (col, neg and 'NOT ' or '',
                                               db.like()),
-                    value)
+                    (value, ))
 
+        db = self.env.get_db_cnx()
         clauses = []
         args = []
         for k, v in self.constraints.items():
@@ -480 +501 @@
                     clauses.append('%s(%s)' % (neg and 'NOT ' or '',
                                                ' OR '.join(id_clauses)))
             # Special case for exact matches on multiple values
-            elif not mode and len(v) > 1:
+            elif not mode and len(v) > 1 and k not in self.time_fields:
                 if k not in custom_fields:
                     col = 't.' + k
                 else:
@@ -501 +522 @@
                 else:
                     clauses.append("(" + " OR ".join(
                         [item[0] for item in constraint_sql]) + ")")
-                args += [item[1] for item in constraint_sql]
+                for item in constraint_sql:
+                    args.extend(item[1])
             elif len(v) == 1:
                 constraint_sql = get_constraint_sql(k, v[0], mode, neg)
                 if constraint_sql:
                     clauses.append(constraint_sql[0])
-                    args.append(constraint_sql[1])
+                    args.extend(constraint_sql[1])
 
         clauses = filter(None, clauses)
         if clauses:
@@ -530 +552 @@
             # FIXME: This is a somewhat ugly hack.  Can we also have the
             #        column type for this?  If it's an integer, we do first
             #        one, if text, we do 'else'
-            if name in ('id', 'time', 'changetime'):
+            if name == 'id' or name in self.time_fields:
                 sql.append("COALESCE(%s,0)=0%s," % (col, desc))
             else:
                 sql.append("COALESCE(%s,'')=''%s," % (col, desc))
@@ -576 +598 @@
         labels = dict([(f['name'], f['label']) for f in self.fields])
         wikify = set(f['name'] for f in self.fields 
                      if f['type'] == 'text' and f.get('format') == 'wiki')
-
-        # TODO: remove after adding time/changetime to the api.py
-        labels['changetime'] = _('Modified')
-        labels['time'] = _('Created')
 
         headers = [{
             'name': col, 'label': labels.get(col, _('Ticket')),
@@ -829 +847 @@
 
     def _get_constraints(self, req):
         constraints = {}
-        ticket_fields = [f['name'] for f in
-                         TicketSystem(self.env).get_ticket_fields()]
+        fields = TicketSystem(self.env).get_ticket_fields()
+        synonyms = TicketSystem(self.env).get_field_synonyms()
+        ticket_fields = [f['name'] for f in fields]
         ticket_fields.append('id')
+        ticket_fields.extend(synonyms.iterkeys())
+        time_fields = [f['name'] for f in fields if f['type'] == 'time']
+        time_fields.extend([k for (k, v) in synonyms.iteritems() 
+                            if v in time_fields])
 
         # For clients without JavaScript, we remove constraints here if
         # requested
@@ -853 +876 @@
                 mode = req.args.get(field + '_mode')
                 if mode:
                     vals = [mode + x for x in vals]
+                if field in time_fields:
+                    ends = req.args.getlist(field + '_end')
+                    if ends:
+                        vals = [start + ';' + end 
+                                for (start, end) in zip(vals, ends)]
                 if field in remove_constraints:
                     idx = remove_constraints[field]
                     if idx >= 0:
@@ -861 +889 @@
                             continue
                     else:
                         continue
-                constraints[field] = vals
+                constraints.setdefault(synonyms.get(field, field), 
+                                       []).extend(vals)
 
         return constraints
 
@@ -957 +986 @@
                     if col in ('cc', 'reporter'):
                         value = Chrome(self.env).format_emails(context(ticket),
                                                                value)
+                    elif col in query.time_fields:
+                        value = format_datetime(value, tzinfo=req.tz)
                     values.append(unicode(value).encode('utf-8'))
                 writer.writerow(values)
         return (content.getvalue(), '%s;charset=utf-8' % mimetype)

trac/ticket/templates/query.html

@@ -43 +43 @@
             <py:for each="field_name in field_names" py:with="field = fields[field_name]">
               <py:for each="constraint_name, constraint in constraints.items()">
                 <tbody py:if="field_name == constraint_name"
-                  py:with="multiline = field.type in ('select', 'text', 'textarea')">
+                  py:with="multiline = field.type in ('select', 'text', 'textarea', 'time')">
                   <py:for each="constraint_idx, constraint_value in enumerate(constraint['values'])">
                     <tr class="${field_name}" py:if="multiline or constraint_idx == 0">
                       <py:choose test="constraint_idx">
                         <py:when test="0">
-                          <th scope="row"><label>$field.label</label></th>
-                          <td py:if="field.type not in ('radio', 'checkbox')" class="mode">
+                          <th scope="row"><label id="label_${field_name}">$field.label</label></th>
+                          <td py:if="field.type not in ('radio', 'checkbox', 'time')" class="mode">
                             <select name="${field_name}_mode">
                               <option py:for="mode in modes[field.type]" value="$mode.value"
                                 selected="${mode.value == constraint.mode and 'selected' or None}">$mode.name
@@ -58 +58 @@
                           </td>
                         </py:when>
                         <py:otherwise><!--! not the first line of a multiline constraint -->
-                          <th colspan="2"><label>or</label></th>
+                          <th colspan="${field.type == 'time' and 1 or 2}"><label>or</label></th>
                         </py:otherwise>
                       </py:choose>
 
-                      <td class="filter" colspan="${field.type in ('radio', 'checkbox') and 2 or None}"