fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
355 Commits 1 Branch 0 Tags
0cde2a0c277eb139f81c7ecf6556807e3354dfa7
Commit Graph
355 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
YaFedImYaEatIm 0cde2a0c27 Made dataset the main container after load 2016-10-02 21:22:56 +13:00
YaFedImYaEatIm 4cf08e5737 Editted slight editting bug 2016-10-02 21:22:22 +13:00
YaFedImYaEatIm 9a964ff00e Fixed merge Conflicts 2016-10-02 19:30:17 +13:00
YaFedImYaEatIm 85f675998d Inital Enter to submit forms 2016-10-02 19:29:22 +13:00
Sunguin Peng 74c129c3b9 Added reset buttons on filter forms and attempted to decipher code. Also refactored GUI. 2016-10-02 19:22:59 +13:00
YaFedImYaEatIm 48f3d85901 Merged Conflicts 2016-10-02 18:02:03 +13:00
YaFedImYaEatIm 17b945c404 Added Session remembering last filtered information 2016-10-02 17:59:21 +13:00
Michael edf6a64211 Added route data converter to the bar graph. 2016-10-02 17:15:43 +13:00
YaFedImYaEatIm fe554ccef5 made things final 2016-10-02 16:47:18 +13:00
YaFedImYaEatIm c752ed969e Fixed Merge COnflicts 2016-10-02 16:41:28 +13:00
YaFedImYaEatIm a1624f2c5d FInisehd Pop Up Map 2016-10-02 16:39:30 +13:00
Michael 85c1389557 Made error message report correctly. 2016-10-02 16:24:39 +13:00
Sunguin Peng 7f42e7f59b Fixed success message in airport filter 2016-10-02 16:22:30 +13:00
Sunguin Peng c0a9ac63ac Fixed merge conflict 2016-10-02 16:13:11 +13:00
Sunguin Peng 2404c18d51 Changed JSwing component in new flight path. 2016-10-02 16:11:52 +13:00
Michael 028ea2dcce Trying to make merge official. 2016-10-02 16:00:38 +13:00
Michael a666eeef83 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/seng202/group9/Controller/SceneCode.java
	src/main/java/seng202/group9/Controller/Session.java
	src/main/java/seng202/group9/GUI/AirportAnalyser.java
	src/main/java/seng202/group9/GUI/RouteAnalyser.java
 2016-10-02 15:55:41 +13:00
Michael c0ab798123 Minor bug fixes. 2016-10-02 15:49:37 +13:00
YaFedImYaEatIm af25df2f2b Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-10-02 15:35:01 +13:00
YaFedImYaEatIm ae82d7000a Added Pop Up Map 2016-10-02 15:34:54 +13:00
Sunguin Peng 725900f80a Added button for map 2016-10-02 15:06:47 +13:00
Michael Wilson 9141f5abf3 Error handling added. 2016-10-02 13:41:07 +13:00
Sunguin Peng d0c7cbde7d Updated the Getting Started page to manage datasets 2016-10-02 13:01:47 +13:00
YaFedImYaEatIm 5f2967e9cc Simplified get Route By Airport 2016-10-02 01:37:42 +13:00
YaFedImYaEatIm 3f26aff3d2 Added Routes By Equipment 2016-10-02 01:36:15 +13:00
YaFedImYaEatIm f930f7664e Made the first one of each Airline, Airport and Route tables load each load 2016-10-02 00:58:00 +13:00
YaFedImYaEatIm 1e65e8ef37 Fixed Dataset Changing Error and Selected Table Item Indices Error 2016-10-02 00:52:53 +13:00
YaFedImYaEatIm 236b93ed85 Added Routes By Airport Menu 2016-10-02 00:52:03 +13:00
YaFedImYaEatIm b31fa6e24b Added Connection error message to google maps. 2016-10-01 23:19:16 +13:00
YaFedImYaEatIm 021a03c6b4 Added if dataset open/add incase dataset is null to all pages that require a non null dataset to exist. 2016-10-01 23:10:36 +13:00
YaFedImYaEatIm e217d23ebc Created button in menu to open/change the dataset 2016-10-01 22:55:34 +13:00
YaFedImYaEatIm fe485184d9 Added change dataset prompts to import functions 2016-10-01 22:51:04 +13:00
YaFedImYaEatIm af27e408f4 Made VIA column in Flight Points invisible 2016-10-01 22:28:11 +13:00
YaFedImYaEatIm df6f2a9c93 Cleaned up unnecessary entries for the flight point adder 2016-10-01 22:25:48 +13:00
YaFedImYaEatIm 12601287b2 removed IATA/FFA column and added Number of ROutes column 2016-10-01 22:01:40 +13:00
Michael Wilson 8ac6606b76 Pie graph fully hooked up. 2016-10-01 20:07:13 +13:00
YaFedImYaEatIm ca12ff4202 Fixed flightPaths adding new flight path error 2016-10-01 18:53:20 +13:00
YaFedImYaEatIm 8f5bd3e192 Added Cannot delte if the flight path only has 2 points 2016-10-01 18:37:09 +13:00
YaFedImYaEatIm fdce7e2f2f Made Delete update the Flight Path Information 2016-10-01 18:25:56 +13:00
YaFedImYaEatIm 986e22bf1e Moved Add Listeners to Initilisation function to prevent 500000000000 stacks of listeners 2016-10-01 18:16:16 +13:00
YaFedImYaEatIm a1f02b7cfb Initialised the LIstener in the Initilisation method instead of an onclick function 2016-10-01 18:14:44 +13:00
YaFedImYaEatIm 1cdc1f387c Changed OnMouseClick to OnMenu Change to prevent errors 2016-10-01 18:13:37 +13:00
YaFedImYaEatIm ee239d9d6b Added catching for no Paths in Dataset 2016-10-01 18:06:46 +13:00
YaFedImYaEatIm 4118d2762c Refreshing side when tflight data is edited 2016-10-01 18:00:25 +13:00
YaFedImYaEatIm 3f54e0998b Fixed Liam's silly, not setting dataset. And Sunguin's merge deleting Liam's Move up and Down buttons 2016-10-01 17:35:25 +13:00
Liam Beckett 12c396a263 Merge branch 'Update_Path' into 'master' 
Update path



See merge request !22
 2016-10-01 16:50:04 +13:00
Liam Beckett e34e0bafee Merge remote-tracking branch 'remotes/origin/master' into Update_Path 
# Conflicts:
#	src/main/java/seng202/group9/GUI/FlightRDController.java
#	src/main/resources/flight_raw_data.fxml
 2016-10-01 16:49:06 +13:00
Liam Beckett e51aaaa7f2 Fixed bug with flight pages and an empty dataset 2016-10-01 16:43:28 +13:00
Sunguin Peng bb6895b40a Fixed Merge Errors 2016-10-01 16:34:50 +13:00
Sunguin Peng cc9de4e05b Ignored Database from git 2016-10-01 16:28:54 +13:00