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

Merge pull request #5369 from betagouv/revert-5339-feat/5287

Browse source 
Administrateur : retour à l'ancien design de la page des détails d'une démarche (le nouveau design fonctionne mal sous Internet Explorer 11, mais va rapidement être amélioré)
This commit is contained in:
Pierre de La Morinerie 2020-07-13 14:27:20 +02:00 • committed by GitHub
commit a0df6e0ebb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 16 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/new_design/badges.scss
View file

@ -11,10 +11,6 @@
background-color: rgba(0, 0, 0, 0.08);
vertical-align: top;
&.baseline {
vertical-align: baseline;
}
&.warning {
background-color: $orange;
color: #FFFFFF;

11
app/assets/stylesheets/new_design/buttons.scss
View file

@ -317,14 +317,3 @@
.link {
color: $blue;
}
.card-admin-action-btn {
width: 90px;
height: 36px;
border-radius: 30px;
border: solid 1px #BBBBBB;
background: #FFFFFF;
cursor: pointer;
padding-left: 10px;
padding-right: 10px;
}

43
app/assets/stylesheets/new_design/card.scss
View file

@ -62,46 +62,3 @@
margin-bottom: $default-spacer;
}
}
.card-admin-list {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(236px, 1fr));
grid-gap: 20px;
margin: auto;
margin-bottom: 20px;
}
.card-admin {
padding-top: 10px;
padding-bottom: 10px;
width: 236px;
height: 200px;
border-radius: 4px;
border: solid 1px $border-grey;
text-align: center;
margin: auto;
display: flex;
flex-direction: column;
.card-admin-status-accept {
color: #50AA75;
}
.card-admin-status-todo {
color: #246AC5;
}
.card-admin-title {
font-weight: bold;
font-size: 18px;
margin-bottom: $default-spacer;
}
.card-admin-subtitle {
font-size: 14px;
}
.card-admin-action {
margin-top: auto;
}
}

4
app/controllers/new_administrateur/procedures_controller.rb
View file

@ -12,10 +12,6 @@ module NewAdministrateur
@procedure ||= Procedure.new(for_individual: true)
end
def show
@procedure = current_administrateur.procedures.find(params[:id])
end
def edit
end

2
app/views/new_administrateur/procedures/monavis.html.haml
View file

@ -1,7 +1,7 @@
= render partial: 'new_administrateur/breadcrumbs',
locals: { steps: [link_to('Démarches', admin_procedures_path),
link_to(@procedure.libelle, admin_procedure_path(@procedure)),
'MonAvis'] }
link_to('MonAvis', admin_procedures_path)] }
.container
%h1.page-title

136
app/views/new_administrateur/procedures/show.html.haml
View file

@ -1,136 +0,0 @@
= render partial: 'new_administrateur/breadcrumbs',
locals: { steps: [link_to('Démarches', admin_procedures_path),
"#{@procedure.libelle} (crée le #{@procedure.created_at.strftime('%d/%m/%Y')})"] }
.container{ style: "text-align:right; margin-bottom: 20px" }
= button_to 'Publier la démarche', admin_procedure_publication_path(@procedure), method: :get, class: 'button primary',id: 'publish-procedure-link', disabled: @procedure.publiee? ? true : false
.container
%h2.explication-libelle{ style: "font-weight: bold; font-size: 20px; margin-bottom: 20px;" } Indispensable avant publication
.card-admin-list
.card-admin
%div
%span.icon.accept
%p.card-admin-status-accept Validé
%div
%p.card-admin-title Présentation
%p.card-admin-subtitle Logo, nom, description
.card-admin-action
= button_to 'Modifier', edit_admin_procedure_path(@procedure), method: :get, class: 'card-admin-action-btn', id: "presentation"
- if !@procedure.locked?
.card-admin
%div
%span.icon.clock
%p.card-admin-status-todo À faire
%div
%p.card-admin-title Formulaire
%p.card-admin-subtitle Champs à remplir par les usagers
.card-admin-action
= button_to 'Modifier', champs_admin_procedure_path(@procedure), method: :get, class: 'card-admin-action-btn'
.card-admin
- if @procedure.service_id.present?
%div
%span.icon.accept
%p.card-admin-status-accept Validé
- else
%div
%span.icon.clock
%p.card-admin-status-todo À faire
%div
%p.card-admin-title Service
%p.card-admin-subtitle Choix du service de la démarche
.card-admin-action
= button_to 'Modifier', new_admin_service_path, params: { procedure_id: @procedure.id }, method: :get, class: 'card-admin-action-btn'
.card-admin
%div
%span.icon.accept
%p.card-admin-status-accept Validé
%div
%p.card-admin-title
Administrateurs
%span.badge.baseline
= @procedure.administrateurs.count
%p.card-admin-subtitle Gestion de la démarche
.card-admin-action
= button_to 'Modifier', admin_procedure_administrateurs_path(@procedure), method: :get, class: 'card-admin-action-btn', id: "administrateurs"
.card-admin
- if @procedure.instructeurs.count > 1
%div
%span.icon.accept
%p.card-admin-status-accept Validé
- else
%div
%span.icon.clock
%p.card-admin-status-todo À faire
%div
%p.card-admin-title
= feature_enabled?(:administrateur_routage) ? "Groupe Instructeurs" : "Instructeurs"
%span.badge.baseline
= @procedure.instructeurs.count
%p.card-admin-subtitle Suivi des dossiers
.card-admin-action
- if feature_enabled?(:administrateur_routage)
= button_to 'Modifier', admin_procedure_groupe_instructeurs_path(@procedure), method: :get, class: 'card-admin-action-btn', id: "groupe-instructeurs"
- else
= button_to 'Modifier', admin_procedure_groupe_instructeur_path(@procedure, @procedure.defaut_groupe_instructeur), method: :get, class: 'card-admin-action-btn', id: "instructeurs"
%h2.explication-libelle{ style: "font-weight: bold; font-size: 20px; margin-bottom: 20px;" } Pour aller plus loin
.card-admin-list
.card-admin
- if @procedure.attestation_template.present?
%div
%span.icon.accept
%p.card-admin-status-accept Activée
- else
%div
%span.icon.clock
%p.card-admin-status-todo À activer
%div
%p.card-admin-title Attestation
%p.card-admin-subtitle Délivrance automatique pour les dossiers acceptés
.card-admin-action
= button_to 'Modifier', edit_admin_procedure_attestation_template_path(@procedure), method: :get, class: 'card-admin-action-btn'
.card-admin
%div
%span.icon.clock
%p.card-admin-status-todo À configurer
%div
%p.card-admin-title Configuration des emails
%p.card-admin-subtitle Notifications automatiques
.card-admin-action
= button_to 'Modifier', admin_procedure_mail_templates_path(@procedure), method: :get, class: 'card-admin-action-btn'
.card-admin
- if @procedure.api_entreprise_token.present?
%div
%span.icon.accept
%p.card-admin-status-accept Validé
- else
%div
%span.icon.clock
%p.card-admin-status-todo À configurer
%div
%p.card-admin-title Jeton
%p.card-admin-subtitle Configurer le jeton API entreprise
.card-admin-action
= button_to 'Modifier', jeton_admin_procedure_path(@procedure), method: :get, class: 'card-admin-action-btn'
.card-admin
- if @procedure.monavis_embed.present?
%div
%span.icon.accept
%p.card-admin-status-accept Validé
- else
%div
%span.icon.clock
%p.card-admin-status-todo À configurer
%div
%p.card-admin-title MonAvis
%p.card-admin-subtitle Avis des usagers sur votre démarche
.card-admin-action
= button_to 'Modifier', monavis_admin_procedure_path(@procedure), method: :get, class: 'card-admin-action-btn'

5
config/routes.rb
View file

@ -176,9 +176,8 @@ Rails.application.routes.draw do
patch 'activate' => '/administrateurs/activate#create'
get 'procedures/archived' => 'procedures#archived'
get 'procedures/draft' => 'procedures#draft'
get 'procedures/:id/publication' => 'procedures#show', as: :procedure_publication
resources :procedures, only: [:index, :destroy] do
resources :procedures, only: [:index, :show, :destroy] do
collection do
get 'new_from_existing' => 'procedures#new_from_existing', as: :new_from_existing
end
@ -371,7 +370,7 @@ Rails.application.routes.draw do
#
namespace :admin, module: 'new_administrateur' do
resources :procedures, except: [:index, :destroy] do
resources :procedures, except: [:index, :show, :destroy] do
member do
get 'apercu'
get 'champs'

1
spec/features/admin/procedure_cloning_spec.rb
View file

@ -24,7 +24,6 @@ feature 'As an administrateur I wanna clone a procedure', js: true do
click_on Procedure.last.libelle
expect(page).to have_current_path(admin_procedure_path(Procedure.last))
find('#publish-procedure-link').click
find('#publish-procedure').click
within '#publish-modal' do

3
spec/features/admin/procedure_creation_spec.rb
View file

@ -77,7 +77,6 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
expect(page).to have_selector('#champ-1-libelle')
click_on Procedure.last.libelle
find('#publish-procedure-link').click
preview_window = window_opened_by { click_on 'onglet-preview' }
within_window(preview_window) do
@ -96,7 +95,7 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
click_on Procedure.last.libelle
expect(page).to have_current_path(admin_procedure_path(Procedure.last))
find('#publish-procedure-link').click
expect(page).to have_content('en test')
# Only check the path even though the link is the complete URL
# (Capybara runs the app on an arbitrary host/port.)

2
spec/features/admin/procedure_locked_spec.rb
View file

@ -3,7 +3,7 @@ feature 'procedure locked' do
before do
login_as administrateur.user, scope: :user
visit admin_procedure_publication_path(procedure)
visit admin_procedure_path(procedure)
end
context 'when procedure is not published' do

3
spec/features/admin/procedure_publish_spec.rb
View file

@ -22,7 +22,6 @@ feature 'Publication de démarches', js: true do
scenario 'un administrateur peut la publier' do
visit admin_procedures_draft_path
click_on procedure.libelle
find('#publish-procedure-link').click
within "#procedure_show" do
click_on "Publier"
end
@ -52,7 +51,6 @@ feature 'Publication de démarches', js: true do
scenario 'un administrateur peut la publier' do
visit admin_procedures_archived_path
click_on procedure.libelle
find('#publish-procedure-link').click
within "#procedure_show" do
click_on "Réactiver"
end
@ -82,7 +80,6 @@ feature 'Publication de démarches', js: true do
scenario 'un administrateur peut la publier' do
visit admin_procedures_archived_path
click_on procedure.libelle
find('#publish-procedure-link').click
within "#procedure_show" do
click_on "Réactiver"
end

6
spec/features/admin/procedure_update_spec.rb
View file

@ -27,7 +27,7 @@ feature 'Administrateurs can edit procedures', js: true do
scenario 'the administrator can edit the libelle' do
visit admin_procedures_draft_path
click_on procedure.libelle
find('#presentation').click
click_on 'Description'
expect(page).to have_field('procedure_libelle', with: procedure.libelle)
@ -46,7 +46,7 @@ feature 'Administrateurs can edit procedures', js: true do
scenario 'the administrator can edit the libellé, but can‘t change the path' do
visit root_path
click_on procedure.libelle
find('#presentation').click
click_on 'Description'
expect(page).to have_field('procedure_libelle', with: procedure.libelle)
expect(page).not_to have_field('procedure_path')
@ -62,7 +62,7 @@ feature 'Administrateurs can edit procedures', js: true do
scenario 'the administrator can add another administrator' do
another_administrateur = create(:administrateur)
visit admin_procedure_path(procedure)
find('#administrateurs').click
click_on 'Administrateurs'
fill_in('administrateur_email', with: another_administrateur.email)

3
spec/features/routing/full_scenario_spec.rb
View file

@ -14,7 +14,7 @@ feature 'The routing', js: true do
login_as administrateur.user, scope: :user
visit admin_procedure_path(procedure.id)
find('#groupe-instructeurs').click
click_on "Groupe d'instructeurs"
# rename routing criteria to spécialité
fill_in 'Libellé du routage', with: 'spécialité'
@ -173,7 +173,6 @@ feature 'The routing', js: true do
def publish_procedure(procedure)
click_on procedure.libelle
find('#publish-procedure-link').click
find('#publish-procedure').click
within '#publish-modal' do
fill_in 'lien_site_web', with: 'http://some.website'

4
spec/features/users/dossier_details_spec.rb
View file

@ -19,7 +19,7 @@ describe 'Dossier details:' do
describe "the user can see the mean time they are expected to wait" do
let(:other_dossier) { create(:dossier, :accepte, :with_individual, procedure: procedure, en_construction_at: 10.days.ago, en_instruction_at: 9.days.ago, processed_at: Time.zone.now) }
context "when the dossier is in construction" do
context "when the dossier is in construction", pending: true do
it "displays the estimated wait duration" do
other_dossier
visit dossier_path(dossier)
@ -27,7 +27,7 @@ describe 'Dossier details:' do
end
end
context "when the dossier is in instruction" do
context "when the dossier is in instruction", pending: true do
let(:dossier) { create(:dossier, :en_instruction, :with_individual, :with_commentaires, user: user, procedure: procedure) }
it "displays the estimated wait duration" do

10
spec/models/procedure_spec.rb
View file

@ -981,7 +981,7 @@ describe Procedure do
context 'when there are several processed dossiers' do
let(:delays) { [1.day, 2.days, 2.days, 2.days, 2.days, 3.days, 3.days, 3.days, 3.days, 12.days] }
it 'returns a time representative of the dossier instruction delay' do
it 'returns a time representative of the dossier instruction delay', pending: true do
expect(procedure.usual_traitement_time).to be_between(3.days, 4.days)
end
end
@ -990,7 +990,7 @@ describe Procedure do
let(:delays) { [2.days, 2.days] }
let!(:old_dossier) { create_dossier(construction_date: 3.months.ago, instruction_date: 2.months.ago, processed_date: 2.months.ago) }
it 'ignores dossiers older than 1 month' do
it 'ignores dossiers older than 1 month', pending: true do
expect(procedure.usual_traitement_time).to be_within(1.hour).of(2.days)
end
end
@ -999,17 +999,17 @@ describe Procedure do
let(:delays) { [2.days, 2.days] }
let!(:bad_dossier) { create_dossier(construction_date: nil, instruction_date: nil, processed_date: 10.days.ago) }
it 'ignores bad dossiers' do
it 'ignores bad dossiers', pending: true do
expect(procedure.usual_traitement_time).to be_within(1.hour).of(2.days)
end
end
context 'when there is only one processed dossier' do
context 'when there is only one processed dossier', pending: true do
let(:delays) { [1.day] }
it { expect(procedure.usual_traitement_time).to be_within(1.hour).of(1.day) }
end
context 'where there is no processed dossier' do
context 'where there is no processed dossier', pending: true do
let(:delays) { [] }
it { expect(procedure.usual_traitement_time).to be_nil }
end