audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] handle readonly flag

Browse Source 
[ADD] show grand total
[IMP] classify floats as floats
This commit is contained in:
Holger Brunn
2015-03-12 15:44:57 +01:00
committed by Simone Orsi
parent 6f84c7577c
commit 7fff989504
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,6 +230,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
compute_totals: function()
{
var self = this,
grand_total = 0,
totals_x = {},
totals_y = {};
return self.dataset.read_ids(self.dataset.ids).then(function(rows)
@@ -240,6 +241,7 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
key_y = self.get_field_value(row, self.field_y_axis);
totals_x[key_x] = (totals_x[key_x] || 0) + 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()
{
@@ -255,6 +257,8 @@ openerp.web_widget_x2many_2d_matrix = function(instance)
_.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))
});
},