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

style checkbox for notification as regular checkbox instead of switch button

Browse source
This commit is contained in:
Lisa Durand 2023-09-05 17:49:55 +02:00
parent 387c89f23c
commit 5fe5320127
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,10 +15,6 @@ class Dossiers::NotifiedToggleComponent < ApplicationComponent
sorted_by_notifications? && order_desc? sorted_by_notifications? && order_desc?
end end
def icon_class_name
active? ? 'fr-fi-checkbox' : 'fr-fi-checkbox-blank'
end
def order_desc? def order_desc?
current_order == 'desc' current_order == 'desc'
end end

9
app/components/dossiers/notified_toggle_component/notified_toggle_component.html.haml
View file

@ -1,5 +1,6 @@
= form_tag update_sort_instructeur_procedure_path(procedure_id: @procedure.id, table: 'notifications', column: 'notifications', order: opposite_order), method: :get, data: { controller: 'autosubmit' } do = form_tag update_sort_instructeur_procedure_path(procedure_id: @procedure.id, table: 'notifications', column: 'notifications', order: opposite_order), method: :get, data: { controller: 'autosubmit' } do
.fr-toggle .fr-fieldset__element.fr-m-0
= check_box_tag :order, opposite_order, active?, class: 'fr-toggle__input' .fr-checkbox-group.fr-checkbox-group--sm
= label_tag :order, t('.show_notified_first'), class: 'fr-toggle__label' = check_box_tag :order, opposite_order, active?
= submit_tag t('.show_notified_first'), data: {"checkbox-target": 'submit' }, class: 'visually-hidden' = label_tag :order, t('.show_notified_first'), class: 'fr-label'
= submit_tag t('.show_notified_first'), data: {"checkbox-target": 'submit' }, class: 'visually-hidden'

2
app/views/instructeurs/procedures/_dossiers_filter_tags.html.haml
View file

@ -7,5 +7,5 @@
- if i > 0 - if i > 0
= " ou " = " ou "
= link_to remove_filter_instructeur_procedure_path(procedure, { statut: statut, field: "#{filter['table']}/#{filter['column']}", value: filter['value'] }), = link_to remove_filter_instructeur_procedure_path(procedure, { statut: statut, field: "#{filter['table']}/#{filter['column']}", value: filter['value'] }),
class: "fr-tag fr-tag--dismiss fr-mb-1w", aria: { label: "Retirer le filtre #{filter['column']}" } do class: "fr-tag fr-tag--dismiss fr-my-1w", aria: { label: "Retirer le filtre #{filter['column']}" } do
= "#{filter['label'].truncate(50)} : #{procedure_presentation.human_value_for_filter(filter)}" = "#{filter['label'].truncate(50)} : #{procedure_presentation.human_value_for_filter(filter)}"

2
app/views/instructeurs/procedures/show.html.haml
View file

@ -179,7 +179,7 @@
%span.cell-link %span.cell-link
= link_to_if p.hidden_by_administration_at.blank?, render(Instructeurs::SVASVRDecisionBadgeComponent.new(projection_or_dossier: p, procedure: @procedure)), path = link_to_if p.hidden_by_administration_at.blank?, render(Instructeurs::SVASVRDecisionBadgeComponent.new(projection_or_dossier: p, procedure: @procedure)), path
%td.follow-col{colspan:'2'} %td.follow-col{ colspan:'2' }
%ul.inline.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline.fr-btns-group--icon-right %ul.inline.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline.fr-btns-group--icon-right
= render partial: 'instructeurs/procedures/dossier_actions', locals: { procedure_id: @procedure.id, = render partial: 'instructeurs/procedures/dossier_actions', locals: { procedure_id: @procedure.id,
dossier_id: p.dossier_id, dossier_id: p.dossier_id,