mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-21 14:36:31 +00:00
Maurice
9765cf3fee
A tour on a day had no place in the day's timeline: its time was not tied to the slot it was planned in, so several hikes on one day could not be lined up. A tour now sits there the way a place does, on the times of its day entry, one model for every tour type. With a start and a known time (the planned total, else the estimate of an import) its end follows as the start plus that time; it is shown fainter, marked with an approximate sign where it comes from an estimate, and says in its tooltip how it was worked out. An end typed by hand wins. A day that holds one stage of a multi-day tour gets no end from the whole route. When the end runs past the start of the day's next timed item, the row says so in one quiet line, as a late connection between two city walks does; nothing is moved. The existing time fields of the day entry, on the desktop form and the phone sheet, say what the end works out to while none is typed. City walks keep their arrivals per station. The logic lives in one module both day plans run on.
211 lines
8.4 KiB
TypeScript
211 lines
8.4 KiB
TypeScript
import { describe, expect, it, vi } from 'vitest'
|
|
import PlTimeFields from '../../../../src/mobile/screens/trip/sheets/PlTimeFields'
|
|
import type { Assignment } from '../../../../src/types'
|
|
import { buildPlanner } from '../../../helpers/mobileTrip'
|
|
import { fireEvent, render, screen } from '../../../helpers/render'
|
|
import { seedStore } from '../../../helpers/store'
|
|
import { buildSettings } from '../../../helpers/factories'
|
|
import { useSettingsStore } from '../../../../src/store/settingsStore'
|
|
|
|
// FE-MOB-PLTIME-001 to FE-MOB-PLTIME-017
|
|
|
|
const planner = buildPlanner()
|
|
|
|
function assignment(
|
|
id: number,
|
|
name: string,
|
|
place_time: string | null,
|
|
end_time: string | null = null,
|
|
day_id = 1,
|
|
): Assignment {
|
|
return { id, day_id, place_id: id, order_index: 0, place: { id, name, place_time, end_time } } as unknown as Assignment
|
|
}
|
|
|
|
const SELF = assignment(1, 'Museum', '10:00', '11:00')
|
|
|
|
interface Options {
|
|
startTime?: string
|
|
endTime?: string
|
|
dayAssignments?: Assignment[]
|
|
hasTimeError?: boolean
|
|
assignmentId?: number
|
|
}
|
|
|
|
function setup({
|
|
startTime = '10:00',
|
|
endTime = '11:00',
|
|
dayAssignments = [SELF],
|
|
hasTimeError = false,
|
|
assignmentId = 1,
|
|
}: Options = {}) {
|
|
const onChange = vi.fn()
|
|
const view = render(
|
|
<PlTimeFields
|
|
planner={planner}
|
|
startTime={startTime}
|
|
endTime={endTime}
|
|
onChange={onChange}
|
|
assignmentId={assignmentId}
|
|
dayAssignments={dayAssignments}
|
|
hasTimeError={hasTimeError}
|
|
/>,
|
|
)
|
|
// Both fields are CustomTimePicker text inputs now, so they answer to its
|
|
// 24h placeholder rather than to a native time input (#2067).
|
|
// Both fields are CustomTimePicker text inputs now, and they are the only text
|
|
// inputs this component renders — the placeholder itself changes with the
|
|
// user's format, so it cannot be the hook (#2067).
|
|
const inputs = Array.from(view.container.querySelectorAll('input[type="text"]')) as HTMLInputElement[]
|
|
return { ...view, onChange, start: inputs[0], end: inputs[1] }
|
|
}
|
|
|
|
describe('PlTimeFields', () => {
|
|
it('FE-MOB-PLTIME-001: renders both labelled time inputs with their current values', () => {
|
|
const { start, end } = setup()
|
|
expect(screen.getByText('places.startTime')).toBeInTheDocument()
|
|
expect(screen.getByText('places.endTime')).toBeInTheDocument()
|
|
expect(start).toHaveValue('10:00')
|
|
expect(end).toHaveValue('11:00')
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-002: editing the start reports the place_time field', () => {
|
|
const { start, onChange } = setup()
|
|
fireEvent.change(start, { target: { value: '09:15' } })
|
|
expect(onChange).toHaveBeenCalledWith('place_time', '09:15')
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-003: editing the end reports the end_time field', () => {
|
|
const { end, onChange } = setup()
|
|
fireEvent.change(end, { target: { value: '12:45' } })
|
|
expect(onChange).toHaveBeenCalledWith('end_time', '12:45')
|
|
})
|
|
|
|
// #2067 — the desktop twin (PlaceFormModal) has used CustomTimePicker for ages;
|
|
// the phone kept a native time input, so the same form obeyed the setting on one
|
|
// shell and ignored it on the other.
|
|
// The normalisation back to 24h on blur belongs to CustomTimePicker and is
|
|
// covered by its own suite; what this file owns is that the phone shows the
|
|
// user's format at all, which the native input it replaced never did.
|
|
it('FE-MOB-PLTIME-013: a 12h user sees meridiem clocks, a 24h user does not', () => {
|
|
seedStore(useSettingsStore, { settings: buildSettings({ time_format: '12h' }) })
|
|
const twelve = setup()
|
|
expect(twelve.start).toHaveValue('10:00 AM')
|
|
expect(twelve.end).toHaveValue('11:00 AM')
|
|
twelve.unmount()
|
|
|
|
seedStore(useSettingsStore, { settings: buildSettings({ time_format: '24h' }) })
|
|
const twentyFour = setup()
|
|
expect(twentyFour.start).toHaveValue('10:00')
|
|
expect(twentyFour.end).toHaveValue('11:00')
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-004: shows the end-before-start warning only when the sheet flags it', () => {
|
|
setup()
|
|
expect(screen.queryByText('places.endTimeBeforeStart')).not.toBeInTheDocument()
|
|
setup({ hasTimeError: true })
|
|
expect(screen.getByText('places.endTimeBeforeStart')).toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-005: stays quiet without a usable start time', () => {
|
|
setup({ startTime: '', dayAssignments: [assignment(1, 'Museum', null), assignment(2, 'Park', '10:30')] })
|
|
expect(screen.queryByText(/places.timeCollision/)).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-006: stays quiet when the edited assignment is not in the day', () => {
|
|
setup({ assignmentId: 99, dayAssignments: [SELF, assignment(2, 'Park', '10:30')] })
|
|
expect(screen.queryByText(/places.timeCollision/)).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-007: names the overlapping places of the same day', () => {
|
|
setup({
|
|
dayAssignments: [SELF, assignment(2, 'Park', '10:30', '12:00'), assignment(3, 'Cafe', '10:45')],
|
|
})
|
|
expect(screen.getByText(/places.timeCollision/)).toHaveTextContent('places.timeCollision Park, Cafe')
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-008: ignores places of other days', () => {
|
|
setup({ dayAssignments: [SELF, assignment(2, 'Park', '10:30', '12:00', 2)] })
|
|
expect(screen.queryByText(/places.timeCollision/)).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-009: ignores untimed places', () => {
|
|
setup({ dayAssignments: [SELF, assignment(2, 'Park', null)] })
|
|
expect(screen.queryByText(/places.timeCollision/)).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-010: back-to-back slots are not a collision', () => {
|
|
setup({ dayAssignments: [SELF, assignment(2, 'Park', '11:00', '12:00')] })
|
|
expect(screen.queryByText(/places.timeCollision/)).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-011: an open-ended slot still collides with a place starting later', () => {
|
|
setup({
|
|
endTime: '',
|
|
dayAssignments: [assignment(1, 'Museum', '10:00'), assignment(2, 'Park', '09:00', '10:30')],
|
|
})
|
|
expect(screen.getByText(/places.timeCollision/)).toHaveTextContent('Park')
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-012: a half-typed end time is discarded instead of widening the slot', () => {
|
|
// With a complete 11:00 end the 10:30 place would overlap — '11:0' must not count.
|
|
setup({ endTime: '11:0', dayAssignments: [SELF, assignment(2, 'Park', '10:30', '12:00')] })
|
|
expect(screen.queryByText(/places.timeCollision/)).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-014: opened from the road trip tab, End says the drive leaves at it', () => {
|
|
render(
|
|
<PlTimeFields
|
|
planner={buildPlanner({ activeTab: 'roadtrip' } as never)}
|
|
startTime="10:00"
|
|
endTime="14:00"
|
|
onChange={vi.fn()}
|
|
assignmentId={1}
|
|
dayAssignments={[SELF]}
|
|
hasTimeError={false}
|
|
/>,
|
|
)
|
|
expect(screen.getByText('roadtrip.stop.endIsLeave')).toBeInTheDocument()
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-015: from the plan tab End stays a plain label', () => {
|
|
setup()
|
|
expect(screen.queryByText('roadtrip.stop.endIsLeave')).not.toBeInTheDocument()
|
|
})
|
|
|
|
// TIME-02: an imported hike of 12 km, 300 m up and 500 m down, estimated at 4 h.
|
|
const hike = {
|
|
place_id: 1, name: 'Museum ridge', tour_type: 'hike', distance: 12, elevation_gain: 300, elevation_loss: 500,
|
|
duration: null, planned_duration_minutes: null, break_additional_minutes: null, difficulty: null, wanderer_ref: null,
|
|
match_confidence: 1, max_hiking_difficulty: null, planned: true, caution: false,
|
|
}
|
|
|
|
function renderTour(startTime: string, endTime: string) {
|
|
seedStore(useSettingsStore, { settings: buildSettings({ time_format: '24h' }) })
|
|
return render(
|
|
<PlTimeFields
|
|
planner={buildPlanner({ tours: [hike] } as never)}
|
|
startTime={startTime}
|
|
endTime={endTime}
|
|
onChange={vi.fn()}
|
|
assignmentId={1}
|
|
dayAssignments={[SELF]}
|
|
hasTimeError={false}
|
|
/>,
|
|
)
|
|
}
|
|
|
|
it('FE-MOB-PLTIME-016: a tour without a typed end says the end its start and its time work out to', () => {
|
|
renderTour('09:00', '')
|
|
expect(screen.getByTestId('tour-day-end-hint')).toHaveTextContent('13:00')
|
|
expect(screen.getByTestId('tour-day-end-hint')).toHaveTextContent('≈ 4 h')
|
|
})
|
|
|
|
it('FE-MOB-PLTIME-017: before a start it says one will set the end, and a typed end needs no hint', () => {
|
|
const view = renderTour('', '')
|
|
expect(screen.getByTestId('tour-day-end-hint')).toHaveTextContent('≈ 4 h')
|
|
view.unmount()
|
|
renderTour('09:00', '15:00')
|
|
expect(screen.queryByTestId('tour-day-end-hint')).not.toBeInTheDocument()
|
|
})
|
|
})
|