Commit Graph
20 Commits
Author SHA1 Message Date
Michael Wilson ab21d0f25d Airline Summary controller code built though currently has nothing calling it and has not been tested. 2016-09-14 20:33:58 +12:00
Liam Beckett 9912f2c3af Merge branch 'WIP_Flight_RawData' into 'master'
flight raw data



See merge request !4
2016-09-14 13:43:31 +12:00
Liam Beckett 208621650e Minor updates to the GUI files for both raw data and summary Flight pages. Implemented the loading of data into tables for flight raw data. 2016-09-14 13:38:13 +12:00
Liam Beckett 399d1eb069 Changed the raw data GUI for flights and testing new branch 2016-09-14 11:45:04 +12:00
Sunguin Peng 6806c0d099 Linked Raw Data GUI together and tables have some data in them from the database. 2016-09-14 11:38:59 +12:00
Sunguin Peng dff71615cb Trialing branch for own work 2016-09-14 08:35:32 +12:00
YaFedImYaEatIm b08f190124 Fixed Errors with Loading Flight Data FXML 2016-09-13 21:15:00 +12:00
Liam Beckett 3be9fca029 Added back in the GUI implementation for the flight raw data and summary viewer which was lost / changed earlier. Also in the process of updating their fxml files to improve the GUI 2016-09-13 21:01:58 +12:00
YaFedImYaEatIm b9308060f1 Fixed Controller after merge 2016-09-13 18:26:07 +12:00
YaFedImYaEatIm 859b19f7d5 Fixed Scene Loading 2016-09-13 18:22:28 +12:00
Liam Beckett 9c594fd474 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/seng202/group9/GUI/MenuController.java
2016-09-13 16:42:33 +12:00
YaFedImYaEatIm 6f14fc48f0 Added Raw Data loader for Airline 2016-09-13 16:23:27 +12:00
YaFedImYaEatIm d7ddf99842 Added Sample Loading for the GUI 2016-09-13 16:16:24 +12:00
Liam Beckett b7674fc8ea Added in the Raw Flight Data page which now appears as a new window something again we will need to fix, have updated the menu.fxml document to include the tags for the two menu buttons for flight. Have realized that I will have to rework the GUI so that it scales better. 2016-09-13 13:46:25 +12:00
Liam Beckett 83ccf04d85 Implemented the GUI to open for the Flight Data Summary page however was unable to get it to open in the same stage so it opens in a new window. This is something to address later. 2016-09-13 13:23:44 +12:00
YaFedImYaEatIm 19ee2d2fff Moved files around to get resources folder for maven 2016-09-12 14:40:18 +12:00
Sunguin ccb852e670 Completed the first draft GUI for airline, airport and route raw data viewers. 2016-08-19 17:36:18 +12:00
Liam 8111b9d35d Added in the GUI template for the raw flight data view. 2016-08-19 12:29:02 +12:00
Liam c3a6dd406b Added in the GUI template for the flight data summary. 2016-08-19 12:28:36 +12:00
YaFedImYaEatIm e1d72c318d Partial Skeleton of the project 2016-08-12 12:54:16 +12:00