diff --git a/res/userdb.db b/res/userdb.db index 1dfa74e..2cdbf70 100644 Binary files a/res/userdb.db and b/res/userdb.db differ 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 @@ - + - - - - - + + + + +