Merge pull request #2855 from betagouv/fix-2738
[Ref #2738] Cache les exercices à l'usager
This commit is contained in:
commit
a26db84b74
11 changed files with 22 additions and 19 deletions
|
@ -47,11 +47,7 @@
|
||||||
.row
|
.row
|
||||||
.col-xs-4.entreprise-label Exercices :
|
.col-xs-4.entreprise-label Exercices :
|
||||||
.col-xs-8.entreprise-info
|
.col-xs-8.entreprise-info
|
||||||
- @facade.etablissement.exercices.each_with_index do |exercice, index|
|
les exercices comptables des trois dernières années sont joints à votre dossier.
|
||||||
%strong
|
|
||||||
= "#{exercice.date_fin_exercice.year} : "
|
|
||||||
= number_to_currency(exercice.ca)
|
|
||||||
%br
|
|
||||||
|
|
||||||
.row.split-row
|
.row.split-row
|
||||||
.col-xs-12.split-hr
|
.col-xs-12.split-hr
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
|
|
||||||
= render partial: 'header', locals: { avis: @avis, dossier: @dossier }
|
= render partial: 'header', locals: { avis: @avis, dossier: @dossier }
|
||||||
|
|
||||||
= render partial: 'shared/dossiers/demande', locals: { dossier: @dossier, demande_seen_at: nil }
|
= render partial: 'shared/dossiers/demande', locals: { dossier: @dossier, demande_seen_at: nil, profile: 'instructeur' }
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
= render partial: "shared/dossiers/user_infos", locals: { user: @dossier.user }
|
= render partial: "shared/dossiers/user_infos", locals: { user: @dossier.user }
|
||||||
|
|
||||||
- if @dossier.etablissement.present?
|
- if @dossier.etablissement.present?
|
||||||
= render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: @dossier.etablissement }
|
= render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: @dossier.etablissement, profile: 'instructeur' }
|
||||||
|
|
||||||
- if @dossier.individual.present?
|
- if @dossier.individual.present?
|
||||||
= render partial: "shared/dossiers/identite_individual", locals: { individual: @dossier.individual }
|
= render partial: "shared/dossiers/identite_individual", locals: { individual: @dossier.individual }
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
- champs = @dossier.champs.decorate
|
- champs = @dossier.champs.decorate
|
||||||
- if champs.any?
|
- if champs.any?
|
||||||
= render partial: "shared/dossiers/champs", locals: { champs: champs, dossier: @dossier, demande_seen_at: nil }
|
= render partial: "shared/dossiers/champs", locals: { champs: champs, dossier: @dossier, demande_seen_at: nil, profile: 'instructeur' }
|
||||||
|
|
||||||
- if @dossier.procedure.use_api_carto
|
- if @dossier.procedure.use_api_carto
|
||||||
%h3 Cartographie
|
%h3 Cartographie
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
|
|
||||||
= render partial: "header", locals: { dossier: @dossier }
|
= render partial: "header", locals: { dossier: @dossier }
|
||||||
|
|
||||||
= render partial: "shared/dossiers/demande", locals: { dossier: @dossier, demande_seen_at: @demande_seen_at }
|
= render partial: "shared/dossiers/demande", locals: { dossier: @dossier, demande_seen_at: @demande_seen_at, profile: 'instructeur' }
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#dossier-show
|
#dossier-show
|
||||||
= render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
|
= render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
|
||||||
|
|
||||||
= render partial: 'shared/dossiers/demande', locals: { dossier: @dossier, demande_seen_at: nil }
|
= render partial: 'shared/dossiers/demande', locals: { dossier: @dossier, demande_seen_at: nil, profile: 'usager' }
|
||||||
|
|
||||||
.container
|
.container
|
||||||
- if !@dossier.read_only?
|
- if !@dossier.read_only?
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
%td.rich-text
|
%td.rich-text
|
||||||
%span{ class: highlight_if_unseen_class(demande_seen_at, c.updated_at) }
|
%span{ class: highlight_if_unseen_class(demande_seen_at, c.updated_at) }
|
||||||
- if c.etablissement.present?
|
- if c.etablissement.present?
|
||||||
= render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: c.etablissement }
|
= render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: c.etablissement, profile: profile }
|
||||||
- else
|
- else
|
||||||
%th.libelle
|
%th.libelle
|
||||||
= "#{c.libelle} :"
|
= "#{c.libelle} :"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
= render partial: "shared/dossiers/user_infos", locals: { user: dossier.user }
|
= render partial: "shared/dossiers/user_infos", locals: { user: dossier.user }
|
||||||
|
|
||||||
- if dossier.etablissement.present?
|
- if dossier.etablissement.present?
|
||||||
= render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: dossier.etablissement }
|
= render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: dossier.etablissement, profile: profile }
|
||||||
|
|
||||||
- if dossier.individual.present?
|
- if dossier.individual.present?
|
||||||
= render partial: "shared/dossiers/identite_individual", locals: { individual: dossier.individual }
|
= render partial: "shared/dossiers/identite_individual", locals: { individual: dossier.individual }
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
- champs = dossier.champs.includes(:type_de_champ).decorate
|
- champs = dossier.champs.includes(:type_de_champ).decorate
|
||||||
- if champs.any?
|
- if champs.any?
|
||||||
.card
|
.card
|
||||||
= render partial: "shared/dossiers/champs", locals: { champs: champs, demande_seen_at: demande_seen_at }
|
= render partial: "shared/dossiers/champs", locals: { champs: champs, demande_seen_at: demande_seen_at, profile: profile }
|
||||||
|
|
||||||
- if dossier.procedure.use_api_carto
|
- if dossier.procedure.use_api_carto
|
||||||
.tab-title Cartographie
|
.tab-title Cartographie
|
||||||
|
|
|
@ -44,10 +44,14 @@
|
||||||
%tr
|
%tr
|
||||||
%th.libelle Exercices :
|
%th.libelle Exercices :
|
||||||
%td
|
%td
|
||||||
|
- if profile == 'instructeur'
|
||||||
- etablissement.exercices.each_with_index do |exercice, index|
|
- etablissement.exercices.each_with_index do |exercice, index|
|
||||||
= "#{exercice.date_fin_exercice.year} : "
|
= "#{exercice.date_fin_exercice.year} : "
|
||||||
= pretty_currency(exercice.ca)
|
= pretty_currency(exercice.ca)
|
||||||
%br
|
%br
|
||||||
|
- elsif etablissement.exercices.present?
|
||||||
|
= t('activemodel.models.exercices_summary', count: etablissement.exercices.count)
|
||||||
|
|
||||||
- if etablissement.association?
|
- if etablissement.association?
|
||||||
%tr
|
%tr
|
||||||
%th.libelle Numéro RNA :
|
%th.libelle Numéro RNA :
|
||||||
|
|
|
@ -2,6 +2,9 @@ fr:
|
||||||
activemodel:
|
activemodel:
|
||||||
models:
|
models:
|
||||||
siret: 'SIRET'
|
siret: 'SIRET'
|
||||||
|
exercices_summary:
|
||||||
|
one: L’exercice comptable de l’année dernière a été joint à votre dossier.
|
||||||
|
other: "Les exercices comptables des %{count} dernières années ont été joints à votre dossier."
|
||||||
errors:
|
errors:
|
||||||
models:
|
models:
|
||||||
siret:
|
siret:
|
||||||
|
|
|
@ -9,7 +9,7 @@ describe 'shared/dossiers/demande.html.haml', type: :view do
|
||||||
sign_in current_gestionnaire
|
sign_in current_gestionnaire
|
||||||
end
|
end
|
||||||
|
|
||||||
subject! { render 'shared/dossiers/demande.html.haml', dossier: dossier, demande_seen_at: nil }
|
subject! { render 'shared/dossiers/demande.html.haml', dossier: dossier, demande_seen_at: nil, profile: 'usager' }
|
||||||
|
|
||||||
context 'when dossier was created by an etablissement' do
|
context 'when dossier was created by an etablissement' do
|
||||||
let(:etablissement) { create(:etablissement) }
|
let(:etablissement) { create(:etablissement) }
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
describe 'shared/dossiers/identite_entreprise.html.haml', type: :view do
|
describe 'shared/dossiers/identite_entreprise.html.haml', type: :view do
|
||||||
before { render 'shared/dossiers/identite_entreprise.html.haml', etablissement: etablissement }
|
before { render 'shared/dossiers/identite_entreprise.html.haml', etablissement: etablissement, profile: 'usager' }
|
||||||
|
|
||||||
context "there is an association" do
|
context "there is an association" do
|
||||||
let(:etablissement) { create(:etablissement, :is_association) }
|
let(:etablissement) { create(:etablissement, :is_association) }
|
||||||
|
|
Loading…
Add table
Reference in a new issue