fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68 Commits 1 Branch 0 Tags
9da9b401763b1d018d1618c3a9f6ca7d002bba8b
Commit Graph
53 Commits
Author SHA1 Message Date
Michael Wilson 9da9b40176 Route Summary controller code built though currently has nothing calling it and has not been tested. 2016-09-14 21:05:35 +12:00
Michael Wilson a1bf694699 Airport Summary controller code built though currently has nothing calling it and has not been tested. 2016-09-14 20:47:15 +12:00
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
YaFedImYaEatIm e6c468e826 Added Singular Airport Adding 2016-09-14 11:52:45 +12:00
YaFedImYaEatIm d84346de60 Added singular Airport adding 2016-09-14 11:51:39 +12:00
Sunguin Peng 3eb144ae36 Merged into master branch 2016-09-14 11:45:19 +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
YaFedImYaEatIm 4418bc6824 Changed files to work with merge 2016-09-14 10:40:28 +12:00
Liam Beckett 30181d39da Merge branch 'WIP_Flights' into 'master' 
Flights



See merge request !3
 2016-09-14 10:37:58 +12:00
Liam Beckett 35db19db2d Not all files were commited from the earlier commit, due to idle functionality misunderstandings 2016-09-14 10:34:54 +12:00
Liam Beckett af8617b316 Commented out tests in the App 2016-09-14 10:30:27 +12:00
YaFedImYaEatIm a89e5f7b95 Made Add Airline FUnction 2016-09-14 10:25:58 +12:00
Liam Beckett 13697ac673 Implemented the parser for basic Flight files(The one given to us in the important documents folder on learn) 2016-09-14 10:22:01 +12:00
Michael b5b7899b7b Merge remote-tracking branch 'origin/master' 2016-09-14 08:51:32 +12:00
Michael 0182cabec6 Added summary gui components 2016-09-14 08:50:13 +12:00
Sunguin Peng dff71615cb Trialing branch for own work 2016-09-14 08:35:32 +12:00
Liam Beckett b6624f20a8 Updated the Flight Summary GUI 2016-09-14 08:29:01 +12:00
YaFedImYaEatIm dac4146f33 Added calculate Distance() 2016-09-14 08:23:30 +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
Liam Beckett 3e5b793cb2 Trying to fix the merge conflict 2016-09-13 16:39:22 +12:00
Liam Beckett a46609b0b2 Begun work on the flight data parser, committing changes and merging in order to add another feature. 2016-09-13 16:24:43 +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
Liam 9cc02bb305 Added in the drop down menu for the view tab on the menu bar. This provides individual links to the different GUI pages. 2016-09-13 11:05:36 +12:00
YaFedImYaEatIm 19ee2d2fff Moved files around to get resources folder for maven 2016-09-12 14:40:18 +12:00
YaFedImYaEatIm a0f5505e27 Added Route Parser to Dataset, Runtime takes a while optimisation may be needed 2016-09-12 10:38:08 +12:00
YaFedImYaEatIm 6f861400c2 Added Dataset Implementation as well as fixing a small bugs 2016-09-12 10:13:04 +12:00
YaFedImYaEatIm ffa26bc944 Starting run time changed to run some of the Dataset Parser Functions 2016-09-12 10:12:13 +12:00
YaFedImYaEatIm 4c53609a45 Added Current Dataset Variable 2016-09-11 20:54:00 +12:00
YaFedImYaEatIm bbb9a250ba Parsers, Core Files and Dataset Controllers 2016-09-09 10:05:02 +12:00
YaFedImYaEatIm 5d70c087ac Added Name Attribute and changed location to city as it was vague 2016-08-26 17:31:06 +12:00
YaFedImYaEatIm af3a30011a Added Javadoc to Airport and configured a few variable types. 2016-08-25 15:37:58 +12:00
YaFedImYaEatIm eac9a931b6 Added Route Unit Tests and DataException Exceptions Class 2016-08-25 13:28:44 +12:00
YaFedImYaEatIm c096cf07dc Finished basic airline JUnit test 2016-08-22 18:36:10 +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 392246dfed Added java doc to route as well as reordered the constructor to match openflights.org/data 2016-08-16 13:50:32 +12:00
YaFedImYaEatIm 215e626afc Added Unit tests to Airline (Missing Add, Set and Get routes) 2016-08-15 22:54:13 +12:00
YaFedImYaEatIm 8d6c1badcb Wrote java doc for Airline as well as fixed up constructor order to match the openflights layout. Lastly added a toString function which returns the name of the Airline. 2016-08-15 22:29:10 +12:00
YaFedImYaEatIm 9f7d53c192 Added setters for Core classes 2016-08-15 22:14:54 +12:00