| Make the text field of Section and Note widget scrollable
[web_widget_url_advanced](web_widget_url_advanced/) | 17.0.1.0.0 | | This module extends URL widget for displaying anchors with custom labels.
-[web_widget_x2many_2d_matrix](web_widget_x2many_2d_matrix/) | 17.0.2.0.0 | 
| Show list fields as a matrix
+[web_widget_x2many_2d_matrix](web_widget_x2many_2d_matrix/) | 17.0.2.0.1 | | Show list fields as a matrix
[//]: # (end addons)
diff --git a/web_widget_x2many_2d_matrix/README.rst b/web_widget_x2many_2d_matrix/README.rst
index 6c3766041d32..b218f059e650 100644
--- a/web_widget_x2many_2d_matrix/README.rst
+++ b/web_widget_x2many_2d_matrix/README.rst
@@ -11,7 +11,7 @@
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! source digest: sha256:3b939ed31516b2624a4420ffc82a3930260841d3edd944ba87968d79353e11c1
+ !! source digest: sha256:b3c49bb3ff89ecca8e15592499b305035a572489dbca5abb391c3a1946978fc5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py
index d219bf546365..6ba83068125e 100644
--- a/web_widget_x2many_2d_matrix/__manifest__.py
+++ b/web_widget_x2many_2d_matrix/__manifest__.py
@@ -5,7 +5,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
"name": "2D matrix for x2many fields",
- "version": "17.0.2.0.0",
+ "version": "17.0.2.0.1",
"maintainers": ["JasminSForgeFlow", "hbrunn"],
"development_status": "Production/Stable",
"author": (
diff --git a/web_widget_x2many_2d_matrix/demo/res_groups_views.xml b/web_widget_x2many_2d_matrix/demo/res_groups_views.xml
index 4488c30e167b..fd87de62e57c 100644
--- a/web_widget_x2many_2d_matrix/demo/res_groups_views.xml
+++ b/web_widget_x2many_2d_matrix/demo/res_groups_views.xml
@@ -15,7 +15,7 @@
field_y_axis="partner_id"
field_value="country_id"
>
- 
This module allows to show an x2many field with 3-tuples ($x_value,
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 cb429feff4ae..9f4dceced343 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
@@ -3,17 +3,14 @@
import {Component, onWillUpdateProps} from "@odoo/owl";
import {evaluateBooleanExpr, evaluateExpr} from "@web/core/py_js/py";
import {Domain} from "@web/core/domain";
+import {Record} from "@web/model/relational_model/record";
import {getFieldContext} from "@web/model/relational_model/utils";
-import {registry} from "@web/core/registry";
-const fieldRegistry = registry.category("fields");
export class X2Many2DMatrixRenderer extends Component {
setup() {
- this.ValueFieldComponent = this._getValueFieldComponent();
this.columns = this._getColumns();
this.rows = this._getRows();
this.matrix = this._getMatrix();
- this.ValueFieldType = this._getValueFieldType();
onWillUpdateProps((newProps) => {
this.columns = this._getColumns(newProps.list.records);
@@ -28,6 +25,7 @@ export class X2Many2DMatrixRenderer extends Component {
const column = {
value: record.data[this.matrixFields.x],
text: record.data[this.matrixFields.x],
+ rawValue: record.data[this.matrixFields.x],
};
if (record.fields[this.matrixFields.x].type === "many2one") {
column.text = column.value[1];
@@ -45,6 +43,7 @@ export class X2Many2DMatrixRenderer extends Component {
const row = {
value: record.data[this.matrixFields.y],
text: record.data[this.matrixFields.y],
+ rawValue: record.data[this.matrixFields.y],
};
if (record.fields[this.matrixFields.y].type === "many2one") {
row.text = row.value[1];
@@ -94,62 +93,41 @@ export class X2Many2DMatrixRenderer extends Component {
return this.props.matrixFields;
}
- _getValueField() {
- const field = this.list.fields[this.matrixFields.value];
- if (!field.widget) {
- return fieldRegistry.get(field.type);
- }
- return fieldRegistry.get(field.widget);
- }
-
- _getValueFieldComponent() {
- return this._getValueField().component;
+ get valueFieldComponent() {
+ return this.props.list_view.fieldNodes[this.matrixFields.value + "_0"].field
+ .component;
}
- _getValueFieldType() {
- const field = this.list.fields[this.matrixFields.value];
- return field.type;
+ get xFieldComponent() {
+ return this.props.list_view.fieldNodes[this.matrixFields.x + "_0"].field
+ .component;
}
- _getXAxisField() {
- return this.list.fields[this.matrixFields.x];
- }
-
- _getYAxisField() {
- return this.list.fields[this.matrixFields.y];
+ get yFieldComponent() {
+ return this.props.list_view.fieldNodes[this.matrixFields.y + "_0"].field
+ .component;
}
_aggregateRow(row) {
const y = this.rows.findIndex((r) => r.value === row);
const total = this.matrix[y].map((r) => r.value).reduce((aggr, x) => aggr + x);
- if (this.ValueFieldType === "integer") {
- return total;
- }
- return Number(total).toFixed(2);
+ return total;
}
_aggregateColumn(column) {
const x = this.columns.findIndex((c) => c.value === column);
-
const total = this.matrix
-
.map((r) => r[x])
.map((r) => r.value)
.reduce((aggr, y) => aggr + y);
- if (this.ValueFieldType === "integer") {
- return total;
- }
- return Number(total).toFixed(2);
+ return total;
}
_aggregateAll() {
const total = this.matrix
.map((r) => r.map((x) => x.value).reduce((aggr, x) => aggr + x))
.reduce((aggr, y) => aggr + y);
- if (this.ValueFieldType === "integer") {
- return total;
- }
- return Number(total).toFixed(2);
+ return total;
}
_canAggregate() {
@@ -158,26 +136,43 @@ export class X2Many2DMatrixRenderer extends Component {
);
}
- getValueFieldProps(column, row) {
+ _getValueFieldProps(column, row) {
const x = this.columns.findIndex((c) => c.value === column);
const y = this.rows.findIndex((r) => r.value === row);
- let record = null;
- let value = null;
- if (
- this.matrix[y] &&
- this.matrix[y][x] &&
- (record = this.matrix[y][x].records[0])
- ) {
- record = this.matrix[y][x].records[0];
- value = this.matrix[y][x].value;
- }
- value = record ? record.data[this.matrixFields.value] : value;
- this.matrix[y][x].value = value;
+ const record = this.matrix[y][x].records[0];
+
if (!record) {
return null;
}
+ return this._getMatrixFieldProps(record, "value");
+ }
+
+ _getAxisFieldProps(value, axis) {
+ const fieldName = this.matrixFields[axis];
+ const record = new Record(this.list.model, this.list._config, {
+ [fieldName]: value,
+ });
+ const props = this._getMatrixFieldProps(record, axis);
+ if (this.list.fields[fieldName].type === "many2one") {
+ props.canOpen =
+ axis === "x" ? this.props.isXClickable : this.props.isYClickable;
+ }
+ props.readonly = true;
+ return props;
+ }
+
+ _getAggregateProps(value) {
+ const record = new Record(this.list.model, this.list._config, {
+ [this.matrixFields.value]: value,
+ });
+ const props = this._getMatrixFieldProps(record, "value");
+ props.readonly = true;
+ return props;
+ }
+
+ _getMatrixFieldProps(record, fieldName) {
const fieldInfo =
- this.props.list_view.fieldNodes[this.matrixFields.value + "_0"];
+ this.props.list_view.fieldNodes[this.matrixFields[fieldName] + "_0"];
const dynamicInfo = {
get context() {
return getFieldContext(record, fieldInfo.name, fieldInfo.context);
@@ -201,19 +196,15 @@ export class X2Many2DMatrixRenderer extends Component {
record.evalContextWithVirtualIds
),
};
- const valueField = this._getValueField();
const result = {
readonly: dynamicInfo.readonly,
record: record,
- name: this.matrixFields.value,
- ...(valueField.extractProps || (() => ({}))).apply(valueField, [
+ name: this.matrixFields[fieldName],
+ ...(fieldInfo.field.extractProps || (() => ({}))).apply(fieldInfo.field, [
fieldInfo,
dynamicInfo,
]),
};
- if (value === null) {
- result.readonly = true;
- }
return result;
}
}
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 edc7b67fa5db..6aff7687dbf5 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
@@ -14,15 +14,10 @@
t-key="column.value"
class="text-center"
>
-