scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix docx report generation with broken metadate [SCI-8165]

Browse source
This commit is contained in:
Andrej 2023-03-20 11:14:27 +01:00
parent 7584242745
commit c84adfdecc
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/reports/docx/draw_result_table.rb
View file

@ -9,7 +9,9 @@ module Reports::Docx::DrawResultTable
@docx.p @docx.p
@docx.table JSON.parse(table.contents_utf_8)['data'], border_size: Constants::REPORT_DOCX_TABLE_BORDER_SIZE do @docx.table JSON.parse(table.contents_utf_8)['data'], border_size: Constants::REPORT_DOCX_TABLE_BORDER_SIZE do
JSON.parse(table.metadata)['cells'].each do |cell| JSON.parse(table.metadata)['cells'].each do |cell|
cell_style rows[cell['row']][cell['col']], align: obj.table_cell_alignment(cell['className']) if rows[cell['row'].to_i].present?
cell_style rows[cell['row']][cell['col']], align: obj.table_cell_alignment(cell['className'])
end
end end
end end
@docx.p do @docx.p do

4
app/services/reports/docx/draw_step_table.rb
View file

@ -10,7 +10,9 @@ module Reports::Docx::DrawStepTable
if table.metadata if table.metadata
table.metadata['cells'].each do |cell| table.metadata['cells'].each do |cell|
data = cell[1] data = cell[1]
cell_style rows[data['row'].to_i][data['col'].to_i], align: obj.table_cell_alignment(data['className']) if rows[data['row'].to_i].present?
cell_style rows[data['row'].to_i][data['col'].to_i], align: obj.table_cell_alignment(data['className'])
end
end end
end end
end end