mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 07:26:15 +08:00
Use case insensitive sample types and groups in import [SCI-1689]
This commit is contained in:
parent
db9a031581
commit
d266034406
|
@ -106,10 +106,12 @@ class Team < ActiveRecord::Base
|
|||
|
||||
sheet.row(i).each.with_index do |value, index|
|
||||
if index == stype_index
|
||||
stype = SampleType.where(name: value.strip, team: self).take
|
||||
stype = SampleType.where(team: self)
|
||||
.where('name ILIKE ?', value.strip)
|
||||
.take
|
||||
|
||||
unless stype
|
||||
stype = SampleType.new(name: value, team: self)
|
||||
stype = SampleType.new(name: value.strip, team: self)
|
||||
unless stype.save
|
||||
errors = true
|
||||
raise ActiveRecord::Rollback
|
||||
|
@ -117,10 +119,12 @@ class Team < ActiveRecord::Base
|
|||
end
|
||||
sample.sample_type = stype
|
||||
elsif index == sgroup_index
|
||||
sgroup = SampleGroup.where(name: value.strip, team: self).take
|
||||
sgroup = SampleGroup.where(team: self)
|
||||
.where('name ILIKE ?', value.strip)
|
||||
.take
|
||||
|
||||
unless sgroup
|
||||
sgroup = SampleGroup.new(name: value, team: self)
|
||||
sgroup = SampleGroup.new(name: value.strip, team: self)
|
||||
unless sgroup.save
|
||||
errors = true
|
||||
raise ActiveRecord::Rollback
|
||||
|
|
Loading…
Reference in a new issue