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

Now rework the action interface for dossiers in their show

Browse source
This commit is contained in:
JC 2016-12-06 12:49:56 +01:00
parent 30d5323d7e
commit 02f913afdf
7 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/default_data_block.scss
View file

@ -46,8 +46,13 @@
background-color: #E45B51;
text-align: center;
float: right;
color: white;
line-height: 20px;
font-size: 15px;
text-decoration: none;
color: #FFFFFF;
}
.action:hover {
color: #F2F6FA;
}
.count {
font-size: 16px;

3
app/views/backoffice/dossiers/show.html.haml
View file

@ -66,7 +66,6 @@
%div.carret-right
%div.carret-down
CONSTRUCTION DU DOSSIER
%div.col-lg-2.col-md-2.action
EDITER
= render partial: '/dossiers/actions'
%div.body
= render partial: '/dossiers/infos_dossier'

20
app/views/dossiers/_actions.html.haml Normal file
View file

@ -0,0 +1,20 @@
%div.col-lg-2.col-md-2.action
- unless @facade.dossier.read_only?
- if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
%a#maj_pj.btn.btn-success{"data-target" => "#UploadPJmodal",
"data-toggle" => "modal",
:type => "button",
style: 'margin-bottom: 15px; margin-top: -30px'}
Modifier les documents
%br
= render partial: 'users/recapitulatif/modal_upload_pj'
- if @facade.procedure.individual_with_siret
%a#add_siret.btn.btn-success{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
= "Renseigner un SIRET"
- if @facade.dossier.procedure.module_api_carto.use_api_carto
%a#maj_carte.btn.btn-primary{href: "/users/dossiers/#{@facade.dossier.id}/carte"}
= 'Modifier la carte'
%a#maj_infos.action{href: "/users/dossiers/#{@facade.dossier.id}/description"}
= 'Modifier le dossier'

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

@ -67,27 +67,6 @@
= "var dossier_id =#{@facade.dossier.id}"
initCarto();
.row{style: 'text-align:right'}
- unless @facade.dossier.read_only?
- if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
%a#maj_pj.btn.btn-success{"data-target" => "#UploadPJmodal",
"data-toggle" => "modal",
:type => "button",
style: 'margin-bottom: 15px; margin-top: -30px'}
Modifier les documents
%br
= render partial: 'users/recapitulatif/modal_upload_pj'
-if @facade.procedure.individual_with_siret
%a#add_siret.btn.btn-success{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
= "Renseigner un SIRET"
-if @facade.dossier.procedure.module_api_carto.use_api_carto
%a#maj_carte.btn.btn-primary{href: "/users/dossiers/#{@facade.dossier.id}/carte"}
= 'Modifier la carte'
%a#maj_infos.btn.btn-info{href: "/users/dossiers/#{@facade.dossier.id}/description"}
= 'Modifier le dossier'
#modalCommentairesDossierParChamp.modal.fade{"tabindex" => -1, "role" => "dialog"}
.modal-dialog{"role" => "document"}
.modal-content

2
app/views/dossiers/etapes/_etape1.html.haml
View file

@ -22,4 +22,4 @@
- unless @facade.procedure.lien_site_web.blank?
.center
%a{href: "#{@facade.procedure.lien_site_web.html_safe}", target: '_blank'}
En savoir plus ...
En savoir plus ...

2
app/views/dossiers/etapes/_etape2.html.haml
View file

@ -1,4 +1,4 @@
- if @facade.procedure.for_individual?
= render partial: 'dossiers/etapes/etape_2/individual'
- else
= render partial: 'dossiers/etapes/etape_2/entreprise'
= render partial: 'dossiers/etapes/etape_2/entreprise'

3
app/views/users/recapitulatif/show.html.haml
View file

@ -66,7 +66,6 @@
%div.carret-right
%div.carret-down
CONSTRUCTION DU DOSSIER
%div.col-lg-2.col-md-2.action
EDITER
= render partial: '/dossiers/actions'
%div.body
= render partial: '/dossiers/infos_dossier'