mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-28 01:36:33 +08:00
Conver to string if not importing into Number column
This commit is contained in:
parent
d714b4b7bf
commit
2283491629
1 changed files with 15 additions and 1 deletions
|
@ -75,7 +75,10 @@ module RepositoryImportParser
|
||||||
SpreadsheetParser.parse_row(row, @sheet).each_with_index do |value, index|
|
SpreadsheetParser.parse_row(row, @sheet).each_with_index do |value, index|
|
||||||
if index == @name_index
|
if index == @name_index
|
||||||
new_row =
|
new_row =
|
||||||
RepositoryRow.new(name: value, repository: @repository, created_by: @user, last_modified_by: @user)
|
RepositoryRow.new(name: try_decimal_to_string(value),
|
||||||
|
repository: @repository,
|
||||||
|
created_by: @user,
|
||||||
|
last_modified_by: @user)
|
||||||
unless new_row.valid?
|
unless new_row.valid?
|
||||||
errors = true
|
errors = true
|
||||||
break
|
break
|
||||||
|
@ -128,6 +131,9 @@ module RepositoryImportParser
|
||||||
|
|
||||||
row.reject { |k| k == :repository_row }.each do |index, value|
|
row.reject { |k| k == :repository_row }.each do |index, value|
|
||||||
column = @columns[index]
|
column = @columns[index]
|
||||||
|
|
||||||
|
value = try_decimal_to_string(value) unless column.repository_number_value?
|
||||||
|
|
||||||
cell_value_attributes = { created_by: @user,
|
cell_value_attributes = { created_by: @user,
|
||||||
last_modified_by: @user,
|
last_modified_by: @user,
|
||||||
repository_cell_attributes: { repository_row: row[:repository_row],
|
repository_cell_attributes: { repository_row: row[:repository_row],
|
||||||
|
@ -150,5 +156,13 @@ module RepositoryImportParser
|
||||||
data_type.to_s.constantize.import(cell_values, recursive: true, validate: false)
|
data_type.to_s.constantize.import(cell_values, recursive: true, validate: false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def try_decimal_to_string(value)
|
||||||
|
if value.is_a?(BigDecimal)
|
||||||
|
value.frac.zero? ? value.to_i.to_s : value.to_s
|
||||||
|
else
|
||||||
|
value
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue