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

Add feature flag OpenSimplif for comments per field

Browse source
This commit is contained in:
JC 2016-12-05 15:24:07 +01:00
parent 5556775ee9
commit 17e5800487
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/dossier_show.scss
View file

@ -99,6 +99,9 @@
.comments {
margin-right: -10px;
}
.comments-off {
margin-right: -35px;
}
.dossier-title {
font-size: 16px;
min-height: 40px;

12
app/views/backoffice/dossiers/_onglets.html.haml
View file

@ -1,23 +1,23 @@
#onglets
%ul.nav.nav-tabs
-unless Features.opensimplif
- unless Features.opensimplif
%li{ class: (@dossiers_list_facade.nouveaux_class)}
%a{:href => "#{url_for @dossiers_list_facade.nouveaux_url}", 'data-toggle' => :tooltip, title: 'Les nouveaux dossiers non ouverts.'}
%h5.text-info
= "Nouveaux "
.badge.progress-bar-info
=@dossiers_list_facade.nouveaux_total
= @dossiers_list_facade.nouveaux_total
%li{ class: (@dossiers_list_facade.suivi_class) }
%a{:href => "#{url_for @dossiers_list_facade.suivi_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui ne sont pas encore déclarés complets.'}
%h5.text-danger
="Suivis"
= "Suivis"
.badge.progress-bar-danger
=@dossiers_list_facade.suivi_total
= @dossiers_list_facade.suivi_total
%li{ class: (@dossiers_list_facade.all_state_class) }
%a{:href => "#{url_for @dossiers_list_facade.all_state_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui sont déclarés complets et donc figés.'}
%h5.text-default
="Tous"
= "Tous"
.badge.progress-bar-default
=@dossiers_list_facade.all_state_total
= @dossiers_list_facade.all_state_total

18
app/views/dossiers/_infos_dossier.html.haml
View file

@ -29,13 +29,17 @@
- else
.row
%div.col-md-6.col-lg-6.depositaire-label= champ.libelle
%div.col-md-1.col-lg-1.comments
- if gestionnaire_signed_in?
= link_to "", "data-href" => backoffice_dossier_commentaires_path(@facade.dossier, champs_id: champ.id), "data-toggle" => "modal", "data-target" => "#modalCommentairesDossierParChamp" do
%i.fa.fa-comment-o
- else
= link_to "", "data-href" => users_dossier_commentaires_path(@facade.dossier, champs_id: champ.id), "data-toggle" => "modal", "data-target" => "#modalCommentairesDossierParChamp" do
%i.fa.fa-commenting-o
- if Features.opensimplif
%div.col-md-1.col-lg-1.comments
- if gestionnaire_signed_in?
= link_to "", "data-href" => backoffice_dossier_commentaires_path(@facade.dossier, champs_id: champ.id), "data-toggle" => "modal", "data-target" => "#modalCommentairesDossierParChamp" do
%i.fa.fa-comment-o
- else
= link_to "", "data-href" => users_dossier_commentaires_path(@facade.dossier, champs_id: champ.id), "data-toggle" => "modal", "data-target" => "#modalCommentairesDossierParChamp" do
%i.fa.fa-commenting-o
- else
%div.col-md-1.col-lg-1.comments-off
= "-"
%div.col-md-5.col-lg-5.depositaire-info
- unless champ.decorate.value.blank?
= champ.decorate.value.html_safe