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

Merge pull request #9201 from demarches-simplifiees/user-dashboard/add-filter-a-corriger

Browse source 
[refonte usager] Tableau de bord - remonter les dossiers à corriger
This commit is contained in:
Colin Darie 2023-06-19 19:21:32 +00:00 • committed by GitHub
commit acc6456b08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 81 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/components/dossiers/user_filter_component.rb
View file

@ -15,9 +15,9 @@ class Dossiers::UserFilterComponent < ApplicationComponent
def states_collection(statut)
case statut
when 'en-cours'
Dossier.states.values - Dossier::TERMINE
(Dossier.states.values - Dossier::TERMINE) << Dossier::A_CORRIGER
when 'traites'
Dossier::TERMINE
end
end.map { |state| [t("activerecord.attributes.dossier/state.#{state}"), state] }
end
end

8
app/components/dossiers/user_filter_component/user_filter_component.en.yml
View file

@ -1,8 +1,8 @@
en:
legend:
states: States
created_at: Creation date
depose_at: Submission date
state: States
created_at: Creation date since
depose_at: Submission date since
button:
apply_filters: Apply filters
reset_filters: Reset filters
@ -14,3 +14,5 @@ en:
active_filters_link_title:
one: Remove the active filter
other: "Remove the %{count} active filters"
states:
prompt: Select a state

8
app/components/dossiers/user_filter_component/user_filter_component.fr.yml
View file

@ -1,8 +1,8 @@
fr:
legend:
states: États
created_at: Date de création
depose_at: Date de dépôt
state: Statut
created_at: Date de création depuis le
depose_at: Date de dépôt depuis le
button:
apply_filters: Appliquer les filtres
reset_filters: Réinitialiser les filtres
@ -14,3 +14,5 @@ fr:
active_filters_link_title:
one: Retirer le filtre actif
other: "Retirer les %{count} filtres actifs"
states:
prompt: Sélectionner un statut

12
app/components/dossiers/user_filter_component/user_filter_component.html.haml
View file

@ -9,15 +9,9 @@
= form_with(url: dossiers_path(), method: :get ) do |f|
= f.hidden_field :statut, value: @statut
%fieldset#checkboxes.fr-fieldset{ "aria-labelledby" => "checkboxes-legend" }
%legend#checkboxes-legend.fr-fieldset__legend--regular.fr-fieldset__legend
= t('.legend.states')
= f.collection_check_boxes :states, states_collection(@statut), :to_s, :to_s, include_hidden: false do |b|
.fr-fieldset__element
.fr-checkbox-group.fr-ml-2w.fr-py-1w
= b.check_box(checked: filter.states_filtered?(b.value))
= b.label(class: 'fr-label') { dossier_display_state(b.text) }
.fr-input-group
= f.label :state, t('.legend.state'), class: 'fr-label'
= f.select :state, options_for_select(states_collection(@statut), params[:state]), {prompt: t('.states.prompt')}, {class: 'fr-select'}
.fr-input-group
= f.label 'from_created_at_date', t('.legend.created_at'), class: 'fr-label'