use common layout for all procedures and admins
This commit is contained in:
Christophe Robillard
parent
5f5b6bf7c7
commit
3a15178cee
4 changed files with 163 additions and 223 deletions
|
|
@ -1,5 +1,7 @@
|
||||||
module Administrateurs
|
module Administrateurs
|
||||||
class ProceduresController < AdministrateurController
|
class ProceduresController < AdministrateurController
|
||||||
|
layout 'all', only: [:all, :administrateurs]
|
||||||
|
|
||||||
before_action :retrieve_procedure, only: [:champs, :annotations, :modifications, :edit, :zones, :monavis, :update_monavis, :jeton, :update_jeton, :publication, :publish, :transfert, :close, :allow_expert_review, :experts_require_administrateur_invitation, :reset_draft]
|
before_action :retrieve_procedure, only: [:champs, :annotations, :modifications, :edit, :zones, :monavis, :update_monavis, :jeton, :update_jeton, :publication, :publish, :transfert, :close, :allow_expert_review, :experts_require_administrateur_invitation, :reset_draft]
|
||||||
before_action :procedure_revisable?, only: [:champs, :annotations, :modifications, :reset_draft]
|
before_action :procedure_revisable?, only: [:champs, :annotations, :modifications, :reset_draft]
|
||||||
before_action :draft_valid?, only: [:apercu]
|
before_action :draft_valid?, only: [:apercu]
|
||||||
|
|
|
||||||
|
|
@ -1,69 +1,4 @@
|
||||||
= render 'main_menu'
|
- content_for :results do
|
||||||
.fr-container
|
|
||||||
%h1.fr-my-4w Toutes les démarches
|
|
||||||
|
|
||||||
.fr-container--fluid
|
|
||||||
.fr-grid-row.fr-grid-row--gutters
|
|
||||||
.fr-col-8
|
|
||||||
.fr-highlight.fr-mb-4w
|
|
||||||
%p Ce tableau de bord permet de consulter les informations sur les démarches simplifiées pour toutes les zones. Filtrez par zone et statut. Consultez la liste des démarches et cliquez sur une démarche pour voir la zone et quels sont les administrateurs.
|
|
||||||
|
|
||||||
.fr-container--fluid{ 'data-turbo': 'true', 'data-controller': 'autosubmit' }
|
|
||||||
.fr-grid-row.fr-grid-row--gutters
|
|
||||||
.fr-col-3
|
|
||||||
= form_with(url: all_admin_procedures_path, method: :get, html: {'data-autosubmit-target': 'form'}) do |f|
|
|
||||||
|
|
||||||
%fieldset.sidebar-filter
|
|
||||||
%legend
|
|
||||||
.title.font-weight-bold.fr-pl-2w
|
|
||||||
%span.fr-icon-filter-fill.fr-icon--sm.fr-mr-1w{ 'aria-hidden': 'true' }
|
|
||||||
Filtrer
|
|
||||||
.reinit
|
|
||||||
= link_to all_admin_procedures_path(zone_ids: current_administrateur.zones) do
|
|
||||||
%span.fr-icon-arrow-go-back-line Réinitialiser
|
|
||||||
%ul
|
|
||||||
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w
|
|
||||||
%button{ 'data-action': 'expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Mes zones
|
|
||||||
.fr-ml-1w{ 'data-expand-target': 'content' }
|
|
||||||
= f.collection_check_boxes :zone_ids, @filter.admin_zones, :id, :current_label, include_hidden: false do |b|
|
|
||||||
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
|
||||||
= b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
|
||||||
= b.label(class: 'fr-label') { b.text }
|
|
||||||
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w
|
|
||||||
%button{ 'data-action': 'expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Autres zones
|
|
||||||
.fr-ml-1w.hidden{ 'data-expand-target': 'content' }
|
|
||||||
= f.collection_check_boxes :zone_ids, @filter.other_zones, :id, :current_label, include_hidden: false do |b|
|
|
||||||
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
|
||||||
= b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
|
||||||
= b.label(class: 'fr-label') { b.text }
|
|
||||||
%li.fr-py-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w.fr-pl-2w
|
|
||||||
%button{ 'data-action': 'click->expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Date de publication
|
|
||||||
.fr-input-group.hidden{ 'data-expand-target': 'content' }
|
|
||||||
= f.label 'from_publication_date', 'Depuis', class: 'fr-label'
|
|
||||||
.fr-input-wrap.fr-fi-calendar-line
|
|
||||||
= f.date_field 'from_publication_date', value: @filter.from_publication_date, class: 'fr-input', 'data-action': 'blur->autosubmit#submit change->autosubmit#debouncedSubmit'
|
|
||||||
|
|
||||||
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w
|
|
||||||
%button{ 'data-action': 'expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Statut
|
|
||||||
.fr-ml-1w.hidden{ 'data-expand-target': 'content' }
|
|
||||||
= f.collection_check_boxes :statuses, ['publiee', 'close'], :to_s, :to_s, include_hidden: false do |b|
|
|
||||||
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
|
||||||
= b.check_box(checked: @filter.status_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
|
||||||
= b.label(class: 'fr-label') { t b.text, scope: 'activerecord.attributes.procedure.aasm_state' }
|
|
||||||
|
|
||||||
.fr-col-9
|
|
||||||
.main-filter-header.fr-my-3w
|
.main-filter-header.fr-my-3w
|
||||||
.search
|
.search
|
||||||
= link_to 'Voir la liste des démarches', all_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary btn-admins'
|
= link_to 'Voir la liste des démarches', all_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary btn-admins'
|
||||||
|
|
|
||||||
|
|
@ -1,69 +1,4 @@
|
||||||
= render 'main_menu'
|
- content_for :results do
|
||||||
.fr-container
|
|
||||||
%h1.fr-my-4w Toutes les démarches
|
|
||||||
|
|
||||||
.fr-container--fluid
|
|
||||||
.fr-grid-row.fr-grid-row--gutters
|
|
||||||
.fr-col-8
|
|
||||||
.fr-highlight.fr-mb-4w
|
|
||||||
%p Ce tableau de bord permet de consulter les informations sur les démarches simplifiées pour toutes les zones. Filtrez par zone et statut. Consultez la liste des démarches et cliquez sur une démarche pour voir la zone et quels sont les administrateurs.
|
|
||||||
|
|
||||||
.fr-container--fluid{ 'data-turbo': 'true', 'data-controller': 'autosubmit' }
|
|
||||||
.fr-grid-row.fr-grid-row--gutters
|
|
||||||
.fr-col-3
|
|
||||||
= form_with(url: all_admin_procedures_path, method: :get, html: {'data-autosubmit-target': 'form'}) do |f|
|
|
||||||
|
|
||||||
%fieldset.sidebar-filter
|
|
||||||
%legend
|
|
||||||
.title.font-weight-bold.fr-pl-2w
|
|
||||||
%span.fr-icon-filter-fill.fr-icon--sm.fr-mr-1w{ 'aria-hidden': 'true' }
|
|
||||||
Filtrer
|
|
||||||
.reinit
|
|
||||||
= link_to all_admin_procedures_path(zone_ids: current_administrateur.zones) do
|
|
||||||
%span.fr-icon-arrow-go-back-line Réinitialiser
|
|
||||||
%ul
|
|
||||||
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w
|
|
||||||
%button{ 'data-action': 'expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Mes zones
|
|
||||||
.fr-ml-1w{ 'data-expand-target': 'content' }
|
|
||||||
= f.collection_check_boxes :zone_ids, @filter.admin_zones, :id, :current_label, include_hidden: false do |b|
|
|
||||||
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
|
||||||
= b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
|
||||||
= b.label(class: 'fr-label') { b.text }
|
|
||||||
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w
|
|
||||||
%button{ 'data-action': 'expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Autres zones
|
|
||||||
.fr-ml-1w.hidden{ 'data-expand-target': 'content' }
|
|
||||||
= f.collection_check_boxes :zone_ids, @filter.other_zones, :id, :current_label, include_hidden: false do |b|
|
|
||||||
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
|
||||||
= b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
|
||||||
= b.label(class: 'fr-label') { b.text }
|
|
||||||
%li.fr-py-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w.fr-pl-2w
|
|
||||||
%button{ 'data-action': 'click->expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Date de publication
|
|
||||||
.fr-input-group.hidden{ 'data-expand-target': 'content' }
|
|
||||||
= f.label 'from_publication_date', 'Depuis', class: 'fr-label'
|
|
||||||
.fr-input-wrap.fr-fi-calendar-line
|
|
||||||
= f.date_field 'from_publication_date', value: @filter.from_publication_date, class: 'fr-input', 'data-action': 'blur->autosubmit#submit change->autosubmit#debouncedSubmit'
|
|
||||||
|
|
||||||
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
|
||||||
.fr-mb-1w
|
|
||||||
%button{ 'data-action': 'expand#toggle' }
|
|
||||||
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
|
||||||
Statut
|
|
||||||
.fr-ml-1w.hidden{ 'data-expand-target': 'content' }
|
|
||||||
= f.collection_check_boxes :statuses, ['publiee', 'close'], :to_s, :to_s, include_hidden: false do |b|
|
|
||||||
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
|
||||||
= b.check_box(checked: @filter.status_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
|
||||||
= b.label(class: 'fr-label') { t b.text, scope: 'activerecord.attributes.procedure.aasm_state' }
|
|
||||||
|
|
||||||
.fr-col-9
|
|
||||||
.main-filter-header.fr-my-3w
|
.main-filter-header.fr-my-3w
|
||||||
.search
|
.search
|
||||||
= link_to 'Voir la liste des administrateurs', administrateurs_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary btn-admins'
|
= link_to 'Voir la liste des administrateurs', administrateurs_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary btn-admins'
|
||||||
|
|
|
||||||
68
app/views/layouts/all.html.haml
Normal file
68
app/views/layouts/all.html.haml
Normal file
|
|
@ -0,0 +1,68 @@
|
||||||
|
= render 'main_menu'
|
||||||
|
.fr-container
|
||||||
|
%h1.fr-my-4w Toutes les démarches
|
||||||
|
|
||||||
|
.fr-container--fluid
|
||||||
|
.fr-grid-row.fr-grid-row--gutters
|
||||||
|
.fr-col-8
|
||||||
|
.fr-highlight.fr-mb-4w
|
||||||
|
%p Ce tableau de bord permet de consulter les informations sur les démarches simplifiées pour toutes les zones. Filtrez par zone et statut. Consultez la liste des démarches et cliquez sur une démarche pour voir la zone et quels sont les administrateurs.
|
||||||
|
|
||||||
|
.fr-container--fluid{ 'data-turbo': 'true', 'data-controller': 'autosubmit' }
|
||||||
|
.fr-grid-row.fr-grid-row--gutters
|
||||||
|
.fr-col-3
|
||||||
|
= form_with(url: all_admin_procedures_path, method: :get, html: {'data-autosubmit-target': 'form'}) do |f|
|
||||||
|
|
||||||
|
%fieldset.sidebar-filter
|
||||||
|
%legend
|
||||||
|
.title.font-weight-bold.fr-pl-2w
|
||||||
|
%span.fr-icon-filter-fill.fr-icon--sm.fr-mr-1w{ 'aria-hidden': 'true' }
|
||||||
|
Filtrer
|
||||||
|
.reinit
|
||||||
|
= link_to all_admin_procedures_path(zone_ids: current_administrateur.zones) do
|
||||||
|
%span.fr-icon-arrow-go-back-line Réinitialiser
|
||||||
|
%ul
|
||||||
|
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
||||||
|
.fr-mb-1w
|
||||||
|
%button{ 'data-action': 'expand#toggle' }
|
||||||
|
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
||||||
|
Mes zones
|
||||||
|
.fr-ml-1w{ 'data-expand-target': 'content' }
|
||||||
|
= f.collection_check_boxes :zone_ids, @filter.admin_zones, :id, :current_label, include_hidden: false do |b|
|
||||||
|
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
||||||
|
= b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
||||||
|
= b.label(class: 'fr-label') { b.text }
|
||||||
|
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
||||||
|
.fr-mb-1w
|
||||||
|
%button{ 'data-action': 'expand#toggle' }
|
||||||
|
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
||||||
|
Autres zones
|
||||||
|
.fr-ml-1w.hidden{ 'data-expand-target': 'content' }
|
||||||
|
= f.collection_check_boxes :zone_ids, @filter.other_zones, :id, :current_label, include_hidden: false do |b|
|
||||||
|
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
||||||
|
= b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
||||||
|
= b.label(class: 'fr-label') { b.text }
|
||||||
|
%li.fr-py-2w{ 'data-controller': "expand" }
|
||||||
|
.fr-mb-1w.fr-pl-2w
|
||||||
|
%button{ 'data-action': 'click->expand#toggle' }
|
||||||
|
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
||||||
|
Date de publication
|
||||||
|
.fr-input-group.hidden{ 'data-expand-target': 'content' }
|
||||||
|
= f.label 'from_publication_date', 'Depuis', class: 'fr-label'
|
||||||
|
.fr-input-wrap.fr-fi-calendar-line
|
||||||
|
= f.date_field 'from_publication_date', value: @filter.from_publication_date, class: 'fr-input', 'data-action': 'blur->autosubmit#submit change->autosubmit#debouncedSubmit'
|
||||||
|
|
||||||
|
%li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
|
||||||
|
.fr-mb-1w
|
||||||
|
%button{ 'data-action': 'expand#toggle' }
|
||||||
|
%span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' }
|
||||||
|
Statut
|
||||||
|
.fr-ml-1w.hidden{ 'data-expand-target': 'content' }
|
||||||
|
= f.collection_check_boxes :statuses, ['publiee', 'close'], :to_s, :to_s, include_hidden: false do |b|
|
||||||
|
.fr-checkbox-group.fr-ml-2w.fr-py-1w
|
||||||
|
= b.check_box(checked: @filter.status_filtered?(b.value), 'data-action': 'autosubmit#submit')
|
||||||
|
= b.label(class: 'fr-label') { t b.text, scope: 'activerecord.attributes.procedure.aasm_state' }
|
||||||
|
|
||||||
|
.fr-col-9
|
||||||
|
= yield(:results)
|
||||||
|
= render template: 'layouts/application'
|
||||||
Loading…
Add table
Reference in a new issue