Skip to content

Fix timetable previous stop time checks from checking text columns. #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philip-cline merged 3 commits into from
Mar 22, 2022
Merged

Fix timetable previous stop time checks from checking text columns. #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0de00c6
feat(Timetable Validation): Fix timetable previous stop time checks f…
philip-cline Mar 16, 2022
da2ba04
refactor(.gitignore): Add trailing slash to show vscode folder
philip-cline Mar 16, 2022
896ebe0
refactor(timetable.js): Only validate arrival or depature time column…
philip-cline Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ env.yml-original
.env
!configurations/test/env.yml
scripts/*client.json

# Vs code settings
.vscode/
4 changes: 1 addition & 3 deletions lib/editor/selectors/timetable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ import objectPath from 'object-path'

import { getAbbreviatedStopName, getTableById } from '../util/gtfs'
import { isTimeFormat } from '../util/timetable'

import type {
GtfsStop,
Pattern,
TimetableColumn,
Trip
} from '../../types'

import type { AppState } from '../../types/reducers'
import type { EditorValidationIssue } from '../util/validation'

Expand Down Expand Up @@ -152,7 +150,7 @@ const isCellValueInvalid = (
let previousValue = null
let previousIndex = colIndex - 1
// Find previous stop time
while (previousValue === null && previousIndex >= 0) {
while (previousValue === null && previousIndex >= 0 && (columns[previousIndex].type === 'ARRIVAL_TIME' || columns[previousIndex].type === 'DEPARTURE_TIME')) {
const previousCol = columns[previousIndex]
previousValue = previousCol && row && objectPath.get(row, previousCol.key)
previousIndex--
Expand Down