fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
314 Commits 1 Branch 0 Tags
ca12ff4202b54f988833fa6716444ecd8f453ccc
Commit Graph
257 Commits
Author SHA1 Message Date
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 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 3ce0bdda83 Fixed a few bugs and refactored some code. 2016-10-01 16:24:10 +13:00
Liam Beckett 04481661c4 Removed the via column in the table 2016-10-01 16:00:43 +13:00
Liam Beckett 6ec38bcb87 Fixed the error when the user clicks on empty path fields in the flight path list view 2016-10-01 15:31:28 +13:00
Sunguin Peng df00a25b84 Fixed flight error and finished using treeview for help. 2016-10-01 15:21:41 +13:00
Liam Beckett e17bf9b055 Fixed the move up and down bugs on for the first and last points in a path. 2016-10-01 15:02:45 +13:00
Liam Beckett 805eee58af Updated the path so that it will update when the 2nd point becomes the 1st point 2016-10-01 14:52:59 +13:00
Sunguin Peng 5c004886d6 Trialing treeview on help 2016-10-01 13:58:49 +13:00
Liam Beckett b7990a3507 Merge remote-tracking branch 'remotes/origin/master' into WIP_Flight_Order 
# Conflicts:
#	res/userdb.db
 2016-10-01 11:38:45 +13:00
Sunguin Peng b7a3d416ca Remodelled GUI and testing out flight adding. 2016-10-01 01:50:58 +13:00
YaFedImYaEatIm 262547e590 Fixed JUnitTests as well as added a few tweaks to the flight point moving 2016-09-30 15:32:07 +13:00
YaFedImYaEatIm e0d074af19 Made the Dataset chooser not mess with the menu and fixed merge problems 2016-09-30 15:21:50 +13:00
YaFedImYaEatIm 94fc6a8921 Open, delete and add dataset now work 2016-09-30 14:55:02 +13:00
Sunguin 8891c2148b Merge branch 'getting_started' 2016-09-30 14:27:05 +13:00
Sunguin 138b5cae46 Improved the help menu item. 2016-09-30 14:19:54 +13:00
YaFedImYaEatIm b94fcb6c29 Fixed some merge rollback RAWRgit add .git add . 2016-09-30 14:17:33 +13:00
Liam Beckett 70645e7307 Started work on the ordering of flight points 2016-09-30 14:03:38 +13:00
YaFedImYaEatIm 683c89622d Initial commit for Dataset Controller 2016-09-30 13:31:13 +13:00
YaFedImYaEatIm dd2045d147 Fixed Filter Data Dictionary Key error from the GUI 2016-09-30 13:19:40 +13:00
Liam Beckett 7229ac5211 Added java doc 2016-09-30 13:08:10 +13:00
Liam Beckett eae3c34be2 Implemented the Summary information on the flight data summary page 2016-09-30 13:05:54 +13:00
Sunguin c799c722b8 Added a help pop up pane. 2016-09-30 12:55:53 +13:00
YaFedImYaEatIm 79b73f845e Reverted Merge Error where changes were deleted 2016-09-30 10:48:59 +13:00
YaFedImYaEatIm 5c1dbe775e Reverted some merge error 2016-09-30 10:36:21 +13:00
Sunguin b7308f1920 Added a controller and a fxml file for getting started. 2016-09-26 14:50:49 +13:00
Sunguin Peng d485176967 Trialing some push pull stuff 2016-09-26 12:37:38 +13:00
Sunguin Peng ad8d796c89 Javadoc added for airline raw data 2016-09-26 12:32:11 +13:00
YaFedImYaEatIm 7e94a272f0 Optimised Delete Flight Path Function and changed flight Analyser button from private to public 2016-09-24 18:41:08 +12:00
YaFedImYaEatIm 7396ea1f04 Fixed up delete Flight Point so that it updates the flight path on delete as well as recalulating distances 2016-09-24 18:18:34 +12:00
YaFedImYaEatIm 4582f4de61 Fixed Edit Dictionary key entries 2016-09-24 18:13:08 +12:00
YaFedImYaEatIm 2f6a4a156f Fixed pull merge Errors 2016-09-24 18:06:26 +12:00
YaFedImYaEatIm f220bd98aa Added Key Comments 2016-09-24 18:04:21 +12:00
Sunguin Peng bd4ecd20a6 Fixed conflicts 2016-09-24 17:48:08 +12:00
Sunguin Peng 960de77476 Did rd for airport and route 2016-09-24 17:44:13 +12:00
Liam Beckett 5d6d35276b Fixed for merge 2016-09-24 17:40:06 +12:00
Liam Beckett 3091d8eb63 Fixed Some Dictionary Errors in Flightpoints 2016-09-24 17:24:59 +12:00
Liam Beckett b1864b6467 Merge remote-tracking branch 'remotes/origin/master' into WIP_Flight_Editor 
# Conflicts:
#	res/userdb.db
#	src/main/java/seng202/group9/Controller/App.java
#	src/main/java/seng202/group9/Controller/Dataset.java
#	src/main/java/seng202/group9/Controller/SceneCode.java
#	src/main/java/seng202/group9/Controller/Session.java
#	src/main/java/seng202/group9/Core/FlightPath.java
 2016-09-24 17:03:57 +12:00
Liam Beckett aeae85b9e5 Fixed up some of the javadocs and did some refactoring removing unneccesary code. 2016-09-24 16:35:24 +12:00
YaFedImYaEatIm 9e21e32cd8 Fixed Some Errors with Editting Airports with non existing Cities and Countries. Also made it so that if they are new cities they will be added to the database. 2016-09-24 16:31:33 +12:00