From 87d4b420361617346f1325f27ef865da1ea38a32 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Fri, 16 Sep 2016 09:47:36 +1200 Subject: [PATCH] Fixed 2 incorrect buttons and hooked up flight buttons. --- .../group9/GUI/AirlineSummaryController.java | 2 +- .../group9/GUI/FlightSummaryController.java | 34 ++++++++++++++++++ src/main/resources/flight_data_summary.fxml | 36 +++++++++---------- 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/src/main/java/seng202/group9/GUI/AirlineSummaryController.java b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java index da7a9bd..07be386 100644 --- a/src/main/java/seng202/group9/GUI/AirlineSummaryController.java +++ b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java @@ -45,7 +45,7 @@ public class AirlineSummaryController extends MenuController{ } public void airlineRawDataButton() { try { - RouteRDController rawDataController = (RouteRDController) + AirlineRDController rawDataController = (AirlineRDController) parent.replaceSceneContent("airline_raw_data.fxml"); rawDataController.setApp(parent); rawDataController.loadTables(); diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java index 0704d8d..a534407 100644 --- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java +++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java @@ -76,6 +76,40 @@ public class FlightSummaryController implements Initializable { } } + public void airportSummaryButton() { + try { + AirportSummaryController summaryController = (AirportSummaryController) + parent.replaceSceneContent("airport_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void routeSummaryButton() { + try { + RouteSummaryController summaryController = (RouteSummaryController) + parent.replaceSceneContent("routes_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void airlineSummaryButton() { + try { + AirlineSummaryController summaryController = (AirlineSummaryController) + parent.replaceSceneContent("airline_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void initialize(URL arg0, ResourceBundle arg1) { // TODO Auto-generated method stub diff --git a/src/main/resources/flight_data_summary.fxml b/src/main/resources/flight_data_summary.fxml index e28523e..b8c936c 100644 --- a/src/main/resources/flight_data_summary.fxml +++ b/src/main/resources/flight_data_summary.fxml @@ -83,24 +83,24 @@ - - - - - + + +