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

[IMP] web: group by more than two fields in graph view

Browse Source 
Before this commit: select more than two groupbys
in a graph view would have no impact at all if mode
'bar' or 'line' is selected.

This commit allows to correctly handle more than
two groupbys in all modes.

Task ID: 1917948

closes odoo/odoo#29673
This commit is contained in:
jpr-odoo
2019-02-20 09:28:07 +00:00
committed by Mathieu Duckerts-Antoine
parent 726aeefe36
commit 3461637b7a
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views/graph/graph_renderer.js
+3 -3
View File
@@ -174,12 +174,12 @@ return AbstractRenderer.extend({
values = {};
for (var i = 0; i < this.state.data.length; i++) {
label = this.state.data[i].labels[0];
serie = this.state.data[i].labels[1];
serie = this.state.data[i].labels.slice(1).join("/");
value = this.state.data[i].value;
if ((!xlabels.length) || (xlabels[xlabels.length-1] !== label)) {
xlabels.push(label);
}
series.push(this.state.data[i].labels[1]);
series.push(serie);
if (!(serie in values)) {values[serie] = {};}
values[serie][label] = this.state.data[i].value;
}
@@ -403,7 +403,7 @@ return AbstractRenderer.extend({
ticksLabels.push(tickLabel);
tick++;
}
serie = graphData[i].labels[1];
serie = graphData[i].labels.slice(1).join("/");
if (!data_dict[serie]) {
data_dict[serie] = {
values: [],
addons/web/static/tests/views/graph_tests.js
+24 -3
View File
@@ -179,15 +179,36 @@ QUnit.module('Views', {
model: 'foo',
data: this.data,
arch: '<graph type="line"><field name="foo" /></graph>',
groupBy: ['product_id', 'bar'],
groupBy: ['product_id', 'bar', 'color_id'],
});
assert.strictEqual(graph.$('.nv-x text:contains(xphone)').length, 1,
"should contain a text element with product xphone on X axis");
assert.strictEqual(graph.$('.nv-x text:contains(xpad)').length, 1,
"should contain a text element with product xpad on X axis");
assert.strictEqual(graph.$('text:contains(true)').length, 1,
"should have an entry for each value of field 'bar' in the legend");
assert.strictEqual(graph.$('text.nv-legend-text:contains(true)').length, 2,
"should have an entry for each value of field 'bar' and 'color_id' in the legend");
graph.destroy();
});
QUnit.test('displaying bar chart data with multiple groupbys', function (assert) {
assert.expect(3);
var graph = createView({
View: GraphView,
model: 'foo',
data: this.data,
arch: '<graph type="bar"><field name="foo" /></graph>',
groupBy: ['product_id', 'bar', 'color_id'],
});
assert.containsOnce(graph, '.nv-x text:contains(xphone)',
"should contain a text element with product xphone on X axis");
assert.containsOnce(graph, '.nv-x text:contains(xpad)',
"should contain a text element with product xpad on X axis");
assert.containsOnce(graph, 'text.nv-legend-text:contains(true/red)',
"should have an entry for each value of field 'bar' and 'color_id' in the legend");
graph.destroy();
});