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

[IMP] preliminary work on supporting col expansion in pivottable widget (addon web_graph) 

bzr revid: ged@openerp.com-20131119092053-hp1pdgckiplw8mgp
This commit is contained in:
Gery Debongnie 2013-11-19 10:20:53 +01:00
parent 1901b38c16
commit 40ededd540
2 changed files with 55 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,11 +158,18 @@ var PivotTable = instance.web.Widget.extend({
},
'click a.field-selection' : function (event) {
var id,
field_id = event.target.attributes['data-field-id'].nodeValue;
event.preventDefault();
this.dropdown.remove();
var row_id = event.target.attributes['data-row-id'].nodeValue;
var field_id = event.target.attributes['data-field-id'].nodeValue;
this.expand_row(row_id, field_id);
if (event.target.attributes['data-row-id'] !== undefined) {
var id = event.target.attributes['data-row-id'].nodeValue;
this.expand_row(id, field_id);
}
if (event.target.attributes['data-col-id'] !== undefined) {
var id = event.target.attributes['data-col-id'].nodeValue;
this.expand_col(id, field_id);
}
},
},
@ -177,26 +184,31 @@ var PivotTable = instance.web.Widget.extend({
var field_to_expand = this.data.row_groupby[row.path.length];
this.expand_row(row_id, field_to_expand);
} else {
this.display_dropdown(row_id, $(event.target), event.pageY, event.pageY);
this.display_dropdown({row_id:row_id,
target: $(event.target),
x: event.pageY,
y: event.pageY});
}
}
},
handle_col_event: function (event) {
console.log("col expand", this.cols);
// var col_id = event.target.attributes['data-col-id'].nodeValue,
// col = this.get_row(col_id);
var col_id = event.target.attributes['data-col-id'].nodeValue,
col = this.get_col(col_id);
// if (col.expanded) {
// this.fold_row(row_id);
// } else {
// if (col.path.length < this.data.col_groupby.length) {
// var field_to_expand = this.data.col_groupby[col.path.length];
// this.expand_col(col_id, field_to_expand);
// } else {
// this.display_dropdown(col_id, $(event.target), event.pageY, event.pageY);
// }
// }
if (col.expanded) {
this.fold_col(col_id);
} else {
if (col.path.length < this.data.col_groupby.length) {
var field_to_expand = this.data.col_groupby[col.path.length];
this.expand_col(col_id, field_to_expand);
} else {
this.display_dropdown({col_id: col_id,
target: $(event.target),
x: event.pageX,
y: event.pageY});
}
}
},
init: function (data) {
@ -241,21 +253,25 @@ var PivotTable = instance.web.Widget.extend({
this.$el.css('display', 'none');
},
display_dropdown: function (row_id, target, x, y) {
display_dropdown: function (options) {
var self = this,
already_grouped = self.data.row_groupby.concat(self.data.col_groupby),
possible_groups = _.difference(self.data.important_fields, already_grouped),
dropdown_options = {
fields: _.map(possible_groups, function (field) {
return {id: field, value: self.get_descr(field)};
}),
row_id: row_id,
};
})};
if (options.row_id) {
dropdown_options.row_id= options.row_id;
} else {
dropdown_options.col_id = options.col_id;
}
this.dropdown = $(QWeb.render('field_selection', dropdown_options));
target.after(this.dropdown);
options.target.after(this.dropdown);
this.dropdown.css({position:'absolute',
left:x,
top:y});
left:options.x,
top:options.y});
$('.field-selection').next('.dropdown-menu').toggle();
},
@ -271,6 +287,7 @@ var PivotTable = instance.web.Widget.extend({
this.headers = [header];
this.cols= [{
id: col_id,
path: [],
value: this.data.measure_label,
expanded: false,
@ -410,6 +427,10 @@ var PivotTable = instance.web.Widget.extend({
},
expand_col: function (col_id, field_id) {
console.log("expandidng col",col_id, field_id);
},
fold_row: function (row_id) {
var self = this;
var row = this.get_row(row_id);

11
addons/web_graph/static/src/xml/web_graph.xml
View File

@ -31,7 +31,16 @@
<ul class="dropdown-menu" role="menu">
<t t-foreach="fields" t-as="field">
<li>
<a class="field-selection" t-att-data-field-id="field.id" t-att-data-row-id="row_id" href="#"><t t-esc="field.value"/></a>
<t t-if="row_id">
<a class="field-selection" t-att-data-field-id="field.id" t-att-data-row-id="row_id" href="#">
<t t-esc="field.value"/>
</a>
</t>
<t t-if="col_id">
<a class="field-selection" t-att-data-field-id="field.id" t-att-data-col-id="col_id" href="#">
<t t-esc="field.value"/>
</a>
</t>
</li>
</t>
<li class="divider"></li>