Merge branch 'master' of github.com:af83/stif-boiv

14 files changed, 70 insertions, 52 deletions

diff --git a/Gemfile b/Gemfile
index 4e0dd5426..b7844cf28 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,9 @@
 # coding: utf-8
-source 'http://rubygems.org'
+source 'https://rubygems.org'
+
+# Use https for github
+git_source(:github) { |name| "https://github.com/#{name}.git" }
+git_source(:af83) { |name| "git@github.com:af83/#{name}.git" }
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 4.2.8'
@@ -29,7 +33,7 @@ gem 'select2-rails', '~> 4.0', '>= 4.0.3'
 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 gem 'spring', group: :development
 # ActiveRecord associations on top of PostgreSQL arrays
-gem 'has_array_of', git: 'git@github.com:AF83/has_array_of.git'
+gem 'has_array_of', af83: 'has_array_of'
 
 gem 'rails-observers'
 
@@ -60,9 +64,9 @@ gem 'activerecord-postgis-adapter', "~> 3.0.0"
 gem 'polylines'
 
 # Codifligne API
-gem 'codifligne', git: 'git@github.com:AF83/stif-codifline-api.git'
+gem 'codifligne', af83: 'stif-codifline-api'
 # Reflex API
-gem 'reflex', git: 'git@github.com:AF83/stif-reflex-api.git'
+gem 'reflex', af83: 'stif-reflex-api'
 
 # Authentication
 gem 'devise', '~> 3.5.4'
@@ -95,7 +99,7 @@ gem 'breadcrumbs_on_rails'
 
 # Format Output
 gem 'json'
-gem 'rubyzip', '~> 1.1.7'
+gem 'rubyzip'
 gem 'roo'
 
 # Controller
@@ -105,7 +109,7 @@ gem 'google-analytics-rails'
 # Model
 gem 'will_paginate'
 gem 'ransack'
-gem "squeel", :git => "git://github.com/activerecord-hackery/squeel.git"
+gem "squeel", github: 'activerecord-hackery/squeel'
 gem 'active_attr'
 
 gem 'draper'
@@ -194,7 +198,7 @@ gem 'devise-i18n'
 gem 'i18n-tasks'
 
 # Rails Assets
-source 'http://rails-assets.org' do
+source 'https://rails-assets.org' do
   gem 'rails-assets-footable', '~> 2.0.3'
 
   # Use twitter bootstrap resources
diff --git a/Gemfile.lock b/Gemfile.lock
index 3acf91cc5..4e1337ec5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,28 +1,5 @@
 GIT
-  remote: git://github.com/activerecord-hackery/squeel.git
-  revision: 5542266d502db8022e14105f9dfb455a79d6fc4a
-  specs:
-    squeel (1.2.3)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-      polyamorous (~> 1.1.0)
-
-GIT
-  remote: git://github.com/af83/language_engine.git
-  revision: c4d7d5af781b55c1df4806c3960caf3c22f1ee96
-  specs:
-    language_engine (0.0.7)
-      rails (~> 4.2)
-
-GIT
-  remote: git://github.com/af83/whenever.git
-  revision: b7963381a11243affe4f35881c85be0710f434e3
-  specs:
-    whenever (0.9.4)
-      chronic (>= 0.6.3)
-
-GIT
-  remote: git@github.com:AF83/has_array_of.git
+  remote: git@github.com:af83/has_array_of.git
   revision: a6439d93291c7a1ca224ea95a8d39ed101e2f05f
   specs:
     has_array_of (0.0.1)
@@ -31,22 +8,45 @@ GIT
       railties (>= 4.0)
 
 GIT
-  remote: git@github.com:AF83/stif-codifline-api.git
+  remote: git@github.com:af83/stif-codifline-api.git
   revision: 02108a647514ca36e4377deecf3ffcce99359139
   specs:
     codifligne (0.0.2)
       nokogiri (~> 1.6)
 
 GIT
-  remote: git@github.com:AF83/stif-reflex-api.git
+  remote: git@github.com:af83/stif-reflex-api.git
   revision: 7c517b98c3900c9bb0b81dd0ccab97f8e8f5f249
   specs:
     reflex (0.0.1)
       nokogiri (~> 1.6)
 
+GIT
+  remote: https://github.com/activerecord-hackery/squeel.git
+  revision: 5542266d502db8022e14105f9dfb455a79d6fc4a
+  specs:
+    squeel (1.2.3)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      polyamorous (~> 1.1.0)
+
+GIT
+  remote: https://github.com/af83/language_engine.git
+  revision: c4d7d5af781b55c1df4806c3960caf3c22f1ee96
+  specs:
+    language_engine (0.0.7)
+      rails (~> 4.2)
+
+GIT
+  remote: https://github.com/af83/whenever.git
+  revision: b7963381a11243affe4f35881c85be0710f434e3
+  specs:
+    whenever (0.9.4)
+      chronic (>= 0.6.3)
+
 GEM
-  remote: http://rubygems.org/
-  remote: http://rails-assets.org/
+  remote: https://rubygems.org/
+  remote: https://rails-assets.org/
   specs:
     RedCloth (4.3.2)
     SyslogLogger (2.0)
@@ -445,7 +445,7 @@ GEM
     ruby-graphviz (1.2.3)
     rubycas-client (2.3.9)
       activesupport
-    rubyzip (1.1.7)
+    rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sass (3.2.19)
     sass-rails (4.0.5)
@@ -641,7 +641,7 @@ DEPENDENCIES
   rgeo (~> 0.5.2)
   roo
   rspec-rails (~> 3.5.0)
-  rubyzip (~> 1.1.7)
+  rubyzip
   sass-rails (~> 4.0.3)
   sawyer (~> 0.6.0)
   sdoc (~> 0.4.0)
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
index dae62d3e1..64c6d3ac7 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
@@ -24,7 +24,8 @@ class BSelect3 extends React.Component{
       short_name: e.params.data.short_name,
       city_name: e.params.data.city_name,
       area_type: e.params.data.area_type,
-      zip_code: e.params.data.zip_code
+      zip_code: e.params.data.zip_code,
+      comment: e.params.data.comment
     })
   }
 
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
index 0eca5f3ff..b9e106c1a 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
@@ -142,6 +142,10 @@ class OlMap extends Component{
               <strong>Commune : </strong>
               {this.props.value.olMap.json.city_name}
             </p>
+            <p>
+              <strong>Commentaire : </strong>
+              {this.props.value.olMap.json.comment}
+            </p>
             {(this.props.value.stoparea_id != this.props.value.olMap.json.stoparea_id) &&(
               <div className='btn btn-outline-primary btn-sm'
                 onClick= {() => {this.props.onUpdateViaOlMap(this.props.index, this.props.value.olMap.json)}}
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index 57c63a97b..12a44e376 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -38,6 +38,7 @@ const getInitialState = () => {
       for_alighting: v.for_alighting || "normal",
       longitude: v.longitude || 0,
       latitude: v.latitude || 0,
+      comment: v.comment,
       olMap: {
         isOpened: false,
         json: {}
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
index 79b9648a6..a1be73cd9 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
@@ -75,6 +75,7 @@ const stopPoints = (state = [], action) => {
               short_name: action.text.short_name,
               area_type: action.text.area_type,
               city_name: action.text.city_name,
+              comment: action.text.comment,
               registration_number: action.text.registration_number
             }
           )
diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js
index 3bf5a3b99..1fe6ee84b 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/index.js
@@ -6,10 +6,10 @@ var timeTablesApp = require('./reducers')
 var App = require('./containers/App')
 
 // logger, DO NOT REMOVE
-var applyMiddleware = require('redux').applyMiddleware
-var createLogger = require('redux-logger')
-var thunkMiddleware = require('redux-thunk').default
-var promise = require('redux-promise')
+// var applyMiddleware = require('redux').applyMiddleware
+// var createLogger = require('redux-logger')
+// var thunkMiddleware = require('redux-thunk').default
+// var promise = require('redux-promise')
 
 var initialState = {
   status: {
@@ -57,12 +57,12 @@ var initialState = {
     confirmModal: {}
   }
 }
-const loggerMiddleware = createLogger()
+// const loggerMiddleware = createLogger()
 
 let store = createStore(
   timeTablesApp,
-  initialState,
-  applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+  initialState
+  // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
 )
 
 render(
diff --git a/app/assets/stylesheets/components/_panels.sass b/app/assets/stylesheets/components/_panels.sass
index 675faf899..ff384faf9 100644
--- a/app/assets/stylesheets/components/_panels.sass
+++ b/app/assets/stylesheets/components/_panels.sass
@@ -25,3 +25,7 @@
       background-color: transparent
       border-radius: 0
       border: none
+
+  p
+    hyphens: auto
+    word-wrap: break-word
diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb
index 4a9215653..a8c9a1f0c 100644
--- a/app/helpers/routes_helper.rb
+++ b/app/helpers/routes_helper.rb
@@ -21,7 +21,7 @@ module RoutesHelper
 
   def route_json_for_edit(route)
     route.stop_points.includes(:stop_area).order(:position).map do |stop_point|
-      stop_area_attributes = stop_point.stop_area.attributes.slice("name","city_name", "zip_code", "registration_number", "longitude", "latitude", "area_type")
+      stop_area_attributes = stop_point.stop_area.attributes.slice("name","city_name", "zip_code", "registration_number", "longitude", "latitude", "area_type", "comment")
       stop_area_attributes["short_name"] = truncate(stop_area_attributes["name"], :length => 30) || ""
       stop_point_attributes = stop_point.attributes.slice("for_boarding","for_alighting")
       stop_area_attributes.merge(stop_point_attributes).merge(stoppoint_id: stop_point.id, stoparea_id: stop_point.stop_area.id).merge(user_objectid: stop_point.stop_area.user_objectid)
diff --git a/app/views/autocomplete_stop_areas/around.rabl b/app/views/autocomplete_stop_areas/around.rabl
index da4e92552..bc8f06054 100644
--- a/app/views/autocomplete_stop_areas/around.rabl
+++ b/app/views/autocomplete_stop_areas/around.rabl
@@ -19,7 +19,8 @@ child @stop_areas, root: :features, object_root: false do
       user_objectid: s.user_objectid,
       zip_code: s.zip_code,
       latitude: s.latitude,
-      longitude: s.longitude
+      longitude: s.longitude,
+      comment: s.comment
     }
   end
 end
diff --git a/app/views/autocomplete_stop_areas/index.rabl b/app/views/autocomplete_stop_areas/index.rabl
index 5b7f71565..5a9f76a47 100644
--- a/app/views/autocomplete_stop_areas/index.rabl
+++ b/app/views/autocomplete_stop_areas/index.rabl
@@ -13,7 +13,8 @@ node do |stop_area|
   :user_objectid => stop_area.user_objectid,
   :longitude => stop_area.longitude,
   :latitude => stop_area.latitude,
-  :area_type => stop_area.area_type
+  :area_type => stop_area.area_type,
+  :comment => stop_area.comment
   }
 end
 
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index fd6ebf91a..45fffe6a1 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -32,7 +32,7 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { 'Statut' => (@referential.archived? ? 'Conservé' : '-'),
+          { 'Statut' => @referential.archived? ? "<div class='td-block'><span class='fa fa-archive'></span><span>Conservé</span></div>".html_safe : "<div class='td-block'><span class='sb sb-lg sb-preparing'></span><span>En préparation</span></div>".html_safe,
             @referential.human_attribute_name(:validity_period) => (@referential.validity_period.present? ? t('validity_range', debut: l(@referential.try(:validity_period).try(:begin), format: :short), end: l(@referential.try(:validity_period).try(:end), format: :short)) : '-'),
             @referential.human_attribute_name(:organisation) => @referential.organisation.name,
             @referential.human_attribute_name(:published_at) => '-' }
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 85d1cbdf9..926d10aca 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -39,5 +39,4 @@ namespace :ci do
 end
 
 desc "Run continuous integration tasks (spec, ...)"
-task :ci => ["ci:setup", "spec", "cucumber", "ci:deploy", "ci:clean"]
-# task :ci => ["ci:setup", "spec", "cucumber", "ci:check_security", "ci:deploy", "ci:clean"]
+task :ci => ["ci:setup", "spec", "teaspoon", "cucumber", "ci:check_security", "ci:deploy", "ci:clean"]
diff --git a/spec/javascripts/itineraries/reducers/stop_points_spec.js b/spec/javascripts/itineraries/reducers/stop_points_spec.js
index 6065fa4ed..93fe85d36 100644
--- a/spec/javascripts/itineraries/reducers/stop_points_spec.js
+++ b/spec/javascripts/itineraries/reducers/stop_points_spec.js
@@ -195,7 +195,8 @@ describe('stops reducer', () => {
           registration_number: '0',
           city_name: 'city',
           area_type: 'area',
-          short_name: 'new'
+          short_name: 'new',
+          comment: 'newcomment'
         }
       })
     ).toEqual(
@@ -216,6 +217,7 @@ describe('stops reducer', () => {
           city_name: 'city',
           area_type: 'area',
           short_name: 'new',
+          comment: 'newcomment',
           olMap: {
             isOpened: false,
             json: {}