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

Fix date import for repository

Browse source
This commit is contained in:
aignatov-bio 2020-03-05 14:34:31 +01:00
parent f201826eb8
commit 4af992ef35
7 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/repository_checklist_value.rb
View file

@ -53,7 +53,7 @@ class RepositoryChecklistValue < ApplicationRecord
value value
end end
def self.import_from_text(text, attributes) def self.import_from_text(text, attributes, _options = {})
value = new(attributes) value = new(attributes)
column = attributes.dig(:repository_cell_attributes, :repository_column) column = attributes.dig(:repository_cell_attributes, :repository_column)
text.split("\n").each do |item_text| text.split("\n").each do |item_text|

5
app/models/repository_date_time_value_base.rb
View file

@ -25,8 +25,9 @@ class RepositoryDateTimeValueBase < ApplicationRecord
save! save!
end end
def self.import_from_text(text, attributes) def self.import_from_text(text, attributes, options = {})
new(attributes.merge(data: DateTime.parse(text))) date_format = options.dig(:user, :settings, :date_format) || Constants::DEFAULT_DATE_FORMAT
new(attributes.merge(data: DateTime.strptime(text, date_format)))
rescue ArgumentError rescue ArgumentError
nil nil
end end

2
app/models/repository_list_value.rb
View file

@ -51,7 +51,7 @@ class RepositoryListValue < ApplicationRecord
value value
end end
def self.import_from_text(text, attributes) def self.import_from_text(text, attributes, _options = {})
value = new(attributes) value = new(attributes)
column = attributes.dig(:repository_cell_attributes, :repository_column) column = attributes.dig(:repository_cell_attributes, :repository_column)
list_item = column.repository_list_items.find { |item| item.data == text } list_item = column.repository_list_items.find { |item| item.data == text }

2
app/models/repository_number_value.rb
View file

@ -34,7 +34,7 @@ class RepositoryNumberValue < ApplicationRecord
value value
end end
def self.import_from_text(text, attributes) def self.import_from_text(text, attributes, _options = {})
new(attributes.merge(data: BigDecimal(text))) new(attributes.merge(data: BigDecimal(text)))
rescue ArgumentError rescue ArgumentError
nil nil

2
app/models/repository_status_value.rb
View file

@ -44,7 +44,7 @@ class RepositoryStatusValue < ApplicationRecord
value value
end end
def self.import_from_text(text, attributes) def self.import_from_text(text, attributes, _options = {})
icon = text[0] icon = text[0]
status = text[1..-1].strip status = text[1..-1].strip
value = new(attributes) value = new(attributes)

2
app/models/repository_text_value.rb
View file

@ -33,7 +33,7 @@ class RepositoryTextValue < ApplicationRecord
value value
end end
def self.import_from_text(text, attributes) def self.import_from_text(text, attributes, _options = {})
return nil if text.blank? return nil if text.blank?
new(attributes.merge(data: text.truncate(Constants::TEXT_MAX_LENGTH))) new(attributes.merge(data: text.truncate(Constants::TEXT_MAX_LENGTH)))

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

@ -134,7 +134,11 @@ module RepositoryImportParser
repository_column: column, repository_column: column,
importing: true } } importing: true } }
cell_value = column.data_type.constantize.import_from_text(value, cell_value_attributes) cell_value = column.data_type.constantize.import_from_text(
value,
cell_value_attributes,
user: @user.as_json
)
next if cell_value.nil? next if cell_value.nil?
cell_value.repository_cell.value = cell_value cell_value.repository_cell.value = cell_value