mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 14:45:56 +08:00
Report - Well plates columns fix [SCI-9552]
This commit is contained in:
parent
cc4ae4bb57
commit
186eb1cc7e
|
@ -67,8 +67,8 @@
|
||||||
metadata = metadataJson.val() || {};
|
metadata = metadataJson.val() || {};
|
||||||
el.handsontable({
|
el.handsontable({
|
||||||
disableVisualSelection: true,
|
disableVisualSelection: true,
|
||||||
rowHeaders: tableRowHeaders(metadata.plateTemplate),
|
rowHeaders: tableRowHeaders(JSON.parse(metadata).plateTemplate),
|
||||||
colHeaders: tableColHeaders(metadata.plateTemplate),
|
colHeaders: tableColHeaders(JSON.parse(metadata).plateTemplate),
|
||||||
editor: false,
|
editor: false,
|
||||||
copyPaste: false,
|
copyPaste: false,
|
||||||
formulas: true,
|
formulas: true,
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Reports::Docx::DrawResultTable
|
||||||
color = @color
|
color = @color
|
||||||
obj = self
|
obj = self
|
||||||
table_data = JSON.parse(table.contents_utf_8)['data']
|
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)
|
if table.metadata.present? && table.metadata['cells'].is_a?(Array)
|
||||||
table.metadata['cells'].each do |cell|
|
table.metadata['cells'].each do |cell|
|
||||||
|
|
Loading…
Reference in a new issue