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

Merge branch 'develop' into remove_cerfa_text

Browse source
This commit is contained in:
Mathieu Magnin 2017-02-14 17:59:41 +01:00 committed by GitHub
commit c0ae500aa3
46 changed files with 207 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.byebug_history
View file

@ -1,4 +0,0 @@
exit
xit
xtei
cniuecniu

3
Gemfile
View file

@ -119,11 +119,8 @@ end
group :development do group :development do
# Access an IRB console on exception pages or by using <%= console %> in views # Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console' gem 'web-console'
gem 'rack-handlers' gem 'rack-handlers'
gem 'xray-rails' gem 'xray-rails'
end end

2
app/assets/javascripts/bootstrap_wysihtml5.js vendored
View file

@ -3,6 +3,6 @@ $(document).on('page:load', wysihtml5_active);
function wysihtml5_active (){ function wysihtml5_active (){
$('.wysihtml5').each(function(i, elem) { $('.wysihtml5').each(function(i, elem) {
$(elem).wysihtml5({ toolbar:{ "fa": true, "link": false, "color": true }, "locale": "fr-FR" }); $(elem).wysihtml5({ toolbar:{ "fa": true, "link": false, "color": false }, "locale": "fr-FR" });
}); });
} }

8
app/assets/javascripts/description.js
View file

@ -18,14 +18,6 @@ function action_type_de_champs() {
toggleErrorClass(this, validatePhone(val)); toggleErrorClass(this, validatePhone(val));
}); });
$("#liste_champs input").on('focus', function () {
$("#description_" + this.id).slideDown();
});
$("#liste_champs input").on('blur', function () {
$("#description_" + this.id).slideUp();
});
address_type_init(); address_type_init();
} }

1
app/assets/stylesheets/_variables.scss Normal file
View file

@ -0,0 +1 @@
$font-size-base: 16px;

5
app/assets/stylesheets/application.scss
View file

@ -20,6 +20,7 @@
*= require franceconnect *= require franceconnect
*= require bootstrap-wysihtml5 *= require bootstrap-wysihtml5
*/ */
@import "variables";
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@import "bootstrap"; @import "bootstrap";
@ -143,10 +144,6 @@ textarea#description {
max-width: 27px; max-width: 27px;
} }
label {
font-weight: normal;
}
div.pagination { div.pagination {
padding-top: 20px; padding-top: 20px;
display: block; display: block;

11
app/assets/stylesheets/description.scss
View file

@ -7,9 +7,7 @@
.show-block { .show-block {
width: 90%; width: 90%;
.body{ .body{
padding-left: 35px; padding: 15px;
padding-right: 35px;
padding-bottom: 35px;
} }
} }
} }
@ -134,10 +132,3 @@
width: 160px; width: 160px;
} }
} }
.description_div {
margin-top: 5px;
margin-left: 5px;
color: dimgrey;
display: none;
}

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

@ -30,18 +30,6 @@
color: #000000; color: #000000;
margin-bottom: 10px; margin-bottom: 10px;
} }
.new-action {
background-color: #E45B51;
text-align: center;
cursor: pointer;
color: #FFFFFF;
width: 253px;
height: 40px;
line-height: 40px;
font-family: Arial;
font-size: 16px;
font-weight: bold;
}
.file { .file {
padding-right: 70px; padding-right: 70px;
text-align: center; text-align: center;
@ -59,20 +47,7 @@
border-bottom: 1px solid #979797; border-bottom: 1px solid #979797;
} }
#new-commentaire { #new-commentaire {
padding: 35px; padding: 15px;
.btn-send {
background-color: #E45B51;
text-align: center;
color: #FFFFFF;
width: 150px;
height: 40px;
line-height: 28px;
font-family: Arial;
font-size: 16px;
font-weight: bold;
float: right;
border-radius: 0;
}
} }
} }
.infos { .infos {

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

@ -1,3 +1,6 @@
.twitter-typeahead {
width: 100%; // http://stackoverflow.com/questions/17957513/extending-the-width-of-bootstrap-typeahead-to-match-input-field
}
.tt-menu { .tt-menu {
padding: 8px 0; padding: 8px 0;

5
app/decorators/champ_decorator.rb
View file

@ -7,4 +7,9 @@ class ChampDecorator < Draper::Decorator
end end
object.value object.value
end end
def description_with_links
description.gsub(URI.regexp, '<a target="_blank" href="\0">\0</a>').html_safe if description
end
end end

2
app/views/admin/accompagnateurs/_list_not_assign.html.haml
View file

@ -14,7 +14,7 @@
- @accompagnateurs_not_assign.each do |accompagnateur| - @accompagnateurs_not_assign.each do |accompagnateur|
%tr %tr
%td.col-md-11.col-sm-11.col-xs-11.col-lg-11{style:'padding-top: 11px; font-size:15px'}= accompagnateur.email %td.col-xs-11{style:'padding-top: 11px; font-size:15px'}= accompagnateur.email
%td.center %td.center
%a.btn.btn-success.gestionnaire-affectation{href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put'} %a.btn.btn-success.gestionnaire-affectation{href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put'}
.fa.fa-arrow-right .fa.fa-arrow-right

8
app/views/admin/accompagnateurs/show.html.haml
View file

@ -1,7 +1,7 @@
.row.white-back .row.white-back
#accompagnateur_form #accompagnateur_form
.row .row
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
%h3.text-info Disponibles %h3.text-info Disponibles
= smart_listing_render :accompagnateurs_not_assign = smart_listing_render :accompagnateurs_not_assign
@ -11,13 +11,13 @@
#procedure_new.section.section-label #procedure_new.section.section-label
= form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f| = form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f|
.row .row
.col-md-5.col-sm-5.col-xs-5.col-lg-5 .col-xs-5
= hidden_field_tag :procedure_id, params[:procedure_id] = hidden_field_tag :procedure_id, params[:procedure_id]
=render partial: 'admin/gestionnaires/informations', locals: {f: f} =render partial: 'admin/gestionnaires/informations', locals: {f: f}
.col-md-2.col-sm-2.col-xs-2.col-lg-2 .col-xs-2
%br %br
%br %br
= f.submit 'Valider', class: 'btn btn-info', style: 'float:left', id: 'add-gestionnaire-email' = f.submit 'Valider', class: 'btn btn-info', style: 'float:left', id: 'add-gestionnaire-email'
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
%h3.text-success Affectés %h3.text-success Affectés
= smart_listing_render :accompagnateurs_assign = smart_listing_render :accompagnateurs_assign

10
app/views/admin/gestionnaires/index.html.haml
View file

@ -2,18 +2,18 @@
%br %br
.row .row
.col-md-4.col-sm-4.col-xs-4.col-lg-4 .col-xs-4
= smart_listing_render :gestionnaires = smart_listing_render :gestionnaires
.col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1 .col-xs-1
&nbsp; &nbsp;
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
%h3 Ajouter un accompagnateur %h3 Ajouter un accompagnateur
#procedure_new.section.section-label #procedure_new.section.section-label
= form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f| = form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f|
.row .row
.col-md-5.col-sm-5.col-xs-5.col-lg-5 .col-xs-5
= render partial: 'informations', locals: {f: f} = render partial: 'informations', locals: {f: f}
.col-md-2.col-sm-2.col-xs-2.col-lg-2 .col-xs-2
%br %br
%br %br
= f.submit 'Valider', class: 'btn btn-info', style: 'float:left' = f.submit 'Valider', class: 'btn btn-info', style: 'float:left'

11
app/views/admin/procedures/_informations.html.haml
View file

@ -12,7 +12,7 @@
= f.text_field key, class: 'form-control', placeholder: value = f.text_field key, class: 'form-control', placeholder: value
.row .row
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
%h4 Logo de la procédure %h4 Logo de la procédure
- unless @procedure.logo.blank? - unless @procedure.logo.blank?
= image_tag @procedure.decorate.logo_img, {style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo'} = image_tag @procedure.decorate.logo_img, {style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo'}
@ -21,7 +21,7 @@
%div{style:'margin-top:5px'} %div{style:'margin-top:5px'}
%i %i
Fichier accepté : JPG / JPEG / PNG Fichier accepté : JPG / JPEG / PNG
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
%h4 Drapeau européen %h4 Drapeau européen
%label %label
=f.check_box :euro_flag =f.check_box :euro_flag
@ -30,7 +30,7 @@
%br %br
.row .row
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
%h4 Cartographie %h4 Cartographie
= f.fields_for :module_api_carto, @procedure.module_api_carto do |ff| = f.fields_for :module_api_carto, @procedure.module_api_carto do |ff|
@ -48,7 +48,7 @@
= ff.check_box :cadastre = ff.check_box :cadastre
Cadastre Cadastre
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
- if @procedure.cerfa_flag - if @procedure.cerfa_flag
%h4 Formulaire de demande ou CERFA %h4 Formulaire de demande ou CERFA
%label %label
@ -56,9 +56,10 @@
Activer l'envoi de formulaire de demande ou CERFA Activer l'envoi de formulaire de demande ou CERFA
%br %br
=f.text_field :lien_demarche, class: 'form-control', placeholder: 'URL vers le formulaire vierge (facultatif)' =f.text_field :lien_demarche, class: 'form-control', placeholder: 'URL vers le formulaire vierge (facultatif)'
%br %br
.row .row
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
%h4 Particuliers %h4 Particuliers
%div %div
%label %label

2
app/views/admin/procedures/_list.html.haml
View file

@ -12,7 +12,7 @@
- procedure = procedure.decorate - procedure = procedure.decorate
%tr{id: "tr_dossier_#{procedure.id}", 'data-dossier_url' => admin_procedure_path(id: procedure.id)} %tr{id: "tr_dossier_#{procedure.id}", 'data-dossier_url' => admin_procedure_path(id: procedure.id)}
%td= procedure.id %td= procedure.id
%td.col-md-6.col-sm-6.col-xs-6.col-lg-6 %td.col-xs-6
= procedure.libelle = procedure.libelle
- if @active_class - if @active_class
%td= link_to procedure.lien, procedure.lien, class: 'procedure-lien', 'data-method' => :get %td= link_to procedure.lien, procedure.lien, class: 'procedure-lien', 'data-method' => :get

4
app/views/admin/procedures/show.html.haml
View file

@ -96,7 +96,7 @@
=t('dynamics.admin.procedure.stats.title') =t('dynamics.admin.procedure.stats.title')
.row .row
.col-md-6.col-sm-6.col-xs-6.col-lg-6{style:'margin-left:3%'} .col-xs-6{style:'margin-left:3%'}
%h4 Total %h4 Total
%div %div
= @facade.dossiers_total = @facade.dossiers_total
@ -126,7 +126,7 @@
%p %p
0 0
.col-md-5.col-sm-5.col-xs-5.col-lg-5 .col-xs-5
%h4 Non archivés %h4 Non archivés
= javascript_include_tag "https://code.highcharts.com/highcharts.js", "chartkick" = javascript_include_tag "https://code.highcharts.com/highcharts.js", "chartkick"
- if @facade.dossiers_for_pie_highchart.blank? - if @facade.dossiers_for_pie_highchart.blank?

8
app/views/administrations/_list.html.haml
View file

@ -1,10 +1,10 @@
- unless smart_listing.empty? - unless smart_listing.empty?
%table.table %table.table
%thead %thead
%th.col-md-4.col-sm-4.col-xs-4.col-lg-4= smart_listing.sortable 'Email', :email %th.col-xs-4= smart_listing.sortable 'Email', :email
%th.col-md-4.col-sm-4.col-xs-4.col-lg-4= smart_listing.sortable 'Date de dernière connexion', :last_sign_in_at %th.col-xs-4= smart_listing.sortable 'Date de dernière connexion', :last_sign_in_at
%th.col-md-2.col-sm-2.col-xs-2.col-lg-2 Procédure active %th.col-xs-2 Procédure active
%th.col-md-2.col-sm-2.col-xs-2.col-lg-2 Dossier en cours %th.col-xs-2 Dossier en cours
- @admins.each do |admin| - @admins.each do |admin|
%tr %tr

2
app/views/backoffice/dossiers/_followers.html.haml
View file

@ -3,7 +3,7 @@
%br %br
.row .row
.col-md-4.col-sm-4.col-xs-4.col-lg-4 .col-xs-4
- if @facade.followers.size > 0 - if @facade.followers.size > 0
%ul %ul
- @facade.followers.each do |follower| - @facade.followers.each do |follower|

2
app/views/backoffice/dossiers/_pref_list.html.haml
View file

@ -27,7 +27,7 @@
- if index%2 == 0 || tables.first.to_s.include?('champs') - if index%2 == 0 || tables.first.to_s.include?('champs')
%tr %tr
%td.col-sm-5.col-md-5.col-sm-5.col-xs-5.col-lg-5{style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1)} %td.col-xs-5{style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1)}
%h5= tables.first.to_s.gsub('_', ' ').capitalize %h5= tables.first.to_s.gsub('_', ' ').capitalize
%ul %ul
- if tables.second - if tables.second

2
app/views/backoffice/dossiers/_state_description.html.haml
View file

@ -4,7 +4,7 @@
.row .row
.col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1 .col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1
.fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'} .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
.col-md-11.col-sm-11.col-xs-11.col-lg-11 .col-xs-11
-if dossiers_list_facade.liste == 'nouveaux' -if dossiers_list_facade.liste == 'nouveaux'
Tous les dossiers présents dans cette liste sont ceux qui Tous les dossiers présents dans cette liste sont ceux qui
%b %b

4
app/views/demo/_list.html.haml
View file

@ -14,11 +14,11 @@
%tr %tr
%td %td
= procedure.id = procedure.id
%td.col-md-4.col-sm-4.col-xs-4.col-lg-4 %td.col-xs-4
= link_to procedure.libelle, procedure.lien = link_to procedure.libelle, procedure.lien
%td %td
= procedure.description = procedure.description
%td.col-md-3.col-sm-3.col-xs-3.col-lg-3 %td.col-xs-3
= procedure.organisation = procedure.organisation
= smart_listing.paginate = smart_listing.paginate

2
app/views/dossiers/_infos_carto.html.haml
View file

@ -1,5 +1,5 @@
.row .row
.col-md-12.col-sm-12.col-xs-12.col-lg-12 .col-xs-12
#map.mini{class: @facade.dossier.procedure.module_api_carto.classes} #map.mini{class: @facade.dossier.procedure.module_api_carto.classes}
%input{id: 'json_latlngs', type:'hidden', value: "#{@facade.dossier.json_latlngs}"} %input{id: 'json_latlngs', type:'hidden', value: "#{@facade.dossier.json_latlngs}"}

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

@ -2,40 +2,40 @@
.col-lg-12.col-md-12.col-sm-12.col-xs-12 .col-lg-12.col-md-12.col-sm-12.col-xs-12
- if @facade.procedure.for_individual? - if @facade.procedure.for_individual?
.row.title-row .row.title-row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.split-hr %div.col-xs-4.split-hr
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.dossier-title= t('utils.depositaire').upcase %div.col-xs-4.dossier-title= t('utils.depositaire').upcase
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.split-hr %div.col-xs-4.split-hr
.row .row
%div.col-md-6.col-sm-6.col-xs-6.col-lg-6.depositaire-label Civilité %div.col-xs-6.depositaire-label Civilité
%div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-" %div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-"
%div.col-md-5.col-sm-5.col-xs-5.col-lg-5.depositaire-info= @facade.individual.gender %div.col-xs-5.depositaire-info= @facade.individual.gender
.row .row
%div.col-md-6.col-sm-6.col-xs-6.col-lg-6.depositaire-label Nom %div.col-xs-6.depositaire-label Nom
%div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-" %div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-"
%div.col-md-5.col-sm-5.col-xs-5.col-lg-5.depositaire-info= @facade.individual.nom %div.col-xs-5.depositaire-info= @facade.individual.nom
.row .row
%div.col-md-6.col-sm-6.col-xs-6.col-lg-6.depositaire-label Prénom %div.col-xs-6.depositaire-label Prénom
%div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-" %div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-"
%div.col-md-5.col-sm-5.col-xs-5.col-lg-5.despositaire-info= @facade.individual.prenom %div.col-xs-5.despositaire-info= @facade.individual.prenom
.row .row
%div.col-md-6.col-sm-6.col-xs-6.col-lg-6.depositaire-label Date de naissance %div.col-xs-6.depositaire-label Date de naissance
%div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-" %div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-"
%div.col-md-5.col-sm-5.col-xs-5.col-lg-5.depositaire-info= @facade.individual.birthdate %div.col-xs-5.depositaire-info= @facade.individual.birthdate
.row.margin-top-20 .row.margin-top-20
- unless @facade.champs.nil? - unless @facade.champs.nil?
- @facade.champs.each do |champ| - @facade.champs.each do |champ|
- if champ.type_champ == 'header_section' - if champ.type_champ == 'header_section'
.row.title-row.margin-top-40 .row.title-row.margin-top-40
%div.col-md-3.col-sm-3.col-xs-3.col-lg-3.split-hr %div.col-xs-3.split-hr
%div.col-md-6.col-sm-6.col-xs-6.col-lg-6.dossier-title= champ.libelle.upcase %div.col-xs-6.dossier-title= champ.libelle.upcase
%div.col-md-3.col-sm-3.col-xs-3.col-lg-3.split-hr %div.col-xs-3.split-hr
- else - else
.row .row
%div.col-md-6.col-sm-6.col-xs-6.col-lg-6.depositaire-label= champ.libelle %div.col-xs-6.depositaire-label= champ.libelle
%div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off %div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off
= "-" = "-"
%div.col-md-5.col-sm-5.col-xs-5.col-lg-5.depositaire-info{ id: "champ-#{champ.id}-value" } %div.col-xs-5.depositaire-info{ id: "champ-#{champ.id}-value" }
- unless champ.decorate.value.blank? - unless champ.decorate.value.blank?
= champ.decorate.value.html_safe = champ.decorate.value.html_safe
@ -50,18 +50,18 @@
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0 - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0
.col-lg-12.col-md-12.col-sm-12.col-xs-12 .col-lg-12.col-md-12.col-sm-12.col-xs-12
.row.title-row .row.title-row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.split-hr %div.col-xs-4.split-hr
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.dossier-title= t('utils.pieces').upcase %div.col-xs-4.dossier-title= t('utils.pieces').upcase
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.split-hr %div.col-xs-4.split-hr
.col-lg-12.col-md-12.col-sm-12.col-xs-12#pieces_justificatives.margin-bot-40 .col-lg-12.col-md-12.col-sm-12.col-xs-12#pieces_justificatives.margin-bot-40
.row .row
- if @facade.procedure.cerfa_flag? - if @facade.procedure.cerfa_flag?
.col-md-12.col-sm-12.col-xs-12.col-lg-12#piece_justificative_0 .col-xs-12#piece_justificative_0
.row.piece-row .row.piece-row
.col-md-6.col-sm-6.col-xs-6.col-lg-6.depositaire-label= 'Formulaire' .col-xs-6.depositaire-label= 'Formulaire'
.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-" .col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-"
.col-md-5.col-sm-5.col-xs-5.col-lg-5.despositaire-info .col-xs-5.despositaire-info
- if @facade.dossier.cerfa_available? - if @facade.dossier.cerfa_available?
%a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
%span{style:'margin-left:12px'} %span{style:'margin-left:12px'}
@ -71,14 +71,14 @@
- else - else
= 'Pièce non fournie' = 'Pièce non fournie'
.row .row
.col-md-12.col-sm-12.col-xs-12.col-lg-12 .col-xs-12
- @facade.types_de_pieces_justificatives.each do |type_de_piece_justificative| - @facade.types_de_pieces_justificatives.each do |type_de_piece_justificative|
.row.piece-row .row.piece-row
.col-md-12.col-sm-12.col-xs-12.col-lg-12{ id: "piece_justificative_#{type_de_piece_justificative.id}" } .col-xs-12{ id: "piece_justificative_#{type_de_piece_justificative.id}" }
.row .row
%div.col-md-6.col-sm-6.col-xs-6.col-lg-6.depositaire-label= type_de_piece_justificative.libelle %div.col-xs-6.depositaire-label= type_de_piece_justificative.libelle
%div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-" %div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-"
%div.col-md-5.col-sm-5.col-xs-5.col-lg-5.despositaire-info %div.col-xs-5.despositaire-info
- if type_de_piece_justificative.api_entreprise - if type_de_piece_justificative.api_entreprise
%span.text-success Nous l'avons récupéré pour vous. %span.text-success Nous l'avons récupéré pour vous.
- elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil? - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?

54
app/views/dossiers/_infos_entreprise.html.haml
View file

@ -2,51 +2,51 @@
%h4 %h4
= @facade.entreprise.raison_sociale_or_name = @facade.entreprise.raison_sociale_or_name
.row.split-row .row.split-row
%div.col-md-12.col-sm-12.col-xs-12.col-lg-12.split-hr %div.col-xs-12.split-hr
%div.row %div.row
.col-lg-12.col-md-12.col-sm-12.col-xs-12 .col-xs-12
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Siret : %div.col-xs-4.entreprise-label Siret :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.etablissement.siret %div.col-xs-8.entreprise-info= @facade.etablissement.siret
- if @facade.etablissement.siret != @facade.entreprise.siret_siege_social - if @facade.etablissement.siret != @facade.entreprise.siret_siege_social
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label SIRET siège social : %div.col-xs-4.entreprise-label SIRET siège social :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.entreprise.siret_siege_social %div.col-xs-8.entreprise-info= @facade.entreprise.siret_siege_social
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Forme juridique : %div.col-xs-4.entreprise-label Forme juridique :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.entreprise.forme_juridique %div.col-xs-8.entreprise-info= @facade.entreprise.forme_juridique
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Libellé naf : %div.col-xs-4.entreprise-label Libellé naf :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.etablissement.libelle_naf %div.col-xs-8.entreprise-info= @facade.etablissement.libelle_naf
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Code naf : %div.col-xs-4.entreprise-label Code naf :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.etablissement.naf %div.col-xs-8.entreprise-info= @facade.etablissement.naf
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Date de création : %div.col-xs-4.entreprise-label Date de création :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= Time.at(@facade.entreprise.date_creation).strftime "%d-%m-%Y" %div.col-xs-8.entreprise-info= Time.at(@facade.entreprise.date_creation).strftime "%d-%m-%Y"
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Effectif organisation : %div.col-xs-4.entreprise-label Effectif organisation :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.entreprise.effectif %div.col-xs-8.entreprise-info= @facade.entreprise.effectif
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Code effectif : %div.col-xs-4.entreprise-label Code effectif :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.entreprise.code_effectif_entreprise %div.col-xs-8.entreprise-info= @facade.entreprise.code_effectif_entreprise
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Numéro TVA intracommunautaire : %div.col-xs-4.entreprise-label Numéro TVA intracommunautaire :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.entreprise.numero_tva_intracommunautaire %div.col-xs-8.entreprise-info= @facade.entreprise.numero_tva_intracommunautaire
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Adresse : %div.col-xs-4.entreprise-label Adresse :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info %div.col-xs-8.entreprise-info
- @facade.etablissement.adresse.split("\n").each do |line| - @facade.etablissement.adresse.split("\n").each do |line|
= line = line
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Capital social : %div.col-xs-4.entreprise-label Capital social :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info= @facade.entreprise.pretty_capital_social %div.col-xs-8.entreprise-info= @facade.entreprise.pretty_capital_social
.row .row
%div.col-md-4.col-sm-4.col-xs-4.col-lg-4.entreprise-label Exercices : %div.col-xs-4.entreprise-label Exercices :
%div.col-md-8.col-sm-8.col-xs-8.col-lg-8.entreprise-info %div.col-xs-8.entreprise-info
- @facade.etablissement.exercices.each_with_index do |exercice, index| - @facade.etablissement.exercices.each_with_index do |exercice, index|
%strong %strong
= "#{exercice.dateFinExercice.year} : " = "#{exercice.dateFinExercice.year} : "
@ -54,7 +54,7 @@
%br %br
.row.split-row .row.split-row
%div.col-md-12.col-sm-12.col-xs-12.col-lg-12.split-hr %div.col-xs-12.split-hr
- unless @facade.entreprise.rna_information.nil? - unless @facade.entreprise.rna_information.nil?
= render partial: '/dossiers/infos_rna' = render partial: '/dossiers/infos_rna'

14
app/views/dossiers/_infos_pieces_jointes.html.haml
View file

@ -1,11 +1,11 @@
#pieces_justificatives #pieces_justificatives
.row .row
- if @facade.procedure.cerfa_flag? - if @facade.procedure.cerfa_flag?
.col-md-12.col-sm-12.col-xs-12.col-lg-12#piece_justificative_0 .col-xs-12#piece_justificative_0
.row.piece-row .row.piece-row
.col-md-6.col-sm-6.col-xs-6.col-lg-6.piece-label= 'Formulaire' .col-xs-6.piece-label= 'Formulaire'
.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-" .col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off= "-"
.col-md-5.col-sm-5.col-xs-5.col-lg-5 .col-xs-5
- if @facade.dossier.cerfa_available? - if @facade.dossier.cerfa_available?
%a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
%span{style:'margin-left:12px'} %span{style:'margin-left:12px'}
@ -20,13 +20,13 @@
= 'Pièce non fournie' = 'Pièce non fournie'
.row .row
.col-md-12.col-sm-12.col-xs-12.col-lg-12 .col-xs-12
- @facade.dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative| - @facade.dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
.row.piece-row .row.piece-row
.col-md-12.col-sm-12.col-xs-12.col-lg-12{ id: "piece_justificative_#{type_de_piece_justificative.id}" } .col-xs-12{ id: "piece_justificative_#{type_de_piece_justificative.id}" }
.row .row
.col-md-6.col-sm-6.col-xs-6.col-lg-6= type_de_piece_justificative.libelle .col-xs-6= type_de_piece_justificative.libelle
.col-md-6.col-sm-6.col-xs-6.col-lg-6 .col-xs-6
- if type_de_piece_justificative.api_entreprise - if type_de_piece_justificative.api_entreprise
%span.text-success Nous l'avons récupéré pour vous. %span.text-success Nous l'avons récupéré pour vous.
- elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil? - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?

2
app/views/dossiers/_infos_private_fields.html.haml
View file

@ -1,5 +1,5 @@
.row{style: 'margin-top: -20px'} .row{style: 'margin-top: -20px'}
.col-md-12.col-sm-12.col-xs-12.col-lg-12 .col-xs-12
= form_for @facade.dossier, url: {controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id}, remote: true do = form_for @facade.dossier, url: {controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id}, remote: true do
= render partial: '/users/description/champs', locals:{private: true} = render partial: '/users/description/champs', locals:{private: true}
.row.center .row.center

4
app/views/dossiers/_invites.html.haml
View file

@ -2,7 +2,7 @@
%br %br
.row .row
.col-md-4.col-sm-4.col-xs-4.col-lg-4 .col-xs-4
- if @facade.invites.size > 0 - if @facade.invites.size > 0
%ul %ul
- @facade.invites.each do |invite| - @facade.invites.each do |invite|
@ -11,7 +11,7 @@
- else - else
Aucune personne invitée Aucune personne invitée
.col-md-3.col-sm-3.col-xs-3.col-lg-3 .col-xs-3
= form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline' do = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline' do
= text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation' = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation'
= submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation' = submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation'

2
app/views/dossiers/_messagerie.html.haml
View file

@ -25,5 +25,5 @@
DERNIER MESSAGE DERNIER MESSAGE
= render partial: 'dossiers/commentaires/commentaire', object: last_comment = render partial: 'dossiers/commentaires/commentaire', object: last_comment
#open-message.new-action %button#open-message.new-action.btn.btn-danger
ENVOYER UN MESSAGE ENVOYER UN MESSAGE

4
app/views/dossiers/commentaires/_form.html.haml
View file

@ -7,5 +7,5 @@
%h4.text-primary{style: 'margin-top: 0px'} Ajouter un fichier %h4.text-primary{style: 'margin-top: 0px'} Ajouter un fichier
= file_field_tag "piece_justificative[content]", accept: PieceJustificative.accept_format, style: 'float: left; margin-left: 20px' = file_field_tag "piece_justificative[content]", accept: PieceJustificative.accept_format, style: 'float: left; margin-left: 20px'
.col-md-6 .col-md-6.text-right
%input#save-message.form-control.btn.btn-send{ type: 'submit', value: 'ENVOYER' } %input#save-message.form-control.btn.btn-danger{ type: 'submit', value: 'ENVOYER' }

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

@ -1,4 +1,4 @@
.col-md-3.col-sm-3.col-xs-3.col-lg-3.center .col-xs-3.center
%h3 Ma procédure %h3 Ma procédure
#logos.center{class: (@facade.entreprise.nil? ? '' : 'mask')} #logos.center{class: (@facade.entreprise.nil? ? '' : 'mask')}
@ -9,9 +9,9 @@
#logo_procedure.flag #logo_procedure.flag
=image_tag( @facade.procedure.decorate.logo_img ) =image_tag( @facade.procedure.decorate.logo_img )
.etape.etapes_informations.col-md-9.col-sm-9.col-xs-9.col-lg-9 .etape.etapes_informations.col-xs-9
.row .row
.col-md-12.col-sm-12.col-xs-12.col-lg-12.padding-left-30 .col-xs-12.padding-left-30
%h2#titre_procedure.text-info %h2#titre_procedure.text-info
= @facade.procedure.libelle = @facade.procedure.libelle

4
app/views/dossiers/etapes/_etape3.html.haml
View file

@ -1,6 +1,6 @@
.etape.etapes_menu.col-md-3.col-sm-3.col-xs-3.col-lg-3 .etape.etapes_menu.col-xs-3
%h3 %h3
Ma zone d'intervention Ma zone d'intervention
.etape.etapes_informations.col-md-9.col-sm-9.col-xs-9.col-lg-9 .etape.etapes_informations.col-xs-9
.row .row

4
app/views/dossiers/etapes/_etape4.html.haml
View file

@ -1,6 +1,6 @@
.etape.etapes_menu.col-md-3.col-sm-3.col-xs-3.col-lg-3 .etape.etapes_menu.col-xs-3
%h3 %h3
Mon dossier Mon dossier
.etape.etapes_informations.col-md-9.col-sm-9.col-xs-9.col-lg-9 .etape.etapes_informations.col-xs-9
.row .row

4
app/views/dossiers/etapes/etape_2/_entreprise.html.haml
View file

@ -1,4 +1,4 @@
.etape.etapes_menu.col-md-3.col-sm-3.col-xs-3.col-lg-3 .etape.etapes_menu.col-xs-3
%h3 %h3
Mes informations Mes informations
%br %br
@ -12,7 +12,7 @@
= f.submit 'Changer de SIRET', class: %w(btn btn-xs btn-primary) = f.submit 'Changer de SIRET', class: %w(btn btn-xs btn-primary)
.etape.etapes_informations.col-md-9.col-sm-9.col-xs-9.col-lg-9 .etape.etapes_informations.col-xs-9
.row .row
- if @facade.entreprise.nil? - if @facade.entreprise.nil?
#new_siret{style:'margin-left: 20%; margin-top: 5%'} #new_siret{style:'margin-left: 20%; margin-top: 5%'}

12
app/views/dossiers/etapes/etape_2/_individual.html.haml
View file

@ -1,14 +1,14 @@
.col-md-3.col-sm-3.col-xs-3.col-lg-3.center .col-xs-3.center
%h3 Mes informations %h3 Mes informations
%p %p
Les informations de bases Les informations de bases
%br %br
vous concernant. vous concernant.
.etape.etapes_informations.col-md-9.col-sm-9.col-xs-9.col-lg-9 .etape.etapes_informations.col-xs-9
= form_for @facade.dossier, url: { controller: '/users/dossiers', action: :update } do |f| = form_for @facade.dossier, url: { controller: '/users/dossiers', action: :update } do |f|
.row .row
.col-md-12.col-sm-12.col-xs-12.col-lg-12.padding-left-30 .col-xs-12.padding-left-30
= f.hidden_field :id = f.hidden_field :id
= f.fields_for :individual, @facade.individual do |ff| = f.fields_for :individual, @facade.individual do |ff|
@ -40,7 +40,7 @@
Vos informations personnelles ne seront jamais utilisées dans un but lucratif ou commercial. Elles ne pourront être communiquées à de tiers personnes sans votre accord préalable. Elles pourront en revanche être communiquées aux administrations compétentes afin d'instruire votre dossier, conformément à la déclaration CNIL effectué par le service TPS. Vos informations personnelles ne seront jamais utilisées dans un but lucratif ou commercial. Elles ne pourront être communiquées à de tiers personnes sans votre accord préalable. Elles pourront en revanche être communiquées aux administrations compétentes afin d'instruire votre dossier, conformément à la déclaration CNIL effectué par le service TPS.
=link_to 'en savoir plus', cgu_path, target: '_blank' =link_to 'en savoir plus', cgu_path, target: '_blank'
.row .row
.col-md-5.col-sm-5.col-xs-5.col-lg-5.col-xs-5 .col-xs-5.col-xs-5
.col-md-2.col-sm-2.col-xs-2.col-lg-2.col-xs-2 .col-xs-2.col-xs-2
= f.submit 'Etape suivante', class: "action", id: 'etape_suivante' = f.submit 'Etape suivante', class: "action", id: 'etape_suivante'
.col-md-5.col-sm-5.col-xs-5.col-lg-5.col-xs-5 .col-xs-5.col-xs-5

2
app/views/layouts/_support_navigator_banner.html.haml
View file

@ -1,6 +1,6 @@
- unless BrowserService.recommended_browser? - unless BrowserService.recommended_browser?
#support_navigator_banner.row #support_navigator_banner.row
.col-md-12.col-sm-12.col-xs-12.col-lg-12 .col-xs-12
= BROWSER.value.name = BROWSER.value.name
= BROWSER.value.version = BROWSER.value.version
\- \-

6
app/views/users/description/_show.html.haml
View file

@ -6,7 +6,7 @@
.row .row
.col-md-1.col-lg-1.col-sm-1.col-xs-1 .col-md-1.col-lg-1.col-sm-1.col-xs-1
.fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'} .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
.col-md-10.col-sm-10.col-xs-10.col-lg-10{style:'padding-right: 0px'} .col-xs-10{style:'padding-right: 0px'}
%b %b
=link_to 'Accéder au guide', @dossier.procedure.lien_notice, {target: '_blank'} =link_to 'Accéder au guide', @dossier.procedure.lien_notice, {target: '_blank'}
pour remplir pour votre dossier pour remplir pour votre dossier
@ -15,7 +15,7 @@
= @dossier.procedure.libelle = @dossier.procedure.libelle
-#TODO use form_for -#TODO use form_for
= form_tag(url_for({controller: 'users/description', action: :create, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST', multipart: true) do = form_tag(url_for({controller: 'users/description', action: :create, dossier_id: @dossier.id}), class: 'form', method: 'POST', multipart: true) do
-unless @champs.nil? -unless @champs.nil?
#liste_champs #liste_champs
=render partial: 'users/description/champs', locals:{private: false} =render partial: 'users/description/champs', locals:{private: false}
@ -36,7 +36,7 @@
.row .row
.col-md-1.col-lg-1.col-sm-1.col-xs-1 .col-md-1.col-lg-1.col-sm-1.col-xs-1
.fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'} .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
.col-md-11.col-sm-11.col-xs-11.col-lg-11 .col-xs-11
Les documents administratifs ne sont pas indispensables afin d'initier votre dossier. Les documents administratifs ne sont pas indispensables afin d'initier votre dossier.
Vous pourrez dans tous les cas les compléter plus tard si vous ne les possédez pas de suite. Vous pourrez dans tous les cas les compléter plus tard si vous ne les possédez pas de suite.

8
app/views/users/description/champs/_checkbox.html.haml
View file

@ -1,6 +1,2 @@
%h4{style:'margin-left:15px;'} %input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
= champ.libelle %input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}
- if champ.mandatory?
= '*'
%input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
%input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}

13
app/views/users/description/champs/_civilite.html.haml
View file

@ -1,7 +1,8 @@
%label.radio-inline %div
= radio_button_tag "champs['#{champ.id}']", "M.", champ.value == 'Mme' ? false : true %label.radio-inline
Monsieur = radio_button_tag "champs['#{champ.id}']", "M.", champ.value == 'Mme' ? false : true
Monsieur
%label.radio-inline %label.radio-inline
= radio_button_tag "champs['#{champ.id}']", "Mme", champ.value == 'Mme' = radio_button_tag "champs['#{champ.id}']", "Mme", champ.value == 'Mme'
Madame Madame

10
app/views/users/description/champs/_engagement.html.haml
View file

@ -1,8 +1,2 @@
%h4{style:'margin-left:15px;'} %input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
= champ.libelle %input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}
- if champ.mandatory?
= '*'
%input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
%input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}
%div{style:'margin-left: 5%; margin-right: 5%; text-align: justify; text-justify: inter-word;'}
= champ.description.gsub(/\r\n/, '<br>').html_safe

99
app/views/users/description/champs/_render_list_champs.html.haml
View file

@ -1,54 +1,55 @@
-champs.each do |champ| - champs.decorate.each do |champ|
- if champ.order_place > order_place - if champ.order_place > order_place
- if champ.type_champ == 'header_section' - if champ.type_champ == 'header_section'
- break - break
- unless champ.type_champ == 'checkbox' || champ.type_champ == 'engagement'
%h4
= champ.libelle
- if champ.mandatory?
= '*'
-if champ.type_champ == 'textarea'
=render partial: 'users/description/champs/textarea', locals: {champ: champ}
-elsif champ.type_champ == 'checkbox'
= render partial: 'users/description/champs/checkbox', locals: {champ: champ}
-elsif champ.type_champ == 'civilite'
=render partial: 'users/description/champs/civilite', locals: {champ: champ}
- elsif champ.type_champ == 'datetime'
=render partial: 'users/description/champs/datetime', locals: {champ: champ}
- elsif champ.type_champ == 'yes_no'
=render partial: 'users/description/champs/yes_no', locals: {champ: champ}
- elsif champ.type_champ == 'drop_down_list'
=render partial: 'users/description/champs/drop_down_list', locals: {champ: champ}
- elsif champ.type_champ == 'pays'
=render partial: 'users/description/champs/pays', locals: {champ: champ}
- elsif champ.type_champ == 'regions'
=render partial: 'users/description/champs/regions', locals: {champ: champ}
- elsif champ.type_champ == 'engagement'
=render partial: 'users/description/champs/engagement', locals: {champ: champ}
- elsif champ.type_champ == 'departements'
=render partial: 'users/description/champs/departements', locals: {champ: champ}
-else
%input.form-control{name:"champs['#{champ.id}']",
placeholder: champ.libelle,
id: "champs_#{champ.id}",
value: champ.value,
type: champ.type_champ,
'data-provide' => champ.data_provide,
'data-date-format' => champ.data_date_format}
- unless champ.description.empty? || champ.type_champ == 'engagement'
.row .row
.col-lg-8.col-md-8.col-sm-8.col-xs-8{class: 'description_div', id:"description_champs_#{champ.id}"} %div{ class: if champ.type_champ == 'textarea' || champ.type_champ == 'engagement' then 'col-md-12' else 'col-md-6' end }
= champ.description .form-group
%label{ for: "champs_#{ champ.id }"}
= champ.libelle
- if champ.mandatory?
*
- if champ.type_champ == 'textarea'
= render partial: 'users/description/champs/textarea', locals: { champ: champ }
- elsif champ.type_champ == 'checkbox'
= render partial: 'users/description/champs/checkbox', locals: { champ: champ }
- elsif champ.type_champ == 'civilite'
= render partial: 'users/description/champs/civilite', locals: { champ: champ }
- elsif champ.type_champ == 'datetime'
= render partial: 'users/description/champs/datetime', locals: { champ: champ }
- elsif champ.type_champ == 'yes_no'
= render partial: 'users/description/champs/yes_no', locals: { champ: champ }
- elsif champ.type_champ == 'drop_down_list'
= render partial: 'users/description/champs/drop_down_list', locals: { champ: champ }
- elsif champ.type_champ == 'pays'
= render partial: 'users/description/champs/pays', locals: { champ: champ }
- elsif champ.type_champ == 'regions'
= render partial: 'users/description/champs/regions', locals: { champ: champ }
- elsif champ.type_champ == 'engagement'
= render partial: 'users/description/champs/engagement', locals: { champ: champ }
- elsif champ.type_champ == 'departements'
= render partial: 'users/description/champs/departements', locals: { champ: champ }
- else
%input.form-control{name:"champs['#{ champ.id }']",
placeholder: champ.libelle,
id: "champs_#{ champ.id }",
value: champ.value,
type: champ.type_champ,
'data-provide' => champ.data_provide,
'data-date-format' => champ.data_date_format}
- unless champ.description.empty?
%div{ id:"description_champs_#{ champ.id }", class: ('help-block' unless champ.type_champ == 'engagement') }
= champ.description_with_links

2
app/views/users/description/champs/_textarea.html.haml
View file

@ -2,4 +2,4 @@
placeholder: champ.description, placeholder: champ.description,
id: "champs_#{champ.id}", id: "champs_#{champ.id}",
row: '6'} row: '6'}
=champ.value = champ.value

13
app/views/users/description/champs/_yes_no.html.haml
View file

@ -1,7 +1,8 @@
%label.radio-inline %div
= radio_button_tag "champs['#{champ.id}']", "true", champ.value == 'true' %label.radio-inline
Oui = radio_button_tag "champs['#{champ.id}']", "true", champ.value == 'true'
Oui
%label.radio-inline %label.radio-inline
= radio_button_tag "champs['#{champ.id}']", "false", champ.value == 'false' = radio_button_tag "champs['#{champ.id}']", "false", champ.value == 'false'
Non Non

8
app/views/users/dossiers/_list.html.haml
View file

@ -2,11 +2,11 @@
%table#dossiers_list.table %table#dossiers_list.table
%thead %thead
%th#sort-id.col-md-1.col-lg-1.col-sm-1.col-xs-1= smart_listing.sortable 'Numéro', 'id' %th#sort-id.col-md-1.col-lg-1.col-sm-1.col-xs-1= smart_listing.sortable 'Numéro', 'id'
%th#sort-libelle.col-md-5.col-sm-5.col-xs-5.col-lg-5= smart_listing.sortable 'Procédure', 'procedure.libelle' %th#sort-libelle.col-xs-5= smart_listing.sortable 'Procédure', 'procedure.libelle'
%th#sort-state.col-md-2.col-sm-2.col-xs-2.col-lg-2= smart_listing.sortable 'État', 'state' %th#sort-state.col-xs-2= smart_listing.sortable 'État', 'state'
%th#sort-updated.col-md-2.col-sm-2.col-xs-2.col-lg-2= smart_listing.sortable 'Date de mise à jour', 'updated_at' %th#sort-updated.col-xs-2= smart_listing.sortable 'Date de mise à jour', 'updated_at'
- if @liste == "brouillon" - if @liste == "brouillon"
%th.col-md-2.col-sm-2.col-xs-2.col-lg-2= 'Action' %th.col-xs-2= 'Action'
- @dossiers.each do |dossier| - @dossiers.each do |dossier|
- if dossier.kind_of? Invite - if dossier.kind_of? Invite
- invite = dossier - invite = dossier

2
app/views/users/dossiers/_state_description.html.haml
View file

@ -4,7 +4,7 @@
.row .row
.col-md-1.col-lg-1.col-sm-1.col-xs-1 .col-md-1.col-lg-1.col-sm-1.col-xs-1
.fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'} .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
.col-md-11.col-sm-11.col-xs-11.col-lg-11 .col-xs-11
-if dossiers_list_facade.liste == 'brouillon' -if dossiers_list_facade.liste == 'brouillon'
Les dossiers présents dans cette liste Les dossiers présents dans cette liste
%b %b

5
spec/features/users/start_demande_spec.rb
View file

@ -6,7 +6,7 @@ feature 'user arrive on siret page' do
let(:siret) { '42149333900020' } let(:siret) { '42149333900020' }
let(:siren) { siret[0...9] } let(:siren) { siret[0...9] }
context 'when user is not logged in', js: true do context 'when user is not logged in' do
before do before do
visit new_users_dossiers_path(procedure_id: procedure.id) visit new_users_dossiers_path(procedure_id: procedure.id)
end end
@ -24,7 +24,7 @@ feature 'user arrive on siret page' do
scenario 'he is redirected to siret page to enter a siret' do scenario 'he is redirected to siret page to enter a siret' do
expect(page).to have_css('#new_siret') expect(page).to have_css('#new_siret')
end end
context 'when enter a siret' do context 'when enter a siret', js: true do
before do before do
stub_request(:get, "https://api-dev.apientreprise.fr/v2/etablissements/#{siret}?token=#{SIADETOKEN}") stub_request(:get, "https://api-dev.apientreprise.fr/v2/etablissements/#{siret}?token=#{SIADETOKEN}")
.to_return(status: 200, body: File.read('spec/support/files/etablissement.json')) .to_return(status: 200, body: File.read('spec/support/files/etablissement.json'))
@ -39,6 +39,7 @@ feature 'user arrive on siret page' do
page.click_on 'Valider' page.click_on 'Valider'
end end
scenario 'he is redirected to recap info entreprise page' do scenario 'he is redirected to recap info entreprise page' do
wait_for_ajax
expect(page).to have_css('#recap_info_entreprise') expect(page).to have_css('#recap_info_entreprise')
end end
end end