diff options
| author | Alban Peignier | 2018-01-11 22:10:34 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-11 22:10:34 +0100 |
| commit | b488ef473da5d7bcc68e31c0a8ef6c7b318b70d1 (patch) | |
| tree | 67d31d2677e80bacf7619e728a9f2e6d239734be /app/javascript | |
| parent | ef7f7425aa45b13fd2e1633b625a5c04346ef5c9 (diff) | |
| parent | cb8b0a431944925885846966c45d7434e6618b8c (diff) | |
| download | chouette-core-b488ef473da5d7bcc68e31c0a8ef6c7b318b70d1.tar.bz2 | |
Merge pull request #234 from af83/5493-use-tz-for-time-display
Use local time in the Journeys editor. Refs #5493
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/helpers/stop_area_header_manager.js | 9 | ||||
| -rw-r--r-- | app/javascript/vehicle_journeys/components/VehicleJourneys.js | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/javascript/helpers/stop_area_header_manager.js b/app/javascript/helpers/stop_area_header_manager.js index 54d957be9..c9f397dee 100644 --- a/app/javascript/helpers/stop_area_header_manager.js +++ b/app/javascript/helpers/stop_area_header_manager.js @@ -21,7 +21,14 @@ export default class StopAreaHeaderManager { data-headline={showHeadline} title={sp.city_name + ' (' + sp.zip_code +')'} > - <span><span>{sp.name}</span></span> + <span> + <span> + {sp.name} + {sp.time_zone_formatted_offset && <span className="small"> + ({sp.time_zone_formatted_offset}) + </span>} + </span> + </span> </div> ) } diff --git a/app/javascript/vehicle_journeys/components/VehicleJourneys.js b/app/javascript/vehicle_journeys/components/VehicleJourneys.js index b188962c2..36721b55b 100644 --- a/app/javascript/vehicle_journeys/components/VehicleJourneys.js +++ b/app/javascript/vehicle_journeys/components/VehicleJourneys.js @@ -109,8 +109,8 @@ export default class VehicleJourneys extends Component { <div className='th'> <div className='strong mb-xs'>ID course</div> <div>Nom course</div> - <div>ID mission</div> <div>Transporteur</div> + <div>ID mission</div> <div>Calendriers</div> { this.hasFeature('purchase_windows') && <div>Calendriers Commerciaux</div> } </div> |