Merge lp:~openerp-dev/openerp-web/7.0-today-filter-mat into lp:openerp-web/7.0

[Martin Trigaux (OpenERP)]

backport of trunk revision 3919, not to be merged in 7.0

[MERGE] [ADD] ways to correctly handle local datetimes in e.g. domains

* Alter datetime.now(), generate a local datetime (add utcnow() which generates a UTC datetime)
* Implement datetime.replace() to manipulate local datetimes
* Implement date.today(), generates a local date
* Implement datetime.toJSON(), returns a javascript Date (assumes datetime attributes are local)
* Add conversion hook in JSON and JSONP handlers, automatically converts a Date object to a UTC datetime formatted according to server formats

Should allow the generation of correctly working (from the end-user's POV) [Today] filters, amongst other things.
Eg: a local expression in a domain for 'Today 00:00:00' would now be expressed as 'datetime.datetime.now().replace(hour=0, minute=0, second=0)' (no .strftime) and will be converted to UTC when sent to the server

[lp:~openerp-dev/openerp-web/7.0-today-filter-mat]

4129. By Martin Trigaux (OpenERP) on 2014-01-30

[ADD] backport part of trunk rev 3918.3923: allow to use filtres defined with field:day

4130. By Martin Trigaux (OpenERP) on 2014-01-30

[fix] grouping_field can be undefined

4131. By Martin Trigaux (OpenERP) on 2014-03-13

[MERGE] sync with 7.0 up to rev 4159

Unmerged revisions

4131. By Martin Trigaux (OpenERP) on 2014-03-13

[MERGE] sync with 7.0 up to rev 4159

4130. By Martin Trigaux (OpenERP) on 2014-01-30

[fix] grouping_field can be undefined

4129. By Martin Trigaux (OpenERP) on 2014-01-30

[ADD] backport part of trunk rev 3918.3923: allow to use filtres defined with field:day

4128. By Martin Trigaux (OpenERP) on 2014-01-28

[ADD] filters: backport of trunk rev 3919

=== modified file 'addons/web/static/src/js/corelib.js'
--- addons/web/static/src/js/corelib.js	2013-03-01 10:22:23 +0000
+++ addons/web/static/src/js/corelib.js	2014-03-13 15:59:47 +0000
@@ -950,6 +950,26 @@
     }
 });
 
+/**
+ * Replacer function for JSON.stringify, serializes Date objects to UTC
+ * datetime in the OpenERP Server format.
+ *
+ * However, if a serialized value has a toJSON method that method is called
+ * *before* the replacer is invoked. Date#toJSON exists, and thus the value
+ * passed to the replacer is a string, the original Date has to be fetched
+ * on the parent object (which is provided as the replacer's context).
+ *
+ * @param {String} k
+ * @param {Object} v
+ * @returns {Object}
+ */
+function date_to_utc(k, v) {
+    var value = this[k];
+    if (!(value instanceof Date)) { return v; }
+  
+    return instance.web.datetime_to_str(value);
+}
+
 instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
     triggers: {
         'request': 'Request sent',
@@ -1055,7 +1075,7 @@
             type: "POST",
             dataType: 'json',
             contentType: 'application/json',
-            data: JSON.stringify(payload),
+            data: JSON.stringify(payload, date_to_utc),
             processData: false
         }, url);
         if (this.synch)
@@ -1088,7 +1108,7 @@
         }, url);
         if (this.synch)
             ajax.async = false;
-        var payload_str = JSON.stringify(payload);
+        var payload_str = JSON.stringify(payload, date_to_utc);
         var payload_url = $.param({r:payload_str});
         if(payload_url.length < 2000) {
             // Direct jsonp request
 
=== modified file 'addons/web/static/src/js/data.js'
--- addons/web/static/src/js/data.js	2014-03-12 15:04:35 +0000
+++ addons/web/static/src/js/data.js	2014-03-13 15:59:47 +0000
@@ -127,10 +127,14 @@
             return null;
         }
 
+        var raw_fields = _.map(grouping.concat(this._fields || []), function (field) {
+            return field.split(':')[0];
+        });
+
         var self = this;
         return this._model.call('read_group', {
             groupby: grouping,
-            fields: _.uniq(grouping.concat(this._fields || [])),
+            fields: _.uniq(raw_fields),
             domain: this._model.domain(this._filter),
             context: ctx,
             offset: this._offset,
@@ -230,12 +234,14 @@
 
         var group_size = fixed_group[grouping_field + '_count'] || fixed_group.__count || 0;
         var leaf_group = fixed_group.__context.group_by.length === 0;
+        var raw_field = grouping_field && grouping_field.split(':')[0];
+
         this.attributes = {
             folded: !!(fixed_group.__fold),
             grouped_on: grouping_field,
             // if terminal group (or no group) and group_by_no_leaf => use group.__count
             length: group_size,
-            value: fixed_group[grouping_field],
+            value: fixed_group[raw_field],
             // A group is open-able if it's not a leaf in group_by_no_leaf mode
             has_children: !(leaf_group && fixed_group.__context['group_by_no_leaf']),
 
 
=== modified file 'addons/web/static/src/js/pyeval.js'
--- addons/web/static/src/js/pyeval.js	2013-07-02 14:16:00 +0000
+++ addons/web/static/src/js/pyeval.js	2014-03-13 15:59:47 +0000
@@ -379,13 +379,28 @@
                 this[key] = asJS(args[key]);
             }
         },
+        replace: function () {
+            var args = py.PY_parseArgs(arguments, [
+                ['year', py.None], ['month', py.None], ['day', py.None],
+                ['hour', py.None], ['minute', py.None], ['second', py.None],
+                ['microsecond', py.None] // FIXME: tzinfo, can't use None as valid input
+            ]);
+            var params = {};
+            for(var key in args) {
+                if (!args.hasOwnProperty(key)) { continue; }
+
+                var arg = args[key];
+                params[key] = (arg === py.None ? this[key] : asJS(arg));
+            }
+            return py.PY_call(datetime.datetime, params);
+        },
         strftime: function () {
             var self = this;
             var args = py.PY_parseArgs(arguments, 'format');
             return py.str.fromJSON(args.format.toJSON()
                 .replace(/%([A-Za-z])/g, function (m, c) {
                     switch (c) {
-                    case 'Y': return self.year;
+                    case 'Y': return _.str.sprintf('%04d', self.year);
                     case 'm': return _.str.sprintf('%02d', self.month);
                     case 'd': return _.str.sprintf('%02d', self.day);
                     case 'H': return _.str.sprintf('%02d', self.hour);
@@ -396,6 +411,17 @@
                 }));
         },
         now: py.classmethod.fromJSON(function () {
+            var d = new Date;
+            return py.PY_call(datetime.datetime, [
+                d.getFullYear(), d.getMonth() + 1, d.getDate(),
+                d.getHours(), d.getMinutes(), d.getSeconds(),
+                d.getMilliseconds() * 1000]);
+        }),
+        today: py.classmethod.fromJSON(function () {
+            var dt_class = py.PY_getAttr(datetime, 'datetime');
+            return py.PY_call(py.PY_getAttr(dt_class, 'now'));
+        }),
+        utcnow: py.classmethod.fromJSON(function () {
             var d = new Date();
             return py.PY_call(datetime.datetime,
                 [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
@@ -412,7 +438,17 @@
                 py.PY_getAttr(args.time, 'minute'),
                 py.PY_getAttr(args.time, 'second')
             ]);
-        })
+        }),
+        toJSON: function () {
+            return new Date(
+                this.year,
+                this.month - 1,
+                this.day,
+                this.hour,
+                this.minute,
+                this.second,
+                this.microsecond / 1000);
+        },
     });
     datetime.date = py.type('date', null, {
         __init__: function () {
@@ -467,7 +503,12 @@
         },
         fromJSON: function (year, month, day) {
             return py.PY_call(datetime.date, [year, month, day])
-        }
+        },
+        today: py.classmethod.fromJSON(function () {
+            var d = new Date;
+            return py.PY_call(datetime.date, [
+                d.getFullYear(), d.getMonth() + 1, d.getDate()]);
+        }),
     });
     /**
         Returns the current local date, which means the date on the client (which can be different
@@ -498,7 +539,7 @@
     time.strftime = py.PY_def.fromJSON(function () {
         var args  = py.PY_parseArgs(arguments, 'format');
         var dt_class = py.PY_getAttr(datetime, 'datetime');
-        var d = py.PY_call(py.PY_getAttr(dt_class, 'now'));
+        var d = py.PY_call(py.PY_getAttr(dt_class, 'utcnow'));
         return py.PY_call(py.PY_getAttr(d, 'strftime'), [args.format]);
     });
 
 
=== modified file 'addons/web/static/test/evals.js'
--- addons/web/static/test/evals.js	2013-06-24 05:59:29 +0000
+++ addons/web/static/test/evals.js	2014-03-13 15:59:47 +0000
@@ -418,6 +418,41 @@
             });
         });
     });
+    test('datetime.tojson', function (instance) {
+        var result = py.eval(
+            'datetime.datetime(2012, 2, 15, 1, 7, 31)',
+            instance.web.pyeval.context());
+        ok(result instanceof Date);
+        equal(result.getFullYear(), 2012);
+        equal(result.getMonth(), 1);
+        equal(result.getDate(), 15);
+        equal(result.getHours(), 1);
+        equal(result.getMinutes(), 7);
+        equal(result.getSeconds(), 31);
+    });
+    test('datetime.combine', function (instance) {
+        var result = py.eval(
+            'datetime.datetime.combine(datetime.date(2012, 2, 15),' +
+            '                          datetime.time(1, 7, 13))' +
+            '   .strftime("%Y-%m-%d %H:%M:%S")',
+            instance.web.pyeval.context());
+        equal(result, "2012-02-15 01:07:13");
+
+        result = py.eval(
+            'datetime.datetime.combine(datetime.date(2012, 2, 15),' +
+            '                          datetime.time())' +
+            '   .strftime("%Y-%m-%d %H:%M:%S")',
+            instance.web.pyeval.context());
+        equal(result, '2012-02-15 00:00:00');
+    });
+    test('datetime.replace', function (instance) {
+        var result = py.eval(
+            'datetime.datetime(2012, 2, 15, 1, 7, 13)' +
+            '   .replace(hour=0, minute=0, second=0)' +
+            '   .strftime("%Y-%m-%d %H:%M:%S")',
+            instance.web.pyeval.context());
+        equal(result, "2012-02-15 00:00:00");
+    });
 });
 openerp.testing.section('eval.edc.nonliterals', {
     dependencies: ['web.data'],