diff --git a/src/api/getReservationsList.ts b/src/api/getReservationsList.ts index a5739f88a491d588c6368a24e38219b345f5c345..51ff9351b631e70ed49d5d42a2bceb935fe2368e 100644 --- a/src/api/getReservationsList.ts +++ b/src/api/getReservationsList.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { InsertReservationType } from 'types/InsertReservationType'; +import { ReservationType } from 'types/ReservationType'; -export const getReservationsList = async (): Promise<InsertReservationType[]> => - axios(`/api/web/reservations/`).then((res) => res.data); +export const getReservationsList = async (): Promise<ReservationType[]> => + axios(`/api/web/reservations/?field=trip_stages`).then((res) => res.data); diff --git a/src/api/setReservation.ts b/src/api/setReservation.ts index b7ef9f379e738a0aff05b1d9b28c92355ce4f378..e8c2e618a6ed87ea890db806fd1b99b6ba846137 100644 --- a/src/api/setReservation.ts +++ b/src/api/setReservation.ts @@ -1,6 +1,6 @@ import axios from 'axios'; -import { InsertReservationType } from 'types/InsertReservationType'; +import { ReservationType } from 'types/ReservationType'; export const setReservation = async ( - reservation: InsertReservationType, + reservation: ReservationType, ): Promise<void> => axios.post('/api/web/reservations/', reservation); diff --git a/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx b/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx index 62a96829b75a70b4d535a805edb65dacf460da86..9c39f7f451c5c7461bcbe80f0c35452a4e452ba9 100644 --- a/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx +++ b/src/components/Dashboard/ReservationPage/Reservation/Reservation.tsx @@ -10,7 +10,7 @@ import { TableHead, TableRow, } from '@material-ui/core'; -import { InsertReservationType } from 'types/InsertReservationType'; +import { ReservationType } from 'types/ReservationType'; const useStyles = makeStyles(() => ({ noShadow: { @@ -21,7 +21,7 @@ const useStyles = makeStyles(() => ({ })); type PropsType = { - reservation: InsertReservationType; + reservation: ReservationType; }; export const Reservation: FC<PropsType> = ({ reservation }: PropsType) => { diff --git a/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx b/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx index 297aeb51425018119ac4ca7036ed56e2a47ec641..71772e582e9a13a416f2c451551b56fbdb2a6af5 100644 --- a/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx +++ b/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx @@ -10,7 +10,7 @@ import { } from '@material-ui/core'; import { Control, Controller } from 'react-hook-form'; import { InputField } from 'components/Auth/InputField/InputField'; -import { InsertReservationType } from 'types/InsertReservationType'; +import { ReservationType } from 'types/ReservationType'; import DateFnsUtils from '@date-io/date-fns'; import { MuiPickersUtilsProvider, @@ -18,7 +18,7 @@ import { } from '@material-ui/pickers'; type TripStageProps = { - control: Control<InsertReservationType>; + control: Control<ReservationType>; }; export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => { diff --git a/src/components/Dashboard/ReservationPage/ReservationDialog.tsx b/src/components/Dashboard/ReservationPage/ReservationDialog.tsx index 5938e3fab56c9b7b2688fc549428e5824d6ea966..ba5914d6a8707cab8aa690cb06fbd70c269f2c26 100644 --- a/src/components/Dashboard/ReservationPage/ReservationDialog.tsx +++ b/src/components/Dashboard/ReservationPage/ReservationDialog.tsx @@ -9,7 +9,7 @@ import { Button, Typography, } from '@material-ui/core'; -import { InsertReservationType } from 'types/InsertReservationType'; +import { ReservationType } from 'types/ReservationType'; import { SeniorSearchQueryType } from 'types/SeniorSearchQueryType'; import { getRoleObject } from 'api/getRoleObject'; import { setReservation } from 'api/setReservation'; @@ -25,14 +25,14 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({ handleClose, isOpen, }: ReservationDialogProps) => { - const { control, handleSubmit } = useForm<InsertReservationType>({ + const { control, handleSubmit } = useForm<ReservationType>({ mode: 'onSubmit', }); const [senior, setSenior] = useState<SeniorSearchQueryType | null>(null); - const onSubmit: SubmitHandler<InsertReservationType> = ( - reservation: InsertReservationType, + const onSubmit: SubmitHandler<ReservationType> = ( + reservation: ReservationType, ) => { const filledReservation = reservation; getRoleObject().then((role) => { diff --git a/src/hooks/useReservations.ts b/src/hooks/useReservations.ts index 32fa622c11c98f636a74c1ddbc6728f2e1d80c0e..bf7fad3a371cae5d78343e7a5f067f6e8de14fd0 100644 --- a/src/hooks/useReservations.ts +++ b/src/hooks/useReservations.ts @@ -1,11 +1,9 @@ import { getReservationsList } from 'api/getReservationsList'; import { useMemo, useState } from 'react'; -import { InsertReservationType } from 'types/InsertReservationType'; +import { ReservationType } from 'types/ReservationType'; -export const useReservations = (): InsertReservationType[] => { - const [reservationList, setReservationList] = useState< - InsertReservationType[] - >([]); +export const useReservations = (): ReservationType[] => { + const [reservationList, setReservationList] = useState<ReservationType[]>([]); useMemo(() => { let isMounted = true; diff --git a/src/types/InsertReservationType.ts b/src/types/ReservationType.ts similarity index 81% rename from src/types/InsertReservationType.ts rename to src/types/ReservationType.ts index d2713dfcfb6414def7a5f4fa51143fd1d08a2a4e..7af907485ced2e5081291b0645269e84ef70bf37 100644 --- a/src/types/InsertReservationType.ts +++ b/src/types/ReservationType.ts @@ -1,6 +1,6 @@ import { TripStageType } from './TripStageType'; -export type InsertReservationType = { +export type ReservationType = { senior: number | undefined; insertedBy: number; tripStages: TripStageType[];