From ad537be88672bc6472925685e3e204ef562ad8c9 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 4 Jan 2018 14:22:45 +0100
Subject: Display checksum for journey patterns -m Refs

---
 app/javascript/journey_patterns/actions/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/javascript/journey_patterns/actions')

diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 4ff3f77ea..1c2eb68b2 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -198,6 +198,7 @@ const actions = {
                 name: val.name,
                 object_id: val.object_id,
                 short_id: val.short_id,
+                checksum: val.checksum,
                 published_name: val.published_name,
                 registration_number: val.registration_number,
                 stop_points: val.route_short_description.stop_points,
@@ -217,4 +218,4 @@ const actions = {
   }
 }
 
-export default actions
\ No newline at end of file
+export default actions
-- 
cgit v1.2.3


From 913d6935727ace3ac94c08adb4e1ec378741fb19 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 3 Jan 2018 16:31:33 +0100
Subject: Refs #5455 @6h; Add time and distance between stops in Journey
 Patterns

- Adds a `JSON` attribute in the model
- Adds the fields in the editor
---
 app/javascript/journey_patterns/actions/index.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'app/javascript/journey_patterns/actions')

diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 1c2eb68b2..09e2001c1 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -64,6 +64,11 @@ const actions = {
     type : 'DELETE_JOURNEYPATTERN',
     index,
   }),
+  updateJourneyPatternCosts : (index, costs) => ({
+    type : 'UPDATE_JOURNEYPATTERN_COSTS',
+    index,
+    costs
+  }),
   closeModal : () => ({
     type : 'CLOSE_MODAL'
   }),
@@ -194,6 +199,7 @@ const actions = {
                   }
                 })
               }
+<<<<<<< HEAD
               journeyPatterns.push({
                 name: val.name,
                 object_id: val.object_id,
@@ -204,6 +210,14 @@ const actions = {
                 stop_points: val.route_short_description.stop_points,
                 deletable: false
               })
+=======
+              journeyPatterns.push(
+                _.assign({}, val, {
+                  stop_points: val.route_short_description.stop_points,
+                  deletable: false
+                })
+              )
+>>>>>>> Refs #5455 @6h; Add time and distance between stops in Journey Patterns
             }
           }
           window.currentItemsLength = journeyPatterns.length
-- 
cgit v1.2.3


From bd0ccefe3b876bc9513966b20d3afa01631a72e1 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 3 Jan 2018 18:33:31 +0100
Subject: Refs #5455; Fix JourneyPattern editor

---
 app/javascript/journey_patterns/actions/index.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/javascript/journey_patterns/actions')

diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 09e2001c1..9f1c1c8d3 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -214,6 +214,7 @@ const actions = {
               journeyPatterns.push(
                 _.assign({}, val, {
                   stop_points: val.route_short_description.stop_points,
+                  costs: val.costs || {},
                   deletable: false
                 })
               )
-- 
cgit v1.2.3


From 5134b83b0bd07d62b6ab1e334977962addfebf47 Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 8 Jan 2018 08:21:25 +0100
Subject: Rebase master

---
 app/javascript/journey_patterns/actions/index.js | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'app/javascript/journey_patterns/actions')

diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 9f1c1c8d3..a70a2e6f2 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -199,18 +199,6 @@ const actions = {
                   }
                 })
               }
-<<<<<<< HEAD
-              journeyPatterns.push({
-                name: val.name,
-                object_id: val.object_id,
-                short_id: val.short_id,
-                checksum: val.checksum,
-                published_name: val.published_name,
-                registration_number: val.registration_number,
-                stop_points: val.route_short_description.stop_points,
-                deletable: false
-              })
-=======
               journeyPatterns.push(
                 _.assign({}, val, {
                   stop_points: val.route_short_description.stop_points,
@@ -218,7 +206,6 @@ const actions = {
                   deletable: false
                 })
               )
->>>>>>> Refs #5455 @6h; Add time and distance between stops in Journey Patterns
             }
           }
           window.currentItemsLength = journeyPatterns.length
-- 
cgit v1.2.3