From e35c1f87578315912d811c2ae59c3f4612ee654c Mon Sep 17 00:00:00 2001 From: JC Date: Wed, 23 Nov 2016 11:31:00 +0100 Subject: [PATCH 1/3] Up limit for export form 200 to 400 --- app/views/backoffice/dossiers/index.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/backoffice/dossiers/index.html.haml b/app/views/backoffice/dossiers/index.html.haml index 0f0f3326b..9b239a510 100644 --- a/app/views/backoffice/dossiers/index.html.haml +++ b/app/views/backoffice/dossiers/index.html.haml @@ -6,9 +6,9 @@ =t('dynamics.backoffice.title') %div.dropdown.pull-right#download_menu - - if @dossiers_list_facade.dossiers_to_display.count > 200 + - if @dossiers_list_facade.dossiers_to_display.count > 400 %button.btn.btn-error.dropdown-toggle#dropdownDownloadMenu{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false, class: 'disabled'} - %span{'data-toggle' => :tooltip, "data-placement" => :left, title: 'Pour réduire le nombre de dossiers et ne pas dépasser la limite autorisée de 200, merci de bien vouloir appliquer des filtres.'} + %span{'data-toggle' => :tooltip, "data-placement" => :left, title: 'Pour réduire le nombre de dossiers et ne pas dépasser la limite autorisée de 400, merci de bien vouloir appliquer des filtres.'} = t('dynamics.backoffice.limit_excess_download_all_dossiers') - else %button.btn.btn-success.dropdown-toggle#dropdownDownloadMenu{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false } From 570b22c60f5111d148b6108e9912c62c4fde49a4 Mon Sep 17 00:00:00 2001 From: JC Date: Mon, 21 Nov 2016 10:53:50 +0100 Subject: [PATCH 2/3] Add google_analytics partial in layout --- app/views/layouts/_google_analytics.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/views/layouts/_google_analytics.html diff --git a/app/views/layouts/_google_analytics.html b/app/views/layouts/_google_analytics.html new file mode 100644 index 000000000..e69de29bb From 97c2be07ea38555469f7d4ea8c967f5128c4a218 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Fri, 25 Nov 2016 10:46:08 +0100 Subject: [PATCH 3/3] Change wording submit and receive action --- app/views/dossiers/_infos_dossier.html.haml | 2 +- app/views/users/recapitulatif/show.html.haml | 2 +- spec/views/backoffice/dossiers/show.html.html_spec.rb | 4 ++-- spec/views/users/recapitulatif/show.html.haml_spec.rb | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml index 6d0bf1ef7..547b082c1 100644 --- a/app/views/dossiers/_infos_dossier.html.haml +++ b/app/views/dossiers/_infos_dossier.html.haml @@ -107,7 +107,7 @@ -elsif @facade.dossier.submitted? = form_tag(url_for({controller: 'backoffice/dossiers', action: :receive, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do %button.action_button.btn.btn-success - = 'Notifier de la bonne réception' + = 'Accuser réception' -elsif @facade.dossier.received? = form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Accepter') do diff --git a/app/views/users/recapitulatif/show.html.haml b/app/views/users/recapitulatif/show.html.haml index 355c92446..ee50144b6 100644 --- a/app/views/users/recapitulatif/show.html.haml +++ b/app/views/users/recapitulatif/show.html.haml @@ -15,7 +15,7 @@ %br = form_tag(url_for({controller: :recapitulatif, action: :submit, dossier_id: @facade.dossier.id}), method: 'POST') do %button#validate_button.btn.btn-success - = 'Déposer mon dossier' + = 'Procéder au dépôt définitif' -else %h3{:class => 'text-success', :style => 'text-align:right'} = @facade.dossier.display_state diff --git a/spec/views/backoffice/dossiers/show.html.html_spec.rb b/spec/views/backoffice/dossiers/show.html.html_spec.rb index 1cd58d236..d09aadeaa 100644 --- a/spec/views/backoffice/dossiers/show.html.html_spec.rb +++ b/spec/views/backoffice/dossiers/show.html.html_spec.rb @@ -121,9 +121,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do it { expect(rendered).to have_content('Déposé') } - it 'button notifier de la bonne réception is present' do + it 'button Accuser réception is present' do expect(rendered).to have_css('.action_button') - expect(rendered).to have_content('Notifier de la bonne réception') + expect(rendered).to have_content('Accuser réception') end it 'button Déclarer complet is not present' do diff --git a/spec/views/users/recapitulatif/show.html.haml_spec.rb b/spec/views/users/recapitulatif/show.html.haml_spec.rb index e70e3723b..739319181 100644 --- a/spec/views/users/recapitulatif/show.html.haml_spec.rb +++ b/spec/views/users/recapitulatif/show.html.haml_spec.rb @@ -107,9 +107,9 @@ describe 'users/recapitulatif/show.html.haml', type: :view do render end - it 'button Déposer mon dossier est present' do + it 'button Procéder au dépôt définitif est present' do expect(rendered).to have_css('#validate_button') - expect(rendered).to have_content('Déposer mon dossier') + expect(rendered).to have_content('Procéder au dépôt définitif') end it 'button Editer mon dossier n\'est plus present' do @@ -218,7 +218,7 @@ describe 'users/recapitulatif/show.html.haml', type: :view do end it 'submitted link is not present' do - expect(rendered).not_to have_content('Déposer mon dossier') + expect(rendered).not_to have_content('Procéder au dépôt définitif') end end end @@ -259,7 +259,7 @@ describe 'users/recapitulatif/show.html.haml', type: :view do end it 'submitted link is not present' do - expect(rendered).not_to have_content('Déposer mon dossier') + expect(rendered).not_to have_content('Procéder au dépôt définitif') end end end