From 351af77182537dbb53e7bbd99d37dde50cd11ffe Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 17 Jan 2018 11:44:15 +0100
Subject: Refs #5614 @0.5h; Fix schedule computation when departure minutes are
 not set

---
 app/javascript/vehicle_journeys/reducers/vehicleJourneys.js | 2 +-
 1 file changed, 1 insertion(+), 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 501c01175..ae45993a8 100644
--- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
@@ -16,7 +16,7 @@ const vehicleJourney= (state = {}, action, keep) => {
       }
       if(action.data["start_time.hour"] && action.data["start_time.minute"] && action.selectedJourneyPattern.full_schedule){
         current_time.hour = parseInt(action.data["start_time.hour"].value)
-        current_time.minute = parseInt(action.data["start_time.minute"].value)
+        current_time.minute = parseInt(action.data["start_time.minute"].value) || 0
       }
       _.each(action.stopPointsList, (sp) =>{
         if(action.selectedJourneyPattern.full_schedule && action.selectedJourneyPattern.costs && action.selectedJourneyPattern.costs[prevSp.stop_area_id + "-" + sp.stop_area_id]){
-- 
cgit v1.2.3


From 2eb5225e23c91656f0f35087adfd1545218ecb23 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 17 Jan 2018 12:36:15 +0100
Subject: Refs #5623; Show journey departure time inputs when JP is prefilled

---
 app/javascript/vehicle_journeys/reducers/modal.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'app/javascript')

diff --git a/app/javascript/vehicle_journeys/reducers/modal.js b/app/javascript/vehicle_journeys/reducers/modal.js
index c2556303d..fb7e16547 100644
--- a/app/javascript/vehicle_journeys/reducers/modal.js
+++ b/app/javascript/vehicle_journeys/reducers/modal.js
@@ -147,14 +147,7 @@ export default function modal(state = {}, action) {
         let stopAreas = _.map(window.jpOriginStopPoints, (sa, i) =>{
           return _.assign({}, {stop_area_short_description : {id : sa.stop_area_id}})
         })
-        selectedJP = {
-          id: window.jpOrigin.id,
-          name: window.jpOrigin.name,
-          published_name: window.jpOrigin.published_name,
-          objectid: window.jpOrigin.objectid,
-          stop_areas: stopAreas,
-          missions: state.missions
-        }
+        selectedJP = _.assign({}, window.jpOrigin, {stop_areas: stopAreas})
       }
       return {
         type: 'create',
-- 
cgit v1.2.3