YaFedImYaEatIm
60bcc0dbf2
Fixed toString Test and added getRoute Test
9 years ago
YaFedImYaEatIm
739fce7ccf
Merge branch 'unitTests' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 into unitTests
9 years ago
YaFedImYaEatIm
80f4db950e
Added new functions to JUnitTest for Route Tests
9 years ago
YaFedImYaEatIm
c92f8e5c54
Added test cases for missing Functiosn in Airport
9 years ago
Liam Beckett
d43fd1bdd6
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
YaFedImYaEatIm
0adc57fc36
Airline Tests
9 years ago
Sunguin Peng
8646e5864d
Changed some variable names for summary controller airport
9 years ago
Sunguin Peng
ab90d060bb
Updated Javadoc and made a popup for not yet implemented button
9 years ago
YaFedImYaEatIm
8c656d0672
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
YaFedImYaEatIm
a857cfb7af
Added Redirection to SUmmary pages after Import.
9 years ago
Michael Wilson
744b96c42a
Fixed some previously unknown issues from merging.
9 years ago
Liam Beckett
7ebfa6c182
Merge remote-tracking branch 'origin/master'
9 years ago
YaFedImYaEatIm
8a4134ae4c
Made variables private
9 years ago
YaFedImYaEatIm
65e05177e9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
YaFedImYaEatIm
57d2ed493c
Fixed Route Unit Test
9 years ago
Liam Beckett
0c98916c04
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# res/userdb.db
9 years ago
YaFedImYaEatIm
618afd4a92
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
Michael Wilson
02b484917d
Fixed calculation bug.
9 years ago
Michael Wilson
60b92d2170
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
9 years ago
Liam Beckett
ffae933085
Database
9 years ago
Sunguin Peng
b2cba96dc1
Added javadoc for airline, airport and route raw data controller classes.
9 years ago
YaFedImYaEatIm
724f63956a
Added Javadoc Strings for Some functions
9 years ago
YaFedImYaEatIm
9e00e3666f
Fixed Conflicts when merging ConnectMaps
9 years ago
Michael Wilson
ff79599c9b
Calculator Implimented.
9 years ago
Sunguin Peng
37e712f734
Refactoring bugs fixed again
9 years ago
YaFedImYaEatIm
84e273de1f
Merge branch 'ConnectMaps'
9 years ago
YaFedImYaEatIm
5363cf8b4e
COnnected maps to airlines, Airports and ROutes
9 years ago
Sunguin Peng
50cc5c6dfb
Merging filter complete GUI for Airport, Airline and Route Raw Data
9 years ago
Liam Beckett
4d662be24a
Layout change
9 years ago
Sunguin Peng
1feb1c9153
Added filter function to the Airline GUI
9 years ago
Liam Beckett
bf33ec61c7
Merge fix
9 years ago
Liam Beckett
1664a49623
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng202/group9/GUI/FlightSummaryController.java
9 years ago
Liam Beckett
cd8e2b0c7f
Implemented the delete option for the flight paths on the Summary and Raw Data pages.
9 years ago
YaFedImYaEatIm
44ed68ee7a
Added Google Maps API
9 years ago
YaFedImYaEatIm
a9edea7690
Finished Google Maps API
9 years ago
Liam Beckett
62a93ad629
Implemented right click, delete ability for the flight raw data paths
9 years ago
Michael Wilson
548ffa99f1
Added webveiws for later maps implimentation.
9 years ago
Sunguin Peng
30f7b2d842
Fixed a bug from Route Filter and implemented Airport Filter in GUI
9 years ago
Liam Beckett
3508518cdd
Added in the right click, delete option for the flight points in the table.
9 years ago
Liam Beckett
be3413a373
Merge branch 'WIP_Update_list' into 'master'
...
update list
See merge request !13
9 years ago
Liam Beckett
afc7d1472f
Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list
9 years ago
Liam Beckett
42bbb327c4
Database
9 years ago
Liam Beckett
7333620964
Fixed the list view bug, so it will now reload the list view so that it includes the newly added path.
9 years ago
YaFedImYaEatIm
ae3fbefd0d
Initial load for GoogleMaps done
9 years ago
Sunguin Peng
4fde239167
Route Filtering on GUI
9 years ago
Michael Wilson
8c49ce4455
Merge remote-tracking branch 'origin/master'
9 years ago
Michael Wilson
3218b72941
Created pie graph viewer for Airports.
9 years ago
Liam Beckett
d838274065
Merge branch 'WIP_Flight_Add_Path' into 'master'
...
Implements the button 'new' on the Flight raw data page which can be used to cre…
…ate a new blank path. Currently does not reload the list view of paths to include the new path.
See merge request !12
9 years ago
Liam Beckett
23bebdf8e3
Implements the button 'new' on the Flight raw data page which can be used to create a new blank path. Currently does not reload the list view of paths to include the new path.
9 years ago
YaFedImYaEatIm
2613489dad
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
Conflicts:
res/session.ser
9 years ago