From ab21d0f25d1a9638e4cdc88217504217c906572e Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Wed, 14 Sep 2016 20:33:58 +1200
Subject: [PATCH 1/8] Airline Summary controller code built though currently
 has nothing calling it and has not been tested.

---
 .../group9/GUI/AirlineSummaryController.java  | 47 +++++++++++++++++++
 .../seng202/group9/GUI/MenuController.java    | 10 ++++
 src/main/resources/airline_summary.fxml       | 22 ++++-----
 3 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/seng202/group9/GUI/AirlineSummaryController.java

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<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()));
+    }
+
+}
diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java
index f78dd94..7219795 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/src/main/java/seng202/group9/GUI/MenuController.java
@@ -65,6 +65,16 @@ 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 setApp(App parent){
 		this.parent = parent;
 	}
diff --git a/src/main/resources/airline_summary.fxml b/src/main/resources/airline_summary.fxml
index 2379ab2..599994a 100644
--- a/src/main/resources/airline_summary.fxml
+++ b/src/main/resources/airline_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.FlightSummaryController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -43,11 +37,11 @@
                                     <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">
                                        <columns>
-                                          <TableColumn prefWidth="75.0" text="Name" />
-                                          <TableColumn prefWidth="75.0" text="City" />
-                                          <TableColumn prefWidth="75.0" text="Country" />
-                                          <TableColumn prefWidth="75.0" text="Altitude" />
-                                          <TableColumn prefWidth="75.0" text="IATA/FAA" />
+                                          <TableColumn fx:id="columnName" text="Name" />
+                                          <TableColumn fx:id="columnCity" prefWidth="77.0" text="City" />
+                                          <TableColumn fx:id="columnCountry" prefWidth="86.0" text="Country" />
+                                          <TableColumn fx:id="columnIATA" prefWidth="86.0" text="IATA/FAA" />
+                                          <TableColumn fx:id="columnActive" prefWidth="46.0" text="Active" />
                                        </columns>
                                     </TableView>
                                  </children>

From a1bf6946993cf4f08f49209f218fb5d76cc9f305 Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Wed, 14 Sep 2016 20:47:15 +1200
Subject: [PATCH 2/8] Airport Summary controller code built though currently
 has nothing calling it and has not been tested.

---
 .../group9/GUI/AirportSummaryController.java  | 48 +++++++++++++++++++
 .../seng202/group9/GUI/MenuController.java    | 10 ++++
 src/main/resources/airport_summary.fxml       | 22 ++++-----
 3 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/seng202/group9/GUI/AirportSummaryController.java

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<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()));
+    }
+
+}
\ 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 7219795..0d6d6c1 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/src/main/java/seng202/group9/GUI/MenuController.java
@@ -75,6 +75,16 @@ public class MenuController implements Initializable{
 		}
 	}
 
+	public void viewAirportSummary() {
+		try {
+			AirlineSummaryController summaryController = (AirportSummaryController) parent.replaceSceneContent("airport_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/resources/airport_summary.fxml b/src/main/resources/airport_summary.fxml
index 3d7c5fa..0308211 100644
--- a/src/main/resources/airport_summary.fxml
+++ b/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.FlightSummaryController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -44,11 +38,11 @@
                                        <children>
                                           <TableView layoutX="10.0" layoutY="10.0" prefHeight="200.0" prefWidth="378.0">
                                              <columns>
-                                                <TableColumn prefWidth="75.0" text="Name" />
-                                                <TableColumn prefWidth="75.0" text="City" />
-                                                <TableColumn prefWidth="75.0" text="Country" />
-                                                <TableColumn prefWidth="75.0" text="Altitude" />
-                                                <TableColumn prefWidth="75.0" text="IATA/FAA" />
+                                                <TableColumn fx:id="columnName" prefWidth="75.0" text="Name" />
+                                                <TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
+                                                <TableColumn fx:id="columnCountry" prefWidth="75.0" text="Country" />
+                                                <TableColumn fx:id="columnAltitude" prefWidth="75.0" text="Altitude" />
+                                                <TableColumn fx:id="columnIATA" prefWidth="75.0" text="IATA/FAA" />
                                              </columns>
                                           </TableView>
                                        </children>

From 9da9b401763b1d018d1618c3a9f6ca7d002bba8b Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Wed, 14 Sep 2016 21:05:35 +1200
Subject: [PATCH 3/8] 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<Route> tableView;
+    @FXML
+    private TableColumn<Route, String> columnName;
+    @FXML
+    private TableColumn<Route, String> columnCity;
+    @FXML
+    private TableColumn<Route, String> columnCountry;
+    @FXML
+    private TableColumn<Route, String> columnAltitude;
+    @FXML
+    private TableColumn<Route, 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<Route, String>("Name"));
+        columnCity.setCellValueFactory(new PropertyValueFactory<Route, String>("City"));
+        columnCountry.setCellValueFactory(new PropertyValueFactory<Route, String>("Country"));
+        columnIATA.setCellValueFactory(new PropertyValueFactory<Route, String>("IATA_FFA"));
+        columnAltitude.setCellValueFactory(new PropertyValueFactory<Route, String>("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 @@
 <?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.FlightSummaryController">
    <children>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
@@ -44,11 +38,11 @@
                                        <children>
                                           <TableView prefHeight="200.0" prefWidth="378.0">
                                             <columns>
-                                              <TableColumn prefWidth="75.0" text="Name" />
-                                              <TableColumn prefWidth="75.0" text="City" />
-                                                <TableColumn prefWidth="75.0" text="Country" />
-                                                <TableColumn prefWidth="75.0" text="Altitude" />
-                                                <TableColumn prefWidth="75.0" text="IATA/FAA" />
+                                              <TableColumn fx:id="columnName" prefWidth="75.0" text="Name" />
+                                              <TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
+                                                <TableColumn fx:id="columnCountry" prefWidth="75.0" text="Country" />
+                                                <TableColumn fx:id="columnAltitude" prefWidth="75.0" text="Altitude" />
+                                                <TableColumn fx:id="columnIATA" prefWidth="75.0" text="IATA/FAA" />
                                             </columns>
                                           </TableView>
                                        </children>

From 11197a0400c615c1a20d63c4d509142af4b9c87c Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Wed, 14 Sep 2016 21:13:05 +1200
Subject: [PATCH 4/8] Hooked up the Summary pages to the Menu bar.

---
 src/main/resources/menu.fxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 @@
 <?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>

From d744442ba268042ccd3966a535f16da310e595ef Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Wed, 14 Sep 2016 21:39:19 +1200
Subject: [PATCH 5/8] Buttons on summary pages have been linked to proper
 functions.

---
 src/main/resources/airline_summary.fxml | 8 ++++----
 src/main/resources/airport_summary.fxml | 8 ++++----
 src/main/resources/routes_summary.fxml  | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/airline_summary.fxml b/src/main/resources/airline_summary.fxml
index 599994a..dc13418 100644
--- a/src/main/resources/airline_summary.fxml
+++ b/src/main/resources/airline_summary.fxml
@@ -55,22 +55,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirportSummaryData" prefHeight="25.0" prefWidth="65.0" text="Airports">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewRouteSummaryData" prefHeight="25.0" prefWidth="65.0" text="Routes">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewFlightSummary" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airline Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" onAction="#veiwAirlineRawData" prefHeight="25.0" prefWidth="214.0" text="Airline Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
diff --git a/src/main/resources/airport_summary.fxml b/src/main/resources/airport_summary.fxml
index 0308211..729f537 100644
--- a/src/main/resources/airport_summary.fxml
+++ b/src/main/resources/airport_summary.fxml
@@ -58,22 +58,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewRouteSummary" prefHeight="25.0" prefWidth="65.0" text="Routes">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirlineSummary" prefHeight="25.0" prefWidth="65.0" text="Airlines">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewFlightSummary" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airport Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" onAction="#viewAirportRawData" prefHeight="25.0" prefWidth="214.0" text="Airport Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
diff --git a/src/main/resources/routes_summary.fxml b/src/main/resources/routes_summary.fxml
index d31a650..788e3d7 100644
--- a/src/main/resources/routes_summary.fxml
+++ b/src/main/resources/routes_summary.fxml
@@ -58,22 +58,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirportSummary" prefHeight="25.0" prefWidth="65.0" text="Airports">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirlineSummary" prefHeight="25.0" prefWidth="65.0" text="Airlines">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewFilghtSummary" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Routes Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" onAction="#viewRouteRawData" prefHeight="25.0" prefWidth="214.0" text="Routes Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />

From 91ad64d399e4f3b617e28f87d42aae9c56f2caa8 Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Wed, 14 Sep 2016 22:16:24 +1200
Subject: [PATCH 6/8] Buttons temporarily removed and a few fixes made.

---
 res/userdb.db                           | Bin 4354048 -> 4360192 bytes
 src/main/resources/airline_summary.fxml |   8 ++++----
 src/main/resources/airport_summary.fxml |   8 ++++----
 src/main/resources/routes_summary.fxml  |   8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index 1af3ac35e457e742acd38b5055ad797ffb3b09b4..1dfa74e3c0176197dc0d469c06344c0054ed00ed 100644
GIT binary patch
delta 7063
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

delta 560
zcma*hJ1;|F0LJn6oVRtU;&56@UFuf1x|EjIwMfK58yzH;A`z8Hq-n(}F$hzeljveH
zYeLT8BUsHQK7vZlWbh|3GyJyadGeg)uhg^GOEvGcXN1sh3cf`p^RQE@mrwHE)U=2+
zVrh@Dqc<sU#;G1{bK7LFI=7$A^=DJ7M~4ULTq?1fOM9dYD@H8j(p4cu<8NZ~_=K$a
zp*I976j>IsTztRNGS?+-?=OXfz0RrFgxkHby|T8IOeSxuY|dKNRcQ+OBF%qI8L?-7
z(abKdI~_k&OUO@Y{j2)@u#l)cx8fI8T!9J+8|<h+C8|&j2WsF%E$UDY4Gn074j0^L
zLNh#QK`XpyLpwUq2_L%9jUM!(4}SDx0D~C9Faj9CD8?|3ASN)05W<+kG$M#%2D6yM
QJQlEs7?vKb__D+I1#KJVlmGw#

diff --git a/src/main/resources/airline_summary.fxml b/src/main/resources/airline_summary.fxml
index dc13418..599994a 100644
--- a/src/main/resources/airline_summary.fxml
+++ b/src/main/resources/airline_summary.fxml
@@ -55,22 +55,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirportSummaryData" prefHeight="25.0" prefWidth="65.0" text="Airports">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewRouteSummaryData" prefHeight="25.0" prefWidth="65.0" text="Routes">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewFlightSummary" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" onAction="#veiwAirlineRawData" prefHeight="25.0" prefWidth="214.0" text="Airline Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airline Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
diff --git a/src/main/resources/airport_summary.fxml b/src/main/resources/airport_summary.fxml
index 729f537..0308211 100644
--- a/src/main/resources/airport_summary.fxml
+++ b/src/main/resources/airport_summary.fxml
@@ -58,22 +58,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewRouteSummary" prefHeight="25.0" prefWidth="65.0" text="Routes">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Routes">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirlineSummary" prefHeight="25.0" prefWidth="65.0" text="Airlines">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewFlightSummary" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" onAction="#viewAirportRawData" prefHeight="25.0" prefWidth="214.0" text="Airport Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Airport Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
diff --git a/src/main/resources/routes_summary.fxml b/src/main/resources/routes_summary.fxml
index 788e3d7..d31a650 100644
--- a/src/main/resources/routes_summary.fxml
+++ b/src/main/resources/routes_summary.fxml
@@ -58,22 +58,22 @@
                            <children>
                               <Pane layoutY="200.0" prefHeight="100.0" prefWidth="253.0">
                                  <children>
-                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirportSummary" prefHeight="25.0" prefWidth="65.0" text="Airports">
+                                    <Button layoutX="20.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airports">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewAirlineSummary" prefHeight="25.0" prefWidth="65.0" text="Airlines">
+                                    <Button layoutX="94.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Airlines">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" onAction="#viewFilghtSummary" prefHeight="25.0" prefWidth="65.0" text="Flights">
+                                    <Button layoutX="169.0" layoutY="14.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Flights">
                                        <font>
                                           <Font size="12.0" />
                                        </font>
                                     </Button>
-                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" onAction="#viewRouteRawData" prefHeight="25.0" prefWidth="214.0" text="Routes Raw Data" />
+                                    <Button layoutX="20.0" layoutY="61.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="214.0" text="Routes Raw Data" />
                                  </children>
                                  <padding>
                                     <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />

From c1f10565862f26c081fb85164ceaccb704cf4935 Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Wed, 14 Sep 2016 23:01:01 +1200
Subject: [PATCH 7/8] Stopped exception on load.

---
 src/main/resources/airline_summary.fxml | 2 +-
 src/main/resources/airport_summary.fxml | 2 +-
 src/main/resources/routes_summary.fxml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/airline_summary.fxml b/src/main/resources/airline_summary.fxml
index 599994a..99eed67 100644
--- a/src/main/resources/airline_summary.fxml
+++ b/src/main/resources/airline_summary.fxml
@@ -13,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.0.45" 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>
       <ScrollPane prefHeight="800.0" prefWidth="800.0">
          <content>
diff --git a/src/main/resources/airport_summary.fxml b/src/main/resources/airport_summary.fxml
index 0308211..1fe4fa3 100644
--- a/src/main/resources/airport_summary.fxml
+++ b/src/main/resources/airport_summary.fxml
@@ -13,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.0.45" 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>
diff --git a/src/main/resources/routes_summary.fxml b/src/main/resources/routes_summary.fxml
index d31a650..e06ff79 100644
--- a/src/main/resources/routes_summary.fxml
+++ b/src/main/resources/routes_summary.fxml
@@ -13,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.0.45" 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>

From 3782334db7b515f05be8a1dcb074d7b57e8fff74 Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Thu, 15 Sep 2016 11:11:04 +1200
Subject: [PATCH 8/8] 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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

delta 502
zcmZ{gO-NKx7>3U|-`vtMuXh|BN5@Jne`?IUHdC3VGb2X0dLf7wfx3tkS_Cs7ZcHU!
zB7(G8_vbQd5rUUy=dN8KShRC7AcPBlpiM41t#ae$**p&~AK(157iNCxxmij$vr2g@
z%Pqrt_VdK28u=;ftDcvZgi<ON5?>b{<O`ko@mr6kA5Im<F<F>0#fj*hWTf(_IVN@D
zB57UBr0VqC>OnNp?K)CYvM*)%E?=b-WS>SFP0+g)eyNM4kuj^wN)F|>?8+}G|JPr1
zacide)$LHNBir^gZ$<vtYEO1#JBU5bZAhE)-si1&ci-aesKuKei`NZdo6l+2&IWEg
zVYE>yaI^7!vj{>Hh7ck|IK&C!BvC<B5@Di>I7L(wE>S~xM1-g%qC_20PsE4@B2F|C
zO+<odCQcJ)h_gfs(Mq%t=ZNz}JJCUO5?#av;v$hGx`|6f4{@33C48cfxI(0eG;x)<
zMqDTQi5tWKF-Y7bhKOMzLuA*G3#FQ>jIZQ}e3S*bD@jpi(|j;b%su1(dtuZBK6Bsn
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<Route> tableView;
     @FXML
-    private TableColumn<Route, String> columnName;
+    private TableColumn<Route, String> columnAirline;
     @FXML
-    private TableColumn<Route, String> columnCity;
+    private TableColumn<Route, String> columnDepart;
     @FXML
-    private TableColumn<Route, String> columnCountry;
+    private TableColumn<Route, String> columnArrive;
     @FXML
-    private TableColumn<Route, String> columnAltitude;
+    private TableColumn<Route, String> columnStops;
     @FXML
-    private TableColumn<Route, String> columnIATA;
+    private TableColumn<Route, String> 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<Route, String>("Name"));
-        columnCity.setCellValueFactory(new PropertyValueFactory<Route, String>("City"));
-        columnCountry.setCellValueFactory(new PropertyValueFactory<Route, String>("Country"));
-        columnIATA.setCellValueFactory(new PropertyValueFactory<Route, String>("IATA_FFA"));
-        columnAltitude.setCellValueFactory(new PropertyValueFactory<Route, String>("Altitude"));
+        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()));
     }
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 @@
                               <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 fx:id="columnName" text="Name" />
-                                          <TableColumn fx:id="columnCity" prefWidth="77.0" text="City" />
+                                          <TableColumn fx:id="columnAlias" prefWidth="77.0" text="Alias" />
                                           <TableColumn fx:id="columnCountry" prefWidth="86.0" text="Country" />
                                           <TableColumn fx:id="columnIATA" prefWidth="86.0" text="IATA/FAA" />
                                           <TableColumn fx:id="columnActive" prefWidth="46.0" text="Active" />
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 @@
                                  <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 fx:id="columnName" prefWidth="75.0" text="Name" />
                                                 <TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
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 @@
                                  <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 fx:id="columnName" prefWidth="75.0" text="Name" />
-                                              <TableColumn fx:id="columnCity" prefWidth="75.0" text="City" />
-                                                <TableColumn fx:id="columnCountry" prefWidth="75.0" text="Country" />
-                                                <TableColumn fx:id="columnAltitude" prefWidth="75.0" text="Altitude" />
-                                                <TableColumn fx:id="columnIATA" prefWidth="75.0" text="IATA/FAA" />
+                                              <TableColumn fx:id="columnAirline" prefWidth="75.0" text="Airline" />
+                                              <TableColumn fx:id="columnDepart" prefWidth="75.0" text="Depart" />
+                                               <TableColumn fx:id="columnArrive" prefWidth="75.0" text="Arrive" />
+                                               <TableColumn fx:id="columnStops" prefWidth="75.0" text="Stops" />
+                                               <TableColumn fx:id="columnEquipment" prefWidth="75.0" text="Equipment" />
                                             </columns>
                                           </TableView>
                                        </children>