fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
229 Commits 1 Branch 0 Tags
4ef20aef0f77dd3af3f41787547161a38539ef58
Commit Graph
229 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
YaFedImYaEatIm 0adc57fc36 Airline Tests 2016-09-18 18:42:15 +12:00
Sunguin Peng 8646e5864d Changed some variable names for summary controller airport 2016-09-18 18:40:13 +12:00
Sunguin Peng ab90d060bb Updated Javadoc and made a popup for not yet implemented button 2016-09-18 18:19:21 +12:00
YaFedImYaEatIm 8c656d0672 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-18 13:59:39 +12:00
YaFedImYaEatIm a857cfb7af Added Redirection to SUmmary pages after Import. 2016-09-18 13:59:33 +12:00
Michael Wilson 744b96c42a Fixed some previously unknown issues from merging. 2016-09-18 13:54:56 +12:00
Liam Beckett 7ebfa6c182 Merge remote-tracking branch 'origin/master' 2016-09-18 13:45:35 +12:00
YaFedImYaEatIm 8a4134ae4c Made variables private 2016-09-18 13:43:59 +12:00
YaFedImYaEatIm 65e05177e9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-18 13:35:18 +12:00
YaFedImYaEatIm 57d2ed493c Fixed Route Unit Test 2016-09-18 13:35:06 +12:00
Liam Beckett 0c98916c04 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	res/userdb.db
 2016-09-18 13:34:09 +12:00
YaFedImYaEatIm 618afd4a92 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-18 13:29:18 +12:00
Michael Wilson 02b484917d Fixed calculation bug. 2016-09-18 13:29:02 +12:00
Michael Wilson 60b92d2170 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/seng202/group9/Controller/SceneCode.java
 2016-09-18 13:14:00 +12:00
Liam Beckett ffae933085 Database 2016-09-18 11:27:17 +12:00
Sunguin Peng b2cba96dc1 Added javadoc for airline, airport and route raw data controller classes. 2016-09-18 10:38:54 +12:00
YaFedImYaEatIm 724f63956a Added Javadoc Strings for Some functions 2016-09-18 01:21:30 +12:00
YaFedImYaEatIm 9e00e3666f Fixed Conflicts when merging ConnectMaps 2016-09-18 00:34:08 +12:00
Michael Wilson ff79599c9b Calculator Implimented. 2016-09-17 20:46:23 +12:00
Sunguin Peng 37e712f734 Refactoring bugs fixed again 2016-09-17 20:33:20 +12:00
YaFedImYaEatIm 84e273de1f Merge branch 'ConnectMaps' 2016-09-17 20:07:02 +12:00
YaFedImYaEatIm 5363cf8b4e COnnected maps to airlines, Airports and ROutes 2016-09-17 20:06:19 +12:00
Sunguin Peng 50cc5c6dfb Merging filter complete GUI for Airport, Airline and Route Raw Data 2016-09-17 18:22:31 +12:00
Liam Beckett 4d662be24a Layout change 2016-09-17 18:16:13 +12:00
Sunguin Peng 1feb1c9153 Added filter function to the Airline GUI 2016-09-17 18:16:10 +12:00
Liam Beckett bf33ec61c7 Merge fix 2016-09-17 18:14:17 +12:00
Liam Beckett 1664a49623 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng202/group9/GUI/FlightSummaryController.java
 2016-09-17 18:13:02 +12:00
Liam Beckett cd8e2b0c7f Implemented the delete option for the flight paths on the Summary and Raw Data pages. 2016-09-17 18:08:42 +12:00
YaFedImYaEatIm 44ed68ee7a Added Google Maps API 2016-09-17 18:03:46 +12:00
YaFedImYaEatIm a9edea7690 Finished Google Maps API 2016-09-17 18:01:35 +12:00
Liam Beckett 62a93ad629 Implemented right click, delete ability for the flight raw data paths 2016-09-17 17:53:16 +12:00
Michael Wilson 548ffa99f1 Added webveiws for later maps implimentation. 2016-09-17 17:50:35 +12:00
Sunguin Peng 30f7b2d842 Fixed a bug from Route Filter and implemented Airport Filter in GUI 2016-09-17 17:40:24 +12:00
Liam Beckett 3508518cdd Added in the right click, delete option for the flight points in the table. 2016-09-17 17:37:39 +12:00
Liam Beckett be3413a373 Merge branch 'WIP_Update_list' into 'master' 
update list



See merge request !13
 2016-09-17 16:48:08 +12:00
Liam Beckett afc7d1472f Merge remote-tracking branch 'remotes/origin/master' into WIP_Update_list 2016-09-17 16:46:41 +12:00
Liam Beckett 42bbb327c4 Database 2016-09-17 16:45:47 +12:00
Liam Beckett 7333620964 Fixed the list view bug, so it will now reload the list view so that it includes the newly added path. 2016-09-17 16:45:11 +12:00
YaFedImYaEatIm ae3fbefd0d Initial load for GoogleMaps done 2016-09-17 16:40:25 +12:00
Sunguin Peng 4fde239167 Route Filtering on GUI 2016-09-17 16:33:20 +12:00
Michael Wilson 8c49ce4455 Merge remote-tracking branch 'origin/master' 2016-09-17 16:03:08 +12:00
Michael Wilson 3218b72941 Created pie graph viewer for Airports. 2016-09-17 16:02:27 +12:00
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
 2016-09-17 15:46:36 +12:00
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. 2016-09-17 15:36:00 +12:00
YaFedImYaEatIm 2613489dad Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 
Conflicts:
	res/session.ser
 2016-09-17 15:15:29 +12:00
YaFedImYaEatIm cbfe40a8fd Edited Session Message as Importer Error messages 2016-09-17 15:09:21 +12:00
YaFedImYaEatIm 03bac3b6dd Made it so that the session file is ignored 2016-09-17 15:08:53 +12:00
Sunguin Peng 5cc305d896 Fixed some refactoring issues and implemented delete functions in the GUI 2016-09-17 15:06:29 +12:00
Michael Wilson 8b30d2c0c2 Merge remote-tracking branch 'origin/master' 2016-09-17 14:58:18 +12:00
Michael Wilson eb698f17c8 Made graph work with new formatting. 2016-09-17 14:57:21 +12:00