aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-05-05Refs: #3297Robert
- fix of RouteObserver#after_destroy (dead code right now, but see below) - change specs to use Route#destroy in order to trigger `dependent: :destroy' in stop_points (#delete does not work as stop_points is used in `has_many :stop_areas, through:', no doc found on this behavior, but #destroy is the advocated method to be used)
2017-05-05Refs # 3297; behavior specedRobert
2017-05-05Refs: #3297 removed patch of inherited_resources in RoutesControllerRobert
2017-05-05made a custom factory for destroy_route spexRobert
2017-05-05Refs: #3297Robert
- fix of RouteObserver#after_destroy (dead code right now, but see below) - change specs to use Route#destroy in order to trigger `dependent: :destroy' in stop_points (#delete does not work as stop_points is used in `has_many :stop_areas, through:', no doc found on this behavior, but #destroy is the advocated method to be used)
2017-05-05Refs # 3297; behavior specedRobert
2017-05-05Add specs for timetable reducersThomas Haddad
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
2017-05-05Refs #3159: updating styles on stop_areas listsjpl
2017-05-05Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-05Spourious characters (from vim misshandling) removedRobert
2017-05-05Js gardening in timetable actions & action specsThomas Haddad
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
2017-05-05Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-05minor INSTALL.md enhancementsRobert
2017-05-05Refs #3287: adding time to date of sync, to sync pagesjpl
2017-05-05Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-05minor INSTALL.md enhancementsjpl
2017-05-05adding reducer tests for timetables reactux (2)jpl
2017-05-05Merge branch 'master' into ↵jpl
3301-vehicle-journey-times--can,t-click-inputs-on-journey-columns-with-errors
2017-05-05Update INSTALL.mdRobert Dober
2017-05-05Update INSTALL.mdRobert Dober
2017-05-05Update INSTALL.mdRobert Dober
2017-05-05Update INSTALL.mdRobert Dober
2017-05-04adding reducer tests for timetables reactuxjpl
2017-05-04_vj_collection.sass: Remove z-index from .has-error:beforeTeddy Wing
When an error occurred when modifying a time in a journey pattern, it would be surrounded by a red box. The trouble is, you wouldn't be able to click inside that box to focus the inputs and change times once the box was added. The problem happens on this page: http://stif-boiv.dev:3000/referentials/4/lines/158/routes/1/vehicle_journeys This was due to the z-index placing the box on a layer closer to the front than the inputs, eating click events and preventing them from being clicked on. Originally I thought about using `pointer-events: none;` but according to http://caniuse.com/#search=pointer-events it isn't supported in IE < 11. Eliminated the `z-index` instead which has the same effect and doesn't appear to cause any visual problems, at least on the page I mentioned. Only tested in Opera TBH. Refs #3301
2017-05-04Merge pull request #10 from ↵teddywing
af83/3268-vehicle-journey-times--order-vehicle-journeys-display-journey-with-earliest-stop-first--rb20170504170900 VehicleJourneysCtl#collection: Use VehicleJourney.with_stops
2017-05-04VehicleJourneysCtl#collection: Use VehicleJourney.with_stopsTeddy Wing
Use the class method to get the vehicle journeys in the proper order of departure time ascending. The `.with_stops` method replicates this same SQL sequence of joins and order. Refs #3268
2017-05-04Merge pull request #9 from ↵teddywing
af83/3268-vehicle-journey-times--order-vehicle-journeys-display-journey-with-earliest-stop-first--rb20170504170900 3268 vehicle journey times order vehicle journeys display journey with earliest stop first rb20170504170900
2017-05-04vehicle_journey_spec.rb: #with_stops should sort journeys missing stopsTeddy Wing
If a journey is missing one or more stops at the beginning of the route, it should be sorted by the first stop it stops at. Given these journeys: | 1 | 2 | 3 -------+-------+-------+------ Stop 1 | 10:00 | | 10:15 Stop 2 | 10:10 | 10:12 | 10:25 Stop 3 | 10:20 | 10:18 | 10:35 Journey should appear in between 1 and 3 because its first stop is between 10:00 and 10:15. Move the `initialize_stop_times` helper function outside of the first test in this `describe` so we can use it again in this test. Refs #3268
2017-05-04vehicle_journey_spec.rb: Simplify factory callTeddy Wing
Simplify the "orders journeys with nil times at the end" test. Instead of manually initialising our data, create a special factory for the empty vehicle journey that we need. This allows us to get rid of the nonsense in the test setup. The existing `:vehicle_journey` factory still works the same as before. Refs #3268
2017-05-04vehicle_journey_spec.rb: #with_stops should sort empty journeysTeddy Wing
Empty journeys, or vehicle journeys with an empty `vehicle_journey_at_stops` collection should be sorted at the end of the list. Refs #3268
2017-05-04VehicleJourney: Add #with_stopsTeddy Wing
A new method that does the same thing as the query in `VehicleJourneysController#collection` (4c12a6632907d5d24b654791db994bfb830c7e37). The goal is to replace the controller query code with this method so that it can be unit tested. Refs #3268
2017-05-04VehicleJourneysCtl#collection: Sort journeys by departure time ascendingTeddy Wing
Correctly sort journeys. They used to be sorted correctly this way, but after d7c6d5ce602219b9bfa47686542dd575f1fe2e50 or c3d207301d17538b65d2a1239ce0acf642942ce9, the sorting got messed up because of the join. Here we leverage `journey_patterns.departure_stop_point_id` in order to get the first stop and sort by that stop's departure time. Query solution thanks to Luc and Alban, who remembered that a reference to the first stop point is stored so we can leverage that for complex things like this. Refs #3268
2017-05-04Merge pull request #8 from af83/configurable_localeRobert Dober
easy change locale for testing and developping translations
2017-05-04schema updateRobert
2017-05-04Fix can't edit or create calendar due to 3 parts date_selectXinhui
Refs #3298
2017-05-04Add specs for redux timetable actionsThomas Haddad
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
2017-05-04Refs #3271: adding periods correct dates display on tt#editjpl
2017-05-04easy change locale for testing and developping translationsRobert
2017-05-04Complete INSTALL.md. Refs #3291Alban Peignier
2017-05-04Improve referential:create task. Refs #3291Alban Peignier
* use a single transaction * use by default workbench 1 * use a random line found in workbench lines
2017-05-04Fixes seed by adding user permissions and organisation functionnal_scope. ↵Alban Peignier
Refs #3291
2017-05-04Jenkins Simplecov/rcov code enabled againRobert
2017-05-04Refs #3284: use I18n for transport_(sub)mode in vj editThomas Haddad
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
2017-05-04filter vendor in SimplecovRobert
2017-05-04Use test env for teaspoon (#mybad). Refs #3275Alban Peignier
2017-05-04Fixes (a little) devise sessions new style. Refs #3038Alban Peignier
2017-05-04Disable teaspoon (#mybad). Refs #3275Alban Peignier
2017-05-04Refs #3269: Fix fields not being required anymore + wordingThomas Haddad
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
2017-05-04some typos and formattingRobert
2017-05-04Refs #3096: Add/store comment when olmap is toggledThomas Haddad
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>