fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
350 Commits 1 Branch 0 Tags
48f3d85901cfd19c9c1720ed0ee35673fc9a7673
Commit Graph
350 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 0e1442e401 Merge branch 'WIP_Flight_Order' into 'master' 
flight order



See merge request !20
 2016-10-01 12:56:13 +13:00
Liam Beckett ccc40cfb60 MERGE 2016-10-01 12:54:31 +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 9dde2ca025 Merge branch 'Flight_Summary_Branch' into 'master' 
Flight summary branch



See merge request !18
 2016-09-30 13:09: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 5d8b3e2656 Still trialing with database 2016-09-26 12:40: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 a8a377a893 Merge branch 'WIP_Flight_Editor' into 'master' 
flight editor



See merge request !17
 2016-09-24 17:42:22 +12:00
Liam Beckett 5d6d35276b Fixed for merge 2016-09-24 17:40:06 +12:00
Liam Beckett 1dd8258217 Deleted print for SQL Entry 2016-09-24 17:35:11 +12:00
Liam Beckett 7c3b84140d Reverted some ID's back from -1 to 1 2016-09-24 17:30:31 +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 5c7991fdc1 Database 2016-09-24 16:38:41 +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
Liam Beckett df5721973f Fixed the intial validation so any lower case name will be chnaged to uppercase 2016-09-24 16:17:29 +12:00
Liam Beckett 5f8e2f2481 Got the basic functionally done on the flight point editor. Currently will change the vaule although a few bugs in the validation aspects. 2016-09-24 16:08:41 +12:00
Michael 810cd0a94f Minor bug fix. 2016-09-24 15:39:15 +12:00
Michael f6696e1859 Added backend controllers which pass the selected options to their respected graphs when creating the graph. 2016-09-24 15:28:38 +12:00
Sunguin Peng a386d28ea1 Made edit function work for airlines 2016-09-24 15:17:18 +12:00
YaFedImYaEatIm 8d55e7dbca Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-24 14:54:59 +12:00
YaFedImYaEatIm f3ab8dfe14 Added Flight Point order switch JUnitTests 2016-09-24 14:54:44 +12:00
Fan-Wu Yang dbc5ed1080 Added how to ignore database changes. 2016-09-24 14:46:54 +12:00
Sunguin Peng e237d058bd Gets information for airlines 2016-09-24 14:37:55 +12:00