diff --git a/src/main/java/seng202/group9/GUI/AirportRDController.java b/src/main/java/seng202/group9/GUI/AirportRDController.java index 8e22508..d09f22f 100644 --- a/src/main/java/seng202/group9/GUI/AirportRDController.java +++ b/src/main/java/seng202/group9/GUI/AirportRDController.java @@ -107,16 +107,11 @@ public class AirportRDController extends Controller{ */ public void deleteAirport(){ //Gets an airport from the table and deletes it before updating the table -// Airport toDelete = tableViewAirportRD.getSelectionModel().getSelectedItem(); -// theDataSet.deleteAirport(toDelete); -// tableViewAirportRD.setItems(observableArrayList(theDataSet.getAirports())); - ObservableList toDelete = tableViewAirportRD.getSelectionModel().getSelectedItems(); Alert alert = new Alert(Alert.AlertType.CONFIRMATION); alert.setTitle("Airport Delete Confirmation"); alert.setHeaderText("You are about to delete some data."); alert.setContentText("Are you sure you want to delete the selected airport(s)?"); - //alert.showAndWait(); Optional result = alert.showAndWait(); Airport air = null; if (result.isPresent() && result.get() == ButtonType.OK) { @@ -132,11 +127,6 @@ public class AirportRDController extends Controller{ Airport toEdit = tableViewAirportRD.getSelectionModel().getSelectedItem(); currentSession.setAirportToEdit(toEdit.getName()); createPopUpStage(SceneCode.AIRPORT_EDIT, 600, 480); - -// System.out.println(toEdit.getName() + "," + toEdit.getCity() + "," + toEdit.getCountry() + "," + toEdit.getIATA_FFA() -// + "," + toEdit.getICAO() + "," + toEdit.getLatitude() + "," + toEdit.getLongitude() + "," + toEdit.getAltitude() -// + "," + toEdit.getTimezone() + "," + toEdit.getDST() + "," + toEdit.getTz()); - tableViewAirportRD.refresh(); } diff --git a/src/main/java/seng202/group9/GUI/GettingStartedController.java b/src/main/java/seng202/group9/GUI/GettingStartedController.java index 0ecc58e..18741e5 100644 --- a/src/main/java/seng202/group9/GUI/GettingStartedController.java +++ b/src/main/java/seng202/group9/GUI/GettingStartedController.java @@ -1,5 +1,6 @@ package seng202.group9.GUI; +import javafx.scene.control.Alert; import seng202.group9.Controller.SceneCode; /** @@ -8,7 +9,6 @@ import seng202.group9.Controller.SceneCode; public class GettingStartedController extends Controller { public void load() { - } public void importAirlines() { @@ -31,7 +31,15 @@ public class GettingStartedController extends Controller { Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage()); } - public void goToAirlineSummary() { + public void manageDatasets() { + getParent().getMenuController().openDataset(); + + Alert alert = new Alert(Alert.AlertType.INFORMATION); + alert.setTitle("Dataset Selected"); + alert.setHeaderText("You have decided to change the Dataset."); + alert.setContentText("You will now be taken to the airline summary page."); + alert.showAndWait(); + replaceSceneContent(SceneCode.AIRLINE_SUMMARY); } } diff --git a/src/main/resources/getting_started.fxml b/src/main/resources/getting_started.fxml index 932647e..25e1d8b 100644 --- a/src/main/resources/getting_started.fxml +++ b/src/main/resources/getting_started.fxml @@ -51,12 +51,12 @@ - - + diff --git a/src/main/resources/route_add_form.fxml b/src/main/resources/route_add_form.fxml index 5be91be..2f5b6f7 100644 --- a/src/main/resources/route_add_form.fxml +++ b/src/main/resources/route_add_form.fxml @@ -53,7 +53,7 @@ -