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

[IMP] web_pivot_computed_measure: black, isort, prettier

pull/2755/head
CarlosRoca13 2022-11-09 19:51:53 +01:00 committed by Carlos Roca
parent ac22fa8129
commit bb8562d929
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,19 +112,22 @@ odoo.define("web_pivot_computed_measure.PivotController", function(require) {
if (this.$buttons_measures_ex && this.$buttons_measures_ex.length) { if (this.$buttons_measures_ex && this.$buttons_measures_ex.length) {
this.$buttons_measures_ex.remove(); this.$buttons_measures_ex.remove();
} }
const measures = _.sortBy(_.pairs(_.omit(this.measures, "__count")), x => { const measures = _.sortBy(
_.pairs(_.omit(this.measures, "__count")),
(x) => {
return x[1].string.toLowerCase(); return x[1].string.toLowerCase();
}); }
);
this.$buttons_measures_ex = $( this.$buttons_measures_ex = $(
QWeb.render("web_pivot_computed_measure.ExtendedMenu", { QWeb.render("web_pivot_computed_measure.ExtendedMenu", {
isOpen: this.computed_measures_open, isOpen: this.computed_measures_open,
debug: config.isDebug(), debug: config.isDebug(),
measures: measures, measures: measures,
computed_measures: _.map( computed_measures: _.map(
_.reject(measures, item => { _.reject(measures, (item) => {
return !item[1].__computed_id; return !item[1].__computed_id;
}), }),
item => { (item) => {
item[1].active = _.contains( item[1].active = _.contains(
this.model.data.measures, this.model.data.measures,
item[0] item[0]

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

@ -24,7 +24,7 @@ odoo.define("web_pivot_computed_measure.PivotModel", function(require) {
* @returns a promise * @returns a promise
*/ */
createComputedMeasure: function (id, field1, field2, operation, name, format) { createComputedMeasure: function (id, field1, field2, operation, name, format) {
const measure = _.find(this._computed_measures, item => { const measure = _.find(this._computed_measures, (item) => {
return ( return (
item.field1 === field1 && item.field1 === field1 &&
item.field2 === field2 && item.field2 === field2 &&
@ -251,7 +251,7 @@ odoo.define("web_pivot_computed_measure.PivotModel", function(require) {
toggleMeasure: function (field) { toggleMeasure: function (field) {
if (this._isMeasureEnabled(field)) { if (this._isMeasureEnabled(field)) {
// Measure is disabled // Measure is disabled
const umeasures = _.filter(this._computed_measures, item => { const umeasures = _.filter(this._computed_measures, (item) => {
return item.field1 === field || item.field2 === field; return item.field1 === field || item.field2 === field;
}); });
if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) { if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) {