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

Merge branch 'staging'

Browse source
This commit is contained in:
Guillaume Lazzara 2016-03-08 11:07:29 +01:00
commit 1a646e58cf
11 changed files with 78 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -2,7 +2,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.0'
gem 'rails', '4.2.5.2'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'

102
Gemfile.lock
View file

@ -9,38 +9,38 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
actionmailer (4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0)
actionview (= 4.2.0)
activesupport (= 4.2.0)
rack (~> 1.6.0)
actionpack (4.2.5.2)
actionview (= 4.2.5.2)
activesupport (= 4.2.5.2)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0)
activesupport (= 4.2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5.2)
activesupport (= 4.2.5.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_model_serializers (0.8.3)
activemodel (>= 3.0)
activejob (4.2.0)
activesupport (= 4.2.0)
activejob (4.2.5.2)
activesupport (= 4.2.5.2)
globalid (>= 0.3.0)
activemodel (4.2.0)
activesupport (= 4.2.0)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
builder (~> 3.1)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
activerecord (4.2.5.2)
activemodel (= 4.2.5.2)
activesupport (= 4.2.5.2)
arel (~> 6.0)
activesupport (4.2.0)
activesupport (4.2.5.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -49,7 +49,7 @@ GEM
addressable (2.3.8)
apipie-rails (0.3.1)
json
arel (6.0.2)
arel (6.0.3)
as_csv (2.0.2)
actionpack (>= 3.0)
activemodel (>= 3.0)
@ -99,6 +99,7 @@ GEM
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
concurrent-ruby (1.0.1)
crack (0.4.2)
safe_yaml (~> 1.0.0)
css_splitter (0.4.4)
@ -135,7 +136,7 @@ GEM
font-awesome-rails (4.4.0.0)
railties (>= 3.2, < 5.0)
formatador (0.2.5)
globalid (0.3.5)
globalid (0.3.6)
activesupport (>= 4.1.0)
guard (2.13.0)
formatador (>= 0.2.4)
@ -204,7 +205,7 @@ GEM
logstasher (0.6.5)
logstash-event (~> 1.2.0)
request_store
loofah (2.0.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.3)
@ -215,15 +216,15 @@ GEM
rest-client
maruku (0.7.2)
method_source (0.8.2)
mime-types (2.6.1)
mini_portile (0.6.2)
minitest (5.7.0)
mime-types (2.99.1)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.2)
multipart-post (2.0.0)
nenv (0.2.0)
netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
@ -271,33 +272,33 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
railroady (1.3.0)
rails (4.2.0)
actionmailer (= 4.2.0)
actionpack (= 4.2.0)
actionview (= 4.2.0)
activejob (= 4.2.0)
activemodel (= 4.2.0)
activerecord (= 4.2.0)
activesupport (= 4.2.0)
rails (4.2.5.2)
actionmailer (= 4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
activemodel (= 4.2.5.2)
activerecord (= 4.2.5.2)
activesupport (= 4.2.5.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0)
railties (= 4.2.5.2)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
raindrops (0.13.0)
rake (10.4.2)
rake (10.5.0)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
@ -385,12 +386,13 @@ GEM
spring (1.3.6)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.2.0)
rack (~> 1.0)
sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.3)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
swd (1.0.0)
activesupport (>= 3)
attr_required (>= 0.0.5)
@ -493,7 +495,7 @@ DEPENDENCIES
poltergeist
pry-byebug
railroady
rails (= 4.2.0)
rails (= 4.2.5.2)
rest-client
rgeo-geojson
rspec-rails (~> 3.0)

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

@ -35,6 +35,10 @@ body {
padding-top: 50px;
}
.wysihtml5-sandbox {
resize:vertical;
}
#wrap {
min-height: 100%;
margin-bottom: -50px;

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

@ -5,7 +5,11 @@
.form-group{class: ('has-error' if @procedure.errors.messages[key])}
%h4
=value
=f.text_field key, class: 'form-control', placeholder: value
- if key == :description
= f.text_area key, rows: '6', placeholder: 'Description du projet', class: 'form-control wysihtml5'
- else
=f.text_field key, class: 'form-control', placeholder: value
.row
.col-md-6.col-lg-6

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

@ -54,7 +54,7 @@
%h4.text-info
= @facade.procedure.libelle
= @facade.procedure.description
= @facade.procedure.description.html_safe
.champs.col-md-4.col-lg-4
%h4.text-info
Champs

9
app/views/users/description/show.html.haml
View file

@ -1,5 +1,8 @@
.container#description_page
%h2 Description de votre projet
%h2
= @dossier.procedure.libelle
%h3 Votre dossier
%br
-#TODO use form_for
@ -7,12 +10,12 @@
%div
.row
.col-md-12
%h4 Nom de votre projet *
%h4 Libellé pour votre dossier *
= text_field_tag :nom_projet, @dossier.nom_projet, placeholder: 'Nom du projet', class: 'form-control'
%br
.row
.col-md-12
%h4 Description de votre projet *
%h4 Description *
= text_area_tag :description, @dossier.description, rows: '6', placeholder: 'Description du projet', class: 'form-control wysihtml5'
#liste_champs

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

@ -14,7 +14,7 @@
%h2#titre_procedure.text-info
= @dossier.procedure.libelle
%p
= @dossier.procedure.description
= @dossier.procedure.description.html_safe
%br
= form_for @dossier, url: {controller: 'users/dossiers', action: :create}, method: :post do |f|

2
app/views/users/siret/_pro.html.haml
View file

@ -6,7 +6,7 @@
= @procedure.libelle
%p
= @procedure.description
= @procedure.description.html_safe
%br
= form_tag(url_for({controller: :dossiers, action: :create}), class: 'form-inline', method: 'POST') do |f|

5
config/initializers/logstasher.rb Normal file
View file

@ -0,0 +1,5 @@
if LogStasher.enabled
LogStasher.add_custom_fields do |fields|
fields[:type] = "tps"
end
end

2
spec/controllers/api/v1/procedures_controller_spec.rb
View file

@ -32,7 +32,7 @@ describe API::V1::ProceduresController do
it { expect(subject[:label]).to eq(procedure.libelle) }
it { expect(subject[:description]).to eq(procedure.description) }
it { expect(subject[:organisation]).to eq(procedure.organisation) }
it { expect(subject[:direction]).to eq(proced,ure.direction) }
it { expect(subject[:direction]).to eq(procedure.direction) }
it { expect(subject[:link]).to eq(procedure.lien_demarche) }
it { expect(subject[:archived]).to eq(procedure.archived) }
it { is_expected.to have_key(:types_de_champ) }

2
spec/views/users/dossiers/new_html.haml_spec.rb
View file

@ -33,7 +33,7 @@ describe 'users/dossiers/new.html.haml', type: :view do
describe 'logo procedure' do
context 'procedure have no logo' do
it 'TPS logo is present' do
is_expected.to have_css("img[src='/assets#{asset_path('logo-tps.png')}']")
is_expected.to match(/src="\/assets\/logo-tps-.*\.png"/)
end
end