YaFedImYaEatIm
|
c752ed969e
|
Fixed Merge COnflicts
|
9 years ago |
|
YaFedImYaEatIm
|
a1624f2c5d
|
FInisehd Pop Up Map
|
9 years ago |
Michael
|
85c1389557
|
Made error message report correctly.
|
9 years ago |
Sunguin Peng
|
7f42e7f59b
|
Fixed success message in airport filter
|
9 years ago |
|
Sunguin Peng
|
c0a9ac63ac
|
Fixed merge conflict
|
9 years ago |
|
Sunguin Peng
|
2404c18d51
|
Changed JSwing component in new flight path.
|
9 years ago |
|
Michael
|
028ea2dcce
|
Trying to make merge official.
|
9 years ago |
|
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
|
9 years ago |
|
Michael
|
c0ab798123
|
Minor bug fixes.
|
9 years ago |
|
YaFedImYaEatIm
|
af25df2f2b
|
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
|
9 years ago |
|
YaFedImYaEatIm
|
ae82d7000a
|
Added Pop Up Map
|
9 years ago |
|
Sunguin Peng
|
725900f80a
|
Added button for map
|
9 years ago |
|
Michael Wilson
|
9141f5abf3
|
Error handling added.
|
9 years ago |
|
Sunguin Peng
|
d0c7cbde7d
|
Updated the Getting Started page to manage datasets
|
9 years ago |
|
YaFedImYaEatIm
|
5f2967e9cc
|
Simplified get Route By Airport
|
9 years ago |
|
YaFedImYaEatIm
|
3f26aff3d2
|
Added Routes By Equipment
|
9 years ago |
|
YaFedImYaEatIm
|
f930f7664e
|
Made the first one of each Airline, Airport and Route tables load each load
|
9 years ago |
|
YaFedImYaEatIm
|
1e65e8ef37
|
Fixed Dataset Changing Error and Selected Table Item Indices Error
|
9 years ago |
|
YaFedImYaEatIm
|
236b93ed85
|
Added Routes By Airport Menu
|
9 years ago |
|
YaFedImYaEatIm
|
b31fa6e24b
|
Added Connection error message to google maps.
|
9 years ago |
|
YaFedImYaEatIm
|
021a03c6b4
|
Added if dataset open/add incase dataset is null to all pages that require a non null dataset to exist.
|
9 years ago |
|
YaFedImYaEatIm
|
e217d23ebc
|
Created button in menu to open/change the dataset
|
9 years ago |
|
YaFedImYaEatIm
|
fe485184d9
|
Added change dataset prompts to import functions
|
9 years ago |
|
YaFedImYaEatIm
|
af27e408f4
|
Made VIA column in Flight Points invisible
|
9 years ago |
|
YaFedImYaEatIm
|
df6f2a9c93
|
Cleaned up unnecessary entries for the flight point adder
|
9 years ago |
|
YaFedImYaEatIm
|
12601287b2
|
removed IATA/FFA column and added Number of ROutes column
|
9 years ago |
|
Michael Wilson
|
8ac6606b76
|
Pie graph fully hooked up.
|
9 years ago |
|
YaFedImYaEatIm
|
ca12ff4202
|
Fixed flightPaths adding new flight path error
|
9 years ago |
|
YaFedImYaEatIm
|
8f5bd3e192
|
Added Cannot delte if the flight path only has 2 points
|
9 years ago |
|
YaFedImYaEatIm
|
fdce7e2f2f
|
Made Delete update the Flight Path Information
|
9 years ago |
|
YaFedImYaEatIm
|
986e22bf1e
|
Moved Add Listeners to Initilisation function to prevent 500000000000 stacks of listeners
|
9 years ago |
|
YaFedImYaEatIm
|
a1f02b7cfb
|
Initialised the LIstener in the Initilisation method instead of an onclick function
|
9 years ago |
|
YaFedImYaEatIm
|
1cdc1f387c
|
Changed OnMouseClick to OnMenu Change to prevent errors
|
9 years ago |
|
YaFedImYaEatIm
|
ee239d9d6b
|
Added catching for no Paths in Dataset
|
9 years ago |
|
YaFedImYaEatIm
|
4118d2762c
|
Refreshing side when tflight data is edited
|
9 years ago |
|
YaFedImYaEatIm
|
3f54e0998b
|
Fixed Liam's silly, not setting dataset. And Sunguin's merge deleting Liam's Move up and Down buttons
|
9 years ago |
Liam Beckett
|
12c396a263
|
Merge branch 'Update_Path' into 'master'
Update path
See merge request !22
|
9 years ago |
|
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
|
9 years ago |
|
Liam Beckett
|
e51aaaa7f2
|
Fixed bug with flight pages and an empty dataset
|
9 years ago |
|
Sunguin Peng
|
bb6895b40a
|
Fixed Merge Errors
|
9 years ago |
|
Sunguin Peng
|
cc9de4e05b
|
Ignored Database from git
|
9 years ago |
|
Sunguin Peng
|
3ce0bdda83
|
Fixed a few bugs and refactored some code.
|
9 years ago |
|
Liam Beckett
|
04481661c4
|
Removed the via column in the table
|
9 years ago |
|
Liam Beckett
|
6ec38bcb87
|
Fixed the error when the user clicks on empty path fields in the flight path list view
|
9 years ago |
|
Sunguin Peng
|
df00a25b84
|
Fixed flight error and finished using treeview for help.
|
9 years ago |
|
Liam Beckett
|
e17bf9b055
|
Fixed the move up and down bugs on for the first and last points in a path.
|
9 years ago |
|
Liam Beckett
|
805eee58af
|
Updated the path so that it will update when the 2nd point becomes the 1st point
|
9 years ago |
|
Sunguin Peng
|
5c004886d6
|
Trialing treeview on help
|
9 years ago |
|
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 |
