73cfca0ccc
fixed index out of array after deleting FlightPath for map
9 years ago
ddac466879
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
4a5d7392e5
Fixed Google Map bug and DeleteFLightPath()
9 years ago
d470d35a12
Updated ReadMe and removed help from menu bar
9 years ago
fa729ee344
Removed no working menu buttons
9 years ago
0f726bbaf4
Added new Sample file and change some parameters in FlightPathParser
9 years ago
dec72c0272
Uncommented a few necessary functions and new Sample DataFile
9 years ago
0fe8f450b0
Refreshed the Database to a clean state
9 years ago
bb535a74bf
Added LOts of Brief Javadocs
9 years ago
0672dfe86b
Merge branch 'unitTests'
9 years ago
3519c52cb1
Added Airline FIlter Javadoc
9 years ago
877e4b5b22
Made Filter Unit Tests
9 years ago
121259626f
Added Session Unit Test
9 years ago
c2bb5d2097
Dataset UnitTests Made
9 years ago
ef3a3fc240
Added Testables to AppTest
9 years ago
0de6bfafe5
Made Route Path Test.
9 years ago
6e3ba9775a
Added Flight POint Test as well as some Exceptions
9 years ago
548b5fe321
Added Flight Path Tests
9 years ago
9391b31092
Made Unit Test for COuntry
9 years ago
b232dcd7e6
Added some index checks and relavent Tests for them
9 years ago
a0959e8de6
Added City JUnit Tests
9 years ago
02c3e3ed99
Added delete Route Tests and toString test
9 years ago
b62bf7f1b1
Added COuntry tests, alternative constructor and ID error tests
9 years ago
960fdc3e96
Missing setID in coverage for routes
9 years ago
60bcc0dbf2
Fixed toString Test and added getRoute Test
9 years ago
739fce7ccf
Merge branch 'unitTests' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 into unitTests
9 years ago
80f4db950e
Added new functions to JUnitTest for Route Tests
9 years ago
c92f8e5c54
Added test cases for missing Functiosn in Airport
9 years ago
0adc57fc36
Airline Tests
9 years ago
8646e5864d
Changed some variable names for summary controller airport
9 years ago
ab90d060bb
Updated Javadoc and made a popup for not yet implemented button
9 years ago
8c656d0672
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
a857cfb7af
Added Redirection to SUmmary pages after Import.
9 years ago
744b96c42a
Fixed some previously unknown issues from merging.
9 years ago
8a4134ae4c
Made variables private
9 years ago
65e05177e9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
9 years ago
57d2ed493c
Fixed Route Unit Test
9 years ago
02b484917d
Fixed calculation bug.
9 years ago
60b92d2170
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/main/java/seng202/group9/Controller/SceneCode.java
9 years ago
b2cba96dc1
Added javadoc for airline, airport and route raw data controller classes.
9 years ago
724f63956a
Added Javadoc Strings for Some functions
9 years ago
9e00e3666f
Fixed Conflicts when merging ConnectMaps
9 years ago
ff79599c9b
Calculator Implimented.
9 years ago
37e712f734
Refactoring bugs fixed again
9 years ago
5363cf8b4e
COnnected maps to airlines, Airports and ROutes
9 years ago
50cc5c6dfb
Merging filter complete GUI for Airport, Airline and Route Raw Data
9 years ago
4d662be24a
Layout change
9 years ago
1feb1c9153
Added filter function to the Airline GUI
9 years ago
bf33ec61c7
Merge fix
9 years ago
1664a49623
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng202/group9/GUI/FlightSummaryController.java
9 years ago
cd8e2b0c7f
Implemented the delete option for the flight paths on the Summary and Raw Data pages.
9 years ago
44ed68ee7a
Added Google Maps API
9 years ago
a9edea7690
Finished Google Maps API
9 years ago
62a93ad629
Implemented right click, delete ability for the flight raw data paths
9 years ago
548ffa99f1
Added webveiws for later maps implimentation.
9 years ago
30f7b2d842
Fixed a bug from Route Filter and implemented Airport Filter in GUI
9 years ago
3508518cdd
Added in the right click, delete option for the flight points in the table.
9 years ago
afc7d1472f
Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list
9 years ago
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
ae3fbefd0d
Initial load for GoogleMaps done
9 years ago
4fde239167
Route Filtering on GUI
9 years ago
8c49ce4455
Merge remote-tracking branch 'origin/master'
9 years ago
3218b72941
Created pie graph viewer for Airports.
9 years ago
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
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
2613489dad
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
Conflicts:
res/session.ser
9 years ago
cbfe40a8fd
Edited Session Message as Importer Error messages
9 years ago
5cc305d896
Fixed some refactoring issues and implemented delete functions in the GUI
9 years ago
8b30d2c0c2
Merge remote-tracking branch 'origin/master'
9 years ago
eb698f17c8
Made graph work with new formatting.
9 years ago
8027b701a0
Added Import UI
9 years ago
56eeb0e9f8
Merge branch 'Analyser'
...
Conflicts:
src/main/java/seng202/group9/GUI/RouteRDController.java
9 years ago
f0fbc7cf24
Small check added.
9 years ago
e3ff9d3bfc
Fixed a bit of Airline GUI
9 years ago
00333b6e58
Added Session and Controller Abstract Class
9 years ago
4ff6aefd1e
Implemented Abstract Controller class which made code a lot short and easier to read
9 years ago
5641cc3728
Loaded Observers to Session loading
9 years ago
bf8c1d1fdf
Added Serialisation for the Session Code
9 years ago
d0148d9e73
Added Enums for each Open View for easier storage for Session.
9 years ago
25fcc8cf94
Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202
...
# Conflicts:
# res/userdb.db
9 years ago
ebe82fb6ed
Initial commit for Session
9 years ago
92c5cf9c8b
First graph displays it's data as desired.
9 years ago
b4073723f5
Merge branch 'Filter'
9 years ago
42592edfa1
Added Route Filtering
9 years ago
ff20c6435e
Implemented the ablitity to manually enter flight points into the database.
9 years ago
462f2304e4
Made Airline Filter
9 years ago
87bd23f722
Made Abstract Filter Class
9 years ago
bed13aca2f
Changed GUI
9 years ago
0cfffd258c
GUI displays all fields and altered some GUI
9 years ago
091d9e5e00
got rid of dataset test code
9 years ago
9f804affff
Merge branch 'DeleteFunctions'
9 years ago
cd94b51282
Delete Code made
9 years ago
87d4b42036
Fixed 2 incorrect buttons and hooked up flight buttons.
9 years ago
94f2d25899
Hooked up all buttons for summary pages.
9 years ago
f54b109639
Added delete dataset Function
9 years ago
de9cee785c
Changed some tests to reflect some function name changes
9 years ago
a6f5f13c0b
Merged CreateLinks Branch which allowed CreateLinks() function to work along with new Import Messages
9 years ago
fac5ec79b1
Changed Import Messages to be relavent to the type of data they import
9 years ago
693acf9b9c
Finished Create Link() establishment
9 years ago
16b9a7a8a8
Fixed routes summary.
9 years ago
YaFedImYaEatIm
Sunguin Peng
Liam Beckett
YaFedImYaEatIm
Michael Wilson