diff --git a/res/userdb.db b/res/userdb.db new file mode 100644 index 0000000..2cdbf70 Binary files /dev/null and b/res/userdb.db differ diff --git a/src/main/java/seng202/group9/GUI/AirlineSummaryController.java b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java new file mode 100644 index 0000000..fa5ba73 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java @@ -0,0 +1,47 @@ +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.Airline; + +/** + * Created by michael on 14/09/2016. + */ +public class AirlineSummaryController extends MenuController{ + @FXML + private TableView tableView; + @FXML + private TableColumn columnName; + @FXML + private TableColumn columnAlias; + @FXML + private TableColumn columnCountry; + @FXML + private TableColumn columnActive; + @FXML + private TableColumn columnIATA; + + private Dataset currentData = null; + + App parent; + + public void setApp(App parent){ + this.parent = parent; + } + + public void loadTables() { + columnName.setCellValueFactory(new PropertyValueFactory("Name")); + columnAlias.setCellValueFactory(new PropertyValueFactory("Alias")); + columnCountry.setCellValueFactory(new PropertyValueFactory("Country")); + columnIATA.setCellValueFactory(new PropertyValueFactory("IATA")); + columnActive.setCellValueFactory(new PropertyValueFactory("Active")); + currentData = this.parent.getCurrentDataset(); + tableView.setItems(FXCollections.observableArrayList(currentData.getAirlines())); + } + +} diff --git a/src/main/java/seng202/group9/GUI/AirportSummaryController.java b/src/main/java/seng202/group9/GUI/AirportSummaryController.java new file mode 100644 index 0000000..467e331 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/AirportSummaryController.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.Airport; + +/** + * Created by michael on 14/09/2016. + */ +public class AirportSummaryController 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.getAirports())); + } + +} \ No newline at end of file diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 846b3a4..ec80209 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -65,6 +65,36 @@ public class MenuController implements Initializable{ } } + public void viewAirlineSummary() { + try { + AirlineSummaryController summaryController = (AirlineSummaryController) parent.replaceSceneContent("airline_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void viewAirportSummary() { + try { + 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) { + e.printStackTrace(); + } + } + public void setApp(App parent){ this.parent = parent; } 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..e67ff12 --- /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 columnAirline; + @FXML + private TableColumn columnDepart; + @FXML + private TableColumn columnArrive; + @FXML + private TableColumn columnStops; + @FXML + private TableColumn columnEquipment; + + private Dataset currentData = null; + + App parent; + + public void setApp(App parent){ + this.parent = parent; + } + + public void loadTables() { + currentData = this.parent.getCurrentDataset(); + 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())); + } + +} \ No newline at end of file diff --git a/src/main/resources/menu.fxml b/src/main/resources/menu.fxml index 57269fa..2f9d217 100644 --- a/src/main/resources/menu.fxml +++ b/src/main/resources/menu.fxml @@ -6,7 +6,7 @@ - + @@ -24,19 +24,19 @@ - + - + - + diff --git a/src/main/resources/routes_summary.fxml b/src/main/resources/routes_summary.fxml index 2c8638d..b376716 100644 --- a/src/main/resources/routes_summary.fxml +++ b/src/main/resources/routes_summary.fxml @@ -1,16 +1,10 @@ - - - - - - - - + + @@ -19,7 +13,7 @@ - + @@ -42,13 +36,13 @@ - + - - - - - + + + + +