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

Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop

Browse source 
Conflicts:
	app/views/dossiers/_infos_dossier.html.haml
This commit is contained in:
Tanguy PATTE 2015-09-22 15:02:04 +02:00
commit d034176fe3
24 changed files with 143 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,21 +24,14 @@
%p
= @dossier.date_fr
.col-lg-6.col-md-6
%br
%h4 Contact
%a{ href: "mailto:#{@dossier.mail_contact}" }
= @dossier.mail_contact
/ -if !request.url.include?('admin')
.col-lg-6.col-md-6
%br
%br
%a#modif_carte{href: "/dossiers/#{@dossier.id}/carte?back_url=recapitulatif"} Modifier la localisation
%br
%a#modif_description{href: "/dossiers/#{@dossier.id}/description?back_url=recapitulatif"} Modifier la description
.col-md-6
= pie_chart({"Montant à charge #{(100 - @dossier.montant_aide_demande.to_f/@dossier.montant_projet.to_f*100).round(2)}%" => (@dossier.montant_projet.to_f - @dossier.montant_aide_demande.to_f), "Montant souhaité #{(@dossier.montant_aide_demande.to_f/@dossier.montant_projet.to_f*100).round(2)}%" => @dossier.montant_aide_demande})