diff options
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 24 | ||||
| -rw-r--r-- | spec/features/workbenches_spec.rb | 12 |
2 files changed, 28 insertions, 8 deletions
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index 30b98eec0..22a71863a 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -7,7 +7,7 @@ class WorkbenchesController < BreadcrumbController def show scope = resource.all_referentials scope = ransack_associated_lines(scope) - scope = ransack_periode(scope) + scope = ransack_period(scope) scope = ransack_status(scope) @q_for_form = scope.ransack(params[:q]) @@ -60,13 +60,21 @@ class WorkbenchesController < BreadcrumbController end # Fake ransack filter - def ransack_periode scope - return scope unless params[:q] && params[:q]['validity_period'] - periode = params[:q]['validity_period'] - return scope if periode['end_lteq(1i)'].blank? || periode['begin_gteq(1i)'].blank? - - begin_range = Date.civil(periode["begin_gteq(1i)"].to_i, periode["begin_gteq(2i)"].to_i, periode["begin_gteq(3i)"].to_i) - end_range = Date.civil(periode["end_lteq(1i)"].to_i, periode["end_lteq(2i)"].to_i, periode["end_lteq(3i)"].to_i) + def ransack_period scope + period = params[:q]['validity_period'] + return scope unless period + + begin + if period['begin_gteq'].kind_of?(Array) + begin_range = Date.new(*period['begin_gteq'].map(&:to_i)) + end_range = Date.new(*period['end_lteq'].map(&:to_i)) + else + begin_range = Date.new(period["begin_gteq(1i)"].to_i, period["begin_gteq(2i)"].to_i, period["begin_gteq(3i)"].to_i) + end_range = Date.new(period["end_lteq(1i)"].to_i, period["end_lteq(2i)"].to_i, period["end_lteq(3i)"].to_i) + end + rescue Exception => e + return scope + end if begin_range > end_range flash.now[:error] = t('referentials.errors.validity_period') diff --git a/spec/features/workbenches_spec.rb b/spec/features/workbenches_spec.rb index 1eb20dd40..9a40a8376 100644 --- a/spec/features/workbenches_spec.rb +++ b/spec/features/workbenches_spec.rb @@ -121,6 +121,18 @@ describe 'Workbenches', type: :feature do expect(page).to_not have_content(other_referential.name) end + it 'should keep filtering on sort' do + dates = referential.validity_period.to_a + fill_validity_field dates[0], 'begin_gteq' + fill_validity_field dates[1], 'end_lteq' + click_button 'Filtrer' + + find('a[href*="&sort=validity_period"]').click + + expect(page).to have_content(referential.name) + expect(page).to_not have_content(other_referential.name) + end + it 'should not show results for out off range' do fill_validity_field(Date.today - 2.year, 'begin_gteq') fill_validity_field(Date.today - 1.year, 'end_lteq') |