amelioration(ChorusComponent): ameliore le rendu de la tuile si celle ci n'est que partiellement rempli

This commit is contained in:
Martin 2023-10-13 13:16:22 +02:00
parent 9c2e8d266c
commit 857c1f0c21
7 changed files with 51 additions and 15 deletions

View file

@ -7,7 +7,7 @@ class Procedure::Card::ChorusComponent < ApplicationComponent
@procedure.chorusable? @procedure.chorusable?
end end
def error_messages def complete?
[] @procedure.chorus_configuration.complete?
end end
end end

View file

@ -1,11 +1,7 @@
.fr-col-6.fr-col-md-4.fr-col-lg-3.chorus-component .fr-col-6.fr-col-md-4.fr-col-lg-3.chorus-component
= link_to edit_admin_procedure_chorus_path(@procedure), class: 'fr-tile fr-enlarge-link', title: 'Configurer le cadre budgetaire Chorus' do = link_to edit_admin_procedure_chorus_path(@procedure), class: 'fr-tile fr-enlarge-link', title: 'Configurer le cadre budgetaire Chorus' do
.fr-tile__body.flex.column.align-center.justify-between .fr-tile__body.flex.column.align-center.justify-between
- if error_messages.present? - if !@procedure.chorus_configuration.complete?
%div
%span.icon.refuse
%p.fr-tile-status-error À modifier
- elsif @count == 0
%div %div
%span.icon.clock %span.icon.clock
%p.fr-tile-status-todo À compléter %p.fr-tile-status-todo À compléter

View file

@ -49,4 +49,12 @@ class ChorusConfiguration
api_result = api_result.symbolize_keys api_result = api_result.symbolize_keys
"#{api_result[:label]} - #{api_result[:code]}" "#{api_result[:label]} - #{api_result[:code]}"
end end
def complete?
[
centre_de_coup,
domaine_fonctionnel,
referentiel_de_programmation
].all?(&:present?)
end
end end

View file

@ -5,7 +5,7 @@
.container .container
%h1.mb-2 %h1.fr-h1
Cadre budgétaire Cadre budgétaire
= render Procedure::ChorusFormComponent.new(procedure: @procedure) = render Procedure::ChorusFormComponent.new(procedure: @procedure)

View file

@ -57,7 +57,7 @@ describe Administrateurs::ChorusController, type: :controller do
let(:referentiel_de_programmation) { '{"code":"010101010101","label":"DOTATIONS+CARPA+AJ+ET+AUTRES+INTERVENTIONS","description":null,"code_programme":"101"}' } let(:referentiel_de_programmation) { '{"code":"010101010101","label":"DOTATIONS+CARPA+AJ+ET+AUTRES+INTERVENTIONS","description":null,"code_programme":"101"}' }
let(:chorus_configuration_params) do let(:chorus_configuration_params) do
{ {
centre_de_coup:, domaine_fonctionnel:, referentiel_de_programmation:, centre_de_coup:, domaine_fonctionnel:, referentiel_de_programmation:
} }
end end

View file

@ -422,6 +422,22 @@ FactoryBot.define do
trait :svr do trait :svr do
sva_svr { SVASVRConfiguration.new(decision: :svr).attributes } sva_svr { SVASVRConfiguration.new(decision: :svr).attributes }
end end
trait :empty_chorus do
chorus { ChorusConfiguration.new }
end
trait :partial_chorus do
chorus { ChorusConfiguration.new(centre_de_coup: { a: 1 }) }
end
trait :filled_chorus do
chorus do
ChorusConfiguration.new(centre_de_coup: { a: 1 },
domaine_fonctionnel: { b: 2 },
referentiel_de_programmation: { c: 3 })
end
end
end end
end end

View file

@ -1,19 +1,16 @@
describe ChorusConfiguration do describe ChorusConfiguration do
subject { create(:procedure) }
it { is_expected.to be_valid }
context 'empty' do context 'empty' do
subject { create(:procedure, chorus: {}) } subject { create(:procedure, :empty_chorus) }
it { is_expected.to be_valid } it { is_expected.to be_valid }
end end
context 'partially filled chorus_configuration' do context 'partially filled chorus_configuration' do
subject { create(:procedure, chorus: { 'centre_de_cout' => '1' }) } subject { create(:procedure, :partial_chorus) }
it { is_expected.to be_valid } it { is_expected.to be_valid }
end end
context 'fully filled chorus_configuration' do context 'fully filled chorus_configuration' do
subject { create(:procedure, chorus: { 'centre_de_coup' => {}, 'domaine_fonctionnel' => {}, 'referentiel_de_programmation' => {} }) } subject { create(:procedure, :filled_chorus) }
it { is_expected.to be_valid } it { is_expected.to be_valid }
end end
@ -33,4 +30,23 @@ describe ChorusConfiguration do
end.not_to raise_error end.not_to raise_error
end end
end end
describe '#complete?' do
subject { procedure.chorus_configuration.complete? }
context 'without data' do
let(:procedure) { create(:procedure, :empty_chorus) }
it { is_expected.to be_falsey }
end
context 'with partial data' do
let(:procedure) { create(:procedure, :partial_chorus) }
it { is_expected.to be_falsey }
end
context 'with all data' do
let(:procedure) { create(:procedure, :filled_chorus) }
it { is_expected.to be_truthy }
end
end
end end