summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/fields/basic_fields.js
diff options
context:
space:
mode:
authorCedric Snauwaert <csn@openerp.com>2019-07-03 08:58:30 +0000
committerCedric Snauwaert <csn@openerp.com>2019-07-09 07:45:42 +0000
commit9cab694bf594f6c7c8d795174d9159ac82f526b2 (patch)
tree59c3726d041e72f92eb40d7b123d96e63eb26445 /addons/web/static/src/js/fields/basic_fields.js
parent38753f95d9890171e8c9d81f29ae0b1b1eafa9cc (diff)
[IMP] web: add simple calculator on numeric fields
Add a new behavior to numeric fields, possibility to enter value manually or to use a simple arithmetic expression that will be evaluated. Example: =20+3*2 In order for the computation of the arithmetic expression to be done, the value needs to starts with = and then an expression can be entered. We only support the basics mathematical operations + - * / ( ) ^ User locale and digits separator are taken into account. If the value entered can't be evaluated to a numeric, the field will be displayed in error. closes odoo/odoo#34538 Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/fields/basic_fields.js')
-rw-r--r--addons/web/static/src/js/fields/basic_fields.js69
1 files changed, 67 insertions, 2 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index ba6fdc1aab6..715cb86d623 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -17,6 +17,7 @@ var Domain = require('web.Domain');
var DomainSelector = require('web.DomainSelector');
var DomainSelectorDialog = require('web.DomainSelectorDialog');
var framework = require('web.framework');
+var py_utils = require('web.py_utils');
var session = require('web.session');
var utils = require('web.utils');
var view_dialogs = require('web.view_dialogs');
@@ -371,6 +372,41 @@ var NumericField = InputField.extend({
// Private
//--------------------------------------------------------------------------
+ /**
+ * Evaluate a string representing a simple formula,
+ * a formula is composed of numbers and arithmetic operations
+ * (ex: 4+3*2)
+ *
+ * Supported arithmetic operations: + - * / ^ ( )
+ * Since each number in the formula can be expressed in user locale,
+ * we parse each float value inside the formula using the user context
+ * This function uses py_eval to safe eval the formula.
+ * We assume that this function is used as a calculator so operand ^ (xor)
+ * is replaced by operand ** (power) so that users that are used to
+ * excel or libreoffice are not confused
+ *
+ * @private
+ * @param expr
+ * @return a float representing the result of the evaluated formula
+ * @throws error if formula can't be evaluated
+ */
+ _evalFormula: function (expr, context) {
+ // remove extra space
+ var val = expr.replace(new RegExp(/( )/g), '');
+ var safeEvalString = '';
+ for (let v of val.split(new RegExp(/([-+*/()^])/g))) {
+ if (!['+','-','*','/','(',')','^'].includes(v) && v.length) {
+ // check if this is a float and take into account user delimiter preference
+ v = field_utils.parse.float(v);
+ }
+ if (v === '^') {
+ v = '**';
+ }
+ safeEvalString += v;
+ };
+ return py_utils.py_eval(safeEvalString, context);
+ },
+
/**
* Format numerical value (integer or float)
*
@@ -406,7 +442,36 @@ var NumericField = InputField.extend({
this.$input.attr({step: this.nodeOptions.step});
}
return result;
- }
+ },
+
+ /**
+ * Evaluate value set by user if starts with =
+ *
+ * @override
+ * @private
+ * @param {any} value
+ * @param {Object} [options]
+ */
+ _setValue: function (value, options) {
+ var originalValue = value;
+ value = value.trim();
+ if (value.startsWith('=')) {
+ try {
+ // Evaluate the formula
+ value = this._evalFormula(value.substr(1));
+ // Format back the value in user locale
+ value = this._formatValue(value);
+ // Set the computed value in the input
+ this.$input.val(value);
+ } catch (err) {
+ // in case of exception, set value as the original value
+ // that way the Webclient will show an error as
+ // it is expecting a numeric value.
+ value = originalValue;
+ }
+ }
+ return this._super(value, options);
+ },
});
var FieldChar = InputField.extend(TranslatableFieldMixin, {
@@ -665,7 +730,7 @@ var FieldDateTime = FieldDate.extend({
},
});
-var FieldMonetary = InputField.extend({
+var FieldMonetary = NumericField.extend({
description: _lt("Monetary"),
className: 'o_field_monetary o_field_number',
tagName: 'span',