diff --git a/src/main/java/controllers/MyTripsController.java b/src/main/java/controllers/MyTripsController.java index 351666d..381308c 100644 --- a/src/main/java/controllers/MyTripsController.java +++ b/src/main/java/controllers/MyTripsController.java @@ -75,7 +75,7 @@ public class MyTripsController extends Controller{ } } if (selectedTrip.ride.getNumSeats() > seats){ - parent.getSession().getDataManager().addSharedTrip(new SharedTrip(selectedTrip)); + parent.getSession().getDataManager().addSharedTrip(new SharedTrip(selectedTrip, seats)); popUp(Alert.AlertType.CONFIRMATION, "SUCCESS!", "Trip has been successfully shared", "The trip can now be seen by other users when there are seats available."); try { changeScene(SceneCode.SHARED_RIDES); diff --git a/src/main/java/controllers/SharedTripsController.java b/src/main/java/controllers/SharedTripsController.java index 296304d..5f262d5 100644 --- a/src/main/java/controllers/SharedTripsController.java +++ b/src/main/java/controllers/SharedTripsController.java @@ -89,19 +89,22 @@ public class SharedTripsController extends Controller{ popUpGrid.add(driverPhoto, 0, 3); Label carTitle = new Label("Car"); - popUpGrid.add(carTitle, 0, 5); + popUpGrid.add(carTitle, 0, 4); Label carModel = new Label(trip.ride.getModel()); - popUpGrid.add(carModel, 0, 6); + popUpGrid.add(carModel, 0, 5); Label carPlate = new Label(trip.ride.getLicensePlate()); - popUpGrid.add(carPlate, 0, 7); + popUpGrid.add(carPlate, 0, 6); Label carColour = new Label(trip.ride.getColour()); - popUpGrid.add(carColour, 0, 8); + popUpGrid.add(carColour, 0, 7); Label carYear = new Label(String.valueOf(trip.ride.getYear())); - popUpGrid.add(carYear, 0, 9); + popUpGrid.add(carYear, 0, 8); + + Label seatsAvailable = new Label(String.valueOf(trip.getSeatsAvailable())); + popUpGrid.add(seatsAvailable, 0, 9); //stops TableView stopTableView = new TableView<>(); diff --git a/src/main/java/model/SharedTrip.java b/src/main/java/model/SharedTrip.java index cf5711c..ebf4e95 100644 --- a/src/main/java/model/SharedTrip.java +++ b/src/main/java/model/SharedTrip.java @@ -5,8 +5,11 @@ package model; */ public class SharedTrip extends Trip { - public SharedTrip (Trip trip){ + private int seatsAvailable; + + public SharedTrip (Trip trip, int seatsAvailable){ super(trip.name, trip.route, trip.direction, trip.ride, trip.days, trip.reoccur, trip.endDate); + this.seatsAvailable = seatsAvailable; } public String getDays(){ @@ -22,4 +25,11 @@ public class SharedTrip extends Trip { return daysString; } + public int getSeatsAvailable() { + return seatsAvailable; + } + + public void setSeatsAvailable(int seatsAvailable) { + this.seatsAvailable = seatsAvailable; + } }