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

[FIX] improves the handling of headers titles when the db query returns false or undefined (addon web_graph)

Browse Source 
bzr revid: ged@openerp.com-20131211162850-mgqs5csnw8wca974
This commit is contained in:
Gery Debongnie
2013-12-11 17:28:50 +01:00
parent 945719fb7d
commit 7a672064c0
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/graph.js
+1 -6
View File
@@ -178,17 +178,12 @@ instance.web_graph.GraphView = instance.web.View.extend({
this.draw_table();
} else {
this.$('.graph_main_content').append($('<div><svg></svg></div>'));
// console.log('this.perentaui', this.getParent().$el);
// this.width = this.$el.width();
// this.height = this.$el.parent().parent().height(); // to get view manager body
// debugger;
var options = {
svg: this.$('.graph_main_content svg')[0],
mode: this.mode,
pivot: this.pivot_table,
width: this.$el.width(),
height: Math.max(this.$el.parent().parent().height() - 45, 250),
height: Math.max(document.documentElement.clientHeight - 116 - 60, 250),
measure_label: this.measure_label()
};
openerp.web_graph.draw_chart(options);
addons/web_graph/static/src/js/pivot.js
+30 -11
View File
@@ -183,7 +183,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
},
make_header: function (groups, parent) {
var name = groups[0].attributes.value[1],
var name = get_attribute_value(groups[0]),
new_header = {
id: _.uniqueId(),
path: parent.path.concat(name),
@@ -387,14 +387,15 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
}
function make_tree_headers (data_pt, parent, max_depth) {
var node = {
id: _.uniqueId(),
path: parent.path.concat(data_pt.attributes.value[1]),
title: data_pt.attributes.value[1],
domain: data_pt.model._domain,
parent: parent,
children: [],
};
var value = get_attribute_value(data_pt),
node = {
id: _.uniqueId(),
path: parent.path.concat(value),
title: value,
domain: data_pt.model._domain,
parent: parent,
children: [],
};
if (self.measure) {
node.total = data_pt.attributes.aggregates[self.measure];
} else {
@@ -412,9 +413,14 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
function make_cells (data, index, current_path) {
_.each(data, function (group) {
var attr = group.attributes,
group_val = (attr.value instanceof Array) ? attr.value[1] : attr.value,
path = current_path,
value;
if (group_val === false) {
group_val = undefined;
}
if (self.measure) {
value = attr.aggregates[self.measure];
} else {
@@ -422,8 +428,14 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
}
if (attr.grouped_on !== undefined) {
path = path.concat(attr.value[1]);
if (attr.value === false) {
path = path.concat('undefined');
} else {
path = path.concat(group_val);
}
}
console.log('attr', attr);
var rowpath = path.slice(0, index),
colpath = path.slice(index);
@@ -433,6 +445,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({
var col = _.find(col_headers, function (header) {
return _.isEqual(header.path, colpath);
});
debugger;
cells.push({x: Math.min(row.id, col.id),
y: Math.max(row.id, col.id),
value: value});
@@ -489,7 +502,7 @@ function query_groups_data (model, fields, domain, row_groupbys, col_groupby) {
}
function format_group (group, path) {
group.path = path.concat(group.attributes.value[1]);
group.path = path.concat(get_attribute_value(group));
var result = [group];
_.each(group.subgroups_data, function (subgroup) {
result = result.concat(format_group (subgroup, group.path));
@@ -497,4 +510,10 @@ function format_group (group, path) {
return result;
}
function get_attribute_value (group) {
var value = group.attributes.value;
if (value === false) return 'undefined';
return (value instanceof Array) ? value[1] : value;
}
})();