Skip to content

Activity Scheduling: Schedule time cannot be in the past #420

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
anantmittal wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Activity Scheduling: Schedule time cannot be in the past #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion web_patient/src/components/Forms/AddEditActivityForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
TextField,
Typography,
} from '@mui/material';
import { isEqual } from 'date-fns';
import { isEqual, isSameDay } from 'date-fns';
import { action, runInAction } from 'mobx';
import { observer, useLocalObservable } from 'mobx-react';
import React, { Fragment, FunctionComponent } from 'react';
Expand Down Expand Up @@ -755,6 +755,21 @@ export const AddEditActivityForm: FunctionComponent<IAddEditActivityFormProps> =
};
}

// Check if activityScheduleViewState.displayedDate is today
const currentTime = new Date();
if (isSameDay(activityScheduleViewState.displayedDate as Date, currentTime)) {
// If so, check if the time is in the past
const timeOfDayDate = new Date(2023, 0, 1, date.getHours(), date.getMinutes(), 0);
const currentTimeDate = new Date(2023, 0, 1, currentTime.getHours(), currentTime.getMinutes(), 0);
if (timeOfDayDate < currentTimeDate) {
return {
valid: false,
error: true,
errorMessage: getString('form_add_edit_activity_schedule_time_of_day_validation_in_past'),
};
}
}

return {
valid: true,
error: false,
Expand Down Expand Up @@ -1038,6 +1053,7 @@ export const AddEditActivityForm: FunctionComponent<IAddEditActivityFormProps> =
activityScheduleViewState.hasRepetition,
activityScheduleViewState.repeatDayFlags,
);

const activitySchedulePage = (
<Stack spacing={4}>
<FormSection
Expand Down
2 changes: 2 additions & 0 deletions web_patient/src/services/strings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ const _strings = {
form_add_edit_activity_schedule_date_validation_invalid_format: 'Invalid date format.',
form_add_edit_activity_schedule_time_of_day_label: 'Schedule Time',
form_add_edit_activity_schedule_time_of_day_help: 'Choose a time you would like to do this activity.',
form_add_edit_activity_schedule_time_of_day_validation_in_past: 'Time must be in the future.',
form_add_edit_activity_schedule_time_of_day_validation_invalid_format: 'Invalid time format.',

form_add_edit_activity_schedule_has_repetition_prompt: 'Would you like to repeat this activity every week?',
form_add_edit_activity_schedule_repeat_days_prompt: 'On what days would you like to repeat this activity?',
form_add_edit_activity_schedule_repetition_validation_no_days: 'Select one or more days.',
Expand Down