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

Autocomplete pour instructeurs qui veulent affecter un expert au dossier, avec tous les experts sollicités sur la démarche

Browse source
This commit is contained in:
Kara Diaby 2023-09-08 11:52:38 +00:00
parent 2f5310a470
commit 7472b17009
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/application_controller.rb
View file

@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
around_action :switch_locale around_action :switch_locale
helper_method :multiple_devise_profile_connect?, :instructeur_signed_in?, :current_instructeur, :current_expert, :expert_signed_in?, helper_method :multiple_devise_profile_connect?, :instructeur_signed_in?, :current_instructeur, :current_expert, :expert_signed_in?,
:administrateur_signed_in?, :current_administrateur, :current_account, :localization_enabled?, :set_locale :administrateur_signed_in?, :current_administrateur, :current_account, :localization_enabled?, :set_locale, :current_expert_not_instructeur?
before_action do before_action do
Current.request_id = request.uuid Current.request_id = request.uuid
@ -62,6 +62,10 @@ class ApplicationController < ActionController::Base
current_user&.expert current_user&.expert
end end
def current_expert_not_instructeur?
current_user&.expert? && !current_user&.instructeur?
end
def expert_signed_in? def expert_signed_in?
current_expert.present? current_expert.present?
end end

4
app/controllers/instructeurs/dossiers_controller.rb
View file

@ -73,6 +73,8 @@ module Instructeurs
@avis = Avis.new @avis = Avis.new
if @dossier.procedure.experts_require_administrateur_invitation? if @dossier.procedure.experts_require_administrateur_invitation?
@experts_emails = dossier.procedure.experts_procedures.where(revoked_at: nil).map(&:expert).map(&:email).sort @experts_emails = dossier.procedure.experts_procedures.where(revoked_at: nil).map(&:expert).map(&:email).sort
else
@experts_emails = @dossier.procedure.experts.map(&:email).sort
end end
end end
@ -81,6 +83,8 @@ module Instructeurs
@avis = Avis.new @avis = Avis.new
if @dossier.procedure.experts_require_administrateur_invitation? if @dossier.procedure.experts_require_administrateur_invitation?
@experts_emails = dossier.procedure.experts_procedures.where(revoked_at: nil).map(&:expert).map(&:email).sort @experts_emails = dossier.procedure.experts_procedures.where(revoked_at: nil).map(&:expert).map(&:email).sort
else
@experts_emails = @dossier.procedure.experts.map(&:email).sort
end end
end end

2
app/views/shared/avis/_form.html.haml
View file

@ -13,7 +13,7 @@
= hidden_field_tag 'avis[emails]', nil = hidden_field_tag 'avis[emails]', nil
.fr-input-group .fr-input-group
= react_component("ComboMultiple", = react_component("ComboMultiple",
options: @dossier.procedure.experts_require_administrateur_invitation ? @experts_emails : [], options: current_expert_not_instructeur? ? [] : @experts_emails,
selected: [], disabled: [], selected: [], disabled: [],
label: 'Emails', label: 'Emails',
group: '.ask-avis', group: '.ask-avis',