tryton-sao 7.0.49 → 7.0.51

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.0.49",
+  "version": "7.0.51",
   "homepage": "http://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -1621,7 +1621,9 @@
             };
 
             var complete_datetime = function() {
-                return [Sao.Date(), Sao.DateTime().utc()];
+                return [Sao.Date(), Sao.DateTime(
+                    undefined, undefined, undefined,
+                    0, 0, 0, 0, true)];
             };
 
             var complete_date = function() {
@@ -1930,6 +1932,32 @@
                                     ]);
                             return;
                         }
+                        if ((typeof value == 'string') &&
+                            ['datetime', 'timestamp'].includes(field.type) &&
+                            (operator == '=')) {
+                            let ctx, format_, parsed_date;
+                            if (this.context && Object.keys(this.context).length) {
+                                ctx = this.context;
+                            } else {
+                                ctx = {};
+                            }
+                            format_ = Sao.common.date_format(ctx.date_format);
+                            parsed_date = Sao.common.parse_date(format_, value);
+                            if (parsed_date &&
+                                (Sao.common.format_date(format_, parsed_date) == value)) {
+                                let date = Sao.DateTime.combine(parsed_date, Sao.Time());
+                                let next_day = Sao.DateTime(
+                                    date.year(), date.month(), date.date(),
+                                    date.hour(), date.minute(), date.second(),
+                                    date.millisecond())
+                                next_day.add(1, 'day');
+                                result.push(this._clausify([
+                                    [field_name, '>=', date],
+                                    [field_name, '<', next_day]
+                                ]));
+                                return;
+                            }
+                        }
                     }
                     if (value instanceof Array) {
                         value = value.map(

package/src/sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.0.49',
+    __version__: '7.0.51',
 };
 /* eslint-enable no-redeclare */
 

package/src/sao.less

@@ -520,6 +520,10 @@ img.icon {
             width: unit(@line-height-base, em);
             height: unit(@line-height-base, em);
             display: block;
+
+            [dir="rtl"] & {
+                transform: scaleX(-1);
+            }
         }
 
         tr.more-row {
@@ -610,6 +614,7 @@ img.icon {
             [dir="rtl"] & {
                 float: right;
                 margin-left: 1em;
+                transform: scaleX(-1);
             }
             width: unit(@line-height-base, em);
             height: unit(@line-height-base, em);

package/src/view/form.js

@@ -3745,9 +3745,8 @@ function eval_pyson(value){
                 var fields = this.screen.current_view.get_fields();
                 record.validate(fields).then(validate => {
                     if (!validate) {
-                        this.screen.display(true);
-                        prm.reject();
-                        return;
+                        this.screen.display(true).always(() => prm.reject());
+                        return prm;
                     }
                     if (this.screen.pre_validate) {
                         return record.pre_validate().then(

package/src/view/list_form.js

@@ -12,6 +12,7 @@
         },
         button_clicked: function(event) {
             if (Sao.common.compare(this.screen.selected_records, [this.record])) {
+                event.stopPropagation();
                 Sao.View.ListGroupViewForm._super.button_clicked.call(this, event);
             }
         }

package/src/view/tree.js

@@ -2591,7 +2591,7 @@
                 fields, false, false, true)) {
                 var value = cell.prop('checked');
                 this.field.set_client(record, value);
-                if (record !== current_record) {
+                if ((!this.group.parent) & (record !== current_record)) {
                     // we can not rely on editable tree handler to save the row
                     record.save();
                 }

package/src/wizard.js

@@ -53,6 +53,7 @@
             if (this.__processing || this.__waiting_response) {
                 return;
             }
+            this.__processing = true;
             var process = function() {
                 if (this.state == this.end_state) {
                     this.end();
@@ -230,11 +231,14 @@
             this.footer.empty();
         },
         _get_button: function(definition) {
+            let state = this.state;
             var button = Sao.Wizard.Form._super._get_button.call(this,
                 definition);
             this.footer.append(button.el);
             button.el.click(() => {
-                this.response(definition);
+                if (this.state === state) {
+                    this.response(definition);
+                }
             });
             return button;
         },
@@ -282,19 +286,24 @@
             this.footer.empty();
         },
         _get_button: function(definition) {
+            let state = this.state;
             var button = Sao.Wizard.Dialog._super._get_button.call(this,
                     definition);
             this.footer.append(button.el);
             if (definition['default']) {
                 this.content.unbind('submit');
                 this.content.submit(e => {
-                    this.response(definition);
                     e.preventDefault();
+                    if (this.state === state) {
+                        this.response(definition);
+                    }
                 });
                 button.el.attr('type', 'submit');
             } else {
                 button.el.click(() => {
-                    this.response(definition);
+                    if (this.state === state) {
+                        this.response(definition);
+                    }
                 });
             }
             return button;

package/tests/sao.js

@@ -1908,6 +1908,12 @@
                 'name': 'integer',
                 'type': 'integer'
             },
+            'timestamp': {
+                'name': 'timestamp',
+                'string': 'Timestamp',
+                'type': 'timestamp',
+                'format': '"%H:%M:%S"',
+            },
             'selection': {
                 'string': 'Selection',
                 'name': 'selection',
@@ -1996,6 +2002,7 @@
             c(['integer', '>=', 3]),
             c(['integer', '<=', 5])
             ]]],
+        [[c(['Timestamp', null, null])], [c(['timestamp', '=', null])]],
         [[c(['Reference', null, 'foo'])],
             [c(['reference', 'ilike', '%foo%'])]],
         [[c(['Reference', null, 'Spam'])],
@@ -2027,6 +2034,33 @@
             QUnit.deepEqual(parser.parse_clause(value), result,
                 'parse_clause(' + JSON.stringify(value) + ')');
         });
+
+        let clause = parser.parse_clause([c(
+            ['Timestamp', '=', Sao.common.format_date('%x', Sao.Date(2002, 12, 4))])]);
+        QUnit.assert.strictEqual(clause[0].length, 2);
+        let [ , operator, value] = clause[0][0];
+        QUnit.assert.strictEqual(operator, '>=');
+        QUnit.assert.ok(value.isSame(Sao.Date(2002, 12, 4)));
+        [ , operator, value] = clause[0][1];
+        QUnit.assert.strictEqual(operator, '<');
+        QUnit.assert.ok(value.isSame(Sao.Date(2002, 12, 5)));
+
+        clause = parser.parse_clause([c(
+            ['Timestamp', '=',
+                Sao.common.format_datetime('%x %X', Sao.DateTime(2002, 12, 4, 12, 30))])]);
+        [ , operator, value] = clause[0];
+        QUnit.assert.strictEqual(operator, '=');
+        QUnit.assert.ok(value.isSame(Sao.DateTime(2002, 12, 4, 12, 30)));
+
+        clause = parser.parse_clause([c(
+            ['Timestamp', null, [
+                        `${Sao.common.format_date('%x', Sao.Date(2002, 12, 4))}`,
+                        `${Sao.common.format_date('%x', Sao.Date(2002, 12, 5))}`,
+                        ]])]);
+        [ , operator, value] = clause[0];
+        QUnit.assert.strictEqual(operator, 'in');
+        QUnit.assert.ok(value[0].isSame(Sao.DateTime(2002, 12, 4)));
+        QUnit.assert.ok(value[1].isSame(Sao.DateTime(2002, 12, 5)));
     });
 
     QUnit.test('DomainParser.format_value', function() {