Liam Beckett
|
0e1442e401
|
Merge branch 'WIP_Flight_Order' into 'master'
flight order
See merge request !20
|
9 years ago |
|
Liam Beckett
|
ccc40cfb60
|
MERGE
|
9 years ago |
|
Liam Beckett
|
b7990a3507
|
Merge remote-tracking branch 'remotes/origin/master' into WIP_Flight_Order
# Conflicts:
# res/userdb.db
|
9 years ago |
YaFedImYaEatIm
|
262547e590
|
Fixed JUnitTests as well as added a few tweaks to the flight point moving
|
9 years ago |
|
YaFedImYaEatIm
|
e0d074af19
|
Made the Dataset chooser not mess with the menu and fixed merge problems
|
9 years ago |
|
YaFedImYaEatIm
|
94fc6a8921
|
Open, delete and add dataset now work
|
9 years ago |
Sunguin
|
8891c2148b
|
Merge branch 'getting_started'
|
9 years ago |
|
Sunguin
|
138b5cae46
|
Improved the help menu item.
|
9 years ago |
|
YaFedImYaEatIm
|
b94fcb6c29
|
Fixed some merge rollback RAWRgit add .git add .
|
9 years ago |
|
Liam Beckett
|
70645e7307
|
Started work on the ordering of flight points
|
9 years ago |
|
YaFedImYaEatIm
|
683c89622d
|
Initial commit for Dataset Controller
|
9 years ago |
|
YaFedImYaEatIm
|
dd2045d147
|
Fixed Filter Data Dictionary Key error from the GUI
|
9 years ago |
|
Liam Beckett
|
9dde2ca025
|
Merge branch 'Flight_Summary_Branch' into 'master'
Flight summary branch
See merge request !18
|
9 years ago |
|
Liam Beckett
|
7229ac5211
|
Added java doc
|
9 years ago |
|
Liam Beckett
|
eae3c34be2
|
Implemented the Summary information on the flight data summary page
|
9 years ago |
|
Sunguin
|
c799c722b8
|
Added a help pop up pane.
|
9 years ago |
|
YaFedImYaEatIm
|
79b73f845e
|
Reverted Merge Error where changes were deleted
|
9 years ago |
|
YaFedImYaEatIm
|
5c1dbe775e
|
Reverted some merge error
|
9 years ago |
|
Sunguin
|
b7308f1920
|
Added a controller and a fxml file for getting started.
|
9 years ago |
|
Sunguin Peng
|
5d8b3e2656
|
Still trialing with database
|
9 years ago |
|
Sunguin Peng
|
d485176967
|
Trialing some push pull stuff
|
9 years ago |
|
Sunguin Peng
|
ad8d796c89
|
Javadoc added for airline raw data
|
9 years ago |
|
YaFedImYaEatIm
|
7e94a272f0
|
Optimised Delete Flight Path Function and changed flight Analyser button from private to public
|
9 years ago |
|
YaFedImYaEatIm
|
7396ea1f04
|
Fixed up delete Flight Point so that it updates the flight path on delete as well as recalulating distances
|
9 years ago |
|
YaFedImYaEatIm
|
4582f4de61
|
Fixed Edit Dictionary key entries
|
9 years ago |
|
YaFedImYaEatIm
|
2f6a4a156f
|
Fixed pull merge Errors
|
9 years ago |
|
YaFedImYaEatIm
|
f220bd98aa
|
Added Key Comments
|
9 years ago |
|
Sunguin Peng
|
bd4ecd20a6
|
Fixed conflicts
|
9 years ago |
|
Sunguin Peng
|
960de77476
|
Did rd for airport and route
|
9 years ago |
|
Liam Beckett
|
a8a377a893
|
Merge branch 'WIP_Flight_Editor' into 'master'
flight editor
See merge request !17
|
9 years ago |
|
Liam Beckett
|
5d6d35276b
|
Fixed for merge
|
9 years ago |
|
Liam Beckett
|
1dd8258217
|
Deleted print for SQL Entry
|
9 years ago |
|
Liam Beckett
|
7c3b84140d
|
Reverted some ID's back from -1 to 1
|
9 years ago |
|
Liam Beckett
|
3091d8eb63
|
Fixed Some Dictionary Errors in Flightpoints
|
9 years ago |
|
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
|
9 years ago |
|
Liam Beckett
|
5c7991fdc1
|
Database
|
9 years ago |
|
Liam Beckett
|
aeae85b9e5
|
Fixed up some of the javadocs and did some refactoring removing unneccesary code.
|
9 years ago |
|
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.
|
9 years ago |
|
Liam Beckett
|
df5721973f
|
Fixed the intial validation so any lower case name will be chnaged to uppercase
|
9 years ago |
|
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.
|
9 years ago |
|
Sunguin Peng
|
a386d28ea1
|
Made edit function work for airlines
|
9 years ago |
|
YaFedImYaEatIm
|
8d55e7dbca
|
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
|
9 years ago |
|
YaFedImYaEatIm
|
f3ab8dfe14
|
Added Flight Point order switch JUnitTests
|
9 years ago |
Fan-Wu Yang
|
dbc5ed1080
|
Added how to ignore database changes.
|
9 years ago |
|
Sunguin Peng
|
e237d058bd
|
Gets information for airlines
|
9 years ago |
|
Sunguin Peng
|
8fb7a36d80
|
Commiteed
|
9 years ago |
|
Sunguin Peng
|
38b465200f
|
Commit db
|
9 years ago |
|
YaFedImYaEatIm
|
267a08ce68
|
Fixed Maven Error where ID wasn't set as the database did not establish the index before the creation of the table
|
9 years ago |
|
Sunguin Peng
|
5f576595c0
|
Merge branch 'remaking_rd_gui'
|
9 years ago |
|
Sunguin Peng
|
c9d2047761
|
Attempting to merge
|
9 years ago |
