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

[REF] refactoring in progress. moves some util functions to its own file in addon web_graph 

bzr revid: ged@openerp.com-20131115153701-rxh1voksnu0ule4t
This commit is contained in:
Gery Debongnie 2013-11-15 16:37:01 +01:00
parent b08a38c528
commit 08a26f9e95
2 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/web_graph/__openerp__.py
View File

@ -18,6 +18,7 @@ Graph Views for Web Client.
'static/lib/nvd3/d3.v3.js',
'static/lib/nvd3/nv.d3.js',
'static/lib/bootstrap/bootstrap.js',
'static/src/js/utility.js',
'static/src/js/charts.js',
'static/src/js/graph.js',
],

40
addons/web_graph/static/src/js/graph.js
View File

@ -511,45 +511,5 @@ var PivotTable = BasicDataView.extend({
});
////////////////////////////////////////////////////////////////////////////////
// utility
function removeFromArray(array, element) {
var index = array.indexOf(element);
if (index > -1) {
array.splice(index, 1);
}
}
/**
* Query the server and return a deferred which will return the data
* with all the groupbys applied (this is done for now, but the goal
* is to modify read_group in order to allow eager and lazy groupbys
*/
function query_groups (model, fields, domain, groupbys) {
return model.query(fields)
.filter(domain)
.group_by(groupbys)
.then(function (results) {
var non_empty_results = _.filter(results, function (group) {
return group.attributes.length > 0;
});
if (groupbys.length <= 1) {
return non_empty_results;
} else {
var get_subgroups = $.when.apply(null, _.map(non_empty_results, function (result) {
var new_domain = result.model._domain;
var new_groupings = groupbys.slice(1);
return query_groups(model, fields,new_domain, new_groupings).then(function (subgroups) {
result.subgroups_data = subgroups;
});
}));
return get_subgroups.then(function () {
return non_empty_results;
});
}
});
}
};