Michael
273d694490
Fixed summary files FXML.
9 years ago
Michael
27888ed689
Merge remote-tracking branch 'origin/master'
9 years ago
Liam Beckett
76da24c06e
Merge branch 'WIP_Flight_Summary_Button' into 'master'
...
Implemented the raw data button on the flight summary page so it changes the scene
See merge request !7
9 years ago
Liam Beckett
11ad212c2e
Implemented the raw data button on the flight summary page so it changes the scene
9 years ago
Michael
e914c50498
Merge branch 'WIP_Summary'
...
Conflicts:
res/userdb.db
src/main/resources/airline_summary.fxml
src/main/resources/airport_summary.fxml
9 years ago
Michael
cd1c505dc6
Merge remote-tracking branch 'origin/master'
9 years ago
Liam Beckett
d62dce4041
Merge branch 'WIP_Flight_ListView_Click_Response' into 'master'
...
flight list view click response
See merge request !6
9 years ago
Liam Beckett
c1ac1ca6e3
Added in some comment for the functions and classes that didnt have them
9 years ago
Liam Beckett
6049e5b1a5
Implemented the Flight lists response to being clicked. Now in the raw data when a list item is selected then it changes the displayed table data.
9 years ago
Michael Wilson
3782334db7
Fixed a few bugs though routes doesn't load.
9 years ago
Liam Beckett
8192c59bb4
Merge branch 'WIP_Flight_Path_List' into 'master'
...
Implemented the list view of the different paths in the database. Currently only…
… displays the names without any response when clicked. Also made slight adjustments to the summary and raw data Flight GUIs
See merge request !5
9 years ago
Liam Beckett
f212be8dbd
Implemented the list view of the different paths in the database. Currently only displays the names without any response when clicked. Also made slight adjustments to the summary and raw data Flight GUIs
9 years ago
Sunguin Peng
f33cdca373
Applied single entry add methods to GUI for Airports and Airlines. Made error pop ups for them as well.
9 years ago
Michael Wilson
c1f1056586
Stopped exception on load.
9 years ago
YaFedImYaEatIm
c7f033283d
Add Singular Route Adding Function
9 years ago
YaFedImYaEatIm
66ee9ced2d
Added Singular Add Route
9 years ago
Michael Wilson
91ad64d399
Buttons temporarily removed and a few fixes made.
9 years ago
Michael Wilson
d744442ba2
Buttons on summary pages have been linked to proper functions.
9 years ago
Michael Wilson
11197a0400
Hooked up the Summary pages to the Menu bar.
9 years ago
Michael Wilson
9da9b40176
Route Summary controller code built though currently has nothing calling it and has not been tested.
9 years ago
Michael Wilson
a1bf694699
Airport Summary controller code built though currently has nothing calling it and has not been tested.
9 years ago
Michael Wilson
ab21d0f25d
Airline Summary controller code built though currently has nothing calling it and has not been tested.
9 years ago
Liam Beckett
9912f2c3af
Merge branch 'WIP_Flight_RawData' into 'master'
...
flight raw data
See merge request !4
9 years ago
Liam Beckett
208621650e
Minor updates to the GUI files for both raw data and summary Flight pages. Implemented the loading of data into tables for flight raw data.
9 years ago
YaFedImYaEatIm
e6c468e826
Added Singular Airport Adding
9 years ago
YaFedImYaEatIm
d84346de60
Added singular Airport adding
9 years ago
Sunguin Peng
3eb144ae36
Merged into master branch
9 years ago
Liam Beckett
399d1eb069
Changed the raw data GUI for flights and testing new branch
9 years ago
Sunguin Peng
6806c0d099
Linked Raw Data GUI together and tables have some data in them from the database.
9 years ago
YaFedImYaEatIm
4418bc6824
Changed files to work with merge
9 years ago
Liam Beckett
30181d39da
Merge branch 'WIP_Flights' into 'master'
...
Flights
See merge request !3
9 years ago
Liam Beckett
35db19db2d
Not all files were commited from the earlier commit, due to idle functionality misunderstandings
9 years ago
Liam Beckett
af8617b316
Commented out tests in the App
9 years ago
YaFedImYaEatIm
a89e5f7b95
Made Add Airline FUnction
9 years ago
Liam Beckett
13697ac673
Implemented the parser for basic Flight files(The one given to us in the important documents folder on learn)
9 years ago
Michael
0fa08a9d5d
Fixed missing button names.
9 years ago
Michael
58c4a31441
Buttons named.
9 years ago
Michael
b5b7899b7b
Merge remote-tracking branch 'origin/master'
9 years ago
Michael
0182cabec6
Added summary gui components
9 years ago
Sunguin Peng
dff71615cb
Trialing branch for own work
9 years ago
Liam Beckett
b6624f20a8
Updated the Flight Summary GUI
9 years ago
YaFedImYaEatIm
dac4146f33
Added calculate Distance()
9 years ago
YaFedImYaEatIm
b08f190124
Fixed Errors with Loading Flight Data FXML
9 years ago
Liam Beckett
3be9fca029
Added back in the GUI implementation for the flight raw data and summary viewer which was lost / changed earlier. Also in the process of updating their fxml files to improve the GUI
9 years ago
YaFedImYaEatIm
b9308060f1
Fixed Controller after merge
9 years ago
YaFedImYaEatIm
859b19f7d5
Fixed Scene Loading
9 years ago
Liam Beckett
9c594fd474
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng202/group9/GUI/MenuController.java
9 years ago
Liam Beckett
3e5b793cb2
Trying to fix the merge conflict
9 years ago
Liam Beckett
a46609b0b2
Begun work on the flight data parser, committing changes and merging in order to add another feature.
9 years ago
YaFedImYaEatIm
6f14fc48f0
Added Raw Data loader for Airline
9 years ago