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

Fix handling of empty values for numeric filter type [SCI-6543] (#3866)

Browse source
This commit is contained in:
Alex Kriuchykhin 2022-02-17 15:26:24 +01:00 committed by GitHub
parent c39c767241
commit f9e77991c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/models/repository_number_value.rb
View file

@ -18,21 +18,28 @@ class RepositoryNumberValue < ApplicationRecord
def self.add_filter_condition(repository_rows, join_alias, filter_element)
parameters = filter_element.parameters
if filter_element.operator == 'between'
return repository_rows if parameters['from'].blank? || parameters['to'].blank?
elsif parameters['number'].blank?
return repository_rows
end
case filter_element.operator
when 'equal_to'
repository_rows.where("#{join_alias}.data = ?", parameters['number'])
repository_rows.where("#{join_alias}.data = ?", parameters['number'].to_i)
when 'unequal_to'
repository_rows.where.not("#{join_alias}.data = ?", parameters['number'])
repository_rows.where.not("#{join_alias}.data = ?", parameters['number'].to_i)
when 'greater_than'
repository_rows.where("#{join_alias}.data > ?", parameters['number'])
repository_rows.where("#{join_alias}.data > ?", parameters['number'].to_i)
when 'greater_than_or_equal_to'
repository_rows.where("#{join_alias}.data >= ?", parameters['number'])
repository_rows.where("#{join_alias}.data >= ?", parameters['number'].to_i)
when 'less_than'
repository_rows.where("#{join_alias}.data < ?", parameters['number'])
repository_rows.where("#{join_alias}.data < ?", parameters['number'].to_i)
when 'less_than_or_equal_to'
repository_rows.where("#{join_alias}.data <= ?", parameters['number'])
repository_rows.where("#{join_alias}.data <= ?", parameters['number'].to_i)
when 'between'
repository_rows.where("#{join_alias}.data > ? AND #{join_alias}.data < ?", parameters['from'], parameters['to'])
repository_rows
.where("#{join_alias}.data > ? AND #{join_alias}.data < ?", parameters['from'].to_i, parameters['to'].to_i)
else
raise ArgumentError, 'Wrong operator for RepositoryNumberValue!'
end