From ef3942099583f86d3f355a1bac8d99ce16cd2de3 Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 8 Jan 2018 11:06:20 +0100
Subject: Refs #5493 @1h; Use local time in the Journeys editor

We store UTC times in the database though
---
 app/javascript/helpers/stop_area_header_manager.js            | 9 ++++++++-
 app/javascript/vehicle_journeys/components/VehicleJourneys.js | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'app/javascript')

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">
+              &nbsp;({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>
-- 
cgit v1.2.3