aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-03-23Refs #6146; Fix display in tablesZog
2018-03-23Refs #6146; Add specsZog
2018-03-23Refs #6146; Fix typoZog
2018-03-23Refs #6146; Fix "activated/deactivated" filterZog
2018-03-23Refs #5146 Line state updatecedricnjanga
2018-03-23Refs #6303 Fix published journey identifier label6303-vj-edit-modal-labelcedricnjanga
2018-03-23Refs #6298 Change companies#new breadcrumb6298-change-companies-breadcrumbcedricnjanga
2018-03-23Add erd diagram for export and mergeLuc Donnet
2018-03-23Fix XSS vulnerability in rails-html-sanitizerLuc Donnet
2018-03-23Fix i18n enhancements on titles @3Luc Donnet
2018-03-22Returns boolean in Chouette::StopArea#desactived?. Refs #6068Alban Peignier
2018-03-22Fixe features/vehicle_journey_imports spec. Refs #6296Alban Peignier
2018-03-22Remove maps code. Refs #6296Alban Peignier
2018-03-22Refs #6292 Fix Compliance Control set organisation filter by adding ↵6292-compliance-control-sets-organisation-filtercedricnjanga
value_method in input
2018-03-22Refs #6241 Fix Compliance Control set affectation labels6241-compliance-control-set-affectation-labelscedricnjanga
2018-03-22Merge pull request #256 from af83/enhanced-i18nLuc Donnet
Proposed i18n enhancements
2018-03-22Merge pull request #399 from af83/6256-compliance-check-set-breadcrumbLuc Donnet
Refs #6256 Fix compliance check set breadcrumb
2018-03-21Only notify parent when Import is finished. Refs #6243Alban Peignier
2018-03-21Refs #6256 Fix compliance check set breadcrumb6256-compliance-check-set-breadcrumbcedricnjanga
2018-03-21Refs #6259 Only send mails to users from same workgroup after create/update ↵6259-calendar-mailercedricnjanga
of shared calendars
2018-03-20Refs #6258 associate calendars with current organisationcedricnjanga
2018-03-20Update loofah to 2.2.1. Refs #6260Alban Peignier
2018-03-20Add log messages in Import::Base#child_change process. Refs #6243Alban Peignier
2018-03-20Don't use Import::Base#status_changed? into #notify_parent (status can be ↵Alban Peignier
changed by java side). Refs #6243
2018-03-19Fix typo for Import class Refs #6243Luc Donnet
2018-03-19Fix coordinates synchronization for reflex Refs #6245Luc Donnet
2018-03-19Merge pull request #392 from af83/6240-fix-compliance-check-set-index-bugLuc Donnet
Refs #6240 Fix ComplianceCheckSet#index bug on filters label
2018-03-19Merge pull request #394 from af83/6210-remove-attributes-from-modelsLuc Donnet
Refs #6210 Remove status value attribue from Chouette::VehicleJourney…
2018-03-18Refs #6210 Remove status value attribue from Chouette::VehicleJourney and ↵6210-remove-attributes-from-modelscedricnjanga
section status fron Chouette::JourneyPattern
2018-03-18Refs #6240 Fix ComplianceCheckSet#index bug on filters label6240-fix-compliance-check-set-index-bugcedricnjanga
2018-03-18Refs #6139 Add format validation on min max values for compliance controlscedricnjanga
2018-03-16Refs #6238; Update `t_action` method to handle the 'update' and 'create' actionsenhanced-i18nZog
2018-03-16Use new helper in page headerZog
2018-03-16Use I18n.locale ads default locale (refs #6035)Zog
2018-03-16Proposed i18n enhancementsZog
2018-03-16Refs #6177 Add control attributes to CC#show6177-compliance-control-metadatascedricnjanga
2018-03-16Fix reflex sync Refs #6141Luc Donnet
2018-03-16Fix stop_area state for filter and display. Update reflex sync to use ↵Luc Donnet
confirmed_at. Refs #6141
2018-03-16Refs #6218; UI for exportsZog
2018-03-15Use current locale to pluralize Chouette::Network. Refs #6035Alban Peignier
2018-03-15Merge pull request #385 from ↵Alban Peignier
af83/6203-journeypatternscollection-show--use-route-WayCosts-in-c JourneyPatternsCollection#show use route way costs as default cost. Refs #6203
2018-03-15Avoid error when distance or time cost is ignored. Refs #6203Alban Peignier
2018-03-15RouteWayCostUnitConverter: Round kilometres to 2 decimal placesTeddy Wing
The JavaScript validation doesn't pass if we have more than two decimal places (I think because it uses a number field step value of 0.01). Round the values to allow them to pass frontend validation. Refs #6203
2018-03-15Rename `RouteWayCostJSONSerializer` to `RouteWayCostUnitConverter`Teddy Wing
Because we need to pass a Ruby hash to Rabl instead of a JSON string, get rid of our serialiser and instead turn it into a function that just converts the distance & time units. Fix a bug in the test that had the `'1-2'` key as a symbol instead of a string which was caused by a copy-paste from JSON and not being thorough enough in search-and-replace. Refs #6203
2018-03-15Add `RouteWayCostJSONSerializer`Teddy Wing
This serialiser will take `Route#costs` and convert the distance and time fields from meters to kilometres and seconds to minutes respectively. We need this because the frontend uses kilometre and minute units while the TomTom API gives us the others (and we store the data we get from TomTom without treatment). Unfortunately, due to the way that Rabl works, this doesn't quite work just yet. The serializer returns a string, and Rabl just puts this string into the JSON output instead of a real JSON hash. Looks like I'm going to have to convert my serializer into a generic converter. Refs #6203
2018-03-15JourneyPatternsCollection#show: Fallback to route costsTeddy Wing
When editing a `JourneyPattern`, you can edit the distance & time costs between stops. We want to pre-fill these cost values (in the input fields) if they haven't already been set by a user. This way, they get an existing estimate of the cost and don't have to enter a value manually unless the default doesn't work. The pre-filled values come from `Route#costs`, which get calculated ahead of time via the TomTom API. Add a new `fetchRouteCosts` function that will fetch the costs for the current route from the API. This function also caches the value on `actions` so we don't keep making requests since the data isn't going to change. Put the cached fetch in a `requestAnimationFrame` as a sort of timeout to prevent a warning from React complaining about doing this during a `render()` call. Update `getTimeAndDistanceBetweenStops` to use the cost value from the route costs instead of the journey pattern costs if it doesn't exist. The `totalDistance` and `totalTime` we moved into `componentWillUpdate` instead of `render()` because we thought that might be the cause of the `render()` warning I mentioned above. Decided to leave this part in even though it doesn't have anything to do with the goal of the changes here, because it seemed like an okay change. The `RECEIVE_ROUTE_COSTS` reducer will update the state with route costs. We need the default distance:0 time:0 to avoid infinitely fetching the costs API if a cost with the given key can't be found. Put the route cost API URL in `window.routeCostsUrl` to allow us to get it from the Rails URL helper. Huge thanks to Johan for pairing with me on this code and walking me through the setup for integrating the route costs JSON response into the frontend interface. Refs #6203
2018-03-15Routes: Add `/costs` routeTeddy Wing
Render the `costs` field of a `Chouette::Route` as JSON. This lives at: http://stif-boiv.dev:3000/referentials/4/lines/1857/routes/7/costs.json I want this in order to get the distance & time costs of a route so that I can merge them with `JourneyPattern#costs` on the frontend on `JourneyPatternsCollection#show`. Refs #6203
2018-03-15Merge pull request #379 from ↵Alban Peignier
af83/6095-route--calculate-distance-and-time-cost-between-stops Calculate distance and time cost between Route stops. Refs #6095
2018-03-15Refs #6190; Make Calendar creation more consistent6190-fix-consistency-issue-with-calendarsZog
2018-03-15Merge pull request #372 from af83/6146-line-statesLuc Donnet
6146 Line state update