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

Fix import issues with date formatting [SCI-7111]

Browse source
This commit is contained in:
Martin Artnik 2022-08-31 09:06:16 +02:00
parent a5e52069af
commit 6b25759715
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/spreadsheet_parser.rb
View file

@ -51,11 +51,13 @@ class SpreadsheetParser
return header, columns
end
def self.parse_row(row, sheet, header: false)
def self.parse_row(row, sheet, header: false, date_format: nil)
if sheet.is_a?(Roo::Excelx) && !header
row.map do |cell|
if cell.is_a?(Roo::Excelx::Cell::Number) && cell.format == 'General'
cell&.value&.to_d
elsif date_format && cell&.value.is_a?(Date)
cell&.value&.strftime(date_format)
else
cell&.formatted_value
end

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

@ -72,7 +72,11 @@ module RepositoryImportParser
@total_new_rows += 1
new_full_row = {}
SpreadsheetParser.parse_row(row, @sheet).each_with_index do |value, index|
SpreadsheetParser.parse_row(
row,
@sheet,
date_format: @user.settings['date_format']
).each_with_index do |value, index|
if index == @name_index
new_row =
RepositoryRow.new(name: try_decimal_to_string(value),