Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[IMP] web_pivot_computed_measure: black, isort, prettier

15.0-ocabot-merge-pr-2789-by-pedrobaeza-bump-patch
CarlosRoca13 2022-11-09 19:51:53 +01:00
parent 599030e93f
commit 292be551f7
4 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/web_pivot_computed_measure/odoo/addons/web_pivot_computed_measure 120000
View File

@ -0,0 +1 @@
../../../../web_pivot_computed_measure

6
setup/web_pivot_computed_measure/setup.py 100644
View File

@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

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) {
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();
});
}
);
this.$buttons_measures_ex = $(
QWeb.render("web_pivot_computed_measure.ExtendedMenu", {
isOpen: this.computed_measures_open,
debug: config.isDebug(),
measures: measures,
computed_measures: _.map(
_.reject(measures, item => {
_.reject(measures, (item) => {
return !item[1].__computed_id;
}),
item => {
(item) => {
item[1].active = _.contains(
this.model.data.measures,
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
*/
createComputedMeasure: function (id, field1, field2, operation, name, format) {
const measure = _.find(this._computed_measures, item => {
const measure = _.find(this._computed_measures, (item) => {
return (
item.field1 === field1 &&
item.field2 === field2 &&
@ -251,7 +251,7 @@ odoo.define("web_pivot_computed_measure.PivotModel", function(require) {
toggleMeasure: function (field) {
if (this._isMeasureEnabled(field)) {
// Measure is disabled
const umeasures = _.filter(this._computed_measures, item => {
const umeasures = _.filter(this._computed_measures, (item) => {
return item.field1 === field || item.field2 === field;
});
if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) {