Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202

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<Airline> tableView;
+    @FXML
+    private TableColumn<Airline, String> columnName;
+    @FXML
+    private TableColumn<Airline, String> columnAlias;
+    @FXML
+    private TableColumn<Airline, String> columnCountry;
+    @FXML
+    private TableColumn<Airline, String> columnActive;
+    @FXML
+    private TableColumn<Airline, String> columnIATA;
+
+    private Dataset currentData = null;
+
+    App parent;
+
+    public void setApp(App parent){
+        this.parent = parent;
+    }
+
+    public void loadTables() {
+        columnName.setCellValueFactory(new PropertyValueFactory<Airline, String>("Name"));
+        columnAlias.setCellValueFactory(new PropertyValueFactory<Airline, String>("Alias"));
+        columnCountry.setCellValueFactory(new PropertyValueFactory<Airline, String>("Country"));
+        columnIATA.setCellValueFactory(new PropertyValueFactory<Airline, String>("IATA"));
+        columnActive.setCellValueFactory(new PropertyValueFactory<Airline, String>("Active"));
+        currentData = this.parent.getCurrentDataset();
+        tableView.setItems(FXCollections.observableArrayList(currentData.getAirlines()));
+    }
+
+}

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<Airport> tableView;
+    @FXML
+    private TableColumn<Airport, String> columnName;
+    @FXML
+    private TableColumn<Airport, String> columnCity;
+    @FXML
+    private TableColumn<Airport, String> columnCountry;
+    @FXML
+    private TableColumn<Airport, String> columnAltitude;
+    @FXML
+    private TableColumn<Airport, String> 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<Airport, String>("Name"));
+        columnCity.setCellValueFactory(new PropertyValueFactory<Airport, String>("City"));
+        columnCountry.setCellValueFactory(new PropertyValueFactory<Airport, String>("Country"));
+        columnIATA.setCellValueFactory(new PropertyValueFactory<Airport, String>("IATA_FFA"));
+        columnAltitude.setCellValueFactory(new PropertyValueFactory<Airport, String>("Altitude"));
+        currentData = this.parent.getCurrentDataset();
+        tableView.setItems(FXCollections.observableArrayList(currentData.getAirports()));
+    }
+
+}

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;
 	}

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<Route> tableView;
+    @FXML
+    private TableColumn<Route, String> columnAirline;
+    @FXML
+    private TableColumn<Route, String> columnDepart;
+    @FXML
+    private TableColumn<Route, String> columnArrive;
+    @FXML
+    private TableColumn<Route, String> columnStops;
+    @FXML
+    private TableColumn<Route, String> 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<Route, String>("Airline"));
+        columnDepart.setCellValueFactory(new PropertyValueFactory<Route, String>("DepartureAirport"));
+        columnArrive.setCellValueFactory(new PropertyValueFactory<Route, String>("ArrivalAirport"));
+        columnStops.setCellValueFactory(new PropertyValueFactory<Route, String>("Stops"));
+        columnEquipment.setCellValueFactory(new PropertyValueFactory<Route, String>("Equipment"));
+        currentData = this.parent.getCurrentDataset();
+        tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes()));
+    }
+
+}

src/main/resources/airline_summary.fxml

@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
+        <?import javafx.geometry.Insets?>
-<?import javafx.geometry.*?>
+        <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.*?>
+        <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.layout.*?>
+        <?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.shape.*?>
+        <?import javafx.scene.control.TableView?>
-<?import javafx.scene.text.*?>
+        <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.geometry.Insets?>
+        <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.control.Button?>
+        <?import javafx.scene.layout.Pane?>
-<?import javafx.scene.control.ListView?>
+        <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.ScrollPane?>
+        <?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.control.TextArea?>
+        <?import javafx.scene.text.Font?>
-<?import javafx.scene.layout.AnchorPane?>
+        <?import javafx.scene.text.Text?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineSummaryController">
-   <children>
+<children>
    <ScrollPane prefHeight="800.0" prefWidth="800.0">
       <content>
          <AnchorPane prefHeight="800.0" prefWidth="800.0">
@@ -41,13 +35,13 @@
                            <Pane layoutY="52.0" prefHeight="240.0" prefWidth="480.0" AnchorPane.bottomAnchor="0.0">
                               <children>
                                  <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0" />
-                                    <TableView layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
+                                 <TableView fx:id="tableView" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
                                     <columns>
-                                          <TableColumn prefWidth="75.0" text="Name" />
+                                       <TableColumn fx:id="columnName" text="Name" />
-                                          <TableColumn prefWidth="75.0" text="City" />
+                                       <TableColumn fx:id="columnAlias" prefWidth="77.0" text="Alias" />
-                                          <TableColumn prefWidth="75.0" text="Country" />
+                                       <TableColumn fx:id="columnCountry" prefWidth="86.0" text="Country" />
-                                          <TableColumn prefWidth="75.0" text="Altitude" />
+                                       <TableColumn fx:id="columnIATA" prefWidth="86.0" text="IATA/FAA" />
-                                          <TableColumn prefWidth="75.0" text="IATA/FAA" />
+                                       <TableColumn fx:id="columnActive" prefWidth="46.0" text="Active" />
                                     </columns>
                                  </TableView>
                               </children>
@@ -96,5 +90,5 @@
          </AnchorPane>
       </content>
    </ScrollPane>
-   </children>
+</children>
 </VBox>

src/main/resources/airport_summary.fxml

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.shape.*?>
-<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
@@ -19,7 +13,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirportSummaryController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -42,13 +36,13 @@
                                  <children>
                                     <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
                                        <children>
-                                          <TableView layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
+                                          <TableView fx:id="tableView" layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
                                              <columns>
-                                                <TableColumn prefWidth="75.0" text="Name" />
+                                                <TableColumn fx:id="columnName" prefWidth="75.0" text="Name" />
-                                                <TableColumn prefWidth="75.0" text="City" />
+                                                <TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
-                                                <TableColumn prefWidth="75.0" text="Country" />
+                                                <TableColumn fx:id="columnCountry" prefWidth="75.0" text="Country" />
-                                                <TableColumn prefWidth="75.0" text="Altitude" />
+                                                <TableColumn fx:id="columnAltitude" prefWidth="75.0" text="Altitude" />
-                                                <TableColumn prefWidth="75.0" text="IATA/FAA" />
+                                                <TableColumn fx:id="columnIATA" prefWidth="75.0" text="IATA/FAA" />
                                              </columns>
                                           </TableView>
                                        </children>

src/main/resources/menu.fxml

@@ -6,7 +6,7 @@
 <?import javafx.scene.control.SeparatorMenuItem?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.MenuController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.MenuController">
    <children>
       <MenuBar>
         <menus>
@@ -24,19 +24,19 @@
                <items>
                   <Menu mnemonicParsing="false" text="Airport">
                     <items>
-                        <MenuItem mnemonicParsing="false" text="Summary" />
+                        <MenuItem mnemonicParsing="false" onAction="#viewAirportSummary" text="Summary" />
                         <MenuItem mnemonicParsing="false" onAction="#viewAirportRawData" text="Raw Data" />
                     </items>
                   </Menu>
                   <Menu mnemonicParsing="false" text="Airline">
                      <items>
-                        <MenuItem mnemonicParsing="false" text="Summary" />
+                        <MenuItem mnemonicParsing="false" onAction="#viewAirlineSummary" text="Summary" />
                         <MenuItem mnemonicParsing="false" onAction="#viewAirlineRawData" text="Raw Data" />
                      </items>
                   </Menu>
                   <Menu mnemonicParsing="false" text="Route">
                      <items>
-                        <MenuItem mnemonicParsing="false" text="Summary" />
+                        <MenuItem mnemonicParsing="false" onAction="#viewRouteSummary" text="Summary" />
                         <MenuItem mnemonicParsing="false" onAction="#viewRouteRawData" text="Raw Data" />
                      </items>
                   </Menu>

src/main/resources/routes_summary.fxml

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.shape.*?>
-<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
@@ -19,7 +13,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteSummaryController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -42,13 +36,13 @@
                                  <children>
                                     <Pane layoutX="25.0" layoutY="10.0" prefHeight="220.0" prefWidth="120.0">
                                        <children>
-                                          <TableView prefHeight="200.0" prefWidth="378.0">
+                                          <TableView fx:id="tableView" prefHeight="200.0" prefWidth="378.0">
                                              <columns>
-                                              <TableColumn prefWidth="75.0" text="Name" />
+                                                <TableColumn fx:id="columnAirline" prefWidth="75.0" text="Airline" />
-                                              <TableColumn prefWidth="75.0" text="City" />
+                                                <TableColumn fx:id="columnDepart" prefWidth="75.0" text="Depart" />
-                                                <TableColumn prefWidth="75.0" text="Country" />
+                                                <TableColumn fx:id="columnArrive" prefWidth="75.0" text="Arrive" />
-                                                <TableColumn prefWidth="75.0" text="Altitude" />
+                                                <TableColumn fx:id="columnStops" prefWidth="75.0" text="Stops" />
-                                                <TableColumn prefWidth="75.0" text="IATA/FAA" />
+                                                <TableColumn fx:id="columnEquipment" prefWidth="75.0" text="Equipment" />
                                              </columns>
                                           </TableView>
                                        </children>