From cfd2ab7a20530d65de5efc529d28957bbdced974 Mon Sep 17 00:00:00 2001 From: tarteo Date: Wed, 7 Jun 2023 15:49:51 +0200 Subject: [PATCH] [IMP] web_widget_x2many_2d_matrix: Check is aggregatable --- .../x2many_2d_matrix_renderer.esm.js | 6 ++++++ .../x2many_2d_matrix_renderer.xml | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.esm.js b/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.esm.js index 30756a926..b0e555885 100644 --- a/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.esm.js +++ b/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.esm.js @@ -116,6 +116,12 @@ export class X2Many2DMatrixRenderer extends Component { .reduce((aggr, y) => aggr + y); } + _canAggregate() { + return ["integer", "float", "monetary"].includes( + this.list.fields[this.matrixFields.value].type + ); + } + update(x, y, value) { this.matrix[y][x].value = value; const xFieldValue = this.columns[x].value; diff --git a/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.xml b/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.xml index 1c2fe9c07..be7e979bf 100644 --- a/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.xml +++ b/web_widget_x2many_2d_matrix/static/src/components/x2many_2d_matrix_renderer/x2many_2d_matrix_renderer.xml @@ -30,7 +30,10 @@ t-props="getValueFieldProps(column.value, row.value)" /> - + - +