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

Merge pull request #2599 from betagouv/improve-demarches

Browse source 
Affichage du service dans la liste des démarches
This commit is contained in:
gregoirenovel 2018-09-18 10:56:22 +02:00 committed by GitHub
commit 8aab263a1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,3 +30,7 @@
background-color: $lighter-blue; background-color: $lighter-blue;
} }
} }
.service-name {
color: $grey;
}

1
app/controllers/new_user/demarches_controller.rb
View file

@ -9,6 +9,7 @@ module NewUser
.select { |p| p.publiee? } .select { |p| p.publiee? }
@popular_demarches = Procedure @popular_demarches = Procedure
.includes(:service)
.select("procedures.*, COUNT(*) AS procedures_count") .select("procedures.*, COUNT(*) AS procedures_count")
.joins(:dossiers) .joins(:dossiers)
.publiees .publiees

12
app/views/new_user/demarches/index.html.haml
View file

@ -12,14 +12,22 @@
%ul.demarche-links %ul.demarche-links
- @previous_demarches_still_active.each do |demarche| - @previous_demarches_still_active.each do |demarche|
%li %li
= link_to(demarche.libelle, commencer_url(procedure_path: demarche.path), class: "demarche-link") = link_to(commencer_url(procedure_path: demarche.path), class: "demarche-link") do
= demarche.libelle
%br
.service-name
= demarche&.service&.nom
- if @popular_demarches.present? - if @popular_demarches.present?
%h2.list-header LES PLUS POPULAIRES %h2.list-header LES PLUS POPULAIRES
%ul.demarche-links %ul.demarche-links
- @popular_demarches.each do |demarche| - @popular_demarches.each do |demarche|
%li %li
= link_to(demarche.libelle, commencer_url(procedure_path: demarche.path), class: "demarche-link") = link_to(commencer_url(procedure_path: demarche.path), class: "demarche-link") do
= demarche.libelle
%br
.service-name
= demarche&.service&.nom
%h2.list-header TOUTES LES DÉMARCHES %h2.list-header TOUTES LES DÉMARCHES
= link_to("Voir l'intégralité des démarches disponibles", LISTE_DES_DEMARCHES_URL, class: "button") = link_to("Voir l'intégralité des démarches disponibles", LISTE_DES_DEMARCHES_URL, class: "button")