Refs #3638: changing without_tt toggle filter default behaviour

3 files changed, 16 insertions, 14 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js
index 553e9f3a9..d6e938f0e 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js
@@ -126,7 +126,7 @@ const Filters = ({filters, pagination, onFilter, onResetFilters, onUpdateStartTi
                       onChange={onToggleWithoutTimeTable}
                       checked={filters.query.withoutTimeTable}
                       ></input>
-                    <span className='switch-label' data-checkedvalue='Non' data-uncheckedvalue='Oui'></span>
+                    <span className='switch-label' data-checkedvalue='Oui' data-uncheckedvalue='Non'></span>
                   </label>
                 </div>
               </div>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index 97aa60526..489446ab9 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
@@ -8,10 +8,10 @@ var actions = require("./actions")
 var enableBatching = require('./batch').enableBatching
 
 // 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 selectedJP = []
 
@@ -48,7 +48,7 @@ var initialState = {
         comment: ''
       },
       withoutSchedule: true,
-      withoutTimeTable: true
+      withoutTimeTable: false
     }
 
   },
@@ -85,12 +85,12 @@ if (window.jpOrigin){
   initialState.filters.queryString = actions.encodeParams(params)
 }
 
-// const loggerMiddleware = createLogger()
+const loggerMiddleware = createLogger()
 
 let store = createStore(
   enableBatching(vehicleJourneysApp),
-  initialState
-  // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+  initialState,
+  applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
 )
 
 render(
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 6d40d495b..53008c7ce 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -117,10 +117,12 @@ class VehicleJourneysController < ChouetteController
   end
 
   def maybe_filter_out_journeys_with_time_tables(scope)
-    if params[:q] &&
-        params[:q][:vehicle_journey_without_time_table] == 'false'
-      return scope
-        .without_time_tables
+    if params[:q]
+      if params[:q][:vehicle_journey_without_time_table] == 'false'
+        return scope.without_time_tables
+      end
+    else
+      return scope.without_time_tables
     end
 
     scope
@@ -135,7 +137,7 @@ class VehicleJourneysController < ChouetteController
 
   def adapted_params
     params.tap do |adapted_params|
-      adapted_params.merge!( :route => parent)
+      adapted_params.merge!(:route => parent)
       hour_entry = "vehicle_journey_at_stops_departure_time_gt(4i)".to_sym
       if params[:q] && params[:q][ hour_entry]
         adapted_params[:q].merge! hour_entry => (params[:q][ hour_entry].to_i - utc_offset)