diff options
| author | Teddy Wing | 2017-05-22 15:27:50 +0200 | 
|---|---|---|
| committer | Teddy Wing | 2017-05-22 15:40:01 +0200 | 
| commit | b8bc80a30cdee3448cb97483451a16573ee7bc26 (patch) | |
| tree | 4a80c7257cd54db254de5751604fb54120b21552 | |
| parent | a6aae5dc43eb89ba7ebc5f794f03ce722986957a (diff) | |
| download | chouette-core-b8bc80a30cdee3448cb97483451a16573ee7bc26.tar.bz2 | |
vehicle_journeys: Initialize `withoutTimeTable` to `false`
This filter, currently called "Afficher les courses sans calendrier",
needs to not do anything by default and be set to "Non". When toggled to
"Oui", it should filter to show only the vehicle journeys that have no
associated calendar.
Change the toggle and the initial value of the state variable that it's
backed by to "Non" and `false` to reflect this definition.
See 44712fe052e0c554c0510d4665a35c66540ffa05 and
a6aae5dc43eb89ba7ebc5f794f03ce722986957a for more information.
Refs #3427
4 files changed, 5 insertions, 5 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 c9b5368a1..e2d03e195 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 ba27ca72c..489446ab9 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js @@ -48,7 +48,7 @@ var initialState = {          comment: ''        },        withoutSchedule: true, -      withoutTimeTable: true +      withoutTimeTable: false      }    }, diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js index b4a70ec08..09588f824 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js @@ -15,7 +15,7 @@ const filters = (state = {}, action) => {            minute: '59'          }        } -      newQuery = _.assign({}, state.query, {interval: interval, journeyPattern: {}, vehicleJourney: {}, timetable: {}, withoutSchedule: true, withoutTimeTable: true }) +      newQuery = _.assign({}, state.query, {interval: interval, journeyPattern: {}, vehicleJourney: {}, timetable: {}, withoutSchedule: true, withoutTimeTable: false })        return _.assign({}, state, {query: newQuery, queryString: ''})      case 'TOGGLE_WITHOUT_SCHEDULE':        newQuery = _.assign({}, state.query, {withoutSchedule: !state.query.withoutSchedule}) diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js index 0a6729c8b..2ab88386a 100644 --- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js +++ b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js @@ -31,7 +31,7 @@ describe('filters reducer', () => {        vehicleJourney: {},        timetable: {},        withoutSchedule: true, -      withoutTimeTable: true +      withoutTimeTable: false      },      queryString: ''      } @@ -153,7 +153,7 @@ describe('filters reducer', () => {        "&q%5Bvehicle_journey_at_stops_departure_time_gteq%5D=11%3A11",        "&q%5Bvehicle_journey_at_stops_departure_time_lteq%5D=22%3A22",        "&q%5Bvehicle_journey_without_departure_time%5D=true", -      "&q%5Bvehicle_journey_without_time_table%5D=true" +      "&q%5Bvehicle_journey_without_time_table%5D=false"      ].join('')      expect( | 
