Skip to content

Remove End Time #599

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

Open
anika-4444 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove End Time #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8551ef1
WIP: Add Google estimated trip duration to student and admin rides ov…
anika-4444 Oct 7, 2025
70bd94e
Remove end time from relevant modals
anika-4444 Oct 15, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
- name: Run Linter
run: npm run lint
- name: Run Type Check
run: npm run type-check
run: npm run type-check
94 changes: 1 addition & 93 deletions frontend/src/components/RideDetails/RideOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ interface RideOverviewProps {
const getTemporalType = (ride: RideType): 'Past' | 'Active' | 'Upcoming' => {
const now = new Date().getTime();
const startTime = new Date(ride.startTime).getTime();
const endTime = new Date(ride.endTime).getTime();
const endTime = new Date(ride.startTime).getTime() + 15; //buffer time

if (endTime < now) return 'Past';
if (startTime <= now && now < endTime) return 'Active';
Expand Down Expand Up @@ -275,32 +275,6 @@ const RideOverview: React.FC<RideOverviewProps> = ({ userRole }) => {
updateRideField('startTime', updatedStartTime.toISOString());
};

const handleEndDateChange = (newDate: Dayjs | null) => {
if (!newDate) return;

const currentEndTime = dayjs(ride.endTime);
const updatedEndTime = newDate
.hour(currentEndTime.hour())
.minute(currentEndTime.minute())
.second(0)
.millisecond(0);

updateRideField('endTime', updatedEndTime.toISOString());
};

const handleEndTimeChange = (newTime: Dayjs | null) => {
if (!newTime) return;

const currentEndDate = dayjs(ride.endTime);
const updatedEndTime = currentEndDate
.hour(newTime.hour())
.minute(newTime.minute())
.second(0)
.millisecond(0);

updateRideField('endTime', updatedEndTime.toISOString());
};

const handleStatusChange = (event: any) => {
updateRideField('status', event.target.value);
};
Expand Down Expand Up @@ -402,20 +376,9 @@ const RideOverview: React.FC<RideOverviewProps> = ({ userRole }) => {
const startTimePastError = validation.errors.find(
(e) => e.type === 'start_time_past'
);
const endTimeBeforeStartError = validation.errors.find(
(e) =>
e.type === 'end_time_before_start' ||
e.type === 'same_time'
);
const durationError = validation.errors.find(
(e) => e.type === 'too_long_duration'
);

const hasStartTimeError =
startTimePastError !== undefined;
const hasEndTimeError =
endTimeBeforeStartError !== undefined ||
durationError !== undefined;

return (
<>
Expand Down Expand Up @@ -470,61 +433,6 @@ const RideOverview: React.FC<RideOverviewProps> = ({ userRole }) => {
)}
</div>
</div>

<div className={styles.dateTimeRow}>
<div style={{ flex: 1 }}>
<DatePicker
label="End Date"
value={dayjs(ride.endTime)}
onChange={handleEndDateChange}
slotProps={{
textField: {
size: 'small',
fullWidth: true,
error: hasEndTimeError,
helperText: hasEndTimeError
? ' '
: undefined,
},
}}
/>
</div>
<div style={{ flex: 1 }}>
<TimePicker
label="End Time"
value={dayjs(ride.endTime)}
onChange={handleEndTimeChange}
slotProps={{
textField: {
size: 'small',
fullWidth: true,
error: hasEndTimeError,
helperText: hasEndTimeError
? ' '
: undefined,
},
}}
/>
{/* End time specific errors - directly below end time field */}
{(endTimeBeforeStartError || durationError) && (
<Typography
variant="caption"
color="error"
sx={{
display: 'block',
fontSize: '0.75rem',
marginTop: 0.5,
marginLeft: 1,
}}
>
{
(endTimeBeforeStartError || durationError)
?.message
}
</Typography>
)}
</div>
</div>
</>
);
})()}
Expand Down
Loading