Compare commits

..

No commits in common. "2539e4ddab3ed2501137c3e9b5a1587d818ccded" and "77e684705217d3cff4c69fe303133bb43c706e6f" have entirely different histories.

View File

@ -68,22 +68,19 @@ class ImportCsv < ApplicationRecord
end end
csv_text = File.read(self.file.path, :encoding => 'UTF-8') csv_text = File.read(self.file.path, :encoding => 'UTF-8')
@csv = CSV.parse(csv_text, :headers => true, :col_sep => ";") @csv = CSV.parse(csv_text, :headers => true, :col_sep => ",")
r = [] r = []
@csv.each do |row| @csv.each do |row|
line = {} line = {}
self.import_csv_champs.each do |import_csv_champ| self.import_csv_champs.each do |import_csv_champ|
if import_csv_champ.header? if import_csv_champ.header?
eval "line['#{import_csv_champ.champ}'] = row[\"#{import_csv_champ.header}\"]" eval "line['#{import_csv_champ.champ}'] = row[\"#{import_csv_champ.header}\"]"
elsif import_csv_champ.value? elsif import_csv_champ.value?
eval "line['#{import_csv_champ.champ}'] = #{import_csv_champ.value}" eval "line['#{import_csv_champ.champ}'] = \"#{import_csv_champ.value}\""
end end
end end
r << line r << line
end end
@ -93,6 +90,9 @@ class ImportCsv < ApplicationRecord
def load def load
self.table_name.classify.constantize.import_csv(self.charge, self, self.m_odr_id) self.table_name.classify.constantize.import_csv(self.charge, self, self.m_odr_id)
end end