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

final optims after sim review

Browse source
This commit is contained in:
kara Diaby 2020-12-07 15:10:26 +01:00 • committed by simon lehericey
parent f3c4040d2d
commit c7643154d1
12 changed files with 106 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/controllers/users/dossiers_controller.rb
View file

@ -18,8 +18,8 @@ module Users
def index
@user_dossiers = current_user.dossiers.includes(:procedure).order_by_updated_at.page(page)
@dossiers_invites = current_user.dossiers_invites.includes(:procedure).order_by_updated_at.page(page)
@dossiers_supprimes = DeletedDossier.where(user_id: current_user.id).order_by_updated_at.page(page)
@statut = statut(@user_dossiers.count, @dossiers_invites.count, @dossiers_supprimes.count)
@dossiers_supprimes = current_user.deleted_dossiers.order_by_updated_at.page(page)
@statut = statut(@user_dossiers, @dossiers_invites, @dossiers_supprimes, params[:statut])
end
def show
@ -275,15 +275,22 @@ module Users
private
def statut(mes_dossiers_count, dossiers_invites_count, dossiers_supprimes_count)
if dossiers_invites_count == 0 && dossiers_supprimes_count == 0
'mes-dossiers'
elsif mes_dossiers_count == 0 && dossiers_invites_count > 0
'dossiers-invites'
elsif dossiers_invites_count == 0 && mes_dossiers_count == 0 && dossiers_supprimes_count > 0
'dossiers-supprimes'
# if the status tab is filled, then this tab
# else first filled tab
# else mes-dossiers
def statut(mes_dossiers, dossiers_invites, dossiers_supprimes, params_statut)
tabs = {
'mes-dossiers' => mes_dossiers.present?,
'dossiers-invites' => dossiers_invites.present?,
'dossiers-supprimes' => dossiers_supprimes.present?
}
if tabs[params_statut]
params_statut
else
@statut = params[:statut].presence || 'mes-dossiers'
tabs
.filter { |_tab, filled| filled }
.map { |tab, _| tab }
.first || 'mes-dossiers'
end
end