diff --git a/epictrack-web/src/components/shared/controlledInputComponents/ControlledDatePicker.tsx b/epictrack-web/src/components/shared/controlledInputComponents/ControlledDatePicker.tsx index ce892b528..afae793f2 100644 --- a/epictrack-web/src/components/shared/controlledInputComponents/ControlledDatePicker.tsx +++ b/epictrack-web/src/components/shared/controlledInputComponents/ControlledDatePicker.tsx @@ -7,6 +7,7 @@ import TrackDatePicker from "../DatePicker"; type ControlledDatePickerProps = { name: string; defaultValue?: any; + disabled?: boolean; datePickerProps?: { placeholder?: string; referenceDate?: dayjs.Dayjs; @@ -29,6 +30,7 @@ const ControlledDatePicker: React.FC = ({ datePickerProps, datePickerSlotProps, defaultValue, + disabled, }) => { const { control, register } = useFormContext(); return ( @@ -57,6 +59,7 @@ const ControlledDatePicker: React.FC = ({ onChange(event?.format() || ""); } }} + disabled={disabled} /> )} /> diff --git a/epictrack-web/src/components/workPlan/event/EventForm.tsx b/epictrack-web/src/components/workPlan/event/EventForm.tsx index f87b0e5e1..cdf044005 100644 --- a/epictrack-web/src/components/workPlan/event/EventForm.tsx +++ b/epictrack-web/src/components/workPlan/event/EventForm.tsx @@ -91,7 +91,6 @@ const EventForm = ({ const [showEventPushConfirmation, setShowEventPushConfirmation] = useState(false); const [pushEvents, setPushEvents] = useState(false); - const initialNotes = useMemo(() => event?.notes, [event?.id]); const { handleHighlightRows } = useContext(EventContext); const [dateCheckStatus, setDateCheckStatus] = @@ -144,6 +143,11 @@ const EventForm = ({ }), [selectedConfiguration, actualAdded] ); + const disableAnticipatedDate = Boolean( + selectedConfiguration?.id && + selectedWorkPhase?.work_phase.legislated && + selectedConfiguration?.event_position === EventPosition.END + ); const isHighPriorityActive = useMemo(() => { if (event) { return event.high_priority; @@ -679,6 +683,7 @@ const EventForm = ({ {anticipatedLabel}