scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4679 from artoscinote/ma_SCI_7192

Browse source 
Properly format Excell dates in import preview [SCI-7192]
This commit is contained in:
artoscinote 2022-12-02 16:02:38 +01:00 committed by GitHub
parent a0682f962a b600ca9771
commit 28304668e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/services/import_repository/parse_repository.rb
View file

@ -1,15 +1,18 @@
# frozen_string_literal: true
module ImportRepository
class ParseRepository
include ActionView::Helpers::TextHelper
def initialize(options)
@file = options.fetch(:file)
@date_format = options[:date_format]
@repository = options.fetch(:repository)
@session = options.fetch(:session)
@sheet = SpreadsheetParser.open_spreadsheet(@file)
end
def data
header, columns = SpreadsheetParser.first_two_rows(@sheet)
header, columns = SpreadsheetParser.first_two_rows(@sheet, date_format: @date_format)
# Fill in fields for dropdown
@repository.importable_repository_fields.transform_values! do |name|
truncate(name, length: Constants::NAME_TRUNCATION_LENGTH_DROPDOWN)

4
app/services/spreadsheet_parser.rb
View file

@ -35,12 +35,12 @@ class SpreadsheetParser
end
end
def self.first_two_rows(sheet)
def self.first_two_rows(sheet, date_format: nil)
rows = spreadsheet_enumerator(sheet)
header = []
columns = []
rows.take(2).each_with_index do |row_values, i|
row = parse_row(row_values, sheet, header: i.zero?)
row = parse_row(row_values, sheet, header: i.zero?, date_format: date_format)
if row && i.zero?
header = row
else