Revert "Revert "Merge pull request #7907 from tchak/feat-cond-repetitions""
This reverts commit 0d10d36cb0
.
# Conflicts:
# app/models/dossier.rb
# app/models/dossier_preloader.rb
This commit is contained in:
parent
9b379dcabf
commit
cb5b60ccda
8 changed files with 221 additions and 140 deletions
|
@ -1,7 +1,8 @@
|
||||||
class TypesDeChampEditor::BlockComponent < ApplicationComponent
|
class TypesDeChampEditor::BlockComponent < ApplicationComponent
|
||||||
def initialize(block:, coordinates:)
|
def initialize(block:, coordinates:, upper_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: @coordinates.take(i))
|
= render TypesDeChampEditor::ChampComponent.new(coordinate: coordinate, upper_coordinates: @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? && !coordinate.child?
|
!type_de_champ.private?
|
||||||
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)
|
= render TypesDeChampEditor::BlockComponent.new(block: coordinate, coordinates: coordinate.revision_types_de_champ, upper_coordinates: @upper_coordinates)
|
||||||
= 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?
|
||||||
|
|
|
@ -56,7 +56,13 @@ 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
|
||||||
|
|
|
@ -239,7 +239,7 @@ class Champ < ApplicationRecord
|
||||||
private
|
private
|
||||||
|
|
||||||
def champs_for_condition
|
def champs_for_condition
|
||||||
private? ? dossier.champs_private : dossier.champs_public
|
dossier.champs.filter { _1.row.nil? || _1.row == row }
|
||||||
end
|
end
|
||||||
|
|
||||||
def html_id
|
def html_id
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
describe Administrateurs::ConditionsController, type: :controller do
|
describe Administrateurs::ConditionsController, type: :controller do
|
||||||
include Logic
|
include Logic
|
||||||
|
|
||||||
|
before { sign_in(procedure.administrateurs.first.user) }
|
||||||
|
|
||||||
|
context 'without bloc repetition' do
|
||||||
let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :integer_number }] * 3) }
|
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(:first_tdc) { procedure.draft_revision.types_de_champ.first }
|
||||||
let(:second_tdc) { procedure.draft_revision.types_de_champ.second }
|
let(:second_tdc) { procedure.draft_revision.types_de_champ.second }
|
||||||
let(:third_tdc) { procedure.draft_revision.types_de_champ.third }
|
let(:third_tdc) { procedure.draft_revision.types_de_champ.third }
|
||||||
|
@ -116,3 +116,44 @@ describe Administrateurs::ConditionsController, type: :controller do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'with a repetiton bloc' do
|
||||||
|
let(:procedure) do
|
||||||
|
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
|
||||||
|
{
|
||||||
|
procedure_id: procedure.id,
|
||||||
|
stable_id: child_2.stable_id
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#add_row' do
|
||||||
|
before do
|
||||||
|
post :add_row, params: default_params, format: :turbo_stream
|
||||||
|
end
|
||||||
|
|
||||||
|
it do
|
||||||
|
expect(child_2.reload.condition).to eq(empty_operator(empty, empty))
|
||||||
|
expect(assigns(:coordinate)).to eq(procedure.draft_revision.coordinate_for(child_2))
|
||||||
|
expect(assigns(:upper_tdcs)).to eq([child_1, top])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -289,52 +289,87 @@ 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
|
||||||
procedure = create(:procedure, :published, :for_individual,
|
create(:procedure, :published, :for_individual,
|
||||||
types_de_champ_public: [
|
types_de_champ_public: [
|
||||||
{ type: :integer_number, libelle: 'age' },
|
{ type: :integer_number, libelle: 'age', stable_id: },
|
||||||
{
|
{
|
||||||
type: :repetition, libelle: 'repetition', children: [
|
type: :repetition, libelle: 'repetition', condition:, 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 required conditionnal champ' do
|
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
|
let(:procedure) do
|
||||||
procedure = create(:procedure, :published, :for_individual,
|
create(:procedure, :published, :for_individual,
|
||||||
types_de_champ_public: [
|
types_de_champ_public: [
|
||||||
{ type: :integer_number, libelle: 'age' },
|
{ type: :checkbox, libelle: 'champ_a', stable_id: a_stable_id },
|
||||||
{ type: :text, libelle: 'nom', mandatory: true }
|
{
|
||||||
|
type: :repetition, libelle: 'repetition', children: [
|
||||||
|
{ type: :checkbox, libelle: 'champ_b', stable_id: b_stable_id },
|
||||||
|
{ type: :text, libelle: 'champ_c', condition: }
|
||||||
|
]
|
||||||
|
}
|
||||||
])
|
])
|
||||||
|
end
|
||||||
|
|
||||||
age, nom = procedure.draft_revision.types_de_champ.all
|
scenario 'fill a dossier', js: true do
|
||||||
nom.update(condition: greater_than_eq(champ_value(age.stable_id), constant(18)))
|
log_in(user, procedure)
|
||||||
|
|
||||||
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
|
||||||
|
let(:stable_id) { 999 }
|
||||||
|
let(:condition) { greater_than_eq(champ_value(stable_id), constant(18)) }
|
||||||
|
let(:procedure) do
|
||||||
|
create(:procedure, :published, :for_individual,
|
||||||
|
types_de_champ_public: [
|
||||||
|
{ type: :integer_number, libelle: 'age', stable_id: },
|
||||||
|
{ type: :text, libelle: 'nom', mandatory: true, condition: }
|
||||||
|
])
|
||||||
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
|
||||||
|
@ -353,23 +388,21 @@ 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
|
||||||
procedure = create(:procedure, :for_individual).tap do |p|
|
create(:procedure, :published, :for_individual,
|
||||||
p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'age')
|
types_de_champ_public: [
|
||||||
p.draft_revision.add_type_de_champ(type_champ: :yes_no, libelle: 'permis de conduire')
|
{ type: :integer_number, libelle: 'age', stable_id: age_stable_id },
|
||||||
p.draft_revision.add_type_de_champ(type_champ: :integer_number, libelle: 'tonnage')
|
{ type: :yes_no, libelle: 'permis de conduire', stable_id: permis_stable_id, condition: permis_condition },
|
||||||
p.draft_revision.add_type_de_champ(type_champ: :text, libelle: 'parking')
|
{ type: :integer_number, libelle: 'tonnage', stable_id: tonnage_stable_id, condition: tonnage_condition },
|
||||||
end
|
{ type: :text, libelle: 'parking', condition: parking_condition }
|
||||||
|
])
|
||||||
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