DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

end move up and down button for type de champ

Browse source
This commit is contained in:
Tanguy PATTE 2015-11-19 15:21:18 +01:00
parent 2d8ffc949d
commit 37b4823e9a
5 changed files with 54 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/decorators/type_de_champ_decorator.rb
View file

@ -2,11 +2,11 @@
class TypeDeChampDecorator < Draper::Decorator
delegate_all
def button_up params
h.button_tag '', class: up_classes, id: "btn_up_#{params[:index]}", remote: true, method: :post if display_up_button?(params[:index])
h.link_to '', params[:url], class: up_classes, id: "btn_up_#{params[:index]}", remote: true, method: :post if display_up_button?(params[:index])
end
def button_down params
h.button_tag '', class: down_classes, id: "btn_down_#{params[:index]}", remote: true if display_down_button?(params[:index])
h.link_to '', params[:url], class: down_classes, id: "btn_down_#{params[:index]}", remote: true, method: :post if display_down_button?(params[:index])
end
private

4
app/views/admin/types_de_champ/_fields.html.haml
View file

@ -15,8 +15,8 @@
- unless ff.object.id.nil?
.form-group
%br &nbsp;
= ff.object.button_up(index: ff.index)
= ff.object.button_down(index: ff.index)
= ff.object.button_up(index: ff.index, url: move_up_admin_procedure_types_de_champ_path(@procedure, ff.index))
= ff.object.button_down(index: ff.index, url: move_down_admin_procedure_types_de_champ_path(@procedure, ff.index))
.form-group

4
config/routes.rb
View file

@ -43,8 +43,8 @@ Rails.application.routes.draw do
get 'sign_in' => '/administrateurs/sessions#new'
resources :procedures do
resource :types_de_champ, only: [:show, :update] do
post '/:index/move_up' => 'types_de_champ#move_up'
post '/:index/move_down' => 'types_de_champ#move_down'
post '/:index/move_up' => 'types_de_champ#move_up', as: :move_up
post '/:index/move_down' => 'types_de_champ#move_down', as: :move_down
end
resources :types_de_champ, only: [:destroy]
resource :pieces_justificatives, only: [:edit, :update]

98
spec/features/admin/move_down_type_de_champ_spec.rb
View file

@ -1,79 +1,29 @@
require 'spec_helper'
# feature 'move down button type de champs', js: true do
# let(:administrateur) { create(:administrateur) }
feature 'move down button type de champs', js: true do
let(:administrateur) { create(:administrateur) }
# before do
# login_as administrateur, scope: :administrateur
# end
before do
login_as administrateur, scope: :administrateur
end
# context 'when click on move down type de champs button' do
# let!(:procedure) { create(:procedure, :with_type_de_champ) }
# let!(:type_de_champ) { create(:type_de_champ, procedure: procedure, order_place: 2) }
let(:procedure) { create(:procedure) }
let!(:type_de_champ_0) { create(:type_de_champ, procedure: procedure, order_place: 0) }
let!(:type_de_champ_1) { create(:type_de_champ, procedure: procedure, order_place: 1) }
let!(:type_de_champ_2) { create(:type_de_champ, procedure: procedure, order_place: 2) }
let!(:type_de_champ_3) { create(:type_de_champ, procedure: procedure, order_place: 3) }
# before do
# visit admin_procedure_path id: procedure.id
# end
# context 'when procedure have two type de champs' do
# before do
# page.click_on 'order_type_de_champ_1_down_procedure'
# end
# scenario 'it inverse the twice type de champs' do
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('1');
# end
# end
# context 'when procedure have two type de champs in database and 3 type de champs add on the page' do
# before do
# page.click_on 'add_type_de_champ_procedure'
# page.click_on 'add_type_de_champ_procedure'
# page.click_on 'add_type_de_champ_procedure'
# end
# context 'when to click on down_button type_de_champ_2' do
# before do
# page.click_on 'order_type_de_champ_2_down_procedure'
# end
# scenario 'type_de_champ_2 and type_de_champ_3 is reversed' do
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('1');
# expect(page.find_by_id('type_de_champ_3').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('3');
# expect(page.find_by_id('type_de_champ_4').find('input[class="order_place"]', visible: false).value).to eq('4');
# expect(page.find_by_id('type_de_champ_5').find('input[class="order_place"]', visible: false).value).to eq('5');
# end
# context 'when to click on up_button type_de_champ_4' do
# before do
# page.click_on 'order_type_de_champ_4_down_procedure'
# end
# scenario 'type_de_champ_4 and type_de_champ_5 is reversed' do
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('1');
# expect(page.find_by_id('type_de_champ_3').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('3');
# expect(page.find_by_id('type_de_champ_5').find('input[class="order_place"]', visible: false).value).to eq('4');
# expect(page.find_by_id('type_de_champ_4').find('input[class="order_place"]', visible: false).value).to eq('5');
# end
# context 'when to click on up_button type_de_champ_1' do
# before do
# page.click_on 'order_type_de_champ_1_down_procedure'
# end
# scenario 'type_de_champ_1 and type_de_champ_3 is reversed' do
# expect(page.find_by_id('type_de_champ_3').find('input[class="order_place"]', visible: false).value).to eq('1');
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('3');
# expect(page.find_by_id('type_de_champ_5').find('input[class="order_place"]', visible: false).value).to eq('4');
# expect(page.find_by_id('type_de_champ_4').find('input[class="order_place"]', visible: false).value).to eq('5');
# end
# end
# end
# end
# end
# end
# end
context 'when clicking on move down for type de champ 1' do
before do
visit admin_procedure_types_de_champ_path procedure.id
page.find_by_id('btn_down_1').click
wait_for_ajax
type_de_champ_1.reload
type_de_champ_2.reload
end
scenario 'it switches type_de_champ 1 and 2 place ' do
expect(type_de_champ_1.order_place).to eq(2)
expect(type_de_champ_2.order_place).to eq(1)
end
end
end

99
spec/features/admin/move_up_type_de_champ_spec.rb
View file

@ -1,80 +1,29 @@
require 'spec_helper'
# feature 'move up button type de champs', js: true do
feature 'move up button type de champs', js: true do
let(:administrateur) { create(:administrateur) }
# let(:administrateur) { create(:administrateur) }
before do
login_as administrateur, scope: :administrateur
end
# before do
# login_as administrateur, scope: :administrateur
# end
let(:procedure) { create(:procedure) }
let!(:type_de_champ_0) { create(:type_de_champ, procedure: procedure, order_place: 0) }
let!(:type_de_champ_1) { create(:type_de_champ, procedure: procedure, order_place: 1) }
let!(:type_de_champ_2) { create(:type_de_champ, procedure: procedure, order_place: 2) }
let!(:type_de_champ_3) { create(:type_de_champ, procedure: procedure, order_place: 3) }
# context 'when click on move up type de champs button' do
# let!(:procedure) { create(:procedure, :with_type_de_champ) }
# let!(:type_de_champ) { create(:type_de_champ, procedure: procedure, order_place: 2) }
# before do
# visit admin_procedure_path id: procedure.id
# end
# context 'when procedure have two type de champs' do
# before do
# page.click_on 'order_type_de_champ_2_up_procedure'
# end
# scenario 'it inverse the twice type de champs' do
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('1');
# end
# end
# context 'when procedure have two type de champs in database and 3 type de champs add on the page' do
# before do
# page.click_on 'add_type_de_champ_procedure'
# page.click_on 'add_type_de_champ_procedure'
# page.click_on 'add_type_de_champ_procedure'
# end
# context 'when to click on up_button type_de_champ_2' do
# before do
# page.click_on 'order_type_de_champ_2_up_procedure'
# end
# scenario 'type_de_champ_1 and type_de_champ_2 is reversed' do
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('1');
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_3').find('input[class="order_place"]', visible: false).value).to eq('3');
# expect(page.find_by_id('type_de_champ_4').find('input[class="order_place"]', visible: false).value).to eq('4');
# expect(page.find_by_id('type_de_champ_5').find('input[class="order_place"]', visible: false).value).to eq('5');
# end
# context 'when to click on up_button type_de_champ_4' do
# before do
# page.click_on 'order_type_de_champ_4_up_procedure'
# end
# scenario 'type_de_champ_3 and type_de_champ_4 is reversed' do
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('1');
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_4').find('input[class="order_place"]', visible: false).value).to eq('3');
# expect(page.find_by_id('type_de_champ_3').find('input[class="order_place"]', visible: false).value).to eq('4');
# expect(page.find_by_id('type_de_champ_5').find('input[class="order_place"]', visible: false).value).to eq('5');
# end
# context 'when to click on up_button type_de_champ_5' do
# before do
# page.click_on 'order_type_de_champ_5_up_procedure'
# end
# scenario 'type_de_champ_3 and type_de_champ_5 is reversed' do
# expect(page.find_by_id('type_de_champ_2').find('input[class="order_place"]', visible: false).value).to eq('1');
# expect(page.find_by_id('type_de_champ_1').find('input[class="order_place"]', visible: false).value).to eq('2');
# expect(page.find_by_id('type_de_champ_4').find('input[class="order_place"]', visible: false).value).to eq('3');
# expect(page.find_by_id('type_de_champ_5').find('input[class="order_place"]', visible: false).value).to eq('4');
# expect(page.find_by_id('type_de_champ_3').find('input[class="order_place"]', visible: false).value).to eq('5');
# end
# end
# end
# end
# end
# end
# end
context 'when clicking on move down for type de champ 1' do
before do
visit admin_procedure_types_de_champ_path procedure.id
page.find_by_id('btn_up_1').click
wait_for_ajax
type_de_champ_0.reload
type_de_champ_1.reload
end
scenario 'it switches type_de_champ 1 and 2 place ' do
expect(type_de_champ_0.order_place).to eq(1)
expect(type_de_champ_1.order_place).to eq(0)
end
end
end