odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] list-wise aggregation in case of groups 

bzr revid: xmo@openerp.com-20110608125531-qmsey70ec127asyt
This commit is contained in:
Xavier Morel 2011-06-08 14:55:31 +02:00
parent d6f59ca25b
commit 80e26dce12
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/base/static/src/js/list.js
View File

@ -371,7 +371,9 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
this.compute_aggregates(); this.compute_aggregates();
return; return;
} }
this.compute_aggregates(records); this.compute_aggregates(_(records).map(function (record) {
return {count: 1, values: record};
}));
}, },
/** /**
* Handles action button signals on a record * Handles action button signals on a record
@ -448,9 +450,17 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
var count = 0, sums = {}; var count = 0, sums = {};
_(columns).each(function (column) { sums[column.field] = 0; }); _(columns).each(function (column) { sums[column.field] = 0; });
_(records).each(function (record) { _(records).each(function (record) {
count += 1; //(record.count || 1); count += record.count || 1;
_(columns).each(function (column) { _(columns).each(function (column) {
sums[column.field] += record[column.field]; var field = column.field;
switch (column['function']) {
case 'sum':
sums[field] += record.values[field];
break;
case 'avg':
sums[field] += record.count * record.values[field];
break;
}
}); });
}); });
@ -630,7 +640,7 @@ openerp.base.ListView.List = Class.extend( /** @lends openerp.base.ListView.List
_(row.data).each(function (obj, key) { _(row.data).each(function (obj, key) {
record[key] = obj.value; record[key] = obj.value;
}); });
return record; return {count: 1, values: record};
}); });
}, },
/** /**
@ -941,6 +951,12 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
return this; return this;
}, },
get_records: function () { get_records: function () {
if (_(this.children).isEmpty()) {
return {
count: this.datagroup.length,
values: this.datagroup.aggregates
}
}
return _(this.children).chain() return _(this.children).chain()
.map(function (child) { .map(function (child) {
return child.get_records(); return child.get_records();