🐛 Fix available places #257
Simon Mulquin simon@octree.ch
Tue, 15 Feb 2022 10:20:52 +0000
3 files changed,
9 insertions(+),
5 deletions(-)
M
frontend/containers/NewTravelDialog/useActions.ts
→
frontend/containers/NewTravelDialog/useActions.ts
@@ -7,6 +7,7 @@ Event,
EventByUuidDocument, useCreateTravelMutation, TravelInput, + FindUserVehiclesDocument, } from '../../generated/graphql'; interface Props {@@ -30,6 +31,9 @@ query: EventByUuidDocument,
variables: { uuid: event.uuid, }, + }, + { + query: FindUserVehiclesDocument, }, ], });
M
frontend/containers/Travel/index.tsx
→
frontend/containers/Travel/index.tsx
@@ -24,7 +24,7 @@ const actions = useActions({travel});
if (!travel) return null; const disableNewPassengers = - travel.passengers.length >= travel.vehicle?.seats; + travel.passengers.length >= travel.seats; return ( <Paper className={classes.root}>@@ -44,7 +44,7 @@ <Divider />
{!isEditing && ( <PassengersList passengers={travel.passengers} - places={travel?.vehicle?.seats} + places={travel?.seats} onClick={actions.sendPassengerToWaitingList} isVehicle Button={({onClick}: {onClick: () => void}) => (
M
frontend/containers/WaitingList/TravelDialog.tsx
→
frontend/containers/WaitingList/TravelDialog.tsx
@@ -32,7 +32,7 @@ const {t} = useTranslation();
const availableTravels = travels?.filter( travel => - travel.passengers && travel?.vehicle?.seats > travel.passengers.length + travel.passengers && travel?.seats > travel.passengers.length ); return (@@ -62,7 +62,7 @@ <List disablePadding>
{availableTravels.map((travel, i) => { const passengersCount = travel?.passengers?.length || 0; const counter = `${passengersCount} / ${ - travel?.vehicle?.seats || 0 + travel?.seats || 0 }`; return ( <ListItem key={i} divider className={classes.listItem}>@@ -83,7 +83,7 @@ </Link>
</Box> <Box className={classes.info}> <Typography variant="h6"> - {travel.vehicle?.name} + {travel.vehicleName} </Typography> <Typography variant="body2"> {t('passenger.creation.seats', {seats: counter})}