From 9da9b401763b1d018d1618c3a9f6ca7d002bba8b Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Wed, 14 Sep 2016 21:05:35 +1200 Subject: [PATCH] Route Summary controller code built though currently has nothing calling it and has not been tested. --- .../seng202/group9/GUI/MenuController.java | 12 ++++- .../group9/GUI/RouteSummaryController.java | 48 +++++++++++++++++++ src/main/resources/routes_summary.fxml | 22 ++++----- 3 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 src/main/java/seng202/group9/GUI/RouteSummaryController.java diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 0d6d6c1..ce533fd 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -77,7 +77,17 @@ public class MenuController implements Initializable{ public void viewAirportSummary() { try { - AirlineSummaryController summaryController = (AirportSummaryController) parent.replaceSceneContent("airport_summary.fxml"); + AirportSummaryController summaryController = (AirportSummaryController) parent.replaceSceneContent("airport_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void viewRouteSummary() { + try { + RouteSummaryController summaryController = (RouteSummaryController) parent.replaceSceneContent("route_summary.fxml"); summaryController.setApp(parent); summaryController.loadTables(); } catch (Exception e) { diff --git a/src/main/java/seng202/group9/GUI/RouteSummaryController.java b/src/main/java/seng202/group9/GUI/RouteSummaryController.java new file mode 100644 index 0000000..35e084d --- /dev/null +++ b/src/main/java/seng202/group9/GUI/RouteSummaryController.java @@ -0,0 +1,48 @@ +package seng202.group9.GUI; + +import javafx.collections.FXCollections; +import javafx.fxml.FXML; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.cell.PropertyValueFactory; +import seng202.group9.Controller.App; +import seng202.group9.Controller.Dataset; +import seng202.group9.Core.Route; + +/** + * Created by michael on 14/09/2016. + */ +public class RouteSummaryController extends MenuController{ + @FXML + private TableView tableView; + @FXML + private TableColumn columnName; + @FXML + private TableColumn columnCity; + @FXML + private TableColumn columnCountry; + @FXML + private TableColumn columnAltitude; + @FXML + private TableColumn columnIATA; + + private Dataset currentData = null; + + App parent; + + public void setApp(App parent){ + this.parent = parent; + } + + public void loadTables() { + currentData = this.parent.getCurrentDataset(); + columnName.setCellValueFactory(new PropertyValueFactory("Name")); + columnCity.setCellValueFactory(new PropertyValueFactory("City")); + columnCountry.setCellValueFactory(new PropertyValueFactory("Country")); + columnIATA.setCellValueFactory(new PropertyValueFactory("IATA_FFA")); + columnAltitude.setCellValueFactory(new PropertyValueFactory("Altitude")); + currentData = this.parent.getCurrentDataset(); + tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes())); + } + +} \ No newline at end of file diff --git a/src/main/resources/routes_summary.fxml b/src/main/resources/routes_summary.fxml index 39cc699..d31a650 100644 --- a/src/main/resources/routes_summary.fxml +++ b/src/main/resources/routes_summary.fxml @@ -1,16 +1,10 @@ - - - - - - - - + + @@ -19,7 +13,7 @@ - + @@ -44,11 +38,11 @@ - - - - - + + + + +