Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[8.0] add x_axis_clickable and y_axis_clickable properties on widget

pull/478/head
Cédric Pigeon 2016-11-11 17:15:53 +01:00
parent d96db7d439
commit 3320ada4bb
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web_widget_x2many_2d_matrix/README.rst
View File

@ -48,6 +48,12 @@ field_x_axis
The field that indicates the x value of a point The field that indicates the x value of a point
field_y_axis field_y_axis
The field that indicates the y value of a point The field that indicates the y value of a point
x_axis_clickable
It indicates if the X axis allows to be clicked for navigating to the field
(if it's a many2one field). True by default
y_axis_clickable
It indicates if the Y axis allows to be clicked for navigating to the field
(if it's a many2one field). True by default
field_label_x_axis field_label_x_axis
Use another field to display in the table header Use another field to display in the table header
field_label_y_axis field_label_y_axis

10
web_widget_x2many_2d_matrix/static/src/js/web_widget_x2many_2d_matrix.js
View File

@ -29,12 +29,16 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
fields: {}, fields: {},
// Store fields used to fill HTML attributes // Store fields used to fill HTML attributes
fields_att: {}, fields_att: {},
x_axis_clickable: true,
y_axis_clickable: true,
// read parameters // read parameters
init: function(field_manager, node) init: function(field_manager, node)
{ {
this.field_x_axis = node.attrs.field_x_axis || this.field_x_axis; this.field_x_axis = node.attrs.field_x_axis || this.field_x_axis;
this.field_y_axis = node.attrs.field_y_axis || this.field_y_axis; this.field_y_axis = node.attrs.field_y_axis || this.field_y_axis;
this.x_axis_clickable = node.attrs.x_axis_clickable || this.x_axis_clickable;
this.y_axis_clickable = node.attrs.y_axis_clickable || this.y_axis_clickable;
this.field_label_x_axis = node.attrs.field_label_x_axis || this.field_x_axis; this.field_label_x_axis = node.attrs.field_label_x_axis || this.field_x_axis;
this.field_label_y_axis = node.attrs.field_label_y_axis || this.field_y_axis; this.field_label_y_axis = node.attrs.field_label_y_axis || this.field_y_axis;
this.field_value = node.attrs.field_value || this.field_value; this.field_value = node.attrs.field_value || this.field_value;
@ -84,6 +88,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
self.is_numeric = fields[self.field_value].type == 'float'; self.is_numeric = fields[self.field_value].type == 'float';
self.show_row_totals &= self.is_numeric; self.show_row_totals &= self.is_numeric;
self.show_column_totals &= self.is_numeric; self.show_column_totals &= self.is_numeric;
self.x_axis_clickable &= self.is_numeric;
self.y_axis_clickable &= self.is_numeric;
}) })
// if there are cached writes on the parent dataset, read below // if there are cached writes on the parent dataset, read below
// only returns the written data, which is not enough to properly // only returns the written data, which is not enough to properly
@ -343,14 +349,14 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
setup_many2one_axes: function() setup_many2one_axes: function()
{ {
if(this.fields[this.field_x_axis].type == 'many2one') if(this.fields[this.field_x_axis].type == 'many2one' && this.x_axis_clickable)
{ {
this.$el.find('th[data-x]').addClass('oe_link') this.$el.find('th[data-x]').addClass('oe_link')
.click(_.partial( .click(_.partial(
this.proxy(this.many2one_axis_click), this.proxy(this.many2one_axis_click),
this.field_x_axis, 'x')); this.field_x_axis, 'x'));
} }
if(this.fields[this.field_y_axis].type == 'many2one') if(this.fields[this.field_y_axis].type == 'many2one' && this.y_axis_clickable)
{ {
this.$el.find('tr[data-y] th').addClass('oe_link') this.$el.find('tr[data-y] th').addClass('oe_link')
.click(_.partial( .click(_.partial(