Browse Source

[MRG] XLS file now has correct float values and user can operate with it.

Use language configuration for thounsand and decimal separator.
pull/2/head
Cristian Salamea 11 years ago
committed by Maxime Chambreuil
parent
commit
f9c07798ce
  1. 1
      web_export_view/AUTHORS.txt
  2. 37
      web_export_view/controllers.py

1
web_export_view/AUTHORS.txt

@ -4,3 +4,4 @@ Authors
Simone Orsi <simone.orsi@domsense.com> [simahawk]
Lorenzo Battistini <lorenzo.battistini@agilebg.com>
Stefan Rijnhart <stefan@therp.nl>
Cristian Salamea <ovnicraft@gmail.com>

37
web_export_view/controllers.py

@ -18,6 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import re
import xlwt
from cStringIO import StringIO
try:
import json
except ImportError:
@ -31,6 +35,33 @@ from web.controllers.main import ExcelExport
class ExcelExportView(ExcelExport):
_cp_path = '/web/export/xls_view'
def from_data(self, fields, rows, separators):
workbook = xlwt.Workbook()
worksheet = workbook.add_sheet('Sheet 1')
for i, fieldname in enumerate(fields):
worksheet.write(0, i, fieldname)
worksheet.col(i).width = 8000 # around 220 pixels
style = xlwt.easyxf('align: wrap yes')
m = "^[\d%s]+(\%s\d+)?$" % (separators['thousands_sep'], separators['decimal_point'])
for row_index, row in enumerate(rows):
for cell_index, cell_value in enumerate(row):
if isinstance(cell_value, basestring):
cell_value = re.sub("\r", " ", cell_value)
if re.match(m, cell_value):
cell_value = float(cell_value.replace(separators['thousands_sep'],'').replace(separators['decimal_point'],'.'))
style = xlwt.easyxf(num_format_str='#,##0.00')
if cell_value is False: cell_value = None
worksheet.write(row_index + 1, cell_index, cell_value, style)
fp = StringIO()
workbook.save(fp)
fp.seek(0)
data = fp.read()
fp.close()
return data
@openerpweb.httprequest
def index(self, req, data, token):
data = json.loads(data)
@ -39,8 +70,12 @@ class ExcelExportView(ExcelExport):
rows = data.get('rows',[])
context = req.session.eval_context(req.context)
lang = context.get('lang', 'en_US')
Model = req.session.model('res.lang')
ids = Model.search([['code','=',lang]])
record = Model.read(ids, ['decimal_point','thousands_sep'])
return req.make_response(self.from_data(columns_headers, rows),
return req.make_response(self.from_data(columns_headers, rows, record[0]),
headers=[('Content-Disposition', 'attachment; filename="%s"' % self.filename(model)),
('Content-Type', self.content_type)],
cookies={'fileToken': int(token)})
Loading…
Cancel
Save