Merge branch 'main' into pj-en-construction-replace
This commit is contained in:
commit
3a9a71079a
36 changed files with 233 additions and 321 deletions
|
@ -395,7 +395,7 @@ GEM
|
||||||
railties (>= 4)
|
railties (>= 4)
|
||||||
request_store (~> 1.0)
|
request_store (~> 1.0)
|
||||||
logstash-event (1.2.02)
|
logstash-event (1.2.02)
|
||||||
loofah (2.19.0)
|
loofah (2.19.1)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.7.1)
|
mail (2.7.1)
|
||||||
|
@ -536,8 +536,8 @@ GEM
|
||||||
activesupport (>= 4.2)
|
activesupport (>= 4.2)
|
||||||
choice (~> 0.2.0)
|
choice (~> 0.2.0)
|
||||||
ruby-graphviz (~> 1.2)
|
ruby-graphviz (~> 1.2)
|
||||||
rails-html-sanitizer (1.4.3)
|
rails-html-sanitizer (1.4.4)
|
||||||
loofah (~> 2.3)
|
loofah (~> 2.19, >= 2.19.1)
|
||||||
rails-i18n (7.0.3)
|
rails-i18n (7.0.3)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
railties (>= 6.0.0, < 8)
|
railties (>= 6.0.0, < 8)
|
||||||
|
|
|
@ -23,7 +23,7 @@ class EditableChamp::EditableChampComponent < ApplicationComponent
|
||||||
"hidden": !@champ.visible?
|
"hidden": !@champ.visible?
|
||||||
),
|
),
|
||||||
id: @champ.input_group_id,
|
id: @champ.input_group_id,
|
||||||
data: { controller: stimulus_controller, block: @champ.block? }
|
data: { controller: stimulus_controller }
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -9,5 +9,5 @@
|
||||||
- if @champ.type_champ == "titre_identite"
|
- if @champ.type_champ == "titre_identite"
|
||||||
%p.notice Carte nationale d’identité (uniquement le recto), passeport, titre de séjour ou autre justificatif d’identité.
|
%p.notice Carte nationale d’identité (uniquement le recto), passeport, titre de séjour ou autre justificatif d’identité.
|
||||||
|
|
||||||
= @form.hidden_field :id, value: @champ.id, data: @champ.block? ? { id: true } : {}
|
= @form.hidden_field :id, value: @champ.id
|
||||||
= render component_class.new(form: @form, champ: @champ, seen_at: @seen_at)
|
= render component_class.new(form: @form, champ: @champ, seen_at: @seen_at)
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
class TypesDeChampEditor::BlockComponent < ApplicationComponent
|
class TypesDeChampEditor::BlockComponent < ApplicationComponent
|
||||||
def initialize(block:, coordinates:, upper_coordinates: [])
|
def initialize(block:, coordinates:)
|
||||||
@block = block
|
@block = block
|
||||||
@coordinates = coordinates
|
@coordinates = coordinates
|
||||||
@upper_coordinates = upper_coordinates
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
%ul.types-de-champ-block{ id: block_id, data: sortable_options }
|
%ul.types-de-champ-block{ id: block_id, data: sortable_options }
|
||||||
- @coordinates.each.with_index do |coordinate, i|
|
- @coordinates.each.with_index do |coordinate, i|
|
||||||
= render TypesDeChampEditor::ChampComponent.new(coordinate: coordinate, upper_coordinates: @upper_coordinates + @coordinates.take(i))
|
= render TypesDeChampEditor::ChampComponent.new(coordinate: coordinate, upper_coordinates: @coordinates.take(i))
|
||||||
|
|
|
@ -118,6 +118,6 @@ class TypesDeChampEditor::ChampComponent < ApplicationComponent
|
||||||
end
|
end
|
||||||
|
|
||||||
def conditional_enabled?
|
def conditional_enabled?
|
||||||
!type_de_champ.private?
|
!type_de_champ.private? && !coordinate.child?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -87,7 +87,7 @@
|
||||||
- if type_de_champ.block?
|
- if type_de_champ.block?
|
||||||
.flex.justify-start.section.ml-1
|
.flex.justify-start.section.ml-1
|
||||||
.editor-block.flex-grow.cell
|
.editor-block.flex-grow.cell
|
||||||
= render TypesDeChampEditor::BlockComponent.new(block: coordinate, coordinates: coordinate.revision_types_de_champ, upper_coordinates: @upper_coordinates)
|
= render TypesDeChampEditor::BlockComponent.new(block: coordinate, coordinates: coordinate.revision_types_de_champ)
|
||||||
= render TypesDeChampEditor::AddChampButtonComponent.new(revision: coordinate.revision, parent: coordinate, is_annotation: coordinate.private?)
|
= render TypesDeChampEditor::AddChampButtonComponent.new(revision: coordinate.revision, parent: coordinate, is_annotation: coordinate.private?)
|
||||||
|
|
||||||
- if conditional_enabled?
|
- if conditional_enabled?
|
||||||
|
|
|
@ -55,13 +55,7 @@ module Administrateurs
|
||||||
def retrieve_coordinate_and_uppers
|
def retrieve_coordinate_and_uppers
|
||||||
@tdc = draft_revision.find_and_ensure_exclusive_use(params[:stable_id])
|
@tdc = draft_revision.find_and_ensure_exclusive_use(params[:stable_id])
|
||||||
@coordinate = draft_revision.coordinate_for(@tdc)
|
@coordinate = draft_revision.coordinate_for(@tdc)
|
||||||
|
@upper_tdcs = @coordinate.upper_siblings.map(&:type_de_champ)
|
||||||
upper_coordinates = @coordinate.upper_siblings
|
|
||||||
if @coordinate.child?
|
|
||||||
upper_coordinates += @coordinate.parent.upper_siblings
|
|
||||||
end
|
|
||||||
|
|
||||||
@upper_tdcs = upper_coordinates.map(&:type_de_champ)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def draft_revision
|
def draft_revision
|
||||||
|
|
|
@ -212,7 +212,7 @@ module Instructeurs
|
||||||
|
|
||||||
def update_annotations
|
def update_annotations
|
||||||
dossier_with_champs.assign_attributes(champs_private_params)
|
dossier_with_champs.assign_attributes(champs_private_params)
|
||||||
if dossier.champs_private.any?(&:changed?)
|
if dossier.champs_private_all.any?(&:changed?)
|
||||||
dossier.last_champ_private_updated_at = Time.zone.now
|
dossier.last_champ_private_updated_at = Time.zone.now
|
||||||
end
|
end
|
||||||
dossier.save
|
dossier.save
|
||||||
|
@ -286,10 +286,12 @@ module Instructeurs
|
||||||
end
|
end
|
||||||
|
|
||||||
def champs_private_params
|
def champs_private_params
|
||||||
params.require(:dossier).permit(champs_private_attributes: [
|
champs_params = params.require(:dossier).permit(champs_private_attributes: [
|
||||||
:id, :primary_value, :secondary_value, :piece_justificative_file, :value_other, :external_id, :numero_allocataire, :code_postal, :departement, :code_departement, :value, value: [],
|
:id, :primary_value, :secondary_value, :piece_justificative_file, :value_other, :external_id, :numero_allocataire, :code_postal, :departement, :code_departement, :value, value: [],
|
||||||
champs_attributes: [:id, :_destroy, :value, :primary_value, :secondary_value, :piece_justificative_file, :value_other, :external_id, :numero_allocataire, :code_postal, :departement, :code_departement, value: []]
|
champs_attributes: [:id, :_destroy, :value, :primary_value, :secondary_value, :piece_justificative_file, :value_other, :external_id, :numero_allocataire, :code_postal, :departement, :code_departement, value: []]
|
||||||
])
|
])
|
||||||
|
champs_params[:champs_private_all_attributes] = champs_params.delete(:champs_private_attributes) || {}
|
||||||
|
champs_params
|
||||||
end
|
end
|
||||||
|
|
||||||
def mark_demande_as_read
|
def mark_demande_as_read
|
||||||
|
|
|
@ -391,14 +391,13 @@ module Users
|
||||||
[params[:page].to_i, 1].max
|
[params[:page].to_i, 1].max
|
||||||
end
|
end
|
||||||
|
|
||||||
# FIXME: require(:dossier) when all the champs are united
|
def champs_public_params
|
||||||
def champs_params
|
champs_params = params.require(:dossier).permit(champs_public_attributes: [
|
||||||
params.permit(dossier: {
|
:id, :value, :value_other, :external_id, :primary_value, :secondary_value, :numero_allocataire, :code_postal, :identifiant, :numero_fiscal, :reference_avis, :ine, :piece_justificative_file, :departement, :code_departement, value: [],
|
||||||
champs_public_attributes: [
|
champs_attributes: [:id, :_destroy, :value, :value_other, :external_id, :primary_value, :secondary_value, :numero_allocataire, :code_postal, :identifiant, :numero_fiscal, :reference_avis, :ine, :piece_justificative_file, :departement, :code_departement, value: []]
|
||||||
:id, :value, :value_other, :external_id, :primary_value, :secondary_value, :numero_allocataire, :code_postal, :identifiant, :numero_fiscal, :reference_avis, :ine, :piece_justificative_file, :departement, :code_departement, value: [],
|
])
|
||||||
champs_attributes: [:id, :_destroy, :value, :value_other, :external_id, :primary_value, :secondary_value, :numero_allocataire, :code_postal, :identifiant, :numero_fiscal, :reference_avis, :ine, :piece_justificative_file, :departement, :code_departement, value: []]
|
champs_params[:champs_public_all_attributes] = champs_params.delete(:champs_public_attributes) || {}
|
||||||
]
|
champs_params
|
||||||
})
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def dossier_scope
|
def dossier_scope
|
||||||
|
@ -454,23 +453,16 @@ module Users
|
||||||
def update_dossier_and_compute_errors
|
def update_dossier_and_compute_errors
|
||||||
errors = []
|
errors = []
|
||||||
|
|
||||||
if champs_params[:dossier]
|
@dossier.assign_attributes(champs_public_params)
|
||||||
@dossier.assign_attributes(champs_params[:dossier])
|
if @dossier.champs_public_all.any?(&:changed_for_autosave?)
|
||||||
# FIXME: in some cases a removed repetition bloc row is submitted.
|
@dossier.last_champ_updated_at = Time.zone.now
|
||||||
# In this case it will be treated as a new record, and the action will fail.
|
end
|
||||||
@dossier.champs_public.filter(&:block?).each do |champ|
|
if !@dossier.save(**validation_options)
|
||||||
champ.champs = champ.champs.filter(&:persisted?)
|
errors += @dossier.errors.full_messages
|
||||||
end
|
end
|
||||||
if @dossier.champs_public.any?(&:changed_for_autosave?)
|
|
||||||
@dossier.last_champ_updated_at = Time.zone.now
|
|
||||||
end
|
|
||||||
if !@dossier.save(**validation_options)
|
|
||||||
errors += @dossier.errors.full_messages
|
|
||||||
end
|
|
||||||
|
|
||||||
if should_change_groupe_instructeur?
|
if should_change_groupe_instructeur?
|
||||||
@dossier.assign_to_groupe_instructeur(groupe_instructeur_from_params)
|
@dossier.assign_to_groupe_instructeur(groupe_instructeur_from_params)
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if dossier.en_construction?
|
if dossier.en_construction?
|
||||||
|
|
|
@ -66,4 +66,20 @@ module ProcedureHelper
|
||||||
minutes = (seconds / 60.0).round
|
minutes = (seconds / 60.0).round
|
||||||
[1, minutes].max
|
[1, minutes].max
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def admin_procedures_back_path(procedure)
|
||||||
|
statut = if procedure.discarded?
|
||||||
|
'supprimees'
|
||||||
|
else
|
||||||
|
case procedure.aasm_state
|
||||||
|
when 'brouillon'
|
||||||
|
'brouillons'
|
||||||
|
when 'close', 'depubliee'
|
||||||
|
'archivees'
|
||||||
|
else
|
||||||
|
'publiees'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
admin_procedures_path(statut:)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -201,19 +201,10 @@ export class AutosaveController extends ApplicationController {
|
||||||
private get inputs() {
|
private get inputs() {
|
||||||
const element = this.element as HTMLElement;
|
const element = this.element as HTMLElement;
|
||||||
|
|
||||||
const inputs = [
|
return [
|
||||||
...element.querySelectorAll<HTMLInputElement>(
|
...element.querySelectorAll<HTMLInputElement>(
|
||||||
'input:not([type=file]), textarea, select'
|
'input:not([type=file]), textarea, select'
|
||||||
)
|
)
|
||||||
].filter((element) => !element.disabled);
|
].filter((element) => !element.disabled);
|
||||||
|
|
||||||
const parent = this.element.closest('[data-block]');
|
|
||||||
if (parent) {
|
|
||||||
return [
|
|
||||||
...inputs,
|
|
||||||
...parent.querySelectorAll<HTMLInputElement>('input[data-id]')
|
|
||||||
];
|
|
||||||
}
|
|
||||||
return inputs;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,10 +40,10 @@ class BatchOperation < ApplicationRecord
|
||||||
}
|
}
|
||||||
|
|
||||||
def dossiers_safe_scope(dossier_ids = self.dossier_ids)
|
def dossiers_safe_scope(dossier_ids = self.dossier_ids)
|
||||||
query = Dossier.joins(:procedure)
|
query = instructeur
|
||||||
.where(procedure: { id: instructeur.procedures.ids })
|
.dossiers
|
||||||
.where(id: dossier_ids)
|
|
||||||
.visible_by_administration
|
.visible_by_administration
|
||||||
|
.where(id: dossier_ids)
|
||||||
case operation
|
case operation
|
||||||
when BatchOperation.operations.fetch(:archiver) then
|
when BatchOperation.operations.fetch(:archiver) then
|
||||||
query.not_archived.state_termine
|
query.not_archived.state_termine
|
||||||
|
|
|
@ -178,10 +178,10 @@ class Champ < ApplicationRecord
|
||||||
# attributes. So instead of the field index, this method uses the champ id; which gives us an independent and
|
# attributes. So instead of the field index, this method uses the champ id; which gives us an independent and
|
||||||
# predictable input name.
|
# predictable input name.
|
||||||
def input_name
|
def input_name
|
||||||
if parent_id
|
if private?
|
||||||
"#{parent.input_name}[champs_attributes][#{id}]"
|
"dossier[champs_private_attributes][#{id}]"
|
||||||
else
|
else
|
||||||
"dossier[#{champs_attributes_accessor}][#{id}]"
|
"dossier[champs_public_attributes][#{id}]"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -239,21 +239,13 @@ class Champ < ApplicationRecord
|
||||||
private
|
private
|
||||||
|
|
||||||
def champs_for_condition
|
def champs_for_condition
|
||||||
dossier.champs.filter { _1.row.nil? || _1.row == row }
|
private? ? dossier.champs_private : dossier.champs_public
|
||||||
end
|
end
|
||||||
|
|
||||||
def html_id
|
def html_id
|
||||||
"#{stable_id}-#{id}"
|
"#{stable_id}-#{id}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def champs_attributes_accessor
|
|
||||||
if private?
|
|
||||||
"champs_private_attributes"
|
|
||||||
else
|
|
||||||
"champs_public_attributes"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def needs_dossier_id?
|
def needs_dossier_id?
|
||||||
!dossier_id && parent_id
|
!dossier_id && parent_id
|
||||||
end
|
end
|
||||||
|
|
|
@ -83,7 +83,9 @@ class Dossier < ApplicationRecord
|
||||||
has_many :champs_public, -> { root.public_ordered }, class_name: 'Champ', inverse_of: false, dependent: :destroy
|
has_many :champs_public, -> { root.public_ordered }, class_name: 'Champ', inverse_of: false, dependent: :destroy
|
||||||
has_many :champs_private, -> { root.private_ordered }, class_name: 'Champ', inverse_of: false, dependent: :destroy
|
has_many :champs_private, -> { root.private_ordered }, class_name: 'Champ', inverse_of: false, dependent: :destroy
|
||||||
has_many :champs_public_all, -> { public_only }, class_name: 'Champ', inverse_of: false
|
has_many :champs_public_all, -> { public_only }, class_name: 'Champ', inverse_of: false
|
||||||
has_many :prefilled_champs_public, -> { root.public_only.prefilled }, class_name: 'Champ', inverse_of: false, dependent: :destroy
|
has_many :champs_private_all, -> { private_only }, class_name: 'Champ', inverse_of: false
|
||||||
|
has_many :prefilled_champs_public, -> { root.public_only.prefilled }, class_name: 'Champ', inverse_of: false
|
||||||
|
|
||||||
has_many :commentaires, inverse_of: :dossier, dependent: :destroy
|
has_many :commentaires, inverse_of: :dossier, dependent: :destroy
|
||||||
has_many :invites, dependent: :destroy
|
has_many :invites, dependent: :destroy
|
||||||
has_many :follows, -> { active }, inverse_of: :dossier
|
has_many :follows, -> { active }, inverse_of: :dossier
|
||||||
|
@ -153,6 +155,8 @@ class Dossier < ApplicationRecord
|
||||||
|
|
||||||
accepts_nested_attributes_for :champs_public
|
accepts_nested_attributes_for :champs_public
|
||||||
accepts_nested_attributes_for :champs_private
|
accepts_nested_attributes_for :champs_private
|
||||||
|
accepts_nested_attributes_for :champs_public_all
|
||||||
|
accepts_nested_attributes_for :champs_private_all
|
||||||
|
|
||||||
include AASM
|
include AASM
|
||||||
|
|
||||||
|
|
|
@ -79,6 +79,8 @@ class DossierPreloader
|
||||||
champs_public, champs_private = champs.partition(&:public?)
|
champs_public, champs_private = champs.partition(&:public?)
|
||||||
|
|
||||||
dossier.association(:champs).target = []
|
dossier.association(:champs).target = []
|
||||||
|
dossier.association(:champs_public_all).target = []
|
||||||
|
dossier.association(:champs_private_all).target = []
|
||||||
load_champs(dossier, :champs_public, champs_public, dossier, children_by_parent)
|
load_champs(dossier, :champs_public, champs_public, dossier, children_by_parent)
|
||||||
load_champs(dossier, :champs_private, champs_private, dossier, children_by_parent)
|
load_champs(dossier, :champs_private, champs_private, dossier, children_by_parent)
|
||||||
|
|
||||||
|
@ -91,6 +93,8 @@ class DossierPreloader
|
||||||
end
|
end
|
||||||
|
|
||||||
def load_champs(parent, name, champs, dossier, children_by_parent)
|
def load_champs(parent, name, champs, dossier, children_by_parent)
|
||||||
|
return if champs.empty?
|
||||||
|
|
||||||
champs.each do |champ|
|
champs.each do |champ|
|
||||||
champ.association(:dossier).target = dossier
|
champ.association(:dossier).target = dossier
|
||||||
|
|
||||||
|
@ -98,8 +102,15 @@ class DossierPreloader
|
||||||
champ.association(:parent).target = parent
|
champ.association(:parent).target = parent
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
dossier.association(:champs).target += champs
|
dossier.association(:champs).target += champs
|
||||||
|
|
||||||
|
if champs.first.public?
|
||||||
|
dossier.association(:champs_public_all).target += champs
|
||||||
|
else
|
||||||
|
dossier.association(:champs_private_all).target += champs
|
||||||
|
end
|
||||||
|
|
||||||
parent.association(name).target = champs.sort_by do |champ|
|
parent.association(name).target = champs.sort_by do |champ|
|
||||||
[champ.row, positions[dossier.revision_id][champ.type_de_champ_id]]
|
[champ.row, positions[dossier.revision_id][champ.type_de_champ_id]]
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Configuration des annotations privées']], preview: true }
|
['Configuration des annotations privées']], preview: true }
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Configuration des champs']], preview: @procedure.draft_revision.valid? }
|
['Configuration des champs']], preview: @procedure.draft_revision.valid? }
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
["#{@procedure.libelle.truncate_words(10)} - archiver"]],
|
["#{@procedure.libelle.truncate_words(10)} - archiver"]],
|
||||||
metadatas: true }
|
metadatas: true }
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- content_for(:root_class, 'scroll-margins-for-sticky-footer')
|
- content_for(:root_class, 'scroll-margins-for-sticky-footer')
|
||||||
|
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Description']] }
|
['Description']] }
|
||||||
.procedure-form
|
.procedure-form
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Jeton']] }
|
['Jeton']] }
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Modifications']] }
|
['Modifications']] }
|
||||||
.container
|
.container
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['MonAvis']] }
|
['MonAvis']] }
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- content_for(:root_class, 'scroll-margins-for-sticky-footer')
|
- content_for(:root_class, 'scroll-margins-for-sticky-footer')
|
||||||
|
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
['Nouvelle']] }
|
['Nouvelle']] }
|
||||||
|
|
||||||
.procedure-form
|
.procedure-form
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Publication']] }
|
['Publication']] }
|
||||||
.container
|
.container
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
["#{@procedure.libelle.truncate_words(10)}"]],
|
["#{@procedure.libelle.truncate_words(10)}"]],
|
||||||
metadatas: true }
|
metadatas: true }
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Transfert']] }
|
['Transfert']] }
|
||||||
.container
|
.container
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- content_for(:root_class, 'scroll-margins-for-sticky-footer')
|
- content_for(:root_class, 'scroll-margins-for-sticky-footer')
|
||||||
|
|
||||||
= render partial: 'administrateurs/breadcrumbs',
|
= render partial: 'administrateurs/breadcrumbs',
|
||||||
locals: { steps: [['Démarches', admin_procedures_path],
|
locals: { steps: [['Démarches', admin_procedures_back_path(@procedure)],
|
||||||
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
[@procedure.libelle.truncate_words(10), admin_procedure_path(@procedure)],
|
||||||
['Description']] }
|
['Description']] }
|
||||||
.container
|
.container
|
||||||
|
|
|
@ -220,7 +220,7 @@ ActiveRecord::Schema.define(version: 2022_12_05_144624) do
|
||||||
t.string "external_id"
|
t.string "external_id"
|
||||||
t.string "fetch_external_data_exceptions", array: true
|
t.string "fetch_external_data_exceptions", array: true
|
||||||
t.bigint "parent_id"
|
t.bigint "parent_id"
|
||||||
t.boolean "prefilled", default: false
|
t.boolean "prefilled"
|
||||||
t.boolean "private", default: false, null: false
|
t.boolean "private", default: false, null: false
|
||||||
t.datetime "rebased_at"
|
t.datetime "rebased_at"
|
||||||
t.integer "row"
|
t.integer "row"
|
||||||
|
|
|
@ -1,159 +1,118 @@
|
||||||
describe Administrateurs::ConditionsController, type: :controller do
|
describe Administrateurs::ConditionsController, type: :controller do
|
||||||
include Logic
|
include Logic
|
||||||
|
|
||||||
|
let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :integer_number }] * 3) }
|
||||||
|
let(:first_coordinate) { procedure.draft_revision.revision_types_de_champ.first }
|
||||||
|
let(:second_coordinate) { procedure.draft_revision.revision_types_de_champ.first }
|
||||||
|
let(:third_coordinate) { procedure.draft_revision.revision_types_de_champ.first }
|
||||||
|
let(:first_tdc) { procedure.draft_revision.types_de_champ.first }
|
||||||
|
let(:second_tdc) { procedure.draft_revision.types_de_champ.second }
|
||||||
|
let(:third_tdc) { procedure.draft_revision.types_de_champ.third }
|
||||||
|
|
||||||
before { sign_in(procedure.administrateurs.first.user) }
|
before { sign_in(procedure.administrateurs.first.user) }
|
||||||
|
|
||||||
context 'without bloc repetition' do
|
let(:default_params) do
|
||||||
let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :integer_number }] * 3) }
|
{
|
||||||
let(:first_tdc) { procedure.draft_revision.types_de_champ.first }
|
procedure_id: procedure.id,
|
||||||
let(:second_tdc) { procedure.draft_revision.types_de_champ.second }
|
stable_id: third_tdc.stable_id
|
||||||
let(:third_tdc) { procedure.draft_revision.types_de_champ.third }
|
}
|
||||||
|
end
|
||||||
|
|
||||||
before { sign_in(procedure.administrateurs.first.user) }
|
describe '#update' do
|
||||||
|
before { post :update, params: params, format: :turbo_stream }
|
||||||
|
|
||||||
let(:default_params) do
|
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||||
|
|
||||||
|
let(:condition_form) do
|
||||||
{
|
{
|
||||||
procedure_id: procedure.id,
|
rows: [
|
||||||
stable_id: third_tdc.stable_id
|
{
|
||||||
|
targeted_champ: champ_value(first_tdc.stable_id).to_json,
|
||||||
|
operator_name: Logic::Eq.name,
|
||||||
|
value: '2'
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#update' do
|
it do
|
||||||
before { post :update, params: params, format: :turbo_stream }
|
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(first_tdc.stable_id), constant(2)))
|
||||||
|
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||||
|
|
||||||
let(:condition_form) do
|
|
||||||
{
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
targeted_champ: champ_value(first_tdc.stable_id).to_json,
|
|
||||||
operator_name: Logic::Eq.name,
|
|
||||||
value: '2'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it do
|
|
||||||
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(first_tdc.stable_id), constant(2)))
|
|
||||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
|
||||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#add_row' do
|
|
||||||
before { post :add_row, params: default_params, format: :turbo_stream }
|
|
||||||
|
|
||||||
it do
|
|
||||||
expect(third_tdc.reload.condition).to eq(empty_operator(empty, empty))
|
|
||||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
|
||||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#delete_row' do
|
|
||||||
before { delete :delete_row, params: params.merge(row_index: 0), format: :turbo_stream }
|
|
||||||
|
|
||||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
|
||||||
|
|
||||||
let(:condition_form) do
|
|
||||||
{
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
targeted_champ: champ_value(1).to_json,
|
|
||||||
operator_name: Logic::Eq.name,
|
|
||||||
value: '2'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it do
|
|
||||||
expect(third_tdc.reload.condition).to eq(nil)
|
|
||||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
|
||||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#destroy' do
|
|
||||||
before do
|
|
||||||
second_tdc.update(condition: empty_operator(empty, empty))
|
|
||||||
delete :destroy, params: default_params, format: :turbo_stream
|
|
||||||
end
|
|
||||||
|
|
||||||
it do
|
|
||||||
expect(third_tdc.reload.condition).to eq(nil)
|
|
||||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
|
||||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '#change_targeted_champ' do
|
|
||||||
before do
|
|
||||||
second_tdc.update(condition: empty_operator(empty, empty))
|
|
||||||
patch :change_targeted_champ, params: params, format: :turbo_stream
|
|
||||||
end
|
|
||||||
|
|
||||||
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
|
||||||
|
|
||||||
let(:condition_form) do
|
|
||||||
{
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
targeted_champ: champ_value(second_tdc.stable_id).to_json,
|
|
||||||
operator_name: Logic::EmptyOperator.name,
|
|
||||||
value: empty.to_json
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it do
|
|
||||||
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(second_tdc.stable_id), constant(0)))
|
|
||||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
|
||||||
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with a repetiton bloc' do
|
describe '#add_row' do
|
||||||
let(:procedure) do
|
before { post :add_row, params: default_params, format: :turbo_stream }
|
||||||
create(:procedure, types_de_champ_public: [
|
|
||||||
{ type: :integer_number, libelle: 'top_1' },
|
|
||||||
{
|
|
||||||
type: :repetition,
|
|
||||||
libelle: 'repetition',
|
|
||||||
children: [
|
|
||||||
{ type: :integer_number, libelle: 'child_1' },
|
|
||||||
{ type: :integer_number, libelle: 'child_2' }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
])
|
|
||||||
end
|
|
||||||
let(:tdcs) { procedure.draft_revision.types_de_champ }
|
|
||||||
let(:top) { tdcs.find_by(libelle: 'top_1') }
|
|
||||||
let(:repetition) { tdcs.find_by(libelle: 'repetition') }
|
|
||||||
let(:child_1) { tdcs.find_by(libelle: 'child_1') }
|
|
||||||
let(:child_2) { tdcs.find_by(libelle: 'child_2') }
|
|
||||||
|
|
||||||
let(:default_params) do
|
it do
|
||||||
|
expect(third_tdc.reload.condition).to eq(empty_operator(empty, empty))
|
||||||
|
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||||
|
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#delete_row' do
|
||||||
|
before { delete :delete_row, params: params.merge(row_index: 0), format: :turbo_stream }
|
||||||
|
|
||||||
|
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||||
|
|
||||||
|
let(:condition_form) do
|
||||||
{
|
{
|
||||||
procedure_id: procedure.id,
|
rows: [
|
||||||
stable_id: child_2.stable_id
|
{
|
||||||
|
targeted_champ: champ_value(1).to_json,
|
||||||
|
operator_name: Logic::Eq.name,
|
||||||
|
value: '2'
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#add_row' do
|
it do
|
||||||
before do
|
expect(third_tdc.reload.condition).to eq(nil)
|
||||||
post :add_row, params: default_params, format: :turbo_stream
|
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||||
end
|
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
it do
|
describe '#destroy' do
|
||||||
expect(child_2.reload.condition).to eq(empty_operator(empty, empty))
|
before do
|
||||||
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(child_2))
|
second_tdc.update(condition: empty_operator(empty, empty))
|
||||||
expect(assigns(:upper_tdcs)).to eq([child_1, top])
|
delete :destroy, params: default_params, format: :turbo_stream
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it do
|
||||||
|
expect(third_tdc.reload.condition).to eq(nil)
|
||||||
|
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||||
|
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#change_targeted_champ' do
|
||||||
|
before do
|
||||||
|
second_tdc.update(condition: empty_operator(empty, empty))
|
||||||
|
patch :change_targeted_champ, params: params, format: :turbo_stream
|
||||||
|
end
|
||||||
|
|
||||||
|
let(:params) { default_params.merge(type_de_champ: { condition_form: condition_form }) }
|
||||||
|
|
||||||
|
let(:condition_form) do
|
||||||
|
{
|
||||||
|
rows: [
|
||||||
|
{
|
||||||
|
targeted_champ: champ_value(second_tdc.stable_id).to_json,
|
||||||
|
operator_name: Logic::EmptyOperator.name,
|
||||||
|
value: empty.to_json
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
it do
|
||||||
|
expect(third_tdc.reload.condition).to eq(ds_eq(champ_value(second_tdc.stable_id), constant(0)))
|
||||||
|
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(third_tdc))
|
||||||
|
expect(assigns(:upper_tdcs)).to eq([first_tdc, second_tdc])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -793,11 +793,8 @@ describe Instructeurs::DossiersController, type: :controller do
|
||||||
secondary_value: 'secondary'
|
secondary_value: 'secondary'
|
||||||
},
|
},
|
||||||
'3': {
|
'3': {
|
||||||
id: champ_repetition.id,
|
id: champ_repetition.champs.first.id,
|
||||||
champs_attributes: {
|
value: 'text'
|
||||||
id: champ_repetition.champs.first.id,
|
|
||||||
value: 'text'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -494,7 +494,7 @@ describe Users::DossiersController, type: :controller do
|
||||||
{
|
{
|
||||||
id: dossier.id,
|
id: dossier.id,
|
||||||
dossier: {
|
dossier: {
|
||||||
champs_public_attributes: {}
|
champs_public_attributes: [{ value: '' }]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -506,16 +506,6 @@ describe Users::DossiersController, type: :controller do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when dossier has no champ' do
|
|
||||||
let(:submit_payload) { { id: dossier.id } }
|
|
||||||
|
|
||||||
it 'does not raise any errors' do
|
|
||||||
subject
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when the user has an invitation but is not the owner' do
|
context 'when the user has an invitation but is not the owner' do
|
||||||
let(:dossier) { create(:dossier) }
|
let(:dossier) { create(:dossier) }
|
||||||
let!(:invite) { create(:invite, dossier: dossier, user: user) }
|
let!(:invite) { create(:invite, dossier: dossier, user: user) }
|
||||||
|
@ -664,16 +654,6 @@ describe Users::DossiersController, type: :controller do
|
||||||
it { expect(flash.alert).to eq(['Le champ l doit être rempli.']) }
|
it { expect(flash.alert).to eq(['Le champ l doit être rempli.']) }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when dossier has no champ' do
|
|
||||||
let(:submit_payload) { { id: dossier.id } }
|
|
||||||
|
|
||||||
it 'does not raise any errors' do
|
|
||||||
subject
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when the user has an invitation but is not the owner' do
|
context 'when the user has an invitation but is not the owner' do
|
||||||
let(:dossier) { create(:dossier, :en_construction) }
|
let(:dossier) { create(:dossier, :en_construction) }
|
||||||
let!(:invite) { create(:invite, dossier: dossier, user: user) }
|
let!(:invite) { create(:invite, dossier: dossier, user: user) }
|
||||||
|
|
|
@ -599,12 +599,12 @@ describe Champ do
|
||||||
|
|
||||||
context "when has parent" do
|
context "when has parent" do
|
||||||
let(:champ) { create(:champ_text, parent: create(:champ_text)) }
|
let(:champ) { create(:champ_text, parent: create(:champ_text)) }
|
||||||
it { expect(champ.input_name).to eq "dossier[champs_public_attributes][#{champ.parent_id}][champs_attributes][#{champ.id}]" }
|
it { expect(champ.input_name).to eq "dossier[champs_public_attributes][#{champ.id}]" }
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when has private parent" do
|
context "when has private parent" do
|
||||||
let(:champ) { create(:champ_text, private: true, parent: create(:champ_text, private: true)) }
|
let(:champ) { create(:champ_text, private: true, parent: create(:champ_text, private: true)) }
|
||||||
it { expect(champ.input_name).to eq "dossier[champs_private_attributes][#{champ.parent_id}][champs_attributes][#{champ.id}]" }
|
it { expect(champ.input_name).to eq "dossier[champs_private_attributes][#{champ.id}]" }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -50,7 +50,7 @@ RSpec.describe DossierPrefillableConcern do
|
||||||
end
|
end
|
||||||
|
|
||||||
it "still marks it as prefilled" do
|
it "still marks it as prefilled" do
|
||||||
expect { fill }.to change { dossier.champs_public.first.prefilled }.from(false).to(true)
|
expect { fill }.to change { dossier.champs_public.first.prefilled }.from(nil).to(true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -26,8 +26,16 @@ describe DossierPreloader do
|
||||||
|
|
||||||
expect(first_child.type).to eq('Champs::TextChamp')
|
expect(first_child.type).to eq('Champs::TextChamp')
|
||||||
expect(repetition.id).not_to eq(first_child.id)
|
expect(repetition.id).not_to eq(first_child.id)
|
||||||
|
expect(subject.champs.first.dossier).to eq(subject)
|
||||||
|
expect(subject.champs_public_all.first.dossier).to eq(subject)
|
||||||
expect(subject.champs_public.first.dossier).to eq(subject)
|
expect(subject.champs_public.first.dossier).to eq(subject)
|
||||||
|
|
||||||
expect(subject.champs_public.first.type_de_champ.piece_justificative_template.attached?).to eq(false)
|
expect(subject.champs_public.first.type_de_champ.piece_justificative_template.attached?).to eq(false)
|
||||||
|
|
||||||
|
expect(subject.champs.first.conditional?).to eq(false)
|
||||||
|
expect(subject.champs_public_all.first.conditional?).to eq(false)
|
||||||
|
expect(subject.champs_public.first.conditional?).to eq(false)
|
||||||
|
|
||||||
expect(first_child.parent).to eq(repetition)
|
expect(first_child.parent).to eq(repetition)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -289,87 +289,52 @@ describe 'The user' do
|
||||||
include Logic
|
include Logic
|
||||||
|
|
||||||
context 'with a repetition' do
|
context 'with a repetition' do
|
||||||
let(:stable_id) { 999 }
|
|
||||||
let(:condition) { greater_than_eq(champ_value(stable_id), constant(18)) }
|
|
||||||
let(:procedure) do
|
let(:procedure) do
|
||||||
create(:procedure, :published, :for_individual,
|
procedure = create(:procedure, :published, :for_individual,
|
||||||
types_de_champ_public: [
|
types_de_champ_public: [
|
||||||
{ type: :integer_number, libelle: 'age', stable_id: },
|
{ type: :integer_number, libelle: 'age' },
|
||||||
{
|
{
|
||||||
type: :repetition, libelle: 'repetition', condition:, children: [
|
type: :repetition, libelle: 'repetition', children: [
|
||||||
{ type: :text, libelle: 'nom', mandatory: true }
|
{ type: :text, libelle: 'nom', mandatory: true }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
])
|
])
|
||||||
|
|
||||||
|
age = procedure.published_revision.types_de_champ.where(libelle: 'age').first
|
||||||
|
repetition = procedure.published_revision.types_de_champ.repetition.first
|
||||||
|
repetition.update(condition: greater_than_eq(champ_value(age.stable_id), constant(18)))
|
||||||
|
|
||||||
|
procedure
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'submit a dossier with an hidden mandatory champ within a repetition', js: true do
|
scenario 'submit a dossier with an hidden mandatory champ within a repetition', js: true do
|
||||||
log_in(user, procedure)
|
log_in(user, procedure)
|
||||||
|
|
||||||
fill_individual
|
fill_individual
|
||||||
|
|
||||||
fill_in('age', with: 10)
|
fill_in('age', with: 10)
|
||||||
click_on 'Déposer le dossier'
|
click_on 'Déposer le dossier'
|
||||||
expect(page).to have_current_path(merci_dossier_path(user_dossier))
|
expect(page).to have_current_path(merci_dossier_path(user_dossier))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with a condition inside repetition' do
|
|
||||||
let(:a_stable_id) { 999 }
|
|
||||||
let(:b_stable_id) { 9999 }
|
|
||||||
let(:a_condition) { ds_eq(champ_value(a_stable_id), constant(true)) }
|
|
||||||
let(:b_condition) { ds_eq(champ_value(b_stable_id), constant(true)) }
|
|
||||||
let(:condition) { ds_or([a_condition, b_condition]) }
|
|
||||||
let(:procedure) do
|
|
||||||
create(:procedure, :published, :for_individual,
|
|
||||||
types_de_champ_public: [
|
|
||||||
{ type: :checkbox, libelle: 'champ_a', stable_id: a_stable_id },
|
|
||||||
{
|
|
||||||
type: :repetition, libelle: 'repetition', children: [
|
|
||||||
{ type: :checkbox, libelle: 'champ_b', stable_id: b_stable_id },
|
|
||||||
{ type: :text, libelle: 'champ_c', condition: }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
])
|
|
||||||
end
|
|
||||||
|
|
||||||
scenario 'fill a dossier', js: true do
|
|
||||||
log_in(user, procedure)
|
|
||||||
|
|
||||||
fill_individual
|
|
||||||
|
|
||||||
expect(page).to have_no_css('label', text: 'champ_c', visible: true)
|
|
||||||
check('champ_a')
|
|
||||||
wait_for_autosave
|
|
||||||
|
|
||||||
expect(page).to have_css('label', text: 'champ_c', visible: true)
|
|
||||||
uncheck('champ_a')
|
|
||||||
wait_for_autosave
|
|
||||||
|
|
||||||
expect(page).to have_no_css('label', text: 'champ_c', visible: true)
|
|
||||||
check('champ_b')
|
|
||||||
wait_for_autosave
|
|
||||||
|
|
||||||
expect(page).to have_css('label', text: 'champ_c', visible: true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'with a required conditionnal champ' do
|
context 'with a required conditionnal champ' do
|
||||||
let(:stable_id) { 999 }
|
|
||||||
let(:condition) { greater_than_eq(champ_value(stable_id), constant(18)) }
|
|
||||||
let(:procedure) do
|
let(:procedure) do
|
||||||
create(:procedure, :published, :for_individual,
|
procedure = create(:procedure, :published, :for_individual,
|
||||||
types_de_champ_public: [
|
types_de_champ_public: [
|
||||||
{ type: :integer_number, libelle: 'age', stable_id: },
|
{ type: :integer_number, libelle: 'age' },
|
||||||
{ type: :text, libelle: 'nom', mandatory: true, condition: }
|
{ type: :text, libelle: 'nom', mandatory: true }
|
||||||
])
|
])
|
||||||
|
|
||||||
|
age, nom = procedure.draft_revision.types_de_champ.all
|
||||||
|
nom.update(condition: greater_than_eq(champ_value(age.stable_id), constant(18)))
|
||||||
|
|
||||||
|
procedure
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'submit a dossier with an hidden mandatory champ ', js: true do
|
scenario 'submit a dossier with an hidden mandatory champ ', js: true do
|
||||||
log_in(user, procedure)
|
log_in(user, procedure)
|
||||||
|
|
||||||
fill_individual
|
fill_individual
|
||||||
|
|
||||||
click_on 'Déposer le dossier'
|
click_on 'Déposer le dossier'
|
||||||
expect(page).to have_current_path(merci_dossier_path(user_dossier))
|
expect(page).to have_current_path(merci_dossier_path(user_dossier))
|
||||||
end
|
end
|
||||||
|
@ -388,21 +353,23 @@ describe 'The user' do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with a visibilite in cascade' do
|
context 'with a visibilite in cascade' do
|
||||||
let(:age_stable_id) { 999 }
|
|
||||||
let(:permis_stable_id) { 9999 }
|
|
||||||
let(:tonnage_stable_id) { 99999 }
|
|
||||||
let(:permis_condition) { greater_than_eq(champ_value(age_stable_id), constant(18)) }
|
|
||||||
let(:tonnage_condition) { ds_eq(champ_value(permis_stable_id), constant(true)) }
|
|
||||||
let(:parking_condition) { less_than_eq(champ_value(tonnage_stable_id), constant(20)) }
|
|
||||||
|
|
||||||
let(:procedure) do
|
let(:procedure) do
|
||||||
create(:procedure, :published, :for_individual,
|
procedure = create(:procedure, :for_individual).tap do |p|
|
||||||
types_de_champ_public: [
|
p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'age')
|
||||||
{ type: :integer_number, libelle: 'age', stable_id: age_stable_id },
|
p.draft_revision.add_type_de_champ(type_champ: :yes_no, libelle: 'permis de conduire')
|
||||||
{ type: :yes_no, libelle: 'permis de conduire', stable_id: permis_stable_id, condition: permis_condition },
|
p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'tonnage')
|
||||||
{ type: :integer_number, libelle: 'tonnage', stable_id: tonnage_stable_id, condition: tonnage_condition },
|
p.draft_revision.add_type_de_champ(type_champ: :text, libelle: 'parking')
|
||||||
{ type: :text, libelle: 'parking', condition: parking_condition }
|
end
|
||||||
])
|
|
||||||
|
age, permis, tonnage, parking = procedure.draft_revision.types_de_champ.all
|
||||||
|
|
||||||
|
permis.update(condition: greater_than_eq(champ_value(age.stable_id), constant(18)))
|
||||||
|
tonnage.update(condition: ds_eq(champ_value(permis.stable_id), constant(true)))
|
||||||
|
parking.update(condition: less_than_eq(champ_value(tonnage.stable_id), constant(20)))
|
||||||
|
|
||||||
|
procedure.publish!
|
||||||
|
|
||||||
|
procedure
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'fill a dossier', js: true do
|
scenario 'fill a dossier', js: true do
|
||||||
|
|
Loading…
Reference in a new issue