mirror of https://github.com/OCA/web.git
parent
ff1f9a49e5
commit
f2e2aebbc7
|
@ -31,6 +31,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
|
||||||
// those will be filled with rows from the dataset
|
// those will be filled with rows from the dataset
|
||||||
by_x_axis: {},
|
by_x_axis: {},
|
||||||
by_y_axis: {},
|
by_y_axis: {},
|
||||||
|
by_id: {},
|
||||||
|
// configuration values
|
||||||
field_x_axis: 'x',
|
field_x_axis: 'x',
|
||||||
field_label_x_axis: 'x',
|
field_label_x_axis: 'x',
|
||||||
field_y_axis: 'y',
|
field_y_axis: 'y',
|
||||||
|
@ -81,6 +83,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
|
||||||
|
|
||||||
self.by_x_axis = {};
|
self.by_x_axis = {};
|
||||||
self.by_y_axis = {};
|
self.by_y_axis = {};
|
||||||
|
self.by_id = {};
|
||||||
|
|
||||||
return jQuery.when(result).then(function()
|
return jQuery.when(result).then(function()
|
||||||
{
|
{
|
||||||
|
@ -158,15 +161,29 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
// to whatever needed to setup internal data structure
|
// do whatever needed to setup internal data structure
|
||||||
add_xy_row: function(row)
|
add_xy_row: function(row)
|
||||||
{
|
{
|
||||||
var x = this.get_field_value(row, this.field_x_axis),
|
var x = this.get_field_value(row, this.field_x_axis),
|
||||||
y = this.get_field_value(row, this.field_y_axis);
|
y = this.get_field_value(row, this.field_y_axis);
|
||||||
|
// row is a *copy* of a row in dataset.cache, fetch
|
||||||
|
// a reference to this row in order to have the
|
||||||
|
// internal data structure point to the same data
|
||||||
|
// the dataset manipulates
|
||||||
|
_.every(this.dataset.cache, function(cached_row)
|
||||||
|
{
|
||||||
|
if(cached_row.id == row.id)
|
||||||
|
{
|
||||||
|
row = cached_row.values;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
});
|
||||||
this.by_x_axis[x] = this.by_x_axis[x] || {};
|
this.by_x_axis[x] = this.by_x_axis[x] || {};
|
||||||
this.by_y_axis[y] = this.by_y_axis[y] || {};
|
this.by_y_axis[y] = this.by_y_axis[y] || {};
|
||||||
this.by_x_axis[x][y] = row;
|
this.by_x_axis[x][y] = row;
|
||||||
this.by_y_axis[y][x] = row;
|
this.by_y_axis[y][x] = row;
|
||||||
|
this.by_id[row.id] = row;
|
||||||
},
|
},
|
||||||
|
|
||||||
// get x axis values in the correct order
|
// get x axis values in the correct order
|
||||||
|
@ -255,39 +272,38 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
|
||||||
var self = this,
|
var self = this,
|
||||||
grand_total = 0,
|
grand_total = 0,
|
||||||
totals_x = {},
|
totals_x = {},
|
||||||
totals_y = {};
|
totals_y = {},
|
||||||
return self.dataset.read_ids(self.dataset.ids).then(function(rows)
|
rows = this.by_id,
|
||||||
|
deferred = jQuery.Deferred();
|
||||||
|
_.each(rows, function(row)
|
||||||
{
|
{
|
||||||
_.each(rows, function(row)
|
var key_x = self.get_field_value(row, self.field_x_axis),
|
||||||
{
|
key_y = self.get_field_value(row, self.field_y_axis);
|
||||||
var key_x = self.get_field_value(row, self.field_x_axis),
|
totals_x[key_x] = (totals_x[key_x] || 0) + self.get_field_value(row, self.field_value);
|
||||||
key_y = self.get_field_value(row, self.field_y_axis);
|
totals_y[key_y] = (totals_y[key_y] || 0) + self.get_field_value(row, self.field_value);
|
||||||
totals_x[key_x] = (totals_x[key_x] || 0) + self.get_field_value(row, self.field_value);
|
grand_total += self.get_field_value(row, self.field_value);
|
||||||
totals_y[key_y] = (totals_y[key_y] || 0) + self.get_field_value(row, self.field_value);
|
|
||||||
grand_total += self.get_field_value(row, self.field_value);
|
|
||||||
});
|
|
||||||
}).then(function()
|
|
||||||
{
|
|
||||||
_.each(totals_y, function(total, y)
|
|
||||||
{
|
|
||||||
self.$el.find(
|
|
||||||
_.str.sprintf('td.row_total[data-y="%s"]', y)).text(
|
|
||||||
self.format_xy_value(total));
|
|
||||||
});
|
|
||||||
_.each(totals_x, function(total, x)
|
|
||||||
{
|
|
||||||
self.$el.find(
|
|
||||||
_.str.sprintf('td.column_total[data-x="%s"]', x)).text(
|
|
||||||
self.format_xy_value(total));
|
|
||||||
});
|
|
||||||
self.$el.find('.grand_total').text(
|
|
||||||
self.format_xy_value(grand_total))
|
|
||||||
return {
|
|
||||||
totals_x: totals_x,
|
|
||||||
totals_y: totals_y,
|
|
||||||
grand_total: grand_total,
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
|
_.each(totals_y, function(total, y)
|
||||||
|
{
|
||||||
|
self.$el.find(
|
||||||
|
_.str.sprintf('td.row_total[data-y="%s"]', y)).text(
|
||||||
|
self.format_xy_value(total));
|
||||||
|
});
|
||||||
|
_.each(totals_x, function(total, x)
|
||||||
|
{
|
||||||
|
self.$el.find(
|
||||||
|
_.str.sprintf('td.column_total[data-x="%s"]', x)).text(
|
||||||
|
self.format_xy_value(total));
|
||||||
|
});
|
||||||
|
self.$el.find('.grand_total').text(
|
||||||
|
self.format_xy_value(grand_total))
|
||||||
|
deferred.resolve({
|
||||||
|
totals_x: totals_x,
|
||||||
|
totals_y: totals_y,
|
||||||
|
grand_total: grand_total,
|
||||||
|
rows: rows,
|
||||||
|
});
|
||||||
|
return deferred;
|
||||||
},
|
},
|
||||||
|
|
||||||
setup_many2one_axes: function()
|
setup_many2one_axes: function()
|
||||||
|
|
Loading…
Reference in New Issue