From 3782334db7b515f05be8a1dcb074d7b57e8fff74 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 15 Sep 2016 11:11:04 +1200 Subject: [PATCH] Fixed a few bugs though routes doesn't load. --- res/userdb.db | Bin 4360192 -> 4391936 bytes .../group9/GUI/RouteSummaryController.java | 20 +++++++++--------- src/main/resources/airline_summary.fxml | 4 ++-- src/main/resources/airport_summary.fxml | 2 +- src/main/resources/routes_summary.fxml | 12 +++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 1dfa74e3c0176197dc0d469c06344c0054ed00ed..2cdbf70f0f60441aa2a7c37c4ca04aedd1b08a11 100644 GIT binary patch delta 14281 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 EUk`eioB#j- diff --git a/src/main/java/seng202/group9/GUI/RouteSummaryController.java b/src/main/java/seng202/group9/GUI/RouteSummaryController.java index 35e084d..e67ff12 100644 --- a/src/main/java/seng202/group9/GUI/RouteSummaryController.java +++ b/src/main/java/seng202/group9/GUI/RouteSummaryController.java @@ -16,15 +16,15 @@ public class RouteSummaryController extends MenuController{ @FXML private TableView tableView; @FXML - private TableColumn columnName; + private TableColumn columnAirline; @FXML - private TableColumn columnCity; + private TableColumn columnDepart; @FXML - private TableColumn columnCountry; + private TableColumn columnArrive; @FXML - private TableColumn columnAltitude; + private TableColumn columnStops; @FXML - private TableColumn columnIATA; + private TableColumn columnEquipment; private Dataset currentData = null; @@ -36,11 +36,11 @@ public class RouteSummaryController extends MenuController{ 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")); + columnAirline.setCellValueFactory(new PropertyValueFactory("Airline")); + columnDepart.setCellValueFactory(new PropertyValueFactory("DepartureAirport")); + columnArrive.setCellValueFactory(new PropertyValueFactory("ArrivalAirport")); + columnStops.setCellValueFactory(new PropertyValueFactory("Stops")); + columnEquipment.setCellValueFactory(new PropertyValueFactory("Equipment")); currentData = this.parent.getCurrentDataset(); tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes())); } diff --git a/src/main/resources/airline_summary.fxml b/src/main/resources/airline_summary.fxml index 99eed67..a848c76 100644 --- a/src/main/resources/airline_summary.fxml +++ b/src/main/resources/airline_summary.fxml @@ -35,10 +35,10 @@ - + - + diff --git a/src/main/resources/airport_summary.fxml b/src/main/resources/airport_summary.fxml index 1fe4fa3..ab08f6c 100644 --- a/src/main/resources/airport_summary.fxml +++ b/src/main/resources/airport_summary.fxml @@ -36,7 +36,7 @@ - + diff --git a/src/main/resources/routes_summary.fxml b/src/main/resources/routes_summary.fxml index e06ff79..f6c133f 100644 --- a/src/main/resources/routes_summary.fxml +++ b/src/main/resources/routes_summary.fxml @@ -36,13 +36,13 @@ - + - - - - - + + + + +