From 94f2d25899c0c499ba561102b8b4fac313912e92 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Fri, 16 Sep 2016 09:31:02 +1200 Subject: [PATCH] Hooked up all buttons for summary pages. --- res/userdb.db | Bin 4365312 -> 4378624 bytes .../group9/GUI/AirlineSummaryController.java | 45 +++++++++- .../group9/GUI/AirportSummaryController.java | 45 +++++++++- .../group9/GUI/RouteSummaryController.java | 44 +++++++++ src/main/resources/airline_summary.fxml | 84 +++++++++--------- src/main/resources/airport_summary.fxml | 12 +-- src/main/resources/routes_summary.fxml | 20 ++--- 7 files changed, 191 insertions(+), 59 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 982fc0d957fe95b44e2d3299d520c92464f0f80f..baf6a5eaf0c45f2de8d5860ec3ac8271ee5944df 100644 GIT binary patch delta 4223 zcmZvfdu$Zf6~^ylAAYR8V|%?G?+(T`ej6J|3MbK6)Qjua(NQjz7ElJg=jet}XRTR?RyEE9#DE{MW z_nULhT+jTzbMEdqzZdN|vJV{yI(GpeoI9A^40nClHtcnu#J|G?e;LiWoRW*8T{S6Q z=*+~p7KNwR_z-v}+?F;iRX{zfx_b({SA^DW?ijuLEYST9TnWud!pR|RJ#LOd>hW_wS2_o|+5CjbEBJ8TtB;D`7=zJtHTf2V>Y_5Rs}^siAW z0M66H8EnmXcP?A~2hu(g9Yv{bd>G(=;ji(h_$t1Lhw$OCt*?e99=8Ler!QDGW6n<& zEn4JpS-v@+{uaJEqmfm+1@I&M0N=y^U^TzQx6Eo4ms5^F`h`0+FZ^hBoEV31@|~W; z|7Ee?@txwo;y>Y=XQeq8a6P+nR-Me&Gio+lPpS!Q{h*sI@3*q$y;*EIQqGolGY~5S z@dIA$G=30Go-TfadGskKhH&M|oeEJPQ4mouQ5-~Z62(OnH&Nn<5>J!_q9hWoqsAsY7-#8JsfKKS)%ATm_96~Uf{G6`=A<#zW zE%&X!zBdD5Px@lg>Lab`TB{$nCL#h}Fj5{zJvWkg$_0NfMBp;rd(nT%;T(Q%J#AU; zJ4bXs(KCoH5 zmlAy<(aVTlPV`AcuONCQ(W{7FP4pU~*Ajg)(Wel-j_CD7Zy@?qqBjz~iRjaa-c0oA znjUiWQHM|ZJo0C$5P#rklpS#esE$9}a2|yqfPlz8=}VwrEL1QJgJE0=Sw2K9=NXc$PS4* z&V-ht$X5EonNR_Wyh7V{$}MmU-E=xsf+9WiPL9}&BHgsz@5{x7k@XlO945>Je5q<3@0G8E~gl|6C;+(2_S%ClhyJvu?0h$1i3k0*$gxHz(&c2$Wb z(YmmF%~75Ko&oqKK81JVHe8RB(O2ja3Zu1XI?8}|;BVkta08TK0Ne$?1&3(Gh!7Bp zyOUrBNMnu#Za0I8-rXxp)tg5}$i>j&ABB{bxl6&Wk^9r1Kd|thKg~K{xG4#yJ)Jmh zpB(UZjV8vby*XF%ZnR45ACx6;XA(?#I{8=ouh_x-pBU1)+RpW;u`CQ!hQ2Hy{oMi>HO{NHmj^+_~Ut!_oXq7bpaaePuB|*hw zB7?~lgGo@)n968!ahe1bTE!Snf(k4=xoC{10Siwq&Xc#_qB&{y9tPfaOSY39WW;9}ENXtvVl&dxjlQk6#I ztqDfs*1SgJ){@P}ttAv!=ze}o3uKCol!tL)Y)N) zCX2y`QAbF8jNG^ZECb(yu;QCaH_Q~*q~iaulhil(FZdQ7Vdt~U_&m*O5i8EN^|I5{ z&}?xrZF8nB#G{a^{eH}G*hfEVFH^cdYjLue;jf=b}`@Dunx z?1c+pE_et&0VlxDpJzMsQi|1V%j5ic-s96?{-JESf9cK|;F}MX)vJ`N| z=oZwV?&9tc;a6uJqDkoe}Gi)kHTu}Wsl`}4=={A)^E~q}6$|)Dr zGz;b~hB@myskTr)$ZOSouOJjJx~WYfyE zrj=_A6-PE9})}|U%)!0;ns%o2R zP*r82z->@fX$v)|su)!{Rqh|AYLc~{Nmco1DyPaFqpHlRnN&@*P~|qMDz(NMRFzo8 z*eOv^i*2eg;ESxPG2jbrdo>1pflW0Ae7<#G#(>YWRy7Cw1gmNc_}np(4S2UX;B&@Q z{#@9A52o?%>B8)6&bwzHR&WtEe#BDtYyJ-@`D&x3$+^uYH`UVQ+-8$&u-?FIa`iUV SXmWKn)o5~4Y$|JV!T$q3V!r|a delta 947 zcmZ`%TSyd97@nDbc6Y{IYt-3w8YeSLUAubkYU-p#J;ZsCF0kbKAZ1i6?LtLS67<^z zy6wXWxgzNvw?&hnJP=Rt=itXWoxR9 zwWqc!>3H6X#vJ7@)6}_Zd*^?oYMvj;{}Jx&u!k*xS~-0y&n#>U$}nATZcnu*J5ouX zBuNU43H05B?=Z%VR`dJatnhnBzE>1(Ai2 zWh0w{Y$`GXSq`#XWO*58s;YKS7VnaLrWa~8zd}&d2mW;W_+}P}r$@{}e*K=(#Is*z z*L&I~vr*ye9!2i>h3V*}H5fB77S6;Xa%|FT^h|nR$Mq<$P;=LN+QUef?47vk?vlsN zzxwi#B1i%)q-jVtQUQ{KG##lBX$Dde(oCdcq*+L_kxGzCk;;&wNaaX#kme%ILz<7Y z0BIpo1yUta6;d@)4N@&q9nvDC#Yjt#mLe@fT8>nYv;wICsWC%M>VB?nbl(=#+O+{t z6uZW*fwK~`tL&OApxCSUm@^Lkbo_aC{qoC{TWX8&6bObG*fA_qmz{&@I6b+<@-C P+uHRmdk616=kEOt4Z11T diff --git a/src/main/java/seng202/group9/GUI/AirlineSummaryController.java b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java index fa5ba73..da7a9bd 100644 --- a/src/main/java/seng202/group9/GUI/AirlineSummaryController.java +++ b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java @@ -43,5 +43,48 @@ public class AirlineSummaryController extends MenuController{ currentData = this.parent.getCurrentDataset(); tableView.setItems(FXCollections.observableArrayList(currentData.getAirlines())); } - + public void airlineRawDataButton() { + try { + RouteRDController rawDataController = (RouteRDController) + parent.replaceSceneContent("airline_raw_data.fxml"); + rawDataController.setApp(parent); + rawDataController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void flightSummaryButton() { + try { + FlightSummaryController summaryController = (FlightSummaryController) + parent.replaceSceneContent("flight_data_summary.fxml"); + summaryController.setApp(parent); + summaryController.flightPathListView(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void airportSummaryButton() { + try { + AirportSummaryController summaryController = (AirportSummaryController) + parent.replaceSceneContent("airport_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void routeSummaryButton() { + try { + RouteSummaryController summaryController = (RouteSummaryController) + parent.replaceSceneContent("routes_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/src/main/java/seng202/group9/GUI/AirportSummaryController.java b/src/main/java/seng202/group9/GUI/AirportSummaryController.java index 467e331..03d3dad 100644 --- a/src/main/java/seng202/group9/GUI/AirportSummaryController.java +++ b/src/main/java/seng202/group9/GUI/AirportSummaryController.java @@ -44,5 +44,48 @@ public class AirportSummaryController extends MenuController{ currentData = this.parent.getCurrentDataset(); tableView.setItems(FXCollections.observableArrayList(currentData.getAirports())); } - + public void airportRawDataButton() { + try { + AirportRDController rawDataController = (AirportRDController) + parent.replaceSceneContent("airport_raw_data.fxml"); + rawDataController.setApp(parent); + rawDataController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void flightSummaryButton() { + try { + FlightSummaryController summaryController = (FlightSummaryController) + parent.replaceSceneContent("flight_data_summary.fxml"); + summaryController.setApp(parent); + summaryController.flightPathListView(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void routeSummaryButton() { + try { + RouteSummaryController summaryController = (RouteSummaryController) + parent.replaceSceneContent("routes_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void airlineSummaryButton() { + try { + AirlineSummaryController summaryController = (AirlineSummaryController) + parent.replaceSceneContent("airline_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } } \ No newline at end of file diff --git a/src/main/java/seng202/group9/GUI/RouteSummaryController.java b/src/main/java/seng202/group9/GUI/RouteSummaryController.java index c4f6412..b5f023e 100644 --- a/src/main/java/seng202/group9/GUI/RouteSummaryController.java +++ b/src/main/java/seng202/group9/GUI/RouteSummaryController.java @@ -43,5 +43,49 @@ public class RouteSummaryController extends MenuController{ currentData = this.parent.getCurrentDataset(); tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes())); } + public void routeRawDataButton() { + try { + RouteRDController rawDataController = (RouteRDController) + parent.replaceSceneContent("route_raw_data.fxml"); + rawDataController.setApp(parent); + rawDataController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void flightSummaryButton() { + try { + FlightSummaryController summaryController = (FlightSummaryController) + parent.replaceSceneContent("flight_data_summary.fxml"); + summaryController.setApp(parent); + summaryController.flightPathListView(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void airportSummaryButton() { + try { + AirportSummaryController summaryController = (AirportSummaryController) + parent.replaceSceneContent("airport_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + public void airlineSummaryButton() { + try { + AirlineSummaryController summaryController = (AirlineSummaryController) + parent.replaceSceneContent("airline_summary.fxml"); + summaryController.setApp(parent); + summaryController.loadTables(); + } + catch (Exception e) { + e.printStackTrace(); + } + } } \ No newline at end of file diff --git a/src/main/resources/airline_summary.fxml b/src/main/resources/airline_summary.fxml index 7d7d55e..13a97f9 100644 --- a/src/main/resources/airline_summary.fxml +++ b/src/main/resources/airline_summary.fxml @@ -1,17 +1,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -34,16 +34,18 @@ - - - - - - - - - - + + + + + + + + + + + + @@ -54,24 +56,24 @@ - - - - - + + + - - - - - -