From bc322675d206ff666e4e6ab577f193d67673639b Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 11 Jan 2018 21:37:13 +0100
Subject: Refs #5535; Don't generate time for disabled stops

---
 app/javascript/vehicle_journeys/reducers/vehicleJourneys.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/javascript')

diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
index 62b846d9a..a64966da4 100644
--- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
@@ -18,6 +18,7 @@ const vehicleJourney= (state = {}, action, keep) => {
         current_time.hour = parseInt(action.data["start_time.hour"].value)
         current_time.minute = parseInt(action.data["start_time.minute"].value)
       }
+      console.log(state)
       _.each(action.stopPointsList, (sp) =>{
         if(action.selectedJourneyPattern.full_schedule && action.selectedJourneyPattern.costs && action.selectedJourneyPattern.costs[prevSp.stop_area_id + "-" + sp.stop_area_id]){
           let delta = parseInt(action.selectedJourneyPattern.costs[prevSp.stop_area_id + "-" + sp.stop_area_id].time)
@@ -45,12 +46,18 @@ const vehicleJourney= (state = {}, action, keep) => {
           stop_area_cityname: sp.city_name,
           dummy: true
         }
+
         _.each(action.selectedJourneyPattern.stop_areas, (jp) =>{
           if (jp.stop_area_short_description.id == sp.id){
             newVjas.dummy = false
             return
           }
         })
+
+        if(newVjas.dummy){
+          newVjas.departure_time = {hour: "00", minute: "00"}
+          newVjas.arrival_time = {hour: "00", minute: "00"}
+        }
         pristineVjasList.push(newVjas)
 
       })
-- 
cgit v1.2.3


From 37fc636a9073498b464bd2b9f3be1fa2258f9828 Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 11 Jan 2018 21:51:45 +0100
Subject: :fire: log

---
 app/javascript/vehicle_journeys/reducers/vehicleJourneys.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/javascript')

diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
index a64966da4..68bbe18d2 100644
--- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
@@ -18,7 +18,6 @@ const vehicleJourney= (state = {}, action, keep) => {
         current_time.hour = parseInt(action.data["start_time.hour"].value)
         current_time.minute = parseInt(action.data["start_time.minute"].value)
       }
-      console.log(state)
       _.each(action.stopPointsList, (sp) =>{
         if(action.selectedJourneyPattern.full_schedule && action.selectedJourneyPattern.costs && action.selectedJourneyPattern.costs[prevSp.stop_area_id + "-" + sp.stop_area_id]){
           let delta = parseInt(action.selectedJourneyPattern.costs[prevSp.stop_area_id + "-" + sp.stop_area_id].time)
-- 
cgit v1.2.3


From 3e0591073505eb24b27dfe24b433f2bfece0daa7 Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 11 Jan 2018 22:12:47 +0100
Subject: Refs #5535; Apply timezones during schedule calculation

---
 app/javascript/vehicle_journeys/reducers/vehicleJourneys.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/javascript')

diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
index 68bbe18d2..149b3e23f 100644
--- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
@@ -31,15 +31,17 @@ const vehicleJourney= (state = {}, action, keep) => {
           current_time.hour = current_time.hour % 24
           prevSp = sp
         }
+        let offsetHours = sp.time_zone_offset / 3600
+        let offsetminutes = sp.time_zone_offset/60 - 60*offsetHours
         let newVjas = {
           delta: 0,
           departure_time:{
-            hour: current_time.hour,
-            minute: current_time.minute
+            hour: (current_time.hour + offsetHours) % 24,
+            minute: current_time.minute + offsetminutes
           },
           arrival_time:{
-            hour: current_time.hour,
-            minute: current_time.minute
+            hour: (current_time.hour + offsetHours) % 24,
+            minute: current_time.minute + offsetminutes
           },
           stop_point_objectid: sp.object_id,
           stop_area_cityname: sp.city_name,
-- 
cgit v1.2.3


From ba82ba8a00455eaaaa0e0c3c708cfcaf11ef0b0e Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 11 Jan 2018 22:23:40 +0100
Subject: Refs #5535; set day offsets when needed

---
 app/javascript/vehicle_journeys/reducers/vehicleJourneys.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/javascript')

diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
index 149b3e23f..737faaf4a 100644
--- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
@@ -47,6 +47,14 @@ const vehicleJourney= (state = {}, action, keep) => {
           stop_area_cityname: sp.city_name,
           dummy: true
         }
+        if(current_time.hour + offsetHours > 24){
+          vjas.departure_day_offset = 1
+          vjas.arrival_day_offset = 1
+        }
+        if(current_time.hour + offsetHours < 0){
+          vjas.departure_day_offset = -1
+          vjas.arrival_day_offset = -1
+        }
 
         _.each(action.selectedJourneyPattern.stop_areas, (jp) =>{
           if (jp.stop_area_short_description.id == sp.id){
-- 
cgit v1.2.3