From 16b9a7a8a8511737780b9267e4fd08609d81240e Mon Sep 17 00:00:00 2001
From: Michael Wilson <mrw106@uclive.ac.nz>
Date: Thu, 15 Sep 2016 21:22:08 +1200
Subject: [PATCH] Fixed routes summary.

---
 res/userdb.db                                 | Bin 4358144 -> 4365312 bytes
 .../seng202/group9/GUI/MenuController.java    |   2 +-
 .../group9/GUI/RouteSummaryController.java    |   1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/userdb.db b/res/userdb.db
index e755d4a98b1b52e7f4cda42084b274bdc3999430..982fc0d957fe95b44e2d3299d520c92464f0f80f 100644
GIT binary patch
delta 3709
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

delta 937
zcmY+@T}YEr7zglk&hu`2XVZPWb6c;ooLRa)%yNCVoUeU&5h&!va-)ohG$gDv3#=AJ
zf&`U=P7tkuBz<65QOAV9i=r-r>LTjG3$KEp59+2B{f!{H_#Jqk=Y5`sb2uk6F(fjX
zA#t(H*2kD9f2pE@_ucClb(b_V`br)2mYV4tT~(1OZ>3N@F|Utjn~hpNp6xfPnhZNd
zMen{Nz12r{H+CKF?mD>7yvrDiI{yZ@c6aUX?A_hEr?)diw2J>1{u9Y2VtyWZ@YS$u
zj(WyyfnoiANUPBW%`o~xGk+)7O?e;j>`YSy65kmW==;CK3m&o&=Ry!Uoi>c;^aHCW
zPd`-2G3z6_@o_y^gjj?&qF9!M$`Z12oJ@tjhLG6TGnsJsrp^>v1`9151Q2Lo13NfC
z2PYK49B@G~lz<yN-~}HTs?g%sHT@*_VYbbyTy6euR7~610C&wsZqZh`tJTpVyOaLQ
znm8}cDSfBEQMmoXCi1Rf9Y6Ul^$#XfekfJRRNz*6j<~{3{Au9H$&BVZD~BcmM}@7R
z^v8h=57@>=4xsM#ND}LvkuB(CAE_VAO$HzcA(#s$ltCEEVIItf3Wz`@EPyIl2#cT^
zY9I=WVF@gSWl#&tp$=BSN|>D+gH^B^*1%d=2kT)2Y=k&$f(A&a++^e46O!kP-pTiC
zt*}OUmXHHMXT%XTqcp)n(#6AbRh)-Y0%yc@v)-&%`3=^X-F?8s?mZVAB!pRRmaDX7
z-6)lOYPMI>ipZaVa6-jP!&$DOvQrKmwz_0IWo6`(pmUqj($-JIfy`z;&16M-Nq_d*
zF|XPa^R{v|eaNcgvS*ERnH;MQ?~tETmPft}ggYvWQBlkdMz1MHDXJD9#Hctfwh5g-
z=L5Wf8xk!(Q}ki2>{%IFtP*|JQ+u#Tv@?1`x9JqM;Vu0Vuf$DpTF6Kbt((1^cA?r&
HTBH0oDBe2I

diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java
index f337ef7..7167741 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/src/main/java/seng202/group9/GUI/MenuController.java
@@ -87,7 +87,7 @@ public class MenuController implements Initializable{
 
 	public void viewRouteSummary() {
 		try {
-			RouteSummaryController summaryController = (RouteSummaryController) parent.replaceSceneContent("route_summary.fxml");
+			RouteSummaryController summaryController = (RouteSummaryController) parent.replaceSceneContent("routes_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
index e67ff12..c4f6412 100644
--- a/src/main/java/seng202/group9/GUI/RouteSummaryController.java
+++ b/src/main/java/seng202/group9/GUI/RouteSummaryController.java
@@ -35,7 +35,6 @@ public class RouteSummaryController extends MenuController{
     }
 
     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"));