pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: take into account 0s when aggregating

Browse Source 
**Issue:** The aggregate row of the list renderer doesn't take into
account the fields with zero values. As a result, average values are
not correctly computed. E.g. average of [2, 0] => 2 instead of 1.

**Solution:** Make sure 0s are included in the valid values to
aggregate.

**Change note:** We took the opportunity to make a simple refactor
in the affected test. Instead of asserting contents of the row
with multiple strictEquals (one per cell), we use deepEqual to
check the cells in the aggregate row.

closes odoo/odoo#104968

X-original-commit: 2dcb71aab911a47d8d3a5db6f68a28d1c6d8c9fb
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
This commit is contained in:
Joseph Caburnay
2022-11-04 11:59:05 +01:00
parent 7d61b12bc7
commit 80318050ef
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/views/list/list_renderer.js
+1 -7
View File
@@ -497,13 +497,7 @@ export class ListRenderer extends Component {
const aggregates = {};
for (const fieldName in this.props.list.activeFields) {
const field = this.fields[fieldName];
const fieldValues = [];
for (const value of values) {
const fieldValue = value[fieldName];
if (fieldValue) {
fieldValues.push(fieldValue);
}
}
const fieldValues = values.map((v) => v[fieldName]).filter((v) => v || v === 0);
if (!fieldValues.length) {
continue;
}
addons/web/static/tests/views/list_view_tests.js
+22 -9
View File
@@ -2865,11 +2865,24 @@ QUnit.module("Views", (hooks) => {
});
QUnit.test("aggregates are computed correctly", async function (assert) {
// map: foo record id -> qux value
const quxVals = { 1: 1.0, 2: 2.0, 3: 3.0, 4: 0 };
serverData.models.foo.records = serverData.models.foo.records.map((r) => ({
...r,
qux: quxVals[r.id],
}));
await makeView({
type: "list",
resModel: "foo",
serverData,
arch: '<tree><field name="foo"/><field name="int_field" sum="Sum"/></tree>',
arch: /*xml*/ `
<tree>
<field name="foo"/>
<field name="int_field" sum="Sum"/>
<field name="qux" avg="Average"/>
</tree>`,
searchViewArch: `
<search>
<filter name="my_filter" string="My Filter" domain="[('id', '=', 0)]"/>
@@ -2878,23 +2891,23 @@ QUnit.module("Views", (hooks) => {
const tbodySelectors = target.querySelectorAll("tbody .o_list_record_selector input");
const theadSelector = target.querySelector("thead .o_list_record_selector input");
assert.strictEqual(target.querySelectorAll("tfoot td")[2].innerText, "32");
const getFooterTextArray = () => {
return [...target.querySelectorAll("tfoot td")].map((td) => td.innerText);
};
assert.deepEqual(getFooterTextArray(), ["", "", "32", "1.50"]);
await click(tbodySelectors[0]);
await click(tbodySelectors[3]);
assert.strictEqual(target.querySelectorAll("tfoot td")[2].innerText, "6");
assert.deepEqual(getFooterTextArray(), ["", "", "6", "0.50"]);
await click(theadSelector);
assert.strictEqual(target.querySelectorAll("tfoot td")[2].innerText, "32");
assert.deepEqual(getFooterTextArray(), ["", "", "32", "1.50"]);
// Let's update the view to dislay NO records
await toggleFilterMenu(target);
await toggleMenuItem(target, "My Filter");
assert.strictEqual(
target.querySelectorAll("tfoot td")[2].innerText,
"",
"No records, so no total."
);
assert.deepEqual(getFooterTextArray(), ["", "", "", ""]);
});
QUnit.test("aggregates are computed correctly in grouped lists", async function (assert) {