feat(exception based scheduling): initial work

ibi-group · Nov 8, 2023 · a36bea3 · a36bea3
1 parent 7682f9e
commit a36bea3
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 27 deletions.
diff --git a/lib/editor/actions/editor.js b/lib/editor/actions/editor.js
@@ -513,6 +513,8 @@ export function fetchBaseGtfs ({
             # Fetch dates to ensure we can do validation in the UI
             # (avoid duplicate dates).
             dates
+            # Fetch exemplar for display of exception based service in calendar select
+            exemplar 
           }
           stops (limit: -1) {
             id

diff --git a/lib/editor/components/ScheduleExceptionForm.js b/lib/editor/components/ScheduleExceptionForm.js
@@ -93,6 +93,8 @@ export default class ScheduleExceptionForm extends Component<Props> {
         return 'Swap, add, or remove'
       case EXCEPTION_EXEMPLARS.NO_SERVICE:
         return toSentenceCase(exemplar.replace('_', ' '))
+      case EXCEPTION_EXEMPLARS.EXCEPTION_SERVICE:
+        return 'Exception Based Service'
       default:
         return toSentenceCase(exemplar)
     }

diff --git a/lib/editor/components/timetable/CalendarSelect.js b/lib/editor/components/timetable/CalendarSelect.js
@@ -7,8 +7,7 @@ import Select from 'react-select'
 
 import * as activeActions from '../../actions/active'
 import {entityIsNew} from '../../util/objects'
-
-import type {Pattern, GtfsRoute, Feed, ServiceCalendar, Trip, TripCounts} from '../../../types'
+import type {Pattern, GtfsRoute, Feed, ServiceCalendar, ScheduleException, Trip, TripCounts} from '../../../types'
 
 type CalendarOption = {
   calendar: ServiceCalendar,
@@ -24,6 +23,7 @@ type Props = {
   activeCalendar: ?ServiceCalendar,
   activePattern: Pattern,
   calendars: Array<ServiceCalendar>,
+  exceptionBasedCalendars: Array<ScheduleException>,
   feedSource: Feed,
   route: GtfsRoute,
   setActiveEntity: typeof activeActions.setActiveEntity,
@@ -49,28 +49,36 @@ export default class CalendarSelect extends Component<Props> {
       <span title={title}>
         <Icon type='calendar-o' /> {label}
         {' '}
-        <BsLabel
-          bsStyle={patternTrips ? 'success' : 'default'}
-          title={`Calendar has ${patternTrips} trips for pattern`}>
-          <Icon type='bars' /> {patternTrips}
-        </BsLabel>
-        {/** {' '}
-        <BsLabel
-          title={`Calendar has trips for ${routeCount} routes`}>
-          <Icon type='bus' /> {routeCount}
-        </BsLabel> **/}
-        {' '}
-        <BsLabel
-          title={`Calendar has ${totalTrips} trips for feed`}>
-          <Icon type='building-o' /> {totalTrips}
-        </BsLabel>
+        {/* $FlowFixMe: need to add two types of options */}
+        {option.type !== 'exception-based'
+          ? <>
+            <BsLabel
+              bsStyle={patternTrips ? 'success' : 'default'}
+              title={`Calendar has ${patternTrips} trips for pattern`}>
+              <Icon type='bars' /> {patternTrips}
+            </BsLabel>
+            {/** {' '}
+            <BsLabel
+              title={`Calendar has trips for ${routeCount} routes`}>
+              <Icon type='bus' /> {routeCount}
+            </BsLabel> **/}
+            {' '}
+            <BsLabel
+              title={`Calendar has ${totalTrips} trips for feed`}>
+              <Icon type='building-o' /> {totalTrips}
+            </BsLabel>
+          </>
+          : <>
+            <Icon type='warning' />(Exception based calendar)
+          </>
+        }
       </span>
     )
   }
 
   _onChange = (value: CalendarOption) => {
     const {activePattern, feedSource, route, setActiveEntity} = this.props
-    const calendar = value && value.calendar
+    const calendar = value && (value.calendar || value)
     setActiveEntity(
       feedSource.id,
       'route',
@@ -94,9 +102,9 @@ export default class CalendarSelect extends Component<Props> {
   }
 
   _getOptions = (): Array<CalendarOption> => {
-    const {activePattern, calendars, tripCounts, trips} = this.props
+    const {activePattern, calendars, exceptionBasedCalendars, tripCounts, trips} = this.props
     const patternId = activePattern && activePattern.patternId
-    const calendarOptions: Array<CalendarOption> = calendars && activePattern
+    let calendarOptions: Array<CalendarOption> = calendars && activePattern
       ? calendars
         .map(calendar => ({
           label: calendar.description || calendar.service_id,
@@ -111,6 +119,18 @@ export default class CalendarSelect extends Component<Props> {
         }))
       : []
 
+    // Add exception based calendars to the list
+    // TODO: trip counts (total v pattern)
+    const exceptionBasedCalendarOptions = exceptionBasedCalendars && exceptionBasedCalendars.map(exception => ({
+      label: exception.name || exception.id,
+      value: exception.name,
+      type: 'exception-based',
+      service_id: exception.name
+    }))
+
+    // $FlowFixMe: we need two types of options
+    calendarOptions = calendarOptions.concat(exceptionBasedCalendarOptions)
+
     return calendarOptions
       .sort((a, b) => {
         return b.patternTrips - a.patternTrips

diff --git a/lib/editor/components/timetable/TimetableHeader.js b/lib/editor/components/timetable/TimetableHeader.js
@@ -23,8 +23,9 @@ import OptionButton from '../../../common/components/OptionButton'
 import HourMinuteInput from '../HourMinuteInput'
 import {getTableById} from '../../util/gtfs'
 import { getComponentMessages } from '../../../common/util/config'
+import { EXCEPTION_EXEMPLARS } from '../../util'
 import type {TripValidationIssues} from '../../selectors/timetable'
-import type {Feed, GtfsRoute, Pattern, ServiceCalendar, TripCounts} from '../../../types'
+import type {Feed, GtfsRoute, Pattern, ServiceCalendar, ScheduleException, TripCounts} from '../../../types'
 import type {EditorTables, TimetableState} from '../../../types/reducers'
 
 import PatternSelect from './PatternSelect'
@@ -117,7 +118,15 @@ export default class TimetableHeader extends Component<Props> {
     } = this.props
     const {edited, hideDepartureTimes, selected, trips, useSecondsInOffset} = timetable
     const calendars: Array<ServiceCalendar> = getTableById(tableData, 'calendar')
-    const activeCalendar = calendars.find(c => c.service_id === activeScheduleId)
+    const scheduleExceptions: Array<ScheduleException> = getTableById(tableData, 'scheduleexception')
+    const exceptionBasedCalendars = scheduleExceptions && scheduleExceptions.reduce((calendars, exception) => {
+      if (exception.exemplar === EXCEPTION_EXEMPLARS.EXCEPTION_SERVICE) {
+        calendars.push({...exception, service_id: exception.name})
+      }
+      return calendars
+    }, [])
+
+    const activeCalendar = calendars.find(c => c.service_id === activeScheduleId) || exceptionBasedCalendars.find(c => c.name === activeScheduleId)
     const headerStyle = {
       backgroundColor: 'white'
     }
@@ -370,14 +379,16 @@ export default class TimetableHeader extends Component<Props> {
           </Col>
           <Col xs={12} sm={3} data-test-id='calendar-select-container'>
             <CalendarSelect
-              activePattern={activePattern}
-              route={route}
-              feedSource={feedSource}
               activeCalendar={activeCalendar}
+              activePattern={activePattern}
               calendars={calendars}
+              exceptionBasedCalendars={exceptionBasedCalendars}
+              feedSource={feedSource}
+              route={route}
               setActiveEntity={setActiveEntity}
+              trips={trips}
               tripCounts={tripCounts}
-              trips={trips} />
+            />
           </Col>
           <Col sm={3}>
             {/* Edit timetable buttons */}

diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
@@ -30,7 +30,8 @@ export const EXCEPTION_EXEMPLARS = {
   SUNDAY: 6,
   NO_SERVICE: 7,
   CUSTOM: 8,
-  SWAP: 9
+  SWAP: 9,
+  EXCEPTION_SERVICE: 10
 }
 
 export const ROUTE_STATUS_CODES = {

diff --git a/lib/types/reducers.js b/lib/types/reducers.js
@@ -144,6 +144,7 @@ export type EditorTables = {
     tripPatterns?: Array<Pattern>
   }>,
   schedule_exceptions: Array<{
+    exemplar: number,
     id: number,
     name: string
   }>,