Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/Components/Events/EventSchedule/CreateSchedule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export default function EventEdit({
onChange={(e) => {
setNewEvent((prev) => ({
...prev,
datetime: e ? new Date(e.toString()) : new Date(),
datetime: e ? new Date(e.toLocaleString()) : new Date(),
}));
}}
/>
Expand Down
12 changes: 9 additions & 3 deletions src/Hooks/Event/useScheduleList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,20 +160,26 @@ export function useScheduleList() {
selectedEvent: IScheduleItem | null,
round: string,
roundId: number,
newDatetime: Date,
day: number,
) => {
try {
setError('');
const formattedDate = newDatetime.toLocaleString();

await axiosEventsPrivate.put(`/api/schedule`, {
eventId: selectedEvent?.eventId,
round,
roundId,
day: selectedEvent?.day,
datetime: selectedEvent?.datetime,
day,
datetime: formattedDate,
});

setEventList((prevList) =>
prevList.map((event) =>
event.eventId === selectedEvent?.eventId ? { ...event, round, roundId } : event,
event.eventId === selectedEvent?.eventId && event.roundId === selectedEvent?.roundId
? { ...event, round, roundId, datetime: newDatetime, day }
: event,
),
);
} catch (error) {
Expand Down
45 changes: 43 additions & 2 deletions src/Pages/Events/EventSchedule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import {
DialogTitle,
Typography,
TextField,
Box,
Select,
MenuItem,
FormControl,
InputLabel,
} from '@mui/material';
import {
DataGrid,
Expand All @@ -30,6 +35,8 @@ import {
} from 'Hooks/Event/eventRoles';
import { TypeSafeColDef } from 'Hooks/gridColumType';
import { useScheduleList } from 'Hooks/Event/useScheduleList';
import { DateTimePicker } from '@mui/x-date-pickers';
import dayjs from 'dayjs';

function getRowId(row: IScheduleItem) {
return row.id;
Expand All @@ -54,6 +61,8 @@ export default function EventSchedule() {
const [selectedEvent, setSelectedEvent] = useState<IScheduleItem | null>(null);
const [editRound, setEditRound] = useState('');
const [editRoundId, setEditRoundId] = useState('');
const [editDatetime, setEditDatetime] = useState<Date>(new Date());
const [editDay, setEditDay] = useState<number>(1);

const navigate = useNavigate();

Expand All @@ -62,6 +71,8 @@ export default function EventSchedule() {
setSelectedEvent(event);
setEditRound(event.round);
setEditRoundId(event.roundId.toString());
setEditDatetime(new Date(event.datetime));
setEditDay(event.day);
setEditModalOpen(true);
};

Expand All @@ -70,14 +81,21 @@ export default function EventSchedule() {
setSelectedEvent(null);
setEditRound('');
setEditRoundId('');
setEditDatetime(new Date());
setEditDay(1);
};

const handleSaveEdit = async () => {
if (selectedEvent?.round === editRound && selectedEvent?.roundId === Number(editRoundId)) {
if (
selectedEvent?.round === editRound &&
selectedEvent?.roundId === Number(editRoundId) &&
selectedEvent?.datetime.getTime() === editDatetime.getTime() &&
selectedEvent?.day === editDay
) {
handleCloseModal();
return;
}
await updateScheduleItem(selectedEvent, editRound, Number(editRoundId));
await updateScheduleItem(selectedEvent, editRound, Number(editRoundId), editDatetime, editDay);
handleCloseModal();
};

Expand Down Expand Up @@ -201,6 +219,29 @@ export default function EventSchedule() {
value={editRoundId}
onChange={(e) => setEditRoundId(e.target.value)}
/>
<FormControl fullWidth margin="dense">
<InputLabel id="day-select-label">Day</InputLabel>
<Select
labelId="day-select-label"
value={editDay}
label="Day"
onChange={(e) => setEditDay(Number(e.target.value))}
>
<MenuItem value={1}>1</MenuItem>
<MenuItem value={2}>2</MenuItem>
<MenuItem value={3}>3</MenuItem>
</Select>
</FormControl>
<Box sx={{ mt: 2 }}>
<DateTimePicker
label="Date & Time"
value={dayjs(editDatetime)}
onChange={(newValue) => {
if (newValue) setEditDatetime(dayjs(newValue).toDate());
}}
sx={{ width: '100%' }}
/>
</Box>
</DialogContent>
<DialogActions>
<Button onClick={handleCloseModal}>Cancel</Button>
Expand Down