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

[REF] merge fold_row and fold_col methods into the fold method (addon web_graph)

Browse Source 
bzr revid: ged@openerp.com-20131124150034-0133mgww0nm3dfta
This commit is contained in:
Gery Debongnie
2013-11-24 16:00:34 +01:00
parent 5173a56db6
commit 40889788d3
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/graph.js
+1 -3
View File
@@ -199,7 +199,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
header = pivot['get_' + options.type](id);
if (header.is_expanded) {
pivot['fold_' + options.type](header);
pivot.fold(header);
this.draw_table();
} else {
if (header.path.length < pivot[options.type + 's'].groupby.length) {
@@ -327,9 +327,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
cell.append((value === undefined) ? '' : value);
if ((self.heat_map_mode) && (value !== undefined)) {
// heat map
console.log("heat map", self.heat_map_mode, pivot.total);
var ratio = Math.floor(70 + 185*(pivot.total - value)/pivot.total);
console.log("ratio",ratio);
cell.css("background-color", "rgb(255," + ratio + "," + ratio + ")");
}
html_row.append(cell);
addons/web_graph/static/src/js/pivot.js
+12 -24
View File
@@ -33,6 +33,8 @@ var PivotTable = openerp.web.Class.extend({
headers: [main_col],
};
main_row.root = this.rows;
main_col.root = this.cols;
this.cells = [];
this.model = options.model;
this.domain = options.domain;
@@ -92,34 +94,19 @@ var PivotTable = openerp.web.Class.extend({
return _.find(this.rows.headers, function (row) { return row.id == id;});
},
fold_row: function (row) {
fold: function (header) {
var list = [];
function tree_traversal(tree) {
list.push(tree);
_.each(tree.children, tree_traversal);
}
tree_traversal(row);
this.rows.headers = _.difference(this.rows.headers, _.rest(list));
row.is_expanded = false;
var fold_lvls = _.map(this.rows.headers, function(g) {return g.path.length;});
tree_traversal(header);
header.root.headers = _.difference(header.root.headers, _.rest(list));
header.is_expanded = false;
var fold_lvls = _.map(header.root.headers, function(g) {return g.path.length;});
var new_groupby_length = _.max(fold_lvls);
this.rows.groupby.splice(new_groupby_length);
row.children = [];
},
fold_col: function (col) {
var list = [];
function tree_traversal(tree) {
list.push(tree);
_.each(tree.children, tree_traversal);
}
tree_traversal(col);
this.cols.headers = _.difference(this.cols.headers, _.rest(list));
col.is_expanded = false;
var fold_lvls = _.map(this.cols.headers, function(g) {return g.path.length;});
var new_groupby_length = _.max(fold_lvls);
this.cols.groupby.splice(new_groupby_length);
col.children = [];
header.root.groupby.splice(new_groupby_length);
header.children = [];
},
expand_row: function (row_id, field_id) {
@@ -155,6 +142,7 @@ var PivotTable = openerp.web.Class.extend({
parent: parent.id,
children: [],
domain: groups[0].model._domain,
root: parent.root,
};
parent.children.splice(0,0, new_header)
insertAfter(header_list, parent, new_header);
@@ -201,11 +189,11 @@ var PivotTable = openerp.web.Class.extend({
},
fold_rows: function () {
this.fold_row(this.rows.main);
this.fold(this.rows.main);
},
fold_cols: function () {
this.fold_col(this.cols.main);
this.fold(this.cols.main);
},
fold_all: function () {