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

Improve XLSX parsing with Roo [SCI-1915]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2018-01-11 17:52:57 +01:00
parent 660ee6af81
commit 2ddb0ea009
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/repository.rb
View file

@ -132,8 +132,7 @@ class Repository < ActiveRecord::Base
end
total_nr += 1
# Creek XLSX parser returns Hash of the row, Roo - Array
row = row.is_a?(Hash) ? row.values.map(&:to_s) : row.map(&:to_s)
row = SpreadsheetParser.parse_row(row, sheet)
record_row = RepositoryRow.new(name: row[name_index],
repository: self,

3
app/models/team.rb
View file

@ -80,8 +80,7 @@ class Team < ActiveRecord::Base
next
end
total_nr += 1
# Creek XLSX parser returns Hash of the row, Roo - Array
row = row.is_a?(Hash) ? row.values.map(&:to_s) : row.map(&:to_s)
row = SpreadsheetParser.parse_row(row, sheet)
sample = Sample.new(name: row[sname_index],
team: self,

11
app/services/spreadsheet_parser.rb
View file

@ -52,4 +52,15 @@ class SpreadsheetParser
end
return header, columns
end
def self.parse_row(row, sheet)
# Creek XLSX parser returns Hash of the row, Roo - Array
if row.is_a?(Hash)
row.values.map(&:to_s)
elsif sheet.is_a?(Roo::Excelx)
row.map { |cell| cell.value.to_s }
else
row.map(&:to_s)
end
end
end