scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Report - Well plates columns fix [SCI-9552]

Browse source
This commit is contained in:
Giga Chubinidze 2023-10-20 02:27:06 +04:00
parent cc4ae4bb57
commit 186eb1cc7e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/reports/content.js
View file

@ -67,8 +67,8 @@
metadata = metadataJson.val() || {};
el.handsontable({
disableVisualSelection: true,
rowHeaders: tableRowHeaders(metadata.plateTemplate),
colHeaders: tableColHeaders(metadata.plateTemplate),
rowHeaders: tableRowHeaders(JSON.parse(metadata).plateTemplate),
colHeaders: tableColHeaders(JSON.parse(metadata).plateTemplate),
editor: false,
copyPaste: false,
formulas: true,

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

@ -8,7 +8,7 @@ module Reports::Docx::DrawResultTable
color = @color
obj = self
table_data = JSON.parse(table.contents_utf_8)['data']
table_data = obj.add_headers_to_table(table_data, false)
table_data = obj.add_headers_to_table(table_data, table.metadata.dig('plateTemplate'))
if table.metadata.present? && table.metadata['cells'].is_a?(Array)
table.metadata['cells'].each do |cell|