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

src/main/java/seng202/group9/Controller/App.java

@@ -62,7 +62,7 @@ public class App extends Application
 			e.printStackTrace();
 
 		}
-		/*
+
 		//testout single route adding
 		try {
 			currentDataset.addRoute("D2", "MAC", "WIN", "Y", "0", "NOW");
@@ -75,7 +75,7 @@ public class App extends Application
 		}catch (DataException e){
 			e.printStackTrace();
 		}
-		/*
+
 		//testout single airline adding
 		try {
 			currentDataset.addAirline("Dota2", "Valve", "D2", "DOT", "Defence of the Ancients", "Steam", "Y");
@@ -101,7 +101,7 @@ public class App extends Application
 			System.out.println(currentDataset.importRoute("res/Samples/Routes.txt"));
 		} catch (DataException e) {
 			e.printStackTrace();
-		}*/
+		}
 
 		//testing out flight parser
         try {

src/main/resources/flight_data_summary.fxml

@@ -14,6 +14,7 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
+<?import javafx.scene.web.WebView?>
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
    <children>
@@ -63,6 +64,7 @@
                               </Pane>
                               <Pane prefHeight="934.0" prefWidth="474.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
                                  <children>
+                                    <WebView prefHeight="431.0" prefWidth="310.0" />
                                     <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#0d93e0" height="432.0" layoutX="5.0" layoutY="-1.0" smooth="false" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" width="305.0" />
                                  </children>
                                  <padding>