fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
192 Commits 1 Branch 0 Tags
3519c52cb1514c55880edaa6f02f65ed817beec6
Commit Graph
192 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
YaFedImYaEatIm 8027b701a0 Added Import UI 2016-09-17 14:39:52 +12:00
Michael Wilson 56eeb0e9f8 Merge branch 'Analyser' 
Conflicts:
	src/main/java/seng202/group9/GUI/RouteRDController.java
 2016-09-17 14:06:24 +12:00
Michael Wilson f0fbc7cf24 Small check added. 2016-09-17 14:02:11 +12:00
Sunguin Peng e3ff9d3bfc Fixed a bit of Airline GUI 2016-09-17 11:52:07 +12:00
YaFedImYaEatIm 00333b6e58 Added Session and Controller Abstract Class 2016-09-16 21:55:08 +12:00
YaFedImYaEatIm 4ff6aefd1e Implemented Abstract Controller class which made code a lot short and easier to read 2016-09-16 21:49:12 +12:00
YaFedImYaEatIm 5641cc3728 Loaded Observers to Session loading 2016-09-16 17:23:06 +12:00
YaFedImYaEatIm bf8c1d1fdf Added Serialisation for the Session Code 2016-09-16 17:03:17 +12:00
YaFedImYaEatIm d0148d9e73 Added Enums for each Open View for easier storage for Session. 2016-09-16 17:00:25 +12:00
Liam Beckett 68081c664e Merge branch 'WIP_Flights_Adder' into 'master' 
Flights adder



See merge request !11
 2016-09-16 16:41:50 +12:00
Liam Beckett 25fcc8cf94 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 
# Conflicts:
#	res/userdb.db
 2016-09-16 16:38:31 +12:00
Liam Beckett 55db945a9d Database 2016-09-16 16:27:28 +12:00
YaFedImYaEatIm ebe82fb6ed Initial commit for Session 2016-09-16 14:10:48 +12:00
Michael Wilson 92c5cf9c8b First graph displays it's data as desired. 2016-09-16 13:28:52 +12:00
YaFedImYaEatIm b4073723f5 Merge branch 'Filter' 2016-09-16 12:52:42 +12:00
YaFedImYaEatIm 42592edfa1 Added Route Filtering 2016-09-16 12:52:15 +12:00
Liam Beckett ff20c6435e Implemented the ablitity to manually enter flight points into the database. 2016-09-16 12:50:58 +12:00
YaFedImYaEatIm 462f2304e4 Made Airline Filter 2016-09-16 12:45:24 +12:00
YaFedImYaEatIm 87bd23f722 Made Abstract Filter Class 2016-09-16 12:42:29 +12:00
Sunguin Peng bed13aca2f Changed GUI 2016-09-16 12:09:27 +12:00
Sunguin Peng 0cfffd258c GUI displays all fields and altered some GUI 2016-09-16 12:07:15 +12:00
YaFedImYaEatIm 091d9e5e00 got rid of dataset test code 2016-09-16 11:19:10 +12:00
YaFedImYaEatIm 9f804affff Merge branch 'DeleteFunctions' 2016-09-16 11:16:31 +12:00
YaFedImYaEatIm cd94b51282 Delete Code made 2016-09-16 11:15:38 +12:00
Michael Wilson 87d4b42036 Fixed 2 incorrect buttons and hooked up flight buttons. 2016-09-16 09:47:36 +12:00
Michael Wilson 94f2d25899 Hooked up all buttons for summary pages. 2016-09-16 09:31:02 +12:00
YaFedImYaEatIm f54b109639 Added delete dataset Function 2016-09-16 08:49:01 +12:00
YaFedImYaEatIm de9cee785c Changed some tests to reflect some function name changes 2016-09-16 00:19:57 +12:00
YaFedImYaEatIm a6f5f13c0b Merged CreateLinks Branch which allowed CreateLinks() function to work along with new Import Messages 2016-09-16 00:13:55 +12:00
YaFedImYaEatIm fac5ec79b1 Changed Import Messages to be relavent to the type of data they import 2016-09-16 00:06:57 +12:00
YaFedImYaEatIm 693acf9b9c Finished Create Link() establishment 2016-09-16 00:03:57 +12:00
Michael Wilson 16b9a7a8a8 Fixed routes summary. 2016-09-15 21:22:08 +12:00
YaFedImYaEatIm 58c2c6a839 Refactored some variables 2016-09-15 17:01:42 +12:00
Sunguin Peng 0189cfbe1c Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-15 16:54:24 +12:00
Sunguin Peng 33aafeb510 Resized GUI and refactoring 2016-09-15 16:53:56 +12:00
Sunguin Peng 605717a3c2 Resized GUI and changed add for GUI to not include ID 2016-09-15 16:51:11 +12:00
Liam Beckett ddcb3f65a7 Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202 2016-09-15 16:49:13 +12:00