Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[IMP+FIX] web_pivot_computed_measure: Time Ranges Comparison + Change custom_events addition 

[IMP] web_pivot_computed_measure: Time Ranges Comparison

[FIX] web_pivot_computed_measure: Change custom_events addition

Previous this commit, the controller events are discarted. With this commit
the existing events are respected
pull/2755/head
Alexandre Díaz 2020-04-02 17:10:58 +02:00 committed by Carlos Roca
parent 1cee9f4685
commit 1dbdf5d267
4 changed files with 83 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_pivot_computed_measure/__manifest__.py
View File

@ -4,7 +4,7 @@
{ {
'name': "Web Pivot Computed Measure", 'name': "Web Pivot Computed Measure",
'category': "web", 'category': "web",
'version': "12.0.1.0.0", 'version': "12.0.1.0.1",
'author': "Tecnativa, " 'author': "Tecnativa, "
"Odoo Community Association (OCA)", "Odoo Community Association (OCA)",
'license': 'AGPL-3', 'license': 'AGPL-3',

2
web_pivot_computed_measure/i18n/web_pivot_computed_measure.pot
View File

@ -141,7 +141,7 @@ msgstr ""
#. module: web_pivot_computed_measure #. module: web_pivot_computed_measure
#. openerp-web #. openerp-web
#: code:addons/web_pivot_computed_measure/static/src/js/pivot_model.js:224 #: code:addons/web_pivot_computed_measure/static/src/js/pivot_model.js:275
#, python-format #, python-format
msgid "This measure is currently used by a 'computed measure'. Please, disable the computed measure first." msgid "This measure is currently used by a 'computed measure'. Please, disable the computed measure first."
msgstr "" msgstr ""

8
web_pivot_computed_measure/static/src/js/pivot_controller.js
View File

@ -12,10 +12,10 @@ odoo.define('web_pivot_computed_measure.PivotController', function (require) {
PivotController.include({ PivotController.include({
custom_events: { custom_events: _.extend({}, PivotController.prototype.custom_events, {
'add_measure': '_onAddMeasure', add_measure: '_onAddMeasure',
'remove_measure': '_onRemoveMeasure', remove_measure: '_onRemoveMeasure',
}, }),
computed_measures_open: false, computed_measures_open: false,

77
web_pivot_computed_measure/static/src/js/pivot_model.js
View File

@ -6,6 +6,7 @@ odoo.define('web_pivot_computed_measure.PivotModel', function (require) {
var core = require('web.core'); var core = require('web.core');
var PivotModel = require('web.PivotModel'); var PivotModel = require('web.PivotModel');
var ComparisonUtils = require('web.dataComparisonUtils');
var _t = core._t; var _t = core._t;
@ -102,6 +103,35 @@ odoo.define('web_pivot_computed_measure.PivotModel', function (require) {
return _.contains(this.data.measures, field); return _.contains(this.data.measures, field);
}, },
/**
* Helper function to add computed measure fields data into 'dataPoint'
*
* @param {Object} dataPoint
* @param {Object} dataPointComp
*/
_fillComputedMeasuresData: function (dataPoint, dataPointComp) {
var self = this;
_.each(this._computed_measures, function (cm) {
if (!self._isMeasureEnabled(cm.id)) {
return;
}
if (dataPointComp) {
var resData =
py.eval(cm.operation, dataPointComp.data);
var resComparison =
py.eval(cm.operation, dataPointComp.comparison);
dataPoint[cm.id] = {
data: resData,
comparisonData: resComparison,
variation: ComparisonUtils.computeVariation(
resData, resComparison),
};
} else {
dataPoint[cm.id] = py.eval(cm.operation, dataPoint);
}
});
},
/** /**
* Fill the dataPoints with the computed measures values * Fill the dataPoints with the computed measures values
* *
@ -109,22 +139,43 @@ odoo.define('web_pivot_computed_measure.PivotModel', function (require) {
*/ */
_mergeData: function (data, comparisonData, groupBys) { _mergeData: function (data, comparisonData, groupBys) {
var res = this._super.apply(this, arguments); var res = this._super.apply(this, arguments);
var l = groupBys.length; // Cached loop (This is not python! hehe) var len = groupBys.length; // Cached loop (This is not python! hehe)
for (var index = 0; index < l; ++index) { for (var index = 0; index < len; ++index) {
if (data.length) { if (res.length) {
var l2 = data[index].length; var len2 = res[index].length;
for (var k = 0; k < l2; ++k) { for (var k = 0; k < len2; ++k) {
var dataPoint = data[index][k]; var dataPoint = res[index][k];
if (_.isEmpty(dataPoint)) { if (_.isEmpty(dataPoint)) {
break; break;
} }
var l3 = this._computed_measures.length; if ('__comparisonDomain' in dataPoint) {
for (var x = 0; x < l3; ++x) { // Transform comparison dataPoint object to be compatible
var cm = this._computed_measures[x]; var pairsDataPoint = _.pairs(dataPoint);
if (!this._isMeasureEnabled(cm.id)) { var dataPointComp = {
continue; data: _.object(_.map(
} pairsDataPoint, (item) => {
dataPoint[cm.id] = py.eval(cm.operation, dataPoint); return [
item[0],
item[1] && item[1].data,
];
})),
comparison: _.object(_.map(
pairsDataPoint, (item) => {
return [
item[0],
item[1] && item[1].comparisonData,
];
})),
};
// Update datas. Required by computed measures that uses
// other computed measures to work
this._fillComputedMeasuresData(dataPointComp.data);
this._fillComputedMeasuresData(dataPointComp.comparison);
// Update comparison dataPoint
this._fillComputedMeasuresData(dataPoint, dataPointComp);
} else {
// Update standard dataPoint
this._fillComputedMeasuresData(dataPoint);
} }
} }
} }