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

Merge pull request #2587 from urbanrotnik/ur-sci-4634-v2

Browse source 
Inventory import fix [SCI-4634] v2
This commit is contained in:
Urban Rotnik 2020-05-20 14:45:57 +02:00 committed by GitHub
commit a5b1f1cfd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/utilities/repository_import_parser/importer.rb
View file

@ -75,7 +75,10 @@ module RepositoryImportParser
SpreadsheetParser.parse_row(row, @sheet).each_with_index do |value, index|
if index == @name_index
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?
errors = true
break
@ -128,6 +131,9 @@ module RepositoryImportParser
row.reject { |k| k == :repository_row }.each do |index, value|
column = @columns[index]
value = try_decimal_to_string(value) unless column.repository_number_value?
next if value.nil?
cell_value_attributes = { created_by: @user,
last_modified_by: @user,
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)
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