mirror of
https://github.com/OCA/web.git
synced 2025-02-22 13:21:25 +02:00
[MIG] web_pivot_computed_measure: Migration to 15.0
This commit is contained in:
CarlosRoca13
@@ -0,0 +1,51 @@
|
||||
/** @odoo-module **/
|
||||
/* Copyright 2022 Tecnativa - Carlos Roca
|
||||
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
|
||||
|
||||
const {Component, QWeb} = owl;
|
||||
const {useState} = owl.hooks;
|
||||
|
||||
/**
|
||||
* @extends Component
|
||||
*/
|
||||
export class DropdownItemCustomMeasure extends Component {
|
||||
setup() {
|
||||
this.isOpen = useState({value: false});
|
||||
}
|
||||
|
||||
onClickComputedMeasure() {
|
||||
this.isOpen.value = !this.isOpen.value;
|
||||
}
|
||||
|
||||
addMeasure(ev) {
|
||||
const $target = $(ev.target).closest("#add_computed_measure_wrapper");
|
||||
const id = new Date().getTime();
|
||||
const field1 = $target.find("#computed_measure_field_1").val();
|
||||
const field2 = $target.find("#computed_measure_field_2").val();
|
||||
let operation = $target.find("#computed_measure_operation").val();
|
||||
if (operation === "custom") {
|
||||
operation = $target.find("#computed_measure_operation_custom").val();
|
||||
}
|
||||
const name = $target.find("#computed_measure_name").val();
|
||||
const format = $target.find("#computed_measure_format").val();
|
||||
this.props.model.addComputedMeasure(
|
||||
id,
|
||||
field1,
|
||||
field2,
|
||||
operation,
|
||||
name,
|
||||
format
|
||||
);
|
||||
// Click on measures button to close the modal and recompute the measures added
|
||||
$(ev.target).closest(".dropdown").find(".dropdown-toggle").trigger("click");
|
||||
}
|
||||
}
|
||||
DropdownItemCustomMeasure.template =
|
||||
"web_pivot_computed_measure.DropdownItemCustomMeasure";
|
||||
DropdownItemCustomMeasure.props = {
|
||||
measures: Object,
|
||||
// Set as model because this module can be extended to be used on views that
|
||||
// uses Measures like the graph view.
|
||||
model: Object,
|
||||
};
|
||||
QWeb.registerComponent("DropdownItemCustomMeasure", DropdownItemCustomMeasure);
|
||||
@@ -1,10 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!--
|
||||
Copyright 2020 Tecnativa - Alexandre Díaz
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
-->
|
||||
<templates>
|
||||
<t t-name="web_pivot_computed_measure.ComputedMeasureOperations">
|
||||
<templates xml:space="preserve">
|
||||
<t t-name="web_pivot_computed_measure.ComputedMeasureOperations" owl="1">
|
||||
<option name="sum" value="m1+m2">
|
||||
Sum (m1 + m2)
|
||||
</option>
|
||||
@@ -24,7 +20,8 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
Custom
|
||||
</option>
|
||||
</t>
|
||||
<t t-name="web_pivot_computed_measure.ComputedMeasureFormats">
|
||||
|
||||
<t t-name="web_pivot_computed_measure.ComputedMeasureFormats" owl="1">
|
||||
<option name="int" value="integer">
|
||||
Integer
|
||||
</option>
|
||||
@@ -35,30 +32,19 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
Percentage
|
||||
</option>
|
||||
</t>
|
||||
<t t-name="web_pivot_computed_measure.ExtendedMenu">
|
||||
<div role="separator" class="dropdown-divider" />
|
||||
<t t-foreach="computed_measures" t-as="cm">
|
||||
<a
|
||||
role="menuitem"
|
||||
href="#"
|
||||
t-attf-class="dropdown-item {{cm[1].active and 'selected' or ''}}"
|
||||
t-data-computed="1"
|
||||
t-att-data-field="cm[0]"
|
||||
>
|
||||
<t t-esc="cm[1].string" />
|
||||
</a>
|
||||
</t>
|
||||
<div class="o_menu_item" data-id="__computed__">
|
||||
<a href="#" role="menuitem" class="dropdown-item">
|
||||
|
||||
<t t-name="web_pivot_computed_measure.DropdownItemCustomMeasure" owl="1">
|
||||
<div class="o_menu_item dropdown-item" data-id="__computed__">
|
||||
<a href="#" role="menuitem" t-on-click="onClickComputedMeasure">
|
||||
Computed Measure
|
||||
|
||||
<span class="o_submenu_switcher" data-id="__computed__">
|
||||
<span
|
||||
t-att-class="isOpen ? 'fa fa-caret-down' : 'fa fa-caret-right'"
|
||||
t-att-class="isOpen.value ? 'fa fa-caret-down' : 'fa fa-caret-right'"
|
||||
/>
|
||||
</span>
|
||||
</a>
|
||||
<t t-if="isOpen">
|
||||
<t t-if="isOpen.value">
|
||||
<div id="add_computed_measure_wrapper" class="d-table">
|
||||
<div class="d-table-row">
|
||||
<div class="d-table-cell">
|
||||
@@ -66,9 +52,16 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
</div>
|
||||
<div class="d-table-cell">
|
||||
<select class="o_input" id="computed_measure_field_1">
|
||||
<t t-foreach="measures" t-as="measure">
|
||||
<option t-att-value="measure[0]">
|
||||
<t t-esc="measure[1].string" />
|
||||
<t
|
||||
t-foreach="props.measures"
|
||||
t-as="measure"
|
||||
t-key="measure"
|
||||
>
|
||||
<option
|
||||
t-att-value="measure"
|
||||
t-if="measure != '__count'"
|
||||
>
|
||||
<t t-esc="props.measures[measure].string" />
|
||||
</option>
|
||||
</t>
|
||||
</select>
|
||||
@@ -80,9 +73,16 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
</div>
|
||||
<div class="d-table-cell">
|
||||
<select class="o_input" id="computed_measure_field_2">
|
||||
<t t-foreach="measures" t-as="measure">
|
||||
<option t-att-value="measure[0]">
|
||||
<t t-esc="measure[1].string" />
|
||||
<t
|
||||
t-foreach="props.measures"
|
||||
t-as="measure"
|
||||
t-key="measure"
|
||||
>
|
||||
<option
|
||||
t-att-value="measure"
|
||||
t-if="measure != '__count'"
|
||||
>
|
||||
<t t-esc="props.measures[measure].string" />
|
||||
</option>
|
||||
</t>
|
||||
</select>
|
||||
@@ -148,6 +148,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
<button
|
||||
class="btn btn-primary o_add_computed_measure"
|
||||
type="button"
|
||||
t-on-click="addMeasure"
|
||||
>Add</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -155,4 +156,5 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
</t>
|
||||
</div>
|
||||
</t>
|
||||
|
||||
</templates>
|
||||
@@ -1,198 +0,0 @@
|
||||
/* Copyright 2020 Tecnativa - Alexandre Díaz
|
||||
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
|
||||
|
||||
odoo.define("web_pivot_computed_measure.PivotController", function (require) {
|
||||
"use strict";
|
||||
|
||||
const core = require("web.core");
|
||||
const config = require("web.config");
|
||||
const PivotController = require("web.PivotController");
|
||||
|
||||
const QWeb = core.qweb;
|
||||
|
||||
PivotController.include({
|
||||
custom_events: _.extend({}, PivotController.prototype.custom_events, {
|
||||
add_measure: "_onAddMeasure",
|
||||
remove_measure: "_onRemoveMeasure",
|
||||
}),
|
||||
|
||||
computed_measures_open: false,
|
||||
|
||||
/**
|
||||
* Add the computed measures to the context. This
|
||||
* will be used when save a filter.
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
getOwnedQueryParams: function () {
|
||||
const res = this._super.apply(this, arguments);
|
||||
const state = this.model.get({raw: true});
|
||||
res.context.pivot_computed_measures = state.computed_measures;
|
||||
return res;
|
||||
},
|
||||
|
||||
/**
|
||||
* @override
|
||||
*/
|
||||
renderButtons: function ($node) {
|
||||
this._super.apply(this, arguments);
|
||||
if ($node) {
|
||||
this._renderComputedMeasures();
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Handle click event on measures menu to support computed measures sub-menu
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
_onButtonClick: function (event) {
|
||||
const $target = $(event.target);
|
||||
if ($target.parents("div[data-id='__computed__']").length) {
|
||||
let hideMenu = false;
|
||||
event.preventDefault();
|
||||
|
||||
if (
|
||||
$target.hasClass("dropdown-item") ||
|
||||
$target.hasClass("o_submenu_switcher")
|
||||
) {
|
||||
this.computed_measures_open = !this.computed_measures_open;
|
||||
this._renderComputedMeasures();
|
||||
} else if ($target.hasClass("o_add_computed_measure")) {
|
||||
hideMenu = true;
|
||||
const field1 = this.$buttons_measures_ex
|
||||
.find("#computed_measure_field_1")
|
||||
.val();
|
||||
const field2 = this.$buttons_measures_ex
|
||||
.find("#computed_measure_field_2")
|
||||
.val();
|
||||
let oper = this.$buttons_measures_ex
|
||||
.find("#computed_measure_operation")
|
||||
.val();
|
||||
if (oper === "custom") {
|
||||
oper = this.$buttons_measures_ex
|
||||
.find("#computed_measure_operation_custom")
|
||||
.val();
|
||||
}
|
||||
const name = this.$buttons_measures_ex
|
||||
.find("#computed_measure_name")
|
||||
.val();
|
||||
const format = this.$buttons_measures_ex
|
||||
.find("#computed_measure_format")
|
||||
.val();
|
||||
const uniqueId = new Date().getTime();
|
||||
this.model
|
||||
.createComputedMeasure(
|
||||
uniqueId,
|
||||
field1,
|
||||
field2,
|
||||
oper,
|
||||
name,
|
||||
format
|
||||
)
|
||||
.then(this.update.bind(this, {}, {reload: false}));
|
||||
}
|
||||
|
||||
if (!hideMenu) {
|
||||
event.stopPropagation();
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
this._super.apply(this, arguments);
|
||||
},
|
||||
|
||||
/**
|
||||
* Render computed measures menu
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
_renderComputedMeasures: function () {
|
||||
if (this.$buttons_measures_ex && this.$buttons_measures_ex.length) {
|
||||
this.$buttons_measures_ex.remove();
|
||||
}
|
||||
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) => {
|
||||
return !item[1].__computed_id;
|
||||
}),
|
||||
(item) => {
|
||||
item[1].active = _.contains(
|
||||
this.model.data.measures,
|
||||
item[0]
|
||||
);
|
||||
return item;
|
||||
}
|
||||
),
|
||||
})
|
||||
);
|
||||
this.$buttons_measures_ex
|
||||
.find("#computed_measure_operation")
|
||||
.on("change", this._onChangeComputedMeasureOperation.bind(this));
|
||||
if (this.$buttons)
|
||||
this.$buttons
|
||||
.find(".o_pivot_measures_list")
|
||||
.append(this.$buttons_measures_ex);
|
||||
},
|
||||
|
||||
/**
|
||||
* Custom event to add a new measure
|
||||
*
|
||||
* @private
|
||||
* @param {CustomEvent} ev
|
||||
*/
|
||||
_onAddMeasure: function (ev) {
|
||||
this.measures[ev.data.id] = ev.data.def;
|
||||
this._renderComputedMeasures();
|
||||
},
|
||||
|
||||
/**
|
||||
* Custom event to remove a measure
|
||||
*
|
||||
* @private
|
||||
* @param {CustomEvent} ev
|
||||
*/
|
||||
_onRemoveMeasure: function (ev) {
|
||||
delete this.measures[ev.data.id];
|
||||
this._renderComputedMeasures();
|
||||
},
|
||||
|
||||
/**
|
||||
* Set default values related with the selected operation
|
||||
*
|
||||
* @private
|
||||
* @param {ChangeEvent} ev
|
||||
*/
|
||||
_onChangeComputedMeasureOperation: function (ev) {
|
||||
const $option = $(ev.target.options[ev.target.selectedIndex]);
|
||||
if ($(ev.target).val() === "custom") {
|
||||
this.$buttons_measures_ex
|
||||
.find("#container_computed_measure_operation_custom")
|
||||
.removeClass("d-none")
|
||||
.addClass("d-table-row");
|
||||
} else {
|
||||
const format = $option.data("format");
|
||||
if (format) {
|
||||
this.$buttons_measures_ex
|
||||
.find("#computed_measure_format")
|
||||
.val(format);
|
||||
}
|
||||
this.$buttons_measures_ex
|
||||
.find("#container_computed_measure_operation_custom")
|
||||
.removeClass("d-table-row")
|
||||
.addClass("d-none");
|
||||
}
|
||||
},
|
||||
});
|
||||
});
|
||||
@@ -1,294 +0,0 @@
|
||||
/* Copyright 2020 Tecnativa - Alexandre Díaz
|
||||
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
|
||||
|
||||
odoo.define("web_pivot_computed_measure.PivotModel", function (require) {
|
||||
"use strict";
|
||||
|
||||
const core = require("web.core");
|
||||
const PivotModel = require("web.PivotModel");
|
||||
|
||||
const _t = core._t;
|
||||
|
||||
PivotModel.include({
|
||||
_computed_measures: [],
|
||||
|
||||
/**
|
||||
* Create a new computed measure
|
||||
*
|
||||
* @param {String} id
|
||||
* @param {String} field1
|
||||
* @param {String} field2
|
||||
* @param {String} operation
|
||||
* @param {String} name
|
||||
* @param {String} format
|
||||
* @returns a promise
|
||||
*/
|
||||
createComputedMeasure: function (id, field1, field2, operation, name, format) {
|
||||
const measure = _.find(this._computed_measures, (item) => {
|
||||
return (
|
||||
item.field1 === field1 &&
|
||||
item.field2 === field2 &&
|
||||
item.operation === operation
|
||||
);
|
||||
});
|
||||
if (measure) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
const fieldM1 = this.fields[field1];
|
||||
const fieldM2 = this.fields[field2];
|
||||
const cmId = "__computed_" + id;
|
||||
const oper = operation.replace(/m1/g, field1).replace(/m2/g, field2);
|
||||
const oper_human = operation
|
||||
.replace(
|
||||
/m1/g,
|
||||
fieldM1.__computed_id ? "(" + fieldM1.string + ")" : fieldM1.string
|
||||
)
|
||||
.replace(
|
||||
/m2/g,
|
||||
fieldM2.__computed_id ? "(" + fieldM2.string + ")" : fieldM2.string
|
||||
);
|
||||
const cmTotal = this._computed_measures.push({
|
||||
field1: field1,
|
||||
field2: field2,
|
||||
operation: oper,
|
||||
name: name || oper_human,
|
||||
id: cmId,
|
||||
format: format,
|
||||
});
|
||||
|
||||
return this._createVirtualMeasure(this._computed_measures[cmTotal - 1]);
|
||||
},
|
||||
|
||||
/**
|
||||
* Create and enable a measure based on a 'fake' field
|
||||
*
|
||||
* @private
|
||||
* @param {Object} cmDef
|
||||
* @param {List} fields *Optional*
|
||||
* @returns a promise
|
||||
*/
|
||||
_createVirtualMeasure: function (cmDef, fields) {
|
||||
const arrFields = fields || this.fields;
|
||||
// This is a minimal 'fake' field info
|
||||
arrFields[cmDef.id] = {
|
||||
// Used to format the value
|
||||
type: cmDef.format,
|
||||
// Used to print the header name
|
||||
string: cmDef.name,
|
||||
// Used to know if is a computed measure field
|
||||
__computed_id: cmDef.id,
|
||||
};
|
||||
this.trigger_up("add_measure", {
|
||||
id: cmDef.id,
|
||||
def: arrFields[cmDef.id],
|
||||
});
|
||||
return this._activeMeasures([cmDef.field1, cmDef.field2, cmDef.id]);
|
||||
},
|
||||
|
||||
/*
|
||||
* @private
|
||||
* @param {List of Strings} fields
|
||||
*/
|
||||
_activeMeasures: function (fields) {
|
||||
let needLoad = false;
|
||||
for (const field of fields) {
|
||||
if (!this._isMeasureEnabled(field)) {
|
||||
this.data.measures.push(field);
|
||||
needLoad = true;
|
||||
}
|
||||
}
|
||||
if (needLoad) {
|
||||
return this._loadData();
|
||||
}
|
||||
return Promise.resolve();
|
||||
},
|
||||
|
||||
/*
|
||||
* @private
|
||||
* @param {String} field
|
||||
*/
|
||||
_isMeasureEnabled: function (field) {
|
||||
return _.contains(this.data.measures, field);
|
||||
},
|
||||
|
||||
/**
|
||||
* Helper function to add computed measure fields data into a 'subGroupData'
|
||||
*
|
||||
* @private
|
||||
* @param {Object} subGroupData
|
||||
*/
|
||||
_fillComputedMeasuresData: function (subGroupData) {
|
||||
for (const cm of this._computed_measures) {
|
||||
if (!this._isMeasureEnabled(cm.id)) return;
|
||||
if (subGroupData.__count === 0) {
|
||||
subGroupData[cm.id] = false;
|
||||
} else {
|
||||
// eslint-disable-next-line no-undef
|
||||
subGroupData[cm.id] = py.eval(cm.operation, subGroupData);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Fill the groupSubdivisions with the computed measures and their values
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
_prepareData: function (group, groupSubdivisions) {
|
||||
for (const groupSubdivision of groupSubdivisions) {
|
||||
for (const subGroup of groupSubdivision.subGroups) {
|
||||
this._fillComputedMeasuresData(subGroup);
|
||||
}
|
||||
}
|
||||
this._super.apply(this, arguments);
|
||||
},
|
||||
|
||||
/**
|
||||
* _getGroupSubdivision method invokes the read_group method of the
|
||||
* model via rpc and the passed 'fields' argument is the list of
|
||||
* measure names that is in this.data.measures, so we remove the
|
||||
* computed measures form this.data.measures before calling _super
|
||||
* to prevent an exception
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
_getGroupSubdivision: function () {
|
||||
const computed_measures = [];
|
||||
for (let i = 0; i < this.data.measures.length; i++)
|
||||
if (this.data.measures[i].startsWith("__computed_")) {
|
||||
computed_measures.push(this.data.measures[i]);
|
||||
this.data.measures.splice(i, 1);
|
||||
i--;
|
||||
}
|
||||
const res = this._super.apply(this, arguments);
|
||||
$.merge(this.data.measures, computed_measures);
|
||||
return res;
|
||||
},
|
||||
|
||||
/**
|
||||
* Load the computed measures in context. This is used by filters.
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
load: function (params) {
|
||||
this._computed_measures =
|
||||
params.context.pivot_computed_measures ||
|
||||
params.computed_measures ||
|
||||
[];
|
||||
const toActive = [];
|
||||
for (const cmDef of this._computed_measures) {
|
||||
params.fields[cmDef.id] = {
|
||||
type: cmDef.format,
|
||||
string: cmDef.name,
|
||||
__computed_id: cmDef.id,
|
||||
};
|
||||
toActive.push(cmDef.field1, cmDef.field2, cmDef.id);
|
||||
}
|
||||
return this._super(params).then(() => {
|
||||
_.defer(() => {
|
||||
for (const cmDef of this._computed_measures) {
|
||||
this.trigger_up("add_measure", {
|
||||
id: cmDef.id,
|
||||
def: this.fields[cmDef.id],
|
||||
});
|
||||
}
|
||||
});
|
||||
this._activeMeasures(toActive);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* Load the computed measures in context. This is used by filters.
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
reload: function (handle, params) {
|
||||
if ("context" in params) {
|
||||
this._computed_measures =
|
||||
params.context.pivot_computed_measures ||
|
||||
params.computed_measures ||
|
||||
[];
|
||||
}
|
||||
for (const cmDef of this._computed_measures) {
|
||||
this._createVirtualMeasure(cmDef);
|
||||
}
|
||||
const fieldNames = Object.keys(this.fields);
|
||||
for (const fieldName of fieldNames) {
|
||||
const field = this.fields[fieldName];
|
||||
if (field.__computed_id) {
|
||||
const cm = _.find(this._computed_measures, {
|
||||
id: field.__computed_id,
|
||||
});
|
||||
if (!cm) {
|
||||
delete this.fields[fieldName];
|
||||
this.data.measures = _.without(this.data.measures, fieldName);
|
||||
this.trigger_up("remove_measure", {
|
||||
id: fieldName,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
return this._super.apply(this, arguments);
|
||||
},
|
||||
|
||||
/**
|
||||
* Add the computed measures to the state. This is used by filters.
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
get: function () {
|
||||
const res = this._super.apply(this, arguments);
|
||||
res.computed_measures = this._computed_measures;
|
||||
return res;
|
||||
},
|
||||
|
||||
/**
|
||||
* Adds a rule to deny that measures can be disabled if are being used by a computed measure.
|
||||
* In the other hand, when enables a measure analyzes it to active all involved measures.
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
toggleMeasure: function (field) {
|
||||
if (this._isMeasureEnabled(field)) {
|
||||
// Measure is disabled
|
||||
const umeasures = _.filter(this._computed_measures, (item) => {
|
||||
return item.field1 === field || item.field2 === field;
|
||||
});
|
||||
if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) {
|
||||
return Promise.reject(
|
||||
_t(
|
||||
"This measure is currently used by a 'computed measure'. Please, disable the computed measure first."
|
||||
)
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// Mesaure is enabled
|
||||
const toEnable = [];
|
||||
const toAnalize = [field];
|
||||
while (toAnalize.length) {
|
||||
const afield = toAnalize.shift();
|
||||
const fieldDef = this.fields[afield];
|
||||
if (fieldDef.__computed_id) {
|
||||
const cm = _.find(this._computed_measures, {
|
||||
id: fieldDef.__computed_id,
|
||||
});
|
||||
toAnalize.push(cm.field1, cm.field2);
|
||||
const toEnableFields = [];
|
||||
if (!this.fields[cm.field1].__computed_id) {
|
||||
toEnableFields.push(cm.field1);
|
||||
}
|
||||
if (!this.fields[cm.field2].__computed_id) {
|
||||
toEnableFields.push(cm.field2);
|
||||
}
|
||||
toEnableFields.push(afield);
|
||||
toEnable.push(toEnableFields);
|
||||
}
|
||||
}
|
||||
if (toEnable.length) {
|
||||
return this._activeMeasures(_.flatten(toEnable.reverse()));
|
||||
}
|
||||
}
|
||||
return this._super.apply(this, arguments);
|
||||
},
|
||||
});
|
||||
});
|
||||
238
web_pivot_computed_measure/static/src/pivot/pivot_model.esm.js
Normal file
238
web_pivot_computed_measure/static/src/pivot/pivot_model.esm.js
Normal file
@@ -0,0 +1,238 @@
|
||||
/** @odoo-module **/
|
||||
/* Copyright 2020 Tecnativa - Alexandre Díaz
|
||||
* Copyright 2022 Tecnativa - Carlos Roca
|
||||
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
|
||||
|
||||
import {PivotModel} from "@web/views/pivot/pivot_model";
|
||||
import {patch} from "web.utils";
|
||||
|
||||
patch(PivotModel.prototype, "web_pivot_computed_measure.PivotModel", {
|
||||
/**
|
||||
* Add _computed_measures to avoid recompute them until page is recharged
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
setup() {
|
||||
this._super(...arguments);
|
||||
this._computed_measures = [];
|
||||
},
|
||||
|
||||
/**
|
||||
* Create a new computed measure
|
||||
*
|
||||
* @param {String} id
|
||||
* @param {String} field1
|
||||
* @param {String} field2
|
||||
* @param {String} operation
|
||||
* @param {String} name
|
||||
* @param {String} format
|
||||
* @returns a promise
|
||||
*/
|
||||
addComputedMeasure(id, field1, field2, operation, name, format) {
|
||||
const measure = _.find(this._computed_measures, (item) => {
|
||||
return (
|
||||
item.field1 === field1 &&
|
||||
item.field2 === field2 &&
|
||||
item.operation === operation
|
||||
);
|
||||
});
|
||||
if (measure) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
const fieldM1 = this.metaData.fields[field1];
|
||||
const fieldM2 = this.metaData.fields[field2];
|
||||
const cmId = "__computed_" + id;
|
||||
const oper = operation.replace(/m1/g, field1).replace(/m2/g, field2);
|
||||
const oper_human = operation
|
||||
.replace(
|
||||
/m1/g,
|
||||
fieldM1.__computed_id ? "(" + fieldM1.string + ")" : fieldM1.string
|
||||
)
|
||||
.replace(
|
||||
/m2/g,
|
||||
fieldM2.__computed_id ? "(" + fieldM2.string + ")" : fieldM2.string
|
||||
);
|
||||
const cmTotal = this._computed_measures.push({
|
||||
field1: field1,
|
||||
field2: field2,
|
||||
operation: oper,
|
||||
name: name || oper_human,
|
||||
id: cmId,
|
||||
format: format,
|
||||
});
|
||||
return this._createVirtualMeasure(this._computed_measures[cmTotal - 1]);
|
||||
},
|
||||
|
||||
/**
|
||||
* Create and enable a measure based on a 'fake' field
|
||||
*
|
||||
* @private
|
||||
* @param {Object} cmDef
|
||||
* @param {List} fields *Optional*
|
||||
* @returns a promise
|
||||
*/
|
||||
_createVirtualMeasure(cmDef, fields) {
|
||||
const arrFields = fields || this.metaData.fields;
|
||||
// This is a minimal 'fake' field info
|
||||
arrFields[cmDef.id] = {
|
||||
// Used to format the value
|
||||
type: cmDef.format,
|
||||
// Used to print the header name
|
||||
string: cmDef.name,
|
||||
// Referenced on payload prop at DropdownItem, used to interact with
|
||||
// created measures
|
||||
name: cmDef.id,
|
||||
// Used to know if is a computed measure field
|
||||
__computed_id: cmDef.id,
|
||||
// Operator used for group the measure added.
|
||||
group_operator: "sum",
|
||||
};
|
||||
this.metaData.measures[cmDef.id] = arrFields[cmDef.id];
|
||||
// Activate computed field
|
||||
return this.toggleMeasure(cmDef.id);
|
||||
},
|
||||
|
||||
/**
|
||||
* Active the measures related to the 'fake' field
|
||||
*
|
||||
* @private
|
||||
* @param {List of Strings} fields
|
||||
*/
|
||||
async _activeMeasures(fields) {
|
||||
let needLoad = false;
|
||||
for (const field of fields) {
|
||||
if (await !this._isMeasureEnabled(field)) {
|
||||
this.metaData.activeMeasures.push(field);
|
||||
needLoad = true;
|
||||
}
|
||||
}
|
||||
if (needLoad) {
|
||||
const config = {metaData: this.metaData, data: this.data};
|
||||
|
||||
return this._loadData(config).then(() => {
|
||||
// Notify changes to renderer for show it on the pivot view
|
||||
this.notify();
|
||||
});
|
||||
}
|
||||
return Promise.resolve();
|
||||
},
|
||||
|
||||
/**
|
||||
* Check if the measure is enabled
|
||||
*
|
||||
* @private
|
||||
* @param {String} field
|
||||
*/
|
||||
_isMeasureEnabled(field) {
|
||||
return _.contains(this.metaData.activeMeasures, field);
|
||||
},
|
||||
|
||||
/**
|
||||
* Helper function to add computed measure fields data into a 'subGroupData'
|
||||
*
|
||||
* @private
|
||||
* @param {Object} subGroupData
|
||||
*/
|
||||
_fillComputedMeasuresData(subGroupData) {
|
||||
for (const cm of this._computed_measures) {
|
||||
if (!this._isMeasureEnabled(cm.id)) return;
|
||||
if (subGroupData.__count === 0) {
|
||||
subGroupData[cm.id] = false;
|
||||
} else {
|
||||
// eslint-disable-next-line no-undef
|
||||
subGroupData[cm.id] = py.eval(cm.operation, subGroupData);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Fill the groupSubdivisions with the computed measures and their values
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
_prepareData(group, groupSubdivisions) {
|
||||
for (const groupSubdivision of groupSubdivisions) {
|
||||
for (const subGroup of groupSubdivision.subGroups) {
|
||||
this._fillComputedMeasuresData(subGroup);
|
||||
}
|
||||
}
|
||||
this._super(...arguments);
|
||||
},
|
||||
|
||||
/**
|
||||
* _getGroupSubdivision method invokes the read_group method of the
|
||||
* model via rpc and the passed 'fields' argument is the list of
|
||||
* measure names that is in this.metaData.activeMeasures, so we remove the
|
||||
* computed measures form this.metaData.activeMeasures before calling _super
|
||||
* to prevent any possible exception.
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
_getGroupSubdivision(group, rowGroupBy, colGroupBy, config) {
|
||||
const computed_measures = [];
|
||||
for (let i = 0; i < config.metaData.activeMeasures.length; i++)
|
||||
if (config.metaData.activeMeasures[i].startsWith("__computed_")) {
|
||||
computed_measures.push(config.metaData.activeMeasures[i]);
|
||||
config.metaData.activeMeasures.splice(i, 1);
|
||||
i--;
|
||||
}
|
||||
const res = this._super(...arguments);
|
||||
$.merge(config.metaData.activeMeasures, computed_measures);
|
||||
return res;
|
||||
},
|
||||
|
||||
/**
|
||||
* Adds a rule to deny that measures can be disabled if are being used by a computed measure.
|
||||
* In the other hand, when enables a measure analyzes it to active all involved measures.
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
toggleMeasure(fieldName) {
|
||||
if (this._isMeasureEnabled(fieldName)) {
|
||||
// Mesaure is enabled
|
||||
const umeasures = _.filter(this._computed_measures, (item) => {
|
||||
return item.field1 === fieldName || item.field2 === fieldName;
|
||||
});
|
||||
if (umeasures.length && this._isMeasureEnabled(umeasures[0].id)) {
|
||||
return Promise.reject(
|
||||
this.env._t(
|
||||
"This measure is currently used by a 'computed measure'. Please, disable the computed measure first."
|
||||
)
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// Measure is disabled
|
||||
const toEnable = [];
|
||||
const toAnalyze = [fieldName];
|
||||
while (toAnalyze.length) {
|
||||
// Analyze all items involved on computed measures to enable them
|
||||
const afield = toAnalyze.shift();
|
||||
const fieldDef = this.metaData.fields[afield];
|
||||
// Need to check if fieldDef exists to avoid problems with __count
|
||||
if (fieldDef && fieldDef.__computed_id) {
|
||||
const cm = _.find(this._computed_measures, {
|
||||
id: fieldDef.__computed_id,
|
||||
});
|
||||
toAnalyze.push(cm.field1, cm.field2);
|
||||
const toEnableFields = [];
|
||||
if (!this.metaData.fields[cm.field1].__computed_id) {
|
||||
toEnableFields.push(cm.field1);
|
||||
}
|
||||
if (!this.metaData.fields[cm.field2].__computed_id) {
|
||||
toEnableFields.push(cm.field2);
|
||||
}
|
||||
toEnableFields.push(afield);
|
||||
toEnable.push(toEnableFields);
|
||||
}
|
||||
}
|
||||
if (toEnable.length) {
|
||||
this._activeMeasures(
|
||||
// Transform the array of arrays to a simple array.
|
||||
// [1, [2, 3]] => [1, 2, 3]
|
||||
_.flatten(toEnable.reverse())
|
||||
);
|
||||
}
|
||||
}
|
||||
return this._super(...arguments);
|
||||
},
|
||||
});
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
<t t-inherit="web.PivotView.Buttons" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//t[@t-call='web.ReportViewMeasures']" position="inside">
|
||||
<t t-set="add_computed_measures" t-value="true" />
|
||||
<t t-set="model" t-value="model" />
|
||||
</xpath>
|
||||
</t>
|
||||
</templates>
|
||||
65
web_pivot_computed_measure/static/src/test/test.esm.js
Normal file
65
web_pivot_computed_measure/static/src/test/test.esm.js
Normal file
@@ -0,0 +1,65 @@
|
||||
/** @odoo-module **/
|
||||
/* Copyright 2022 Tecnativa - Carlos Roca
|
||||
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */
|
||||
|
||||
import tour from "web_tour.tour";
|
||||
|
||||
tour.register(
|
||||
"web_pivot_computed_measure_tour",
|
||||
{
|
||||
url: "/web",
|
||||
test: true,
|
||||
},
|
||||
[
|
||||
tour.stepUtils.showAppsMenuItem(),
|
||||
{
|
||||
trigger: 'a[data-menu-xmlid="base.menu_administration"]',
|
||||
},
|
||||
{
|
||||
trigger: 'button[data-menu-xmlid="base.menu_users"]',
|
||||
},
|
||||
{
|
||||
trigger: 'a[data-menu-xmlid="base.menu_action_res_users"]',
|
||||
},
|
||||
{
|
||||
trigger: "button.o_pivot",
|
||||
},
|
||||
{
|
||||
trigger: 'button:contains(" Measures ")',
|
||||
},
|
||||
{
|
||||
trigger: 'a:contains(" Computed Measure ")',
|
||||
},
|
||||
{
|
||||
trigger: "select#computed_measure_field_1",
|
||||
run: "text user_year_now",
|
||||
},
|
||||
{
|
||||
trigger: "select#computed_measure_field_2",
|
||||
run: "text user_year_born",
|
||||
},
|
||||
{
|
||||
trigger: "select#computed_measure_operation",
|
||||
run: "text m1-m2",
|
||||
},
|
||||
{
|
||||
trigger: "select#computed_measure_format",
|
||||
run: "text integer",
|
||||
},
|
||||
{
|
||||
trigger: "button.o_add_computed_measure",
|
||||
},
|
||||
{
|
||||
trigger: 'th.o_pivot_measure_row:contains("User Year Now")',
|
||||
extra_trigger: 'div.o_value:contains("2,022")',
|
||||
},
|
||||
{
|
||||
trigger: 'th.o_pivot_measure_row:contains("User Year Born")',
|
||||
extra_trigger: 'div.o_value:contains("1,998")',
|
||||
},
|
||||
{
|
||||
trigger: 'th.o_pivot_measure_row:contains("User Year Now-User Year Born")',
|
||||
extra_trigger: 'div.o_value:contains("24")',
|
||||
},
|
||||
]
|
||||
);
|
||||
27
web_pivot_computed_measure/static/src/view.xml
Normal file
27
web_pivot_computed_measure/static/src/view.xml
Normal file
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
<t t-inherit="web.ReportViewMeasures" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//DropdownItem" position="attributes">
|
||||
<attribute name="t-if">!measure.startsWith('__computed_')</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//t[@t-foreach='measures']" position="after">
|
||||
<div role="separator" class="dropdown-divider" t-if="add_computed_measures" />
|
||||
<t t-foreach="measures" t-as="measure" t-key="measure_value.name">
|
||||
<DropdownItem
|
||||
t-if="add_computed_measures and measure.startsWith('__computed_')"
|
||||
class="o_menu_item dropdown-item"
|
||||
t-att-class="{ selected: activeMeasures.includes(measure) }"
|
||||
payload="{ measure: measure_value.name }"
|
||||
parentClosingMode="'none'"
|
||||
>
|
||||
<t t-esc="measures[measure].string" />
|
||||
</DropdownItem>
|
||||
</t>
|
||||
<DropdownItemCustomMeasure
|
||||
measures="measures"
|
||||
model="model"
|
||||
t-if="add_computed_measures"
|
||||
/>
|
||||
</xpath>
|
||||
</t>
|
||||
</templates>
|
||||
Reference in New Issue
Block a user