From 6535049acf8b1bb492e8ef565e7c81559a6a76cc Mon Sep 17 00:00:00 2001 From: Philip Cline Date: Thu, 25 Jun 2020 16:06:12 -0400 Subject: [PATCH 1/6] add trip_short_name --- lib/editor/selectors/timetable.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/editor/selectors/timetable.js b/lib/editor/selectors/timetable.js index 59cddb89b..cafb40005 100644 --- a/lib/editor/selectors/timetable.js +++ b/lib/editor/selectors/timetable.js @@ -49,6 +49,13 @@ export const getTimetableColumns = createSelector( key: 'tripHeadsign', type: 'TEXT', placeholder: 'Destination via Transfer Center' + }, + { + name: 'Trip Short Name', + width: 200, + key: 'tripShortName', + type: 'TEXT', + placeholder: '801' } ] if (pattern && pattern.patternStops) { From 6918ce651a6ec22dfe618f66ca8bd25dd246a678 Mon Sep 17 00:00:00 2001 From: Philip Cline Date: Fri, 26 Jun 2020 10:08:18 -0400 Subject: [PATCH 2/6] Add test in end-to-end for trip_short_name --- __tests__/end-to-end.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js index 0f216dd9b..0cf51abac 100644 --- a/__tests__/end-to-end.js +++ b/__tests__/end-to-end.js @@ -2471,6 +2471,11 @@ describe('end-to-end', () => { await page.keyboard.press('Tab') await page.keyboard.press('Enter') + // trip short name + await page.keyboard.type('test-trip-short-name') + await page.keyboard.press('Tab') + await page.keyboard.press('Enter') + // Laurel Dr arrival await page.keyboard.type('1234') await page.keyboard.press('Tab') From 11d8cbe7cf64cd244a5e3230bbe6864d6ca40079 Mon Sep 17 00:00:00 2001 From: Philip Cline Date: Fri, 26 Jun 2020 10:16:56 -0400 Subject: [PATCH 3/6] Adding trip_short_name test to end-to-end --- __tests__/end-to-end.js | 1 + 1 file changed, 1 insertion(+) diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js index 0cf51abac..0eef5750d 100644 --- a/__tests__/end-to-end.js +++ b/__tests__/end-to-end.js @@ -2476,6 +2476,7 @@ describe('end-to-end', () => { await page.keyboard.press('Tab') await page.keyboard.press('Enter') + // Laurel Dr arrival await page.keyboard.type('1234') await page.keyboard.press('Tab') From 16b7e53c8fcadcf017d3fe8deca098c4e0f0e721 Mon Sep 17 00:00:00 2001 From: Philip Cline Date: Fri, 26 Jun 2020 10:28:36 -0400 Subject: [PATCH 4/6] removing blank lines in end-to-end.js --- __tests__/end-to-end.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js index 0eef5750d..fca42eb91 100644 --- a/__tests__/end-to-end.js +++ b/__tests__/end-to-end.js @@ -2474,8 +2474,7 @@ describe('end-to-end', () => { // trip short name await page.keyboard.type('test-trip-short-name') await page.keyboard.press('Tab') - await page.keyboard.press('Enter') - + await page.keyboard.press('Enter') // Laurel Dr arrival await page.keyboard.type('1234') From 13607e79d52cb92560bc7bd71ab5bc3d5ca9c78e Mon Sep 17 00:00:00 2001 From: Philip Cline Date: Fri, 26 Jun 2020 10:36:12 -0400 Subject: [PATCH 5/6] more whitespace formatting --- __tests__/end-to-end.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js index fca42eb91..7c2a43745 100644 --- a/__tests__/end-to-end.js +++ b/__tests__/end-to-end.js @@ -2471,7 +2471,7 @@ describe('end-to-end', () => { await page.keyboard.press('Tab') await page.keyboard.press('Enter') - // trip short name + // trip short name await page.keyboard.type('test-trip-short-name') await page.keyboard.press('Tab') await page.keyboard.press('Enter') From f7272fdb5e16717976388d69c00bcb2289976723 Mon Sep 17 00:00:00 2001 From: Philip Cline Date: Fri, 3 Jul 2020 13:46:45 -0400 Subject: [PATCH 6/6] improvement(editor/selectors/timetable.js): Changed trip_short_name width to 120 Changed trip_short_name width to 120 from 200 of previous commit Close #569 --- lib/editor/selectors/timetable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/editor/selectors/timetable.js b/lib/editor/selectors/timetable.js index cafb40005..33bdb205f 100644 --- a/lib/editor/selectors/timetable.js +++ b/lib/editor/selectors/timetable.js @@ -52,7 +52,7 @@ export const getTimetableColumns = createSelector( }, { name: 'Trip Short Name', - width: 200, + width: 120, key: 'tripShortName', type: 'TEXT', placeholder: '801'