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

16 files changed, 34 insertions, 32 deletions

diff --git a/Gemfile b/Gemfile
index b7844cf28..bda482a75 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,8 +20,6 @@ gem 'browserify-rails'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails', '~> 3.1.4' # Update to v4 for Rails 4.2
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e1337ec5..a56fdfbb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -523,9 +523,6 @@ GEM
       json (>= 1.8, < 3.0)
       parser (>= 2.3.0.7)
       rainbow (>= 1.99.1, < 3.0)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
@@ -659,7 +656,6 @@ DEPENDENCIES
   teaspoon-jasmine
   therubyracer (~> 0.12)
   transpec
-  turbolinks
   uglifier (~> 2.7.2)
   webmock
   whenever!
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b90f7539d..0024b62b5 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -4,7 +4,6 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require turbolinks
 //= require jquery
 //= require jquery_ujs
 //= require modernizr
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index 14ddf2b99..43c40a4d5 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -14,7 +14,7 @@ class JourneyPattern extends Component{
     let vjURL = routeURL + '/vehicle_journeys?jp=' + jpOid
 
     return (
-      <a data-turbolinks="false" href={vjURL}>Horaires des courses</a>
+      <a href={vjURL}>Horaires des courses</a>
     )
   }
 
diff --git a/app/assets/javascripts/forms.coffee b/app/assets/javascripts/forms.coffee
index 6b00e9c26..12d82fef1 100644
--- a/app/assets/javascripts/forms.coffee
+++ b/app/assets/javascripts/forms.coffee
@@ -41,10 +41,11 @@ isEdge = !isIE && !!window.StyleMedia
       else
         $(selectedStatus).css('color', selectedValue)
 
-$(document).on 'turbolinks:load', togglableFilter
-$(document).on 'turbolinks:load', submitMover
-$(document).on 'turbolinks:load', switchInput
-$(document).on 'turbolinks:load', colorSelector
+$ ->
+  togglableFilter()
+  submitMover()
+  switchInput()
+  colorSelector()
 
 if isIE || isEdge
   $(document).on 'click', '.formSubmitr', (e)->
diff --git a/app/assets/javascripts/main_menu.coffee b/app/assets/javascripts/main_menu.coffee
index f6266f06b..a12c47576 100644
--- a/app/assets/javascripts/main_menu.coffee
+++ b/app/assets/javascripts/main_menu.coffee
@@ -1,4 +1,4 @@
-$(document).on 'turbolinks:load', ->
+$ ->
 
   link = []
   ptitleCont = ""
diff --git a/app/assets/javascripts/nav_panels.coffee b/app/assets/javascripts/nav_panels.coffee
index 829db5ad0..25f15f063 100644
--- a/app/assets/javascripts/nav_panels.coffee
+++ b/app/assets/javascripts/nav_panels.coffee
@@ -1,4 +1,4 @@
-$(document).on 'turbolinks:load', ->
+$ ->
   $('#menu_top [data-panel="toggle"]').on 'click', (e) ->
     e.preventDefault()
     $(this).siblings().removeClass 'active'
diff --git a/app/assets/javascripts/routing_constraint_zones.coffee b/app/assets/javascripts/routing_constraint_zones.coffee
index fc032f074..e978cd29a 100644
--- a/app/assets/javascripts/routing_constraint_zones.coffee
+++ b/app/assets/javascripts/routing_constraint_zones.coffee
@@ -22,7 +22,7 @@ fill_stop_points_options = ->
 errors_on_form = ->
   document.location.pathname.endsWith('routing_constraint_zones') && $('#new_routing_constraint_zone').length
 
-$(document).on 'turbolinks:load', ->
+$ ->
   if document.location.pathname.endsWith('routing_constraint_zones/new') || errors_on_form()
     fill_stop_points_options()
   $('#routing_constraint_zone_route_id').change(fill_stop_points_options)
diff --git a/app/assets/javascripts/select2.coffee b/app/assets/javascripts/select2.coffee
index af3dc6d75..5adaabda5 100644
--- a/app/assets/javascripts/select2.coffee
+++ b/app/assets/javascripts/select2.coffee
@@ -39,4 +39,5 @@ bind_select2_ajax = (el, cfg = {}) ->
 
 
 
-$(document).on 'turbolinks:load', select_2
+$ ->
+  select_2()
diff --git a/app/assets/javascripts/selectable_table.coffee b/app/assets/javascripts/selectable_table.coffee
index 4086bf6c2..681c8f9e6 100644
--- a/app/assets/javascripts/selectable_table.coffee
+++ b/app/assets/javascripts/selectable_table.coffee
@@ -53,4 +53,5 @@
           .addClass 'noselect'
           .children('.info-msg').children('span').text(selection.length)
 
-$(document).on 'turbolinks:load', selectTable
+$ ->
+  selectTable()
diff --git a/app/assets/javascripts/time_table_combinations.coffee b/app/assets/javascripts/time_table_combinations.coffee
index 8923af958..6104da7ff 100644
--- a/app/assets/javascripts/time_table_combinations.coffee
+++ b/app/assets/javascripts/time_table_combinations.coffee
@@ -3,4 +3,5 @@
     $(this).closest('.has_switch').siblings('.form-group').each ->
       $(this).toggleClass('hidden')
 
-$(document).on 'turbolinks:load', combinedTypeToggle
+$ ->
+  combinedTypeToggle()
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 72d554e96..84f621582 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -50,9 +50,12 @@ module Chouette
 
     def vehicle_journey_at_stops_matrix
       at_stops = self.vehicle_journey_at_stops.to_a.dup
+      active_stop_point_ids = journey_pattern.stop_points.map(&:id)
+
       (route.stop_points.map(&:id) - at_stops.map(&:stop_point_id)).each do |id|
-        # Set stop_point id for fake vjas with no departure time yep.
-        at_stops.insert(route.stop_points.map(&:id).index(id), Chouette::VehicleJourneyAtStop.new(stop_point_id: id))
+        vjas = Chouette::VehicleJourneyAtStop.new(stop_point_id: id)
+        vjas.dummy = active_stop_point_ids.include?(id) ? false : true
+        at_stops.insert(route.stop_points.map(&:id).index(id), vjas)
       end
       at_stops
     end
diff --git a/app/models/chouette/vehicle_journey_at_stop.rb b/app/models/chouette/vehicle_journey_at_stop.rb
index 553531422..5dfec8352 100644
--- a/app/models/chouette/vehicle_journey_at_stop.rb
+++ b/app/models/chouette/vehicle_journey_at_stop.rb
@@ -9,7 +9,7 @@ module Chouette
     belongs_to :stop_point
     belongs_to :vehicle_journey
 
-    attr_accessor :_destroy
+    attr_accessor :_destroy, :dummy
 
     validate :arrival_must_be_before_departure
     def arrival_must_be_before_departure
@@ -27,6 +27,7 @@ module Chouette
     after_initialize :set_virtual_attributes
     def set_virtual_attributes
       @_destroy = false
+      @dummy = false
     end
 
   end
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index dc1ec9766..6eab2a761 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -8,10 +8,10 @@ html lang=I18n.locale
 
     title STIF BOIV
 
-    = stylesheet_link_tag 'base', media: 'all', 'data-turbolinks-track': true
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': true
+    = stylesheet_link_tag 'base'
+    = stylesheet_link_tag 'application'
 
-    = javascript_include_tag 'application', 'data-turbolinks-track': true
+    = javascript_include_tag 'application'
 
 
   body
diff --git a/app/views/routes/show.html.slim b/app/views/routes/show.html.slim
index d994e3861..6d2d4e90d 100644
--- a/app/views/routes/show.html.slim
+++ b/app/views/routes/show.html.slim
@@ -3,15 +3,15 @@
              @route.name,
              'Lorem ipsum dolor sit amet',
              t('last_update', time: l(@route.updated_at, format: :short)),
-             (policy(@route).edit? ? link_to(t('actions.edit'), edit_referential_line_route_path(@referential, @line, @route), data: {turbolinks: false}, class: 'btn btn-default') : '') do
+             (policy(@route).edit? ? link_to(t('actions.edit'), edit_referential_line_route_path(@referential, @line, @route), class: 'btn btn-default') : '') do
 
   / Below is secundary actions & optional contents (filters, ...)
   .row.mb-sm
     .col-lg-12.text-right
       - if @route_sp.any?
-        = link_to t('journey_patterns.index.title'), [@referential, @line, @route, :journey_patterns_collection], data: {turbolinks: false}, class: 'btn btn-primary'
+        = link_to t('journey_patterns.index.title'), [@referential, @line, @route, :journey_patterns_collection], class: 'btn btn-primary'
       - if @route.journey_patterns.present?
-        = link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], data: {turbolinks: false}, class: 'btn btn-primary'
+        = link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], class: 'btn btn-primary'
 
       = link_to t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, format: :zip), class: 'btn btn-primary'
 
diff --git a/app/views/vehicle_journeys/show.rabl b/app/views/vehicle_journeys/show.rabl
index 1ef9bc6b5..fce16dfb3 100644
--- a/app/views/vehicle_journeys/show.rabl
+++ b/app/views/vehicle_journeys/show.rabl
@@ -31,18 +31,19 @@ end
 
 child(:vehicle_journey_at_stops_matrix, :object_root => false) do |vehicle_stops|
   node do |vehicle_stop|
-    node(:dummy) { !vehicle_stop.id? }
+    node(:dummy) { vehicle_stop.dummy }
+
     node(:stop_area_object_id) do
-      vehicle_stop.stop_point ? vehicle_stop.stop_point.stop_area.objectid : nil
+      vehicle_stop.stop_point.stop_area.objectid
     end
     node(:stop_point_objectid) do
-      vehicle_stop.stop_point ? vehicle_stop.stop_point.objectid : nil
+      vehicle_stop.stop_point.objectid
     end
     node(:stop_area_name) do
-      vehicle_stop.stop_point ? vehicle_stop.stop_point.stop_area.name : nil
+      vehicle_stop.stop_point.stop_area.name
     end
     node(:stop_area_cityname) do
-      vehicle_stop.stop_point ? vehicle_stop.stop_point.stop_area.city_name : nil
+      vehicle_stop.stop_point.stop_area.city_name
     end
 
     [:id, :connecting_service_id, :boarding_alighting_possibility].map do |att|